summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2017-05-02 20:35:25 +1200
committerStefan Roese <sr@denx.de>2017-05-09 13:38:18 +0200
commite38f5fc8d80d946b401ba0e9ba0fcb52d6e7e74b (patch)
tree136b5fe5fad86b74adb2e15ee710c5598c379637
parentf2ca24d9d69efb8f16d6986b5933d963bf813883 (diff)
ARM: mvebu: switch db-88f6820-amc to DM for i2c
Move existing configuration from header file to defconfig or dts as appropriate. Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Stefan Roese <sr@denx.de>
-rw-r--r--arch/arm/dts/armada-385-amc.dts3
-rw-r--r--configs/db-88f6820-amc_defconfig2
-rw-r--r--include/configs/db-88f6820-amc.h7
3 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/dts/armada-385-amc.dts b/arch/arm/dts/armada-385-amc.dts
index a5a8a7f186d..4649c910c7b 100644
--- a/arch/arm/dts/armada-385-amc.dts
+++ b/arch/arm/dts/armada-385-amc.dts
@@ -54,6 +54,7 @@
aliases {
ethernet0 = &eth0;
ethernet1 = &eth1;
+ i2c0 = &i2c0;
spi1 = &spi1;
};
@@ -68,6 +69,8 @@
internal-regs {
i2c@11000 {
+ clock-frequency = <100000>;
+ u-boot,i2c-slave-addr = <0x0>;
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
status = "okay";
diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig
index e90526a4022..63fc4db6c88 100644
--- a/configs/db-88f6820-amc_defconfig
+++ b/configs/db-88f6820-amc_defconfig
@@ -36,6 +36,8 @@ CONFIG_EFI_PARTITION=y
# CONFIG_PARTITION_UUIDS is not set
# CONFIG_SPL_PARTITION_UUIDS is not set
CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MVTWSI=y
# CONFIG_MMC is not set
CONFIG_NAND_PXA3XX=y
CONFIG_SPI_FLASH=y
diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
index ba5c0901b1a..1cdefa05496 100644
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -27,13 +27,6 @@
#define CONFIG_CMD_ENV
#define CONFIG_CMD_PCI
-/* I2C */
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_MVTWSI
-#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE
-#define CONFIG_SYS_I2C_SLAVE 0x0
-#define CONFIG_SYS_I2C_SPEED 100000
-
/* SPI NOR flash default params, used by sf commands */
#define CONFIG_SF_DEFAULT_BUS 1
#define CONFIG_SF_DEFAULT_SPEED 1000000