summaryrefslogtreecommitdiff
path: root/drivers/i2c
diff options
context:
space:
mode:
authorTrent Piepho <tpiepho@impinj.com>2019-05-08 23:30:06 +0000
committerHeiko Schocher <hs@denx.de>2019-05-17 05:35:24 +0200
commitca0a8f3e8c5920485e9ab2ebba30a01b901f6bb7 (patch)
treeef8747e1bf1e3e692d579282bd4b0500a7d5ec71 /drivers/i2c
parentd1337210d16a64eb7cf6e8a4393f08ab84656220 (diff)
downloadu-boot-ca0a8f3e8c5920485e9ab2ebba30a01b901f6bb7.tar.gz
u-boot-ca0a8f3e8c5920485e9ab2ebba30a01b901f6bb7.tar.bz2
u-boot-ca0a8f3e8c5920485e9ab2ebba30a01b901f6bb7.zip
i2c: mxc: Hide kconfig based control in DM_I2C mode
These options only apply when not using DM_I2C. When using device trees, the dt will enable and control the speeds of the I2C controller(s) and these configuration options have no effect. So disable them in DM_I2C mode. Otherwise they show up as decoys, and make it look like one is enabling I2C controllers and setting the speed when really it's doing nothing. However, a system using a SPL build will not use DM_I2C in the SPL, even if DM_I2C is enabled for the main u-boot. And so the SPL might use the kconfig based I2C speed controls while the main u-boot does not. Cc: Sriram Dash <sriram.dash@nxp.com> Cc: Priyanka Jain <priyanka.jain@nxp.com> Cc: Heiko Schocher <hs@denx.de> Signed-off-by: Trent Piepho <tpiepho@impinj.com>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/Kconfig5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 215624020f..095a9bc6a4 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -161,7 +161,10 @@ config SYS_I2C_MXC
channels and operating on standard mode up to 100 kbits/s and fast
mode up to 400 kbits/s.
-if SYS_I2C_MXC
+# These settings are not used with DM_I2C, however SPL doesn't use
+# DM_I2C even if DM_I2C is enabled, and so might use these settings even
+# when main u-boot does not!
+if SYS_I2C_MXC && (!DM_I2C || SPL)
config SYS_I2C_MXC_I2C1
bool "NXP MXC I2C1"
help