Kconfig: Drop CONFIG_SYS_I2C_DTT_ADDR

This option is only defined to a non-default value by canyonlands, which
needs conversion to driver model (where the I2C address would be defined
by the device tree).

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>

diff --git a/README b/README
index 99af4c5bbf586f4d74c6d339f8eaadeb0fd53a7d..a31065b6f5eaa83ffa91c12183ea73a406586121 100644 (file)
--- a/README
+++ b/README
@@ -2329,12 +2329,6 @@ The following options need to be configured:
                If defined, then this indicates the I2C bus number for the DTT.
                If not defined, then U-Boot assumes that DTT is on I2C bus 0.
 
-               CONFIG_SYS_I2C_DTT_ADDR:
-
-               If defined, specifies the I2C address of the DTT device.
-               If not defined, then U-Boot uses predefined value for
-               specified DTT device.
-
                CONFIG_SOFT_I2C_READ_REPEATED_START
 
                defining this will force the i2c_read() function in

diff --git a/drivers/hwmon/ds1775.c b/drivers/hwmon/ds1775.c
index b95b130d926195b0efda75cab81aa84c9a4d1eed..4c0c0b82a07fecd640b06270c03753e18f24ecde 100644 (file)
--- a/drivers/hwmon/ds1775.c
+++ b/drivers/hwmon/ds1775.c
@@ -11,7 +11,7 @@
 #include <i2c.h>
 #include <dtt.h>
 
-#define DTT_I2C_DEV_CODE       CONFIG_SYS_I2C_DTT_ADDR /* Dallas Semi's DS1775 device code */
+#define DTT_I2C_DEV_CODE       0x48 /* Dallas Semi's DS1775 device code */
 #define DTT_READ_TEMP          0x0
 #define DTT_CONFIG             0x1
 #define DTT_TEMP_HYST          0x2

diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 462f902dad49394306889335a04bfd874e38a7ff..aafa4757b130ac222401076676d3455f9f57ef2d 100644 (file)
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -16,11 +16,7 @@
 /*
  * Device code
  */
-#if defined(CONFIG_SYS_I2C_DTT_ADDR)
-#define DTT_I2C_DEV_CODE CONFIG_SYS_I2C_DTT_ADDR
-#else
 #define DTT_I2C_DEV_CODE 0x48                  /* ON Semi's LM75 device */
-#endif
 #define DTT_READ_TEMP          0x0
 #define DTT_CONFIG             0x1
 #define DTT_TEMP_HYST          0x2

diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index a330372d19d064e82a1112591f7c8d132623cb32..ea440d6e165f9f70c3ecd0f1aaf526ddb31bf8a2 100644 (file)
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -269,10 +269,6 @@
 #define CONFIG_SYS_DTT_LOW_TEMP        -30
 #define CONFIG_SYS_DTT_HYSTERESIS      3
 
-#if defined(CONFIG_ARCHES)
-#define CONFIG_SYS_I2C_DTT_ADDR        0x4a            /* AD7414 I2C address   */
-#endif
-
 #if !defined(CONFIG_ARCHES)
 /* RTC configuration */
 #define CONFIG_RTC_M41T62

diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index 1f5c2ad234228fa4da3959df6a72dd0d17a0000f..b8c0d0d8f0a2553dddff230dac783accba8fc355 100644 (file)
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -320,7 +320,6 @@
 /* Standard DTT sensor configuration */
 #define CONFIG_DTT_DS1775      1
 #define CONFIG_DTT_SENSORS     { 0 }
-#define CONFIG_SYS_I2C_DTT_ADDR        0x48
 
 /* RTC configuration */
 #define CONFIG_RTC_DS1338      1

diff --git a/include/configs/makalu.h b/include/configs/makalu.h
index da5cfa19d33ec6b336fc597e515e936dab74a86f..cdb02f36936e03a6e28c18384da95be4454db81b 100644 (file)
--- a/include/configs/makalu.h
+++ b/include/configs/makalu.h
@@ -192,7 +192,6 @@
 /* Standard DTT sensor configuration */
 #define CONFIG_DTT_DS1775      1
 #define CONFIG_DTT_SENSORS     { 0 }
-#define CONFIG_SYS_I2C_DTT_ADDR        0x48
 
 /* RTC configuration */
 #define CONFIG_RTC_X1205       1

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5c4922c8596bd394c1f1a834554006e2b6350465..da5aa39d32d5decaf15741b9b544d040d8af07a4 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4205,7 +4205,6 @@ CONFIG_SYS_I2C_DSPIC_2_ADDR
 CONFIG_SYS_I2C_DSPIC_ADDR
 CONFIG_SYS_I2C_DSPIC_IO_ADDR
 CONFIG_SYS_I2C_DSPIC_KEYB_ADDR
-CONFIG_SYS_I2C_DTT_ADDR
 CONFIG_SYS_I2C_DVI_ADDR
 CONFIG_SYS_I2C_DVI_BUS_NUM
 CONFIG_SYS_I2C_EARLY_INIT