Clean up onewire config options

Rename onewire_led to led_driver_ds2413, since we may have other LED
drivers hanging off a one-wire bus in the future.

No functional changes, just renaming config options.

BUG=chrome-os-partner:18343
BRANCH=none
TEST=build all platforms

Change-Id: I1d70b1c5778da94bda4ebef3b57f7c39bfba2322
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/63273
Reviewed-by: Bill Richardson <wfrichar@chromium.org>

6 files changed, 25 insertions, 16 deletions

diff --git a/board/bolt/board.h b/board/bolt/board.h
index b207e45133..36e274011d 100644
--- a/board/bolt/board.h
+++ b/board/bolt/board.h
@@ -24,10 +24,10 @@
 #ifdef HAS_TASK_KEYPROTO
 #define CONFIG_KEYBOARD_PROTOCOL_8042
 #endif
+#define CONFIG_LED_DRIVER_DS2413
 #define CONFIG_ONEWIRE
-#define  ONEWIRE_BANK LM4_GPIO_F
-#define  ONEWIRE_PIN (1 << 7)
-#define CONFIG_ONEWIRE_LED
+#define CONFIG_ONEWIRE_BANK LM4_GPIO_F
+#define CONFIG_ONEWIRE_PIN (1 << 7)
 #define CONFIG_POWER_BUTTON
 #define CONFIG_POWER_BUTTON_X86
 #define CONFIG_WP_ACTIVE_HIGH
diff --git a/board/link/board.h b/board/link/board.h
index 2cf1c0e7b2..422db1dfcd 100644
--- a/board/link/board.h
+++ b/board/link/board.h
@@ -24,10 +24,10 @@
 #ifdef HAS_TASK_KEYPROTO
 #define CONFIG_KEYBOARD_PROTOCOL_8042
 #endif
+#define CONFIG_LED_DRIVER_DS2413
 #define CONFIG_ONEWIRE
-#define  ONEWIRE_BANK LM4_GPIO_H
-#define  ONEWIRE_PIN (1 << 2)
-#define CONFIG_ONEWIRE_LED
+#define CONFIG_ONEWIRE_BANK LM4_GPIO_H
+#define CONFIG_ONEWIRE_PIN (1 << 2)
 #define CONFIG_POWER_BUTTON
 #define CONFIG_POWER_BUTTON_X86
 #define CONFIG_PWM_FAN
diff --git a/chip/lm4/onewire.c b/chip/lm4/onewire.c
index 9add8f68d6..1147314b6b 100644
--- a/chip/lm4/onewire.c
+++ b/chip/lm4/onewire.c
@@ -12,8 +12,8 @@
 #include "task.h"
 #include "timer.h"
 
-#if !defined(ONEWIRE_BANK) || !defined(ONEWIRE_PIN)
-#error Unsupported board. ONEWIRE_BANK and ONEWIRE_PIN need to be defined.
+#if !defined(CONFIG_ONEWIRE_BANK) || !defined(CONFIG_ONEWIRE_PIN)
+#error Unsupported board. CONFIG_ONEWIRE_BANK/PIN need to be defined.
 #endif
 
 /*
@@ -38,10 +38,10 @@
  */
 static void output0(int usec)
 {
-	LM4_GPIO_DIR(ONEWIRE_BANK) |= ONEWIRE_PIN;
-	LM4_GPIO_DATA(ONEWIRE_BANK, ONEWIRE_PIN) = 0;
+	LM4_GPIO_DIR(CONFIG_ONEWIRE_BANK) |= CONFIG_ONEWIRE_PIN;
+	LM4_GPIO_DATA(CONFIG_ONEWIRE_BANK, CONFIG_ONEWIRE_PIN) = 0;
 	udelay(usec);
-	LM4_GPIO_DIR(ONEWIRE_BANK) &= ~ONEWIRE_PIN;
+	LM4_GPIO_DIR(CONFIG_ONEWIRE_BANK) &= ~CONFIG_ONEWIRE_PIN;
 }
 
 /**
@@ -49,7 +49,7 @@ static void output0(int usec)
  */
 static int readline(void)
 {
-	return LM4_GPIO_DATA(ONEWIRE_BANK, ONEWIRE_PIN) ? 1 : 0;
+	return LM4_GPIO_DATA(CONFIG_ONEWIRE_BANK, CONFIG_ONEWIRE_PIN) ? 1 : 0;
 }
 
 /**
@@ -160,7 +160,8 @@ void onewire_write(int data)
 static void onewire_init(void)
 {
 	/* Configure 1-wire pin as open-drain GPIO */
-	gpio_set_alternate_function(ONEWIRE_BANK, ONEWIRE_PIN, -1);
-	LM4_GPIO_ODR(ONEWIRE_BANK) |= ONEWIRE_PIN;
+	gpio_set_alternate_function(CONFIG_ONEWIRE_BANK,
+				    CONFIG_ONEWIRE_PIN, -1);
+	LM4_GPIO_ODR(CONFIG_ONEWIRE_BANK) |= CONFIG_ONEWIRE_PIN;
 }
 DECLARE_HOOK(HOOK_INIT, onewire_init, HOOK_PRIO_DEFAULT);
diff --git a/common/build.mk b/common/build.mk
index a8846541e4..6596216232 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -44,10 +44,10 @@ common-$(CONFIG_I2C_ARBITRATION)+=i2c_arbitration.o
 common-$(CONFIG_KEYBOARD_PROTOCOL_8042)+=keyboard_8042.o
 common-$(CONFIG_KEYBOARD_PROTOCOL_MKBP)+=keyboard_mkbp.o
 common-$(CONFIG_KEYBOARD_TEST)+=keyboard_test.o
+common-$(CONFIG_LED_DRIVER_DS2413)+=led_driver_ds2413.o
 common-$(CONFIG_LED_DRIVER_LP5562)+=led_driver_lp5562.o led_lp5562.o
 common-$(CONFIG_LID_SWITCH)+=lid_switch.o
 common-$(CONFIG_LPC)+=port80.o
-common-$(CONFIG_ONEWIRE_LED)+=onewire_led.o
 common-$(CONFIG_POWER_BUTTON)+=power_button.o
 common-$(CONFIG_POWER_BUTTON_X86)+=power_button_x86.o
 common-$(CONFIG_PSTORE)+=pstore_commands.o
diff --git a/common/onewire_led.c b/common/led_driver_ds2413.c
index 9babd75992..9babd75992 100644
--- a/common/onewire_led.c
+++ b/common/led_driver_ds2413.c
diff --git a/include/config.h b/include/config.h
index 7484ee5852..d540beb8c1 100644
--- a/include/config.h
+++ b/include/config.h
@@ -307,6 +307,7 @@
 
 /*****************************************************************************/
 
+#undef CONFIG_LED_DRIVER_DS2413  /* Maxim DS2413 */
 #undef CONFIG_LED_DRIVER_LP5562
 
 /*
@@ -322,8 +323,15 @@
 /* Compile support for LPC interface */
 #undef CONFIG_LPC
 
+/* Compile support for one-wire interface */
 #undef CONFIG_ONEWIRE
-#undef CONFIG_ONEWIRE_LED
+
+/* GPIO bank for one-wire interface */
+#undef CONFIG_ONEWIRE_BANK
+
+/* Pin mask for one-wire interface */
+#undef CONFIG_ONEWIRE_PIN
+
 #undef CONFIG_OVERFLOW_DETECT
 
 /* Compile support for PECI interface to x86 processor */