[coreboot-gerrit] New patch to review for coreboot: google/beltino, tidus: simplify led_power_on() function

[Matt DeVillier (matt.devillier@gmail.com)]

Matt DeVillier (matt.devillier at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17744

-gerrit

commit cae045be60220c851e8f65cb2902c4383ebe96d5
Author: Matt DeVillier <matt.devillier at gmail.com>
Date:   Tue Dec 6 17:59:23 2016 -0600

    google/beltino, tidus: simplify led_power_on() function
    
    Simplify set_power_led() by consolidating switch and setting values
    as needed inline based on LED state.  Remove unnecesary function
    param, includes for Tidus.
    
    Change-Id: I28e6fac5f8d7e2ff419002db714ce88697895faf
    Signed-off-by: Matt DeVillier <matt.devillier at gmail.com>
---
 .../google/beltino/variants/mccloud/led.c          | 34 ++++++--------------
 src/mainboard/google/tidus/led.c                   | 37 ++++++----------------
 src/mainboard/google/tidus/onboard.h               |  2 +-
 src/mainboard/google/tidus/romstage.c              |  2 +-
 src/mainboard/google/tidus/smihandler.c            |  5 ++-
 5 files changed, 23 insertions(+), 57 deletions(-)

diff --git a/src/mainboard/google/beltino/variants/mccloud/led.c b/src/mainboard/google/beltino/variants/mccloud/led.c
index da303e8..ce8d2d8 100644
--- a/src/mainboard/google/beltino/variants/mccloud/led.c
+++ b/src/mainboard/google/beltino/variants/mccloud/led.c
@@ -19,29 +19,13 @@
 
 void set_power_led(int state)
 {
-	switch (state) {
-	case LED_ON:
-	case LED_OFF:
-		it8772f_gpio_led(IT8772F_GPIO_DEV,
-			1 /* set */,
-			0x01 /* select */,
-			state /* polarity: state dependent */,
-			0x00 /* 0=pulldown */,
-			0x01 /* output */,
-			0x01 /* 1=Simple IO function */,
-			SIO_GPIO_BLINK_GPIO10,
-			IT8772F_GPIO_BLINK_FREQUENCY_1_HZ);
-		break;
-	case LED_BLINK:
-		it8772f_gpio_led(IT8772F_GPIO_DEV,
-			1 /* set */,
-			0x01 /* select */,
-			0x01 /* polarity */,
-			0x01 /* 1=pullup */,
-			0x01 /* output */,
-			0x00, /* 0=Alternate function */
-			SIO_GPIO_BLINK_GPIO10,
-			IT8772F_GPIO_BLINK_FREQUENCY_1_HZ);
-		break;
-	}
+	it8772f_gpio_led(IT8772F_GPIO_DEV,
+		1, 					/* set */
+		0x01, 					/* select */
+		state == LED_OFF ? 0x00 : 0x01,		/* polarity */
+		state == LED_BLINK ? 0x01 : 0x00,	/* pullup/pulldown */
+		0x01, 					/* output */
+		state == LED_BLINK ? 0x00 : 0x01,	/* I/O function */
+		SIO_GPIO_BLINK_GPIO10,
+		IT8772F_GPIO_BLINK_FREQUENCY_1_HZ);
 }
diff --git a/src/mainboard/google/tidus/led.c b/src/mainboard/google/tidus/led.c
index c0bf332..a21b3b5 100644
--- a/src/mainboard/google/tidus/led.c
+++ b/src/mainboard/google/tidus/led.c
@@ -14,35 +14,18 @@
  */
 
 #include <types.h>
-#include <arch/io.h>
 #include <superio/ite/it8772f/it8772f.h>
 #include "onboard.h"
 
-void set_power_led(u8 led_pin_map, int state)
+void set_power_led(int state)
 {
-	switch (state) {
-	case LED_ON:
-	case LED_OFF:
-		it8772f_gpio_led(IT8772F_GPIO_DEV,
-			1 /* set */,
-			0x01 /* select */,
-			state /* polarity: non-inverting */,
-			0x00 /* 0=pulldown */,
-			0x01 /* output */,
-			0x01 /* 1=Simple IO function */,
-			led_pin_map,
-			IT8772F_GPIO_BLINK_FREQUENCY_1_HZ);
-		break;
-	case LED_BLINK:
-		it8772f_gpio_led(IT8772F_GPIO_DEV,
-			1 /* set */,
-			0x01 /* select */,
-			0x01 /* polarity */,
-			0x01 /* 1=pullup */,
-			0x01 /* output */,
-			0x00, /* 0=Alternate function */
-			led_pin_map,
-			IT8772F_GPIO_BLINK_FREQUENCY_1_HZ);
-		break;
-	}
+	it8772f_gpio_led(IT8772F_GPIO_DEV,
+		1,					/* set */
+		0x01,					/* select */
+		state == LED_OFF ? 0x00 : 0x01,		/* polarity */
+		state == LED_BLINK ? 0x01 : 0x00,	/* pullup/pulldown */
+		0x01,					/* output */
+		state == LED_BLINK ? 0x00 : 0x01,	/* I/O function */
+		SIO_GPIO_BLINK_GPIO10,
+		IT8772F_GPIO_BLINK_FREQUENCY_1_HZ);
 }
diff --git a/src/mainboard/google/tidus/onboard.h b/src/mainboard/google/tidus/onboard.h
index 793c88f..6085c7d 100644
--- a/src/mainboard/google/tidus/onboard.h
+++ b/src/mainboard/google/tidus/onboard.h
@@ -19,7 +19,7 @@
 #ifndef __ACPI__
 void lan_init(void);
 
-void set_power_led(u8 led_pin_map, int state);
+void set_power_led(int state);
 
 enum {
 	LED_OFF		= 0,
diff --git a/src/mainboard/google/tidus/romstage.c b/src/mainboard/google/tidus/romstage.c
index 351fc616..703eaea 100644
--- a/src/mainboard/google/tidus/romstage.c
+++ b/src/mainboard/google/tidus/romstage.c
@@ -56,6 +56,6 @@ void mainboard_pre_console_init(void)
 	ite_enable_serial(IT8772F_SERIAL_DEV, CONFIG_TTYS0_BASE);
 
 	/* Turn On GPIO10.LED */
-	set_power_led(SIO_GPIO_BLINK_GPIO10, LED_ON);
+	set_power_led(LED_ON);
 
 }
diff --git a/src/mainboard/google/tidus/smihandler.c b/src/mainboard/google/tidus/smihandler.c
index 68bc2c2..6bd93d3 100644
--- a/src/mainboard/google/tidus/smihandler.c
+++ b/src/mainboard/google/tidus/smihandler.c
@@ -27,7 +27,6 @@
 #include <soc/nvs.h>
 #include <soc/pm.h>
 #include <soc/smm.h>
-#include <superio/ite/it8772f/it8772f.h>
 #include "onboard.h"
 
 /* USB Charger Control: GPIO26 */
@@ -63,13 +62,13 @@ void mainboard_smi_sleep(u8 slp_typ)
 	/* Disable USB charging if required */
 	switch (slp_typ) {
 	case ACPI_S3:
-		set_power_led(SIO_GPIO_BLINK_GPIO10, LED_BLINK);
+		set_power_led(LED_BLINK);
 
 		/* Enable DCP mode */
 		set_gpio(GPIO_USB_CTL_1, 0);
 		break;
 	case ACPI_S5:
-		set_power_led(SIO_GPIO_BLINK_GPIO10, LED_OFF);
+		set_power_led(LED_OFF);
 		break;
 	}
 }