[U-Boot] [PATCH 07/47] Kconfig: Drop CONFIG_SYS_I2C_DTT_ADDR

Simon Glass
2017-05-15T10:57:22Z

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>
---

README | 6 ------
drivers/hwmon/ds1775.c | 2 +-
drivers/hwmon/lm75.c | 4 ----
include/configs/canyonlands.h | 4 ----
include/configs/kilauea.h | 1 -
include/configs/makalu.h | 1 -
scripts/config_whitelist.txt | 1 -
7 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/README b/README
index ace492edde..0e6ed53736 100644
--- a/README
+++ b/README
@@ -2391,12 +2391,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 b95b130d92..4c0c0b82a0 100644
--- 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 462f902dad..aafa4757b1 100644
--- 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 a330372d19..ea440d6e16 100644
--- 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 1f5c2ad234..b8c0d0d8f0 100644
--- 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 da5cfa19d3..cdb02f3693 100644
--- 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 85ab8f8933..e39fa2520e 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4232,7 +4232,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
--
2.13.0.rc2.291.g57267f2277-goog