diff mbox

[U-Boot,v3,11/48] Kconfig: Drop CONFIG_SYS_I2C_DS4510_ADDR

Message ID 20170517092544.19357-12-sjg@chromium.org
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Simon Glass May 17, 2017, 9:25 a.m. UTC 
This is only used by one board and always set to 0x51. Drop this option.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
---

Changes in v3: None
Changes in v2: None

 drivers/misc/ds4510.c         | 7 +------
 include/configs/xpedite517x.h | 3 ---
 include/configs/xpedite537x.h | 3 ---
 scripts/config_whitelist.txt  | 1 -
 4 files changed, 1 insertion(+), 13 deletions(-)

Comments

Tom Rini May 22, 2017, 6 p.m. UTC | #1 
On Wed, May 17, 2017 at 03:25:07AM -0600, Simon Glass wrote:

> This is only used by one board and always set to 0x51. Drop this option.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> Reviewed-by: Heiko Schocher <hs@denx.de>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c
index 9ffdafc992..55f8936513 100644
--- a/drivers/misc/ds4510.c
+++ b/drivers/misc/ds4510.c
@@ -14,11 +14,6 @@ 
 #include <command.h>
 #include "ds4510.h"
 
-/* Default to an address that hopefully won't corrupt other i2c devices */
-#ifndef CONFIG_SYS_I2C_DS4510_ADDR
-#define CONFIG_SYS_I2C_DS4510_ADDR	(~0)
-#endif
-
 enum {
 	DS4510_CMD_INFO,
 	DS4510_CMD_DEVICE,
@@ -254,7 +249,7 @@  cmd_tbl_t cmd_ds4510[] = {
 
 int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-	static uint8_t chip = CONFIG_SYS_I2C_DS4510_ADDR;
+	static uint8_t chip = 0x51;
 	cmd_tbl_t *c;
 	ulong ul_arg2 = 0;
 	ulong ul_arg3 = 0;
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 94aad2519e..cf84e1f99a 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -234,9 +234,6 @@  extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_I2C_RTC_ADDR		0x68
 #define CONFIG_SYS_M41T11_BASE_YEAR	2000
 
-/* GPIO/EEPROM/SRAM */
-#define CONFIG_SYS_I2C_DS4510_ADDR	0x51
-
 /* GPIO */
 #define CONFIG_PCA953X
 #define CONFIG_SYS_I2C_PCA953X_ADDR0	0x18
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 826cd9aa5f..d630f2a9c9 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -232,9 +232,6 @@  extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_SYS_I2C_RTC_ADDR		0x68
 #define CONFIG_SYS_M41T11_BASE_YEAR	2000
 
-/* GPIO/EEPROM/SRAM */
-#define CONFIG_SYS_I2C_DS4510_ADDR	0x51
-
 /* GPIO */
 #define CONFIG_PCA953X
 #define CONFIG_SYS_I2C_PCA953X_ADDR0	0x18
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 3469deb589..d015fc84e1 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4177,7 +4177,6 @@  CONFIG_SYS_I2C_CLK_OFFSET
 CONFIG_SYS_I2C_DAVINCI
 CONFIG_SYS_I2C_DIRECT_BUS
 CONFIG_SYS_I2C_DPMEM_OFFSET
-CONFIG_SYS_I2C_DS4510_ADDR
 CONFIG_SYS_I2C_DSPIC_2_ADDR
 CONFIG_SYS_I2C_DSPIC_ADDR
 CONFIG_SYS_I2C_DSPIC_IO_ADDR