Skip to contentSkip to conversation

dm: arm64: ls1043a: add i2c DM support

PATCH RESEND New Biwen Li 2 participants 6 messages Feb 5, 2020 – Mar 30, 2020 Arm (32-bit)

lore
Share & tools
lore

Biwen Li

author
#0 lore raw

PATCH RESEND v8 6/8 dm: arm64: ls1043a: add i2c DM support

This supports i2c DM and enables CONFIG_DM_I2C
for SoC LS1043A

---
Changes in RESEND v8:
- fix build warning

Changes in v8:
- none

Changes in v7:
- none

Changes in v6:
- correct dependencies

Changes in v5:
- update subject

Changes in v4:
- update copyright

Changes in v3:
- none

Changes in v2:
- merge some patches to one patch

 arch/arm/cpu/armv8/fsl-layerscape/Kconfig     | 10 +-
 arch/arm/include/asm/gpio.h                   |  4 +-
 board/freescale/ls1043aqds/ls1043aqds.c       | 98 +++++++++++++++++--
 configs/ls1043aqds_defconfig                  |  2 +
 configs/ls1043aqds_lpuart_defconfig           |  2 +
 configs/ls1043aqds_nand_defconfig             |  2 +
 configs/ls1043aqds_nor_ddr3_defconfig         |  2 +
 configs/ls1043aqds_qspi_defconfig             |  2 +
 configs/ls1043aqds_sdcard_ifc_defconfig       |  2 +
 configs/ls1043aqds_sdcard_qspi_defconfig      |  2 +
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig  |  2 +
 configs/ls1043aqds_tfa_defconfig              |  2 +
 configs/ls1043ardb_SECURE_BOOT_defconfig      |  2 +
 configs/ls1043ardb_defconfig                  |  2 +
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig |  2 +
 configs/ls1043ardb_nand_defconfig             |  2 +
 .../ls1043ardb_sdcard_SECURE_BOOT_defconfig   |  2 +
 configs/ls1043ardb_sdcard_defconfig           |  2 +
 configs/ls1043ardb_tfa_SECURE_BOOT_defconfig  |  2 +
 configs/ls1043ardb_tfa_defconfig              |  2 +
 include/configs/ls1043a_common.h              | 11 +++
 21 files changed, 144 insertions(+), 13 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +5 -5
index 275c66d992..760053e401 100644
@@ -74,11 +74,11 @@ config ARCH_LS1043A
 	select SYS_FSL_HAS_DDR4
 	select ARCH_EARLY_INIT_R
 	select BOARD_EARLY_INIT_F
-	select SYS_I2C_MXC
-	select SYS_I2C_MXC_I2C1
-	select SYS_I2C_MXC_I2C2
-	select SYS_I2C_MXC_I2C3
-	select SYS_I2C_MXC_I2C4
+	select SYS_I2C_MXC if !DM_I2C
+	select SYS_I2C_MXC_I2C1 if !DM_I2C
+	select SYS_I2C_MXC_I2C2 if !DM_I2C
+	select SYS_I2C_MXC_I2C3 if !DM_I2C
+	select SYS_I2C_MXC_I2C4 if !DM_I2C
 	imply CMD_PCI
 
 config ARCH_LS1046A
arch/arm/include/asm/gpio.h +2 -2
index 29dc498bd8..c480e712fe 100644
@@ -3,8 +3,8 @@
 	!defined(CONFIG_ARCH_BCM6858) && !defined(CONFIG_ARCH_BCM63158) && \
 	!defined(CONFIG_ARCH_ROCKCHIP) && !defined(CONFIG_ARCH_LX2160A) && \
 	!defined(CONFIG_ARCH_LS1012A) && !defined(CONFIG_ARCH_LS1028A) && \
-       	!defined(CONFIG_ARCH_LS2080A) && !defined(CONFIG_ARCH_LS1088A) && \
-	!defined(CONFIG_ARCH_ASPEED) && \
+	!defined(CONFIG_ARCH_LS1043A) && !defined(CONFIG_ARCH_LS2080A) && \
+	!defined(CONFIG_ARCH_LS1088A) && !defined(CONFIG_ARCH_ASPEED) && \
 	!defined(CONFIG_ARCH_U8500)
 #include <asm/arch/gpio.h>
 #endif
board/freescale/ls1043aqds/ls1043aqds.c +92 -6

157 lines not on this page · raw message

configs/ls1043aqds_defconfig +2 -0
index 2885552ef3..93b86af607 100644
@@ -62,3 +62,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_lpuart_defconfig +2 -0
index 9d9229ac03..f89c2ee3a4 100644
@@ -64,3 +64,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_nand_defconfig +2 -0
index c45eaea02a..a169bfef8f 100644
@@ -78,3 +78,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_nor_ddr3_defconfig +2 -0
index 8d28fe1baf..01d0af30b1 100644
@@ -63,3 +63,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_qspi_defconfig +2 -0
index 86b2eb56b8..65eff7c40b 100644
@@ -58,3 +58,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_sdcard_ifc_defconfig +2 -0
index bf3f0d0990..c5042a345d 100644
@@ -79,3 +79,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_sdcard_qspi_defconfig +2 -0
index 0449469b89..12706a48dc 100644
@@ -72,3 +72,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig +2 -0
index 4ba5a8dd95..bbd01eb290 100644
@@ -64,3 +64,5 @@ CONFIG_SPL_RSA=y
 CONFIG_RSA_SOFTWARE_EXP=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_tfa_defconfig +2 -0
index 24db72a39d..6e594ed07c 100644
@@ -71,3 +71,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_SECURE_BOOT_defconfig +2 -0
index 5e030e2586..153a62866f 100644
@@ -55,3 +55,5 @@ CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_RSA_SOFTWARE_EXP=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_defconfig +2 -0
index 0676cbccdd..d1e534388b 100644
@@ -55,3 +55,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_nand_SECURE_BOOT_defconfig +2 -0
index 1f4c5705d5..252c7c8313 100644
@@ -75,3 +75,5 @@ CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_nand_defconfig +2 -0
index e7fe2de309..de18aaa063 100644
@@ -74,3 +74,5 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 # CONFIG_SPL_USE_TINY_PRINTF is not set
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +2 -0
index 6529c7334c..149b25ffe5 100644
@@ -74,3 +74,5 @@ CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_sdcard_defconfig +2 -0
index 228262477c..b386fc668c 100644
@@ -73,3 +73,5 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 # CONFIG_SPL_USE_TINY_PRINTF is not set
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_tfa_SECURE_BOOT_defconfig +2 -0
index 83bfca078b..017ec5ea7a 100644
@@ -57,3 +57,5 @@ CONFIG_SPL_RSA=y
 CONFIG_RSA_SOFTWARE_EXP=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
 CONFIG_CMD_SETEXPR=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_tfa_defconfig +2 -0
index 4154075986..eaddbca79f 100644
@@ -59,3 +59,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
include/configs/ls1043a_common.h +11 -0
index bf24d4036d..985f40412c 100644
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2015 Freescale Semiconductor
+ * Copyright (C) 2019 NXP
  */
 
 #ifndef __LS1043A_COMMON_H
@@ -141,7 +142,17 @@
 #endif
 
 /* I2C */
+#ifndef CONFIG_DM_I2C
 #define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
+#define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
+#define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
+#define CONFIG_SYS_I2C_MXC_I2C4		/* enable I2C bus 4 */
+#else
+#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
+#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
+#endif
 
 /* PCIe */
 #ifndef SPL_NO_PCIE
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH RESEND v8 6/8 dm: arm64: ls1043a: add i2c DM support

Quoted 2 lines

This supports i2c DM and enables CONFIG_DM_I2C for SoC LS1043A

Hi Priyanka,

Any coments?

Best Regards,
Biwen Li

Quoted 476 lines

---
Changes in RESEND v8:
- fix build warning

Changes in v8:
- none

Changes in v7:
- none

Changes in v6:
- correct dependencies

Changes in v5:
- update subject

Changes in v4:
- update copyright

Changes in v3:
- none

Changes in v2:
- merge some patches to one patch

 arch/arm/cpu/armv8/fsl-layerscape/Kconfig     | 10 +-
 arch/arm/include/asm/gpio.h                   |  4 +-
 board/freescale/ls1043aqds/ls1043aqds.c       | 98
+++++++++++++++++--
 configs/ls1043aqds_defconfig                  |  2 +
 configs/ls1043aqds_lpuart_defconfig           |  2 +
 configs/ls1043aqds_nand_defconfig             |  2 +
 configs/ls1043aqds_nor_ddr3_defconfig         |  2 +
 configs/ls1043aqds_qspi_defconfig             |  2 +
 configs/ls1043aqds_sdcard_ifc_defconfig       |  2 +
 configs/ls1043aqds_sdcard_qspi_defconfig      |  2 +
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig  |  2 +
 configs/ls1043aqds_tfa_defconfig              |  2 +
 configs/ls1043ardb_SECURE_BOOT_defconfig      |  2 +
 configs/ls1043ardb_defconfig                  |  2 +
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig |  2 +
 configs/ls1043ardb_nand_defconfig             |  2 +
 .../ls1043ardb_sdcard_SECURE_BOOT_defconfig   |  2 +
 configs/ls1043ardb_sdcard_defconfig           |  2 +
 configs/ls1043ardb_tfa_SECURE_BOOT_defconfig  |  2 +
 configs/ls1043ardb_tfa_defconfig              |  2 +
 include/configs/ls1043a_common.h              | 11 +++
 21 files changed, 144 insertions(+), 13 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +5 -5
index 275c66d992..760053e401 100644
@@ -74,11 +74,11 @@ config ARCH_LS1043A
 	select SYS_FSL_HAS_DDR4
 	select ARCH_EARLY_INIT_R
 	select BOARD_EARLY_INIT_F
-	select SYS_I2C_MXC
-	select SYS_I2C_MXC_I2C1
-	select SYS_I2C_MXC_I2C2
-	select SYS_I2C_MXC_I2C3
-	select SYS_I2C_MXC_I2C4
+	select SYS_I2C_MXC if !DM_I2C
+	select SYS_I2C_MXC_I2C1 if !DM_I2C
+	select SYS_I2C_MXC_I2C2 if !DM_I2C
+	select SYS_I2C_MXC_I2C3 if !DM_I2C
+	select SYS_I2C_MXC_I2C4 if !DM_I2C
 	imply CMD_PCI
 
 config ARCH_LS1046A
arch/arm/include/asm/gpio.h +1 -2
index 29dc498bd8..c480e712fe 100644
@@ -3,8 +3,8 @@
 	!defined(CONFIG_ARCH_BCM6858)
 && !defined(CONFIG_ARCH_BCM63158) && \
 	!defined(CONFIG_ARCH_ROCKCHIP)
 && !defined(CONFIG_ARCH_LX2160A) && \
 	!defined(CONFIG_ARCH_LS1012A) && !defined(CONFIG_ARCH_LS1028A)
 && \
-       	!defined(CONFIG_ARCH_LS2080A)
 && !defined(CONFIG_ARCH_LS1088A) && \
-	!defined(CONFIG_ARCH_ASPEED) && \
+	!defined(CONFIG_ARCH_LS1043A) && !defined(CONFIG_ARCH_LS2080A)

&& \

arch/arm/include/asm/gpio.h +1 -0
+	!defined(CONFIG_ARCH_LS1088A) && !defined(CONFIG_ARCH_ASPEED)

&& \

arch/arm/include/asm/gpio.h +0 -0
 	!defined(CONFIG_ARCH_U8500)
 #include <asm/arch/gpio.h>
 #endif
board/freescale/ls1043aqds/ls1043aqds.c +87 -4
index 8c96b962b7..2d4b18cdbc 100644
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2015 Freescale Semiconductor, Inc.
+ * Copyright 2019 NXP
  */
 
 #include <common.h>
@@ -271,11 +272,24 @@ unsigned long get_board_ddr_clk(void)
 	return 66666666;
 }
 
-int select_i2c_ch_pca9547(u8 ch)
+int select_i2c_ch_pca9547(u8 ch, int bus_num)
 {
 	int ret;
 
+#ifdef CONFIG_DM_I2C
+	struct udevice *dev;
+
+	ret = i2c_get_chip_for_busnum(bus_num, I2C_MUX_PCA_ADDR_PRI,
+				      1, &dev);
+	if (ret) {
+		printf("%s: Cannot find udev for a bus %d\n", __func__,
+		       bus_num);
+		return ret;
+	}
+	ret = dm_i2c_write(dev, 0, &ch, 1);
+#else
 	ret = i2c_write(I2C_MUX_PCA_ADDR_PRI, 0, 1, &ch, 1);
+#endif
 	if (ret) {
 		puts("PCA: failed to select proper channel\n");
 		return ret;
@@ -290,8 +304,10 @@ int dram_init(void)
 	 * When resuming from deep sleep, the I2C channel may not be
 	 * in the default channel. So, switch to the default channel
 	 * before accessing DDR SPD.
+	 *
+	 * PCA9547 mount on I2C1 bus
 	 */
-	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
 	fsl_initdram();
 #if (!defined(CONFIG_SPL) && !defined(CONFIG_TFABOOT)) || \
 	defined(CONFIG_SPL_BUILD)
@@ -304,16 +320,83 @@ int dram_init(void)
 
 int i2c_multiplexer_select_vid_channel(u8 channel)  {
-	return select_i2c_ch_pca9547(channel);
+	return select_i2c_ch_pca9547(channel, 0);
 }
 
 void board_retimer_init(void)
 {
 	u8 reg;
+	int bus_num = 0;
 
 	/* Retimer is connected to I2C1_CH7_CH5 */
-	select_i2c_ch_pca9547(I2C_MUX_CH7);
+	select_i2c_ch_pca9547(I2C_MUX_CH7, bus_num);
 	reg = I2C_MUX_CH5;
+#ifdef CONFIG_DM_I2C
+	struct udevice *dev;
+	int ret;
+
+	ret = i2c_get_chip_for_busnum(bus_num, I2C_MUX_PCA_ADDR_SEC,
+				      1, &dev);
+	if (ret) {
+		printf("%s: Cannot find udev for a bus %d\n", __func__,
+		       bus_num);
+		return;
+	}
+	dm_i2c_write(dev, 0, &reg, 1);
+
+	/* Access to Control/Shared register */
+	ret = i2c_get_chip_for_busnum(bus_num, I2C_RETIMER_ADDR,
+				      1, &dev);
+	if (ret) {
+		printf("%s: Cannot find udev for a bus %d\n", __func__,
+		       bus_num);
+		return;
+	}
+
+	reg = 0x0;
+	dm_i2c_write(dev, 0xff, &reg, 1);
+
+	/* Read device revision and ID */
+	dm_i2c_read(dev, 1, &reg, 1);
+	debug("Retimer version id = 0x%x\n", reg);
+
+	/* Enable Broadcast. All writes target all channel register sets */
+	reg = 0x0c;
+	dm_i2c_write(dev, 0xff, &reg, 1);
+
+	/* Reset Channel Registers */
+	dm_i2c_read(dev, 0, &reg, 1);
+	reg |= 0x4;
+	dm_i2c_write(dev, 0, &reg, 1);
+
+	/* Enable override divider select and Enable Override Output Mux */
+	dm_i2c_read(dev, 9, &reg, 1);
+	reg |= 0x24;
+	dm_i2c_write(dev, 9, &reg, 1);
+
+	/* Select VCO Divider to full rate (000) */
+	dm_i2c_read(dev, 0x18, &reg, 1);
+	reg &= 0x8f;
+	dm_i2c_write(dev, 0x18, &reg, 1);
+
+	/* Selects active PFD MUX Input as Re-timed Data (001) */
+	dm_i2c_read(dev, 0x1e, &reg, 1);
+	reg &= 0x3f;
+	reg |= 0x20;
+	dm_i2c_write(dev, 0x1e, &reg, 1);
+
+	/* Set data rate as 10.3125 Gbps */
+	reg = 0x0;
+	dm_i2c_write(dev, 0x60, &reg, 1);
+	reg = 0xb2;
+	dm_i2c_write(dev, 0x61, &reg, 1);
+	reg = 0x90;
+	dm_i2c_write(dev, 0x62, &reg, 1);
+	reg = 0xb3;
+	dm_i2c_write(dev, 0x63, &reg, 1);
+	reg = 0xcd;
+	dm_i2c_write(dev, 0x64, &reg, 1);
+#else
 	i2c_write(I2C_MUX_PCA_ADDR_SEC, 0, 1, &reg, 1);
 
 	/* Access to Control/Shared register */ @@ -360,9 +443,10 @@ void
 board_retimer_init(void)
board/freescale/ls1043aqds/ls1043aqds.c +5 -2
 	i2c_write(I2C_RETIMER_ADDR, 0x63, 1, &reg, 1);
 	reg = 0xcd;
 	i2c_write(I2C_RETIMER_ADDR, 0x64, 1, &reg, 1);
+#endif
 
 	/* Return the default channel */
-	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, bus_num);
 }
 
 int board_early_init_f(void)
@@ -375,8 +459,10 @@ int board_early_init_f(void)
 	u8 uart;
 #endif
 
+#ifdef CONFIG_SYS_I2C
 #ifdef CONFIG_SYS_I2C_EARLY_INIT
 	i2c_early_init_f();
+#endif
 #endif
 	fsl_lsch2_early_init_f();
 
@@ -457,7 +543,7 @@ int board_init(void)
 	erratum_a010315();
 #endif
 
-	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
 	board_retimer_init();
 
 #ifdef CONFIG_SYS_FSL_SERDES
configs/ls1043aqds_defconfig +2 -0
index 2885552ef3..93b86af607 100644
@@ -62,3 +62,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_lpuart_defconfig +2 -0
index 9d9229ac03..f89c2ee3a4 100644
@@ -64,3 +64,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_nand_defconfig +2 -0
index c45eaea02a..a169bfef8f 100644
@@ -78,3 +78,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_nor_ddr3_defconfig +2 -0
index 8d28fe1baf..01d0af30b1 100644
@@ -63,3 +63,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_qspi_defconfig +2 -0
index 86b2eb56b8..65eff7c40b 100644
@@ -58,3 +58,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_sdcard_ifc_defconfig +2 -0
index bf3f0d0990..c5042a345d 100644
@@ -79,3 +79,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_sdcard_qspi_defconfig +2 -0
index 0449469b89..12706a48dc 100644
@@ -72,3 +72,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig +2 -0
index 4ba5a8dd95..bbd01eb290 100644
@@ -64,3 +64,5 @@ CONFIG_SPL_RSA=y
 CONFIG_RSA_SOFTWARE_EXP=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043aqds_tfa_defconfig +2 -0
index 24db72a39d..6e594ed07c 100644
@@ -71,3 +71,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_SECURE_BOOT_defconfig +2 -0
index 5e030e2586..153a62866f 100644
@@ -55,3 +55,5 @@ CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_RSA_SOFTWARE_EXP=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_defconfig +2 -0
index 0676cbccdd..d1e534388b 100644
@@ -55,3 +55,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_nand_SECURE_BOOT_defconfig +0 -0
index 1f4c5705d5..252c7c8313 100644
@@ -75,3 +75,5 @@ CONFIG_USB_XHCI_DWC3=y  CONFIG_RSA=y

CONFIG_SPL_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls1043ardb_nand_SECURE_BOOT_defconfig +2 -0
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_nand_defconfig +0 -0
index e7fe2de309..de18aaa063 100644
@@ -74,3 +74,5 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 # CONFIG_SPL_USE_TINY_PRINTF is not set

CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls1043ardb_nand_defconfig +2 -0
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +0 -0
index 6529c7334c..149b25ffe5 100644
@@ -74,3 +74,5 @@ CONFIG_USB_XHCI_DWC3=y  CONFIG_RSA=y

CONFIG_SPL_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +2 -0
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_sdcard_defconfig +0 -0
index 228262477c..b386fc668c 100644
@@ -73,3 +73,5 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 # CONFIG_SPL_USE_TINY_PRINTF is not set

CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls1043ardb_sdcard_defconfig +2 -0
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_tfa_SECURE_BOOT_defconfig +2 -0
index 83bfca078b..017ec5ea7a 100644
@@ -57,3 +57,5 @@ CONFIG_SPL_RSA=y
 CONFIG_RSA_SOFTWARE_EXP=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
 CONFIG_CMD_SETEXPR=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1043ardb_tfa_defconfig +2 -0
index 4154075986..eaddbca79f 100644
@@ -59,3 +59,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
include/configs/ls1043a_common.h +10 -1
index bf24d4036d..985f40412c 100644
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2015 Freescale Semiconductor
+ * Copyright (C) 2019 NXP
  */
 
 #ifndef __LS1043A_COMMON_H
@@ -141,7 +142,17 @@
 #endif
 
 /* I2C */
+#ifndef CONFIG_DM_I2C
 #define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
+#define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
+#define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
+#define CONFIG_SYS_I2C_MXC_I2C4		/* enable I2C bus 4 */
+#else
+#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
+#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0 #endif
 
 /* PCIe */
 #ifndef SPL_NO_PCIE
--

2.17.1

author
#2 lore raw

PATCH RESEND v8 7/8 dm: arm64: ls1046a: add i2c DM support

In reply to Biwen Li

This supports i2c DM and enables CONFIG_DM_I2C
for SoC LS1046A

---
Changes in RESEND v8:
- fix build warning

Changes in v8:
- none

Changes in v7:
- none

Changes in v6:
- correct dependencies

Changes in v5:
- update subject

Changes in v4:
- update copyright

Changes in v3:
- none

Changes in v2:
- merge some patches to one patch

 arch/arm/cpu/armv8/fsl-layerscape/Kconfig     | 10 ++--
 arch/arm/dts/fsl-ls1046a-frwy.dts             |  3 ++
 arch/arm/dts/fsl-ls1046a-qds.dtsi             |  4 ++
 arch/arm/dts/fsl-ls1046a-rdb.dts              |  8 ++++
 arch/arm/include/asm/gpio.h                   |  5 +-
 board/freescale/ls1046afrwy/ls1046afrwy.c     | 17 ++++++-
 board/freescale/ls1046aqds/ls1046aqds.c       | 25 ++++++++--
 configs/ls1046afrwy_tfa_defconfig             |  2 +
 configs/ls1046aqds_SECURE_BOOT_defconfig      |  2 +
 configs/ls1046aqds_defconfig                  |  2 +
 configs/ls1046aqds_lpuart_defconfig           |  2 +
 configs/ls1046aqds_nand_defconfig             |  2 +
 configs/ls1046aqds_qspi_defconfig             |  2 +
 configs/ls1046aqds_sdcard_ifc_defconfig       |  2 +
 configs/ls1046aqds_sdcard_qspi_defconfig      |  2 +
 configs/ls1046aqds_tfa_SECURE_BOOT_defconfig  |  2 +
 configs/ls1046aqds_tfa_defconfig              |  2 +
 configs/ls1046ardb_emmc_defconfig             |  2 +
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig |  2 +
 configs/ls1046ardb_qspi_defconfig             |  2 +
 configs/ls1046ardb_qspi_spl_defconfig         |  2 +
 .../ls1046ardb_sdcard_SECURE_BOOT_defconfig   |  2 +
 configs/ls1046ardb_sdcard_defconfig           |  2 +
 configs/ls1046ardb_tfa_SECURE_BOOT_defconfig  |  2 +
 configs/ls1046ardb_tfa_defconfig              |  2 +
 drivers/power/power_i2c.c                     | 46 ++++++++++++++++++-
 include/configs/ls1046a_common.h              | 11 +++++
 27 files changed, 150 insertions(+), 15 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +5 -5
index 760053e401..b25639183f 100644
@@ -107,11 +107,11 @@ config ARCH_LS1046A
 	select SYS_FSL_SRDS_2
 	select ARCH_EARLY_INIT_R
 	select BOARD_EARLY_INIT_F
-	select SYS_I2C_MXC
-	select SYS_I2C_MXC_I2C1
-	select SYS_I2C_MXC_I2C2
-	select SYS_I2C_MXC_I2C3
-	select SYS_I2C_MXC_I2C4
+	select SYS_I2C_MXC if !DM_I2C
+	select SYS_I2C_MXC_I2C1 if !DM_I2C
+	select SYS_I2C_MXC_I2C2 if !DM_I2C
+	select SYS_I2C_MXC_I2C3 if !DM_I2C
+	select SYS_I2C_MXC_I2C4 if !DM_I2C
 	imply SCSI
 	imply SCSI_AHCI
 
arch/arm/dts/fsl-ls1046a-frwy.dts +3 -0
index 3d41e3bd44..d39159322a 100644
@@ -32,3 +32,6 @@
 
 };
 
+&i2c0 {
+	status = "okay";
+};
arch/arm/dts/fsl-ls1046a-qds.dtsi +4 -0
index c95f44fc36..76dc397328 100644
@@ -80,3 +80,7 @@
 &sata {
 	status = "okay";
 };
+
+&i2c0 {
+	status = "okay";
+};
arch/arm/dts/fsl-ls1046a-rdb.dts +8 -0
index a05c9e9b9e..83e34ab02a 100644
@@ -43,3 +43,11 @@
 &sata {
 	status = "okay";
 };
+
+&i2c0 {
+	status = "okay";
+};
+
+&i2c3 {
+	status = "okay";
+};
arch/arm/include/asm/gpio.h +3 -2
index c480e712fe..09573722ac 100644
@@ -3,8 +3,9 @@
 	!defined(CONFIG_ARCH_BCM6858) && !defined(CONFIG_ARCH_BCM63158) && \
 	!defined(CONFIG_ARCH_ROCKCHIP) && !defined(CONFIG_ARCH_LX2160A) && \
 	!defined(CONFIG_ARCH_LS1012A) && !defined(CONFIG_ARCH_LS1028A) && \
-	!defined(CONFIG_ARCH_LS1043A) && !defined(CONFIG_ARCH_LS2080A) && \
-	!defined(CONFIG_ARCH_LS1088A) && !defined(CONFIG_ARCH_ASPEED) && \
+	!defined(CONFIG_ARCH_LS1043A) && !defined(CONFIG_ARCH_LS1046A) && \
+	!defined(CONFIG_ARCH_LS2080A) && !defined(CONFIG_ARCH_LS1088A) && \
+	!defined(CONFIG_ARCH_ASPEED) && \
 	!defined(CONFIG_ARCH_U8500)
 #include <asm/arch/gpio.h>
 #endif
board/freescale/ls1046afrwy/ls1046afrwy.c +15 -2
index db8b3a5b92..8c0abb63a9 100644
@@ -36,11 +36,24 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int select_i2c_ch_pca9547(u8 ch)
+int select_i2c_ch_pca9547(u8 ch, int bus_num)
 {
 	int ret;
 
+#ifdef CONFIG_DM_I2C
+	struct udevice *dev;
+
+	ret = i2c_get_chip_for_busnum(bus_num, I2C_MUX_PCA_ADDR_PRI,
+				      1, &dev);
+	if (ret) {
+		printf("%s: Cannot find udev for a bus %d\n", __func__,
+		       bus_num);
+		return ret;
+	}
+	ret = dm_i2c_write(dev, 0, &ch, 1);
+#else
 	ret = i2c_write(I2C_MUX_PCA_ADDR_PRI, 0, 1, &ch, 1);
+#endif
 	if (ret) {
 		puts("PCA: failed to select proper channel\n");
 		return ret;
@@ -149,7 +162,7 @@ val = (in_le32(SMMU_SCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK);
 	sec_init();
 #endif
 
-	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
 	return 0;
 }
 
board/freescale/ls1046aqds/ls1046aqds.c +21 -4
index aac5d9aa84..cabd7ee648 100644
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2016 Freescale Semiconductor, Inc.
+ * Copyright 2019 NXP
  */
 
 #include <common.h>
@@ -269,11 +270,23 @@ u32 get_lpuart_clk(void)
 }
 #endif
 
-int select_i2c_ch_pca9547(u8 ch)
+int select_i2c_ch_pca9547(u8 ch, int bus_num)
 {
 	int ret;
+#ifdef CONFIG_DM_I2C
+	struct udevice *dev;
 
+	ret = i2c_get_chip_for_busnum(bus_num, I2C_MUX_PCA_ADDR_PRI,
+				      1, &dev);
+	if (ret) {
+		printf("%s: Cannot find udev for a bus %d\n", __func__,
+		       bus_num);
+		return ret;
+	}
+	ret = dm_i2c_write(dev, 0, &ch, 1);
+#else
 	ret = i2c_write(I2C_MUX_PCA_ADDR_PRI, 0, 1, &ch, 1);
+#endif
 	if (ret) {
 		puts("PCA: failed to select proper channel\n");
 		return ret;
@@ -288,8 +301,10 @@ int dram_init(void)
 	 * When resuming from deep sleep, the I2C channel may not be
 	 * in the default channel. So, switch to the default channel
 	 * before accessing DDR SPD.
+	 *
+	 * PCA9547 mount on I2C1 bus
 	 */
-	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
 	fsl_initdram();
 #if (!defined(CONFIG_SPL) && !defined(CONFIG_TFABOOT)) || \
 	defined(CONFIG_SPL_BUILD)
@@ -302,7 +317,7 @@ int dram_init(void)
 
 int i2c_multiplexer_select_vid_channel(u8 channel)
 {
-	return select_i2c_ch_pca9547(channel);
+	return select_i2c_ch_pca9547(channel, 0);
 }
 
 int board_early_init_f(void)
@@ -315,8 +330,10 @@ int board_early_init_f(void)
 	u8 uart;
 #endif
 
+#ifdef CONFIG_SYS_I2C
 #ifdef CONFIG_SYS_I2C_EARLY_INIT
 	i2c_early_init_f();
+#endif
 #endif
 	fsl_lsch2_early_init_f();
 
@@ -394,7 +411,7 @@ int misc_init_r(void)
 
 int board_init(void)
 {
-	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
 
 #ifdef CONFIG_SYS_FSL_SERDES
 	config_serdes_mux();
configs/ls1046afrwy_tfa_defconfig +2 -0
index 96efee6736..30d8a6c1c9 100644
@@ -62,3 +62,5 @@ CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_SECURE_BOOT_defconfig +2 -0
index 6ea27c7ba4..ed25b7a680 100644
@@ -60,3 +60,5 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_defconfig +2 -0
index 04c1176d85..0a50bb14c0 100644
@@ -62,3 +62,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_lpuart_defconfig +2 -0
index b0a24f297e..17d1685081 100644
@@ -64,3 +64,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_nand_defconfig +2 -0
index 3ffe6a6ef9..0bafcbe168 100644
@@ -70,3 +70,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_qspi_defconfig +2 -0
index d6253c790a..ff0fd45c9e 100644
@@ -58,3 +58,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_sdcard_ifc_defconfig +2 -0
index fad33163b6..78edb456b8 100644
@@ -80,3 +80,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_sdcard_qspi_defconfig +2 -0
index 3571a6f9e9..d085daf384 100644
@@ -74,3 +74,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_tfa_SECURE_BOOT_defconfig +2 -0
index c50e525fd3..837b016d00 100644
@@ -62,3 +62,5 @@ CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
 CONFIG_CMD_SETEXPR=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_tfa_defconfig +2 -0
index 824fc518ca..04e6b2392c 100644
@@ -71,3 +71,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_emmc_defconfig +2 -0
index 768ce7a821..bbb352db31 100644
@@ -73,3 +73,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +2 -0
index aff9bf81fc..b9c8a8822c 100644
@@ -55,3 +55,5 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_qspi_defconfig +2 -0
index b482e73bef..51edada3f8 100644
@@ -57,3 +57,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_qspi_spl_defconfig +2 -0
index 1e2770a9c0..84e059671c 100644
@@ -77,3 +77,5 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_SPL_GZIP=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +2 -0
index 1f5fa8ff03..9954e894da 100644
@@ -70,3 +70,5 @@ CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_sdcard_defconfig +2 -0
index 197090474b..3502809756 100644
@@ -72,3 +72,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_tfa_SECURE_BOOT_defconfig +2 -0
index 43a123625c..c8c6ae9396 100644
@@ -55,3 +55,5 @@ CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
 CONFIG_CMD_SETEXPR=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_tfa_defconfig +2 -0
index 280ca83d42..2f7686bafd 100644
@@ -58,3 +58,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
drivers/power/power_i2c.c +44 -2

86 lines not on this page · raw message

include/configs/ls1046a_common.h +11 -0
index 6543cfd868..5d2d5e6bbf 100644
@@ -16,6 +16,7 @@
 #define SPL_NO_QSPI
 #define SPL_NO_USB
 #define SPL_NO_SATA
+#undef CONFIG_DM_I2C
 #endif
 #if defined(CONFIG_SPL_BUILD) && \
 	(defined(CONFIG_NAND_BOOT) || defined(CONFIG_QSPI_BOOT))
@@ -126,7 +127,17 @@
 #endif
 
 /* I2C */
+#ifndef CONFIG_DM_I2C
 #define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
+#define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
+#define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
+#define CONFIG_SYS_I2C_MXC_I2C4		/* enable I2C bus 4 */
+#else
+#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
+#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
+#endif
 
 /* PCIe */
 #define CONFIG_PCIE1		/* PCIE controller 1 */
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH RESEND v8 7/8 dm: arm64: ls1046a: add i2c DM support

Quoted 2 lines

This supports i2c DM and enables CONFIG_DM_I2C for SoC LS1046A

Hi Priyanka,

Any comments?

Best Regards,
Biwen Li

Quoted 578 lines

---
Changes in RESEND v8:
- fix build warning

Changes in v8:
- none

Changes in v7:
- none

Changes in v6:
- correct dependencies

Changes in v5:
- update subject

Changes in v4:
- update copyright

Changes in v3:
- none

Changes in v2:
- merge some patches to one patch

 arch/arm/cpu/armv8/fsl-layerscape/Kconfig     | 10 ++--
 arch/arm/dts/fsl-ls1046a-frwy.dts             |  3 ++
 arch/arm/dts/fsl-ls1046a-qds.dtsi             |  4 ++
 arch/arm/dts/fsl-ls1046a-rdb.dts              |  8 ++++
 arch/arm/include/asm/gpio.h                   |  5 +-
 board/freescale/ls1046afrwy/ls1046afrwy.c     | 17 ++++++-
 board/freescale/ls1046aqds/ls1046aqds.c       | 25 ++++++++--
 configs/ls1046afrwy_tfa_defconfig             |  2 +
 configs/ls1046aqds_SECURE_BOOT_defconfig      |  2 +
 configs/ls1046aqds_defconfig                  |  2 +
 configs/ls1046aqds_lpuart_defconfig           |  2 +
 configs/ls1046aqds_nand_defconfig             |  2 +
 configs/ls1046aqds_qspi_defconfig             |  2 +
 configs/ls1046aqds_sdcard_ifc_defconfig       |  2 +
 configs/ls1046aqds_sdcard_qspi_defconfig      |  2 +
 configs/ls1046aqds_tfa_SECURE_BOOT_defconfig  |  2 +
 configs/ls1046aqds_tfa_defconfig              |  2 +
 configs/ls1046ardb_emmc_defconfig             |  2 +
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig |  2 +
 configs/ls1046ardb_qspi_defconfig             |  2 +
 configs/ls1046ardb_qspi_spl_defconfig         |  2 +
 .../ls1046ardb_sdcard_SECURE_BOOT_defconfig   |  2 +
 configs/ls1046ardb_sdcard_defconfig           |  2 +
 configs/ls1046ardb_tfa_SECURE_BOOT_defconfig  |  2 +
 configs/ls1046ardb_tfa_defconfig              |  2 +
 drivers/power/power_i2c.c                     | 46
++++++++++++++++++-
 include/configs/ls1046a_common.h              | 11 +++++
 27 files changed, 150 insertions(+), 15 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +5 -5
index 760053e401..b25639183f 100644
@@ -107,11 +107,11 @@ config ARCH_LS1046A
 	select SYS_FSL_SRDS_2
 	select ARCH_EARLY_INIT_R
 	select BOARD_EARLY_INIT_F
-	select SYS_I2C_MXC
-	select SYS_I2C_MXC_I2C1
-	select SYS_I2C_MXC_I2C2
-	select SYS_I2C_MXC_I2C3
-	select SYS_I2C_MXC_I2C4
+	select SYS_I2C_MXC if !DM_I2C
+	select SYS_I2C_MXC_I2C1 if !DM_I2C
+	select SYS_I2C_MXC_I2C2 if !DM_I2C
+	select SYS_I2C_MXC_I2C3 if !DM_I2C
+	select SYS_I2C_MXC_I2C4 if !DM_I2C
 	imply SCSI
 	imply SCSI_AHCI
 
arch/arm/dts/fsl-ls1046a-frwy.dts +3 -0
index 3d41e3bd44..d39159322a 100644
@@ -32,3 +32,6 @@
 
 };
 
+&i2c0 {
+	status = "okay";
+};
arch/arm/dts/fsl-ls1046a-qds.dtsi +4 -0
index c95f44fc36..76dc397328 100644
@@ -80,3 +80,7 @@
 &sata {
 	status = "okay";
 };
+
+&i2c0 {
+	status = "okay";
+};
arch/arm/dts/fsl-ls1046a-rdb.dts +8 -0
index a05c9e9b9e..83e34ab02a 100644
@@ -43,3 +43,11 @@
 &sata {
 	status = "okay";
 };
+
+&i2c0 {
+	status = "okay";
+};
+
+&i2c3 {
+	status = "okay";
+};
arch/arm/include/asm/gpio.h +0 -2
index c480e712fe..09573722ac 100644
@@ -3,8 +3,9 @@
 	!defined(CONFIG_ARCH_BCM6858)
 && !defined(CONFIG_ARCH_BCM63158) && \
 	!defined(CONFIG_ARCH_ROCKCHIP)
 && !defined(CONFIG_ARCH_LX2160A) && \
 	!defined(CONFIG_ARCH_LS1012A) && !defined(CONFIG_ARCH_LS1028A)
 && \
-	!defined(CONFIG_ARCH_LS1043A) && !defined(CONFIG_ARCH_LS2080A)
 && \
-	!defined(CONFIG_ARCH_LS1088A) && !defined(CONFIG_ARCH_ASPEED)

&& \

arch/arm/include/asm/gpio.h +1 -0
+	!defined(CONFIG_ARCH_LS1043A) && !defined(CONFIG_ARCH_LS1046A)

&& \

arch/arm/include/asm/gpio.h +1 -0
+	!defined(CONFIG_ARCH_LS2080A) && !defined(CONFIG_ARCH_LS1088A)

&& \

arch/arm/include/asm/gpio.h +1 -0
+	!defined(CONFIG_ARCH_ASPEED) && \
 	!defined(CONFIG_ARCH_U8500)
 #include <asm/arch/gpio.h>
 #endif
board/freescale/ls1046afrwy/ls1046afrwy.c +15 -2
index db8b3a5b92..8c0abb63a9 100644
@@ -36,11 +36,24 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int select_i2c_ch_pca9547(u8 ch)
+int select_i2c_ch_pca9547(u8 ch, int bus_num)
 {
 	int ret;
 
+#ifdef CONFIG_DM_I2C
+	struct udevice *dev;
+
+	ret = i2c_get_chip_for_busnum(bus_num, I2C_MUX_PCA_ADDR_PRI,
+				      1, &dev);
+	if (ret) {
+		printf("%s: Cannot find udev for a bus %d\n", __func__,
+		       bus_num);
+		return ret;
+	}
+	ret = dm_i2c_write(dev, 0, &ch, 1);
+#else
 	ret = i2c_write(I2C_MUX_PCA_ADDR_PRI, 0, 1, &ch, 1);
+#endif
 	if (ret) {
 		puts("PCA: failed to select proper channel\n");
 		return ret;
@@ -149,7 +162,7 @@ val = (in_le32(SMMU_SCR0) | SCR0_CLIENTPD_MASK)
 & ~(SCR0_USFCFG_MASK);
 	sec_init();
 #endif
 
-	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
 	return 0;
 }
board/freescale/ls1046aqds/ls1046aqds.c +21 -4
index aac5d9aa84..cabd7ee648 100644
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2016 Freescale Semiconductor, Inc.
+ * Copyright 2019 NXP
  */
 
 #include <common.h>
@@ -269,11 +270,23 @@ u32 get_lpuart_clk(void)  }  #endif
 
-int select_i2c_ch_pca9547(u8 ch)
+int select_i2c_ch_pca9547(u8 ch, int bus_num)
 {
 	int ret;
+#ifdef CONFIG_DM_I2C
+	struct udevice *dev;
 
+	ret = i2c_get_chip_for_busnum(bus_num, I2C_MUX_PCA_ADDR_PRI,
+				      1, &dev);
+	if (ret) {
+		printf("%s: Cannot find udev for a bus %d\n", __func__,
+		       bus_num);
+		return ret;
+	}
+	ret = dm_i2c_write(dev, 0, &ch, 1);
+#else
 	ret = i2c_write(I2C_MUX_PCA_ADDR_PRI, 0, 1, &ch, 1);
+#endif
 	if (ret) {
 		puts("PCA: failed to select proper channel\n");
 		return ret;
@@ -288,8 +301,10 @@ int dram_init(void)
 	 * When resuming from deep sleep, the I2C channel may not be
 	 * in the default channel. So, switch to the default channel
 	 * before accessing DDR SPD.
+	 *
+	 * PCA9547 mount on I2C1 bus
 	 */
-	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
 	fsl_initdram();
 #if (!defined(CONFIG_SPL) && !defined(CONFIG_TFABOOT)) || \
 	defined(CONFIG_SPL_BUILD)
@@ -302,7 +317,7 @@ int dram_init(void)
 
 int i2c_multiplexer_select_vid_channel(u8 channel)  {
-	return select_i2c_ch_pca9547(channel);
+	return select_i2c_ch_pca9547(channel, 0);
 }
 
 int board_early_init_f(void)
@@ -315,8 +330,10 @@ int board_early_init_f(void)
 	u8 uart;
 #endif
 
+#ifdef CONFIG_SYS_I2C
 #ifdef CONFIG_SYS_I2C_EARLY_INIT
 	i2c_early_init_f();
+#endif
 #endif
 	fsl_lsch2_early_init_f();
 
@@ -394,7 +411,7 @@ int misc_init_r(void)
 
 int board_init(void)
 {
-	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
 
 #ifdef CONFIG_SYS_FSL_SERDES
 	config_serdes_mux();
configs/ls1046afrwy_tfa_defconfig +0 -0
index 96efee6736..30d8a6c1c9 100644
@@ -62,3 +62,5 @@ CONFIG_USB_HOST_ETHER=y

CONFIG_USB_ETHER_RTL8152=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y

configs/ls1046afrwy_tfa_defconfig +2 -0
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_SECURE_BOOT_defconfig +2 -0
index 6ea27c7ba4..ed25b7a680 100644
@@ -60,3 +60,5 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_defconfig +2 -0
index 04c1176d85..0a50bb14c0 100644
@@ -62,3 +62,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_lpuart_defconfig +2 -0
index b0a24f297e..17d1685081 100644
@@ -64,3 +64,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_nand_defconfig +2 -0
index 3ffe6a6ef9..0bafcbe168 100644
@@ -70,3 +70,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_qspi_defconfig +2 -0
index d6253c790a..ff0fd45c9e 100644
@@ -58,3 +58,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_sdcard_ifc_defconfig +2 -0
index fad33163b6..78edb456b8 100644
@@ -80,3 +80,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_sdcard_qspi_defconfig +2 -0
index 3571a6f9e9..d085daf384 100644
@@ -74,3 +74,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_tfa_SECURE_BOOT_defconfig +0 -0
index c50e525fd3..837b016d00 100644
@@ -62,3 +62,5 @@ CONFIG_USB_XHCI_DWC3=y  CONFIG_RSA=y

CONFIG_EFI_LOADER_BOUNCE_BUFFER=y CONFIG_CMD_SETEXPR=y

configs/ls1046aqds_tfa_SECURE_BOOT_defconfig +2 -0
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_tfa_defconfig +2 -0
index 824fc518ca..04e6b2392c 100644
@@ -71,3 +71,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_emmc_defconfig +2 -0
index 768ce7a821..bbb352db31 100644
@@ -73,3 +73,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +2 -0
index aff9bf81fc..b9c8a8822c 100644
@@ -55,3 +55,5 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_qspi_defconfig +2 -0
index b482e73bef..51edada3f8 100644
@@ -57,3 +57,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_qspi_spl_defconfig +2 -0
index 1e2770a9c0..84e059671c 100644
@@ -77,3 +77,5 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_SPL_GZIP=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +0 -0
index 1f5fa8ff03..9954e894da 100644
@@ -70,3 +70,5 @@ CONFIG_USB_XHCI_DWC3=y  CONFIG_RSA=y

CONFIG_SPL_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +2 -0
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_sdcard_defconfig +2 -0
index 197090474b..3502809756 100644
@@ -72,3 +72,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_tfa_SECURE_BOOT_defconfig +0 -0
index 43a123625c..c8c6ae9396 100644
@@ -55,3 +55,5 @@ CONFIG_USB_XHCI_DWC3=y  CONFIG_RSA=y

CONFIG_EFI_LOADER_BOUNCE_BUFFER=y CONFIG_CMD_SETEXPR=y

configs/ls1046ardb_tfa_SECURE_BOOT_defconfig +2 -0
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_tfa_defconfig +2 -0
index 280ca83d42..2f7686bafd 100644
@@ -58,3 +58,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
drivers/power/power_i2c.c index renamed from drivers/power/power_i2c.c +0 -0

bcddff2d7a..b30f223a5c 100644

drivers/power/power_i2c.c +16 -0
@@ -7,6 +7,7 @@
  * Stefano Babic, DENX Software Engineering, sbabic at denx.de
  *
  * (C) Copyright 2008-2009 Freescale Semiconductor, Inc.
+ * (C) Copyright 2019 NXP
  */
 
 #include <common.h>
@@ -21,8 +22,20 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32 val)
 
 	if (check_reg(p, reg))
 		return -EINVAL;
+#if defined(CONFIG_DM_I2C)
+	struct udevice *dev;
+	int ret;
 
+	ret = i2c_get_chip_for_busnum(p->bus, pmic_i2c_addr,
+				      1, &dev);
+	if (ret) {
+		printf("%s: Cannot find udev for a bus %d\n", __func__,
+		       p->bus);
+		return -ENXIO;
+	}
+#else /* Non DM I2C support - will be removed */
 	I2C_SET_BUS(p->bus);
+#endif
 
 	switch (pmic_i2c_tx_num) {
 	case 3:
@@ -53,7 +66,11 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32 val)
 		return -EINVAL;
 	}
 
+#if defined(CONFIG_DM_I2C)
+	return dm_i2c_write(dev, reg, buf, pmic_i2c_tx_num); #else
 	return i2c_write(pmic_i2c_addr, reg, 1, buf, pmic_i2c_tx_num);
+#endif
 }
 
 int pmic_reg_read(struct pmic *p, u32 reg, u32 *val) @@ -65,9 +82,21 @@

int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)

drivers/power/power_i2c.c +27 -2
 	if (check_reg(p, reg))
 		return -EINVAL;
 
-	I2C_SET_BUS(p->bus);
+#if defined(CONFIG_DM_I2C)
+	struct udevice *dev;
 
+	ret = i2c_get_chip_for_busnum(p->bus, pmic_i2c_addr,
+				      1, &dev);
+	if (ret) {
+		printf("%s: Cannot find udev for a bus %d\n", __func__,
+		       p->bus);
+		return -ENXIO;
+	}
+	ret = dm_i2c_read(dev, reg, buf, pmic_i2c_tx_num); #else /* Non DM I2C
+support - will be removed */
+	I2C_SET_BUS(p->bus);
 	ret = i2c_read(pmic_i2c_addr, reg, 1, buf, pmic_i2c_tx_num);
+#endif
 	if (ret)
 		return ret;
@@ -100,12 +129,25 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32
 *val)
 
 int pmic_probe(struct pmic *p)
 {
-	i2c_set_bus_num(p->bus);
 	debug("Bus: %d PMIC:%s probed!\n", p->bus, p->name);
+#if defined(CONFIG_DM_I2C)
+	struct udevice *dev;
+	int ret;
+
+	ret = i2c_get_chip_for_busnum(p->bus, pmic_i2c_addr,
+				      1, &dev);
+	if (ret) {
+		printf("%s: Cannot find udev for a bus %d\n", __func__,
+		       p->bus);
+		return -ENXIO;
+	}
+#else /* Non DM I2C support - will be removed */
+	i2c_set_bus_num(p->bus);
 	if (i2c_probe(pmic_i2c_addr)) {
 		printf("Can't find PMIC:%s\n", p->name);
 		return -ENODEV;
 	}
+#endif
 
 	return 0;

}

include/configs/ls1046a_common.h +10 -2
index 6543cfd868..5d2d5e6bbf 100644
@@ -16,6 +16,7 @@
 #define SPL_NO_QSPI
 #define SPL_NO_USB
 #define SPL_NO_SATA
+#undef CONFIG_DM_I2C
 #endif
 #if defined(CONFIG_SPL_BUILD) && \
 	(defined(CONFIG_NAND_BOOT) || defined(CONFIG_QSPI_BOOT)) @@
-126,7 +127,17 @@  #endif
 
 /* I2C */
+#ifndef CONFIG_DM_I2C
 #define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
+#define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
+#define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
+#define CONFIG_SYS_I2C_MXC_I2C4		/* enable I2C bus 4 */
+#else
+#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
+#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0 #endif
 
 /* PCIe */
 #define CONFIG_PCIE1		/* PCIE controller 1 */
--

2.17.1

#4 lore raw

PATCH RESEND v8 7/8 dm: arm64: ls1046a: add i2c DM support

Quoted 14 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Biwen Li
Sent: Wednesday, March 4, 2020 9:28 AM
To: Biwen Li <[email protected]>; Jagdish Gediya <[email protected]>; Priyanka Jain <[email protected]>; hs at denx.de;
jagan at amarulasolutions.com; aford173 at gmail.com; Alison Wang <[email protected]>; jh80.chung at samsung.com; Pramod Kumar <[email protected]>; Rajesh Bhagat <[email protected]>; Ruchika Gupta <[email protected]>; olteanv at gmail.com
Cc: Xiaobo Xie <[email protected]>; Jiafei Pan <[email protected]>; u- boot at lists.denx.de
Subject: RE: [RESEND v8 7/8] dm: arm64: ls1046a: add i2c DM support

Quoted 1 line
Quoted 8 lines
Quoted 1 line

This supports i2c DM and enables CONFIG_DM_I2C for SoC LS1046A

Hi Priyanka,

Any comments?

Best Regards,
Biwen Li

Quoted 1 line

I need to build check. Rest looks fine.
Priyanka

Quoted 576 lines
Quoted 126 lines

---
Changes in RESEND v8:
- fix build warning

Changes in v8:
- none

Changes in v7:
- none

Changes in v6:
- correct dependencies

Changes in v5:
- update subject

Changes in v4:
- update copyright

Changes in v3:
- none

Changes in v2:
- merge some patches to one patch

 arch/arm/cpu/armv8/fsl-layerscape/Kconfig     | 10 ++--
 arch/arm/dts/fsl-ls1046a-frwy.dts             |  3 ++
 arch/arm/dts/fsl-ls1046a-qds.dtsi             |  4 ++
 arch/arm/dts/fsl-ls1046a-rdb.dts              |  8 ++++
 arch/arm/include/asm/gpio.h                   |  5 +-
 board/freescale/ls1046afrwy/ls1046afrwy.c     | 17 ++++++-
 board/freescale/ls1046aqds/ls1046aqds.c       | 25 ++++++++--
 configs/ls1046afrwy_tfa_defconfig             |  2 +
 configs/ls1046aqds_SECURE_BOOT_defconfig      |  2 +
 configs/ls1046aqds_defconfig                  |  2 +
 configs/ls1046aqds_lpuart_defconfig           |  2 +
 configs/ls1046aqds_nand_defconfig             |  2 +
 configs/ls1046aqds_qspi_defconfig             |  2 +
 configs/ls1046aqds_sdcard_ifc_defconfig       |  2 +
 configs/ls1046aqds_sdcard_qspi_defconfig      |  2 +
 configs/ls1046aqds_tfa_SECURE_BOOT_defconfig  |  2 +
 configs/ls1046aqds_tfa_defconfig              |  2 +
 configs/ls1046ardb_emmc_defconfig             |  2 +
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig |  2 +
 configs/ls1046ardb_qspi_defconfig             |  2 +
 configs/ls1046ardb_qspi_spl_defconfig         |  2 +
 .../ls1046ardb_sdcard_SECURE_BOOT_defconfig   |  2 +
 configs/ls1046ardb_sdcard_defconfig           |  2 +
 configs/ls1046ardb_tfa_SECURE_BOOT_defconfig  |  2 +
 configs/ls1046ardb_tfa_defconfig              |  2 +
 drivers/power/power_i2c.c                     | 46
++++++++++++++++++-
 include/configs/ls1046a_common.h              | 11 +++++
 27 files changed, 150 insertions(+), 15 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +5 -5
index 760053e401..b25639183f 100644
@@ -107,11 +107,11 @@ config ARCH_LS1046A
 	select SYS_FSL_SRDS_2
 	select ARCH_EARLY_INIT_R
 	select BOARD_EARLY_INIT_F
-	select SYS_I2C_MXC
-	select SYS_I2C_MXC_I2C1
-	select SYS_I2C_MXC_I2C2
-	select SYS_I2C_MXC_I2C3
-	select SYS_I2C_MXC_I2C4
+	select SYS_I2C_MXC if !DM_I2C
+	select SYS_I2C_MXC_I2C1 if !DM_I2C
+	select SYS_I2C_MXC_I2C2 if !DM_I2C
+	select SYS_I2C_MXC_I2C3 if !DM_I2C
+	select SYS_I2C_MXC_I2C4 if !DM_I2C
 	imply SCSI
 	imply SCSI_AHCI
 
arch/arm/dts/fsl-ls1046a-frwy.dts +3 -0
index 3d41e3bd44..d39159322a 100644
@@ -32,3 +32,6 @@
 
 };
 
+&i2c0 {
+	status = "okay";
+};
arch/arm/dts/fsl-ls1046a-qds.dtsi +4 -0
index c95f44fc36..76dc397328 100644
@@ -80,3 +80,7 @@
 &sata {
 	status = "okay";
 };
+
+&i2c0 {
+	status = "okay";
+};
arch/arm/dts/fsl-ls1046a-rdb.dts +8 -0
index a05c9e9b9e..83e34ab02a 100644
@@ -43,3 +43,11 @@
 &sata {
 	status = "okay";
 };
+
+&i2c0 {
+	status = "okay";
+};
+
+&i2c3 {
+	status = "okay";
+};
arch/arm/include/asm/gpio.h +0 -0
index c480e712fe..09573722ac 100644

arch/arm/include/asm/gpio.h line 7

Quoted 5 lines
arch/arm/include/asm/gpio.h +0 -0
@@ -3,8 +3,9 @@
 	!defined(CONFIG_ARCH_BCM6858)
 && !defined(CONFIG_ARCH_BCM63158) && \
 	!defined(CONFIG_ARCH_ROCKCHIP)
 && !defined(CONFIG_ARCH_LX2160A) && \
 	!defined(CONFIG_ARCH_LS1012A) &&

!defined(CONFIG_ARCH_LS1028A) && \

arch/arm/include/asm/gpio.h line 8

Quoted 1 line
arch/arm/include/asm/gpio.h +0 -1
-	!defined(CONFIG_ARCH_LS1043A) &&

!defined(CONFIG_ARCH_LS2080A)

arch/arm/include/asm/gpio.h

Quoted 4 lines
arch/arm/include/asm/gpio.h +0 -1
 && \
-	!defined(CONFIG_ARCH_LS1088A) && !defined(CONFIG_ARCH_ASPEED)

&& \

arch/arm/include/asm/gpio.h +1 -0
+	!defined(CONFIG_ARCH_LS1043A) &&

!defined(CONFIG_ARCH_LS1046A)

arch/arm/include/asm/gpio.h

Quoted 2 lines

&& \

arch/arm/include/asm/gpio.h +1 -0
+	!defined(CONFIG_ARCH_LS2080A) &&

!defined(CONFIG_ARCH_LS1088A)

board/freescale/ls1046afrwy/ls1046afrwy.c val = (in_le32(SMMU_SCR0) | SCR0_CLIENTPD_MASK)

Quoted 37 lines

&& \

arch/arm/include/asm/gpio.h +1 -0
+	!defined(CONFIG_ARCH_ASPEED) && \
 	!defined(CONFIG_ARCH_U8500)
 #include <asm/arch/gpio.h>
 #endif
board/freescale/ls1046afrwy/ls1046afrwy.c +14 -1
index db8b3a5b92..8c0abb63a9 100644
@@ -36,11 +36,24 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int select_i2c_ch_pca9547(u8 ch)
+int select_i2c_ch_pca9547(u8 ch, int bus_num)
 {
 	int ret;
 
+#ifdef CONFIG_DM_I2C
+	struct udevice *dev;
+
+	ret = i2c_get_chip_for_busnum(bus_num, I2C_MUX_PCA_ADDR_PRI,
+				      1, &dev);
+	if (ret) {
+		printf("%s: Cannot find udev for a bus %d\n", __func__,
+		       bus_num);
+		return ret;
+	}
+	ret = dm_i2c_write(dev, 0, &ch, 1);
+#else
 	ret = i2c_write(I2C_MUX_PCA_ADDR_PRI, 0, 1, &ch, 1);
+#endif
 	if (ret) {
 		puts("PCA: failed to select proper channel\n");
 		return ret;
@@ -149,7 +162,7 @@ val = (in_le32(SMMU_SCR0) | SCR0_CLIENTPD_MASK)

&

configs/ls1046afrwy_tfa_defconfig CONFIG_USB_HOST_ETHER=y

Quoted 91 lines
board/freescale/ls1046afrwy/ls1046afrwy.c +1 -1
 ~(SCR0_USFCFG_MASK);
 	sec_init();
 #endif
 
-	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
 	return 0;
 }
board/freescale/ls1046aqds/ls1046aqds.c +21 -4
index aac5d9aa84..cabd7ee648 100644
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2016 Freescale Semiconductor, Inc.
+ * Copyright 2019 NXP
  */
 
 #include <common.h>
@@ -269,11 +270,23 @@ u32 get_lpuart_clk(void)  }  #endif
 
-int select_i2c_ch_pca9547(u8 ch)
+int select_i2c_ch_pca9547(u8 ch, int bus_num)
 {
 	int ret;
+#ifdef CONFIG_DM_I2C
+	struct udevice *dev;
 
+	ret = i2c_get_chip_for_busnum(bus_num, I2C_MUX_PCA_ADDR_PRI,
+				      1, &dev);
+	if (ret) {
+		printf("%s: Cannot find udev for a bus %d\n", __func__,
+		       bus_num);
+		return ret;
+	}
+	ret = dm_i2c_write(dev, 0, &ch, 1);
+#else
 	ret = i2c_write(I2C_MUX_PCA_ADDR_PRI, 0, 1, &ch, 1);
+#endif
 	if (ret) {
 		puts("PCA: failed to select proper channel\n");
 		return ret;
@@ -288,8 +301,10 @@ int dram_init(void)
 	 * When resuming from deep sleep, the I2C channel may not be
 	 * in the default channel. So, switch to the default channel
 	 * before accessing DDR SPD.
+	 *
+	 * PCA9547 mount on I2C1 bus
 	 */
-	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
 	fsl_initdram();
 #if (!defined(CONFIG_SPL) && !defined(CONFIG_TFABOOT)) || \
 	defined(CONFIG_SPL_BUILD)
@@ -302,7 +317,7 @@ int dram_init(void)
 
 int i2c_multiplexer_select_vid_channel(u8 channel)  {
-	return select_i2c_ch_pca9547(channel);
+	return select_i2c_ch_pca9547(channel, 0);
 }
 
 int board_early_init_f(void)
@@ -315,8 +330,10 @@ int board_early_init_f(void)
 	u8 uart;
 #endif
 
+#ifdef CONFIG_SYS_I2C
 #ifdef CONFIG_SYS_I2C_EARLY_INIT
 	i2c_early_init_f();
+#endif
 #endif
 	fsl_lsch2_early_init_f();
 
@@ -394,7 +411,7 @@ int misc_init_r(void)
 
 int board_init(void)
 {
-	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
 
 #ifdef CONFIG_SYS_FSL_SERDES
 	config_serdes_mux();
configs/ls1046afrwy_tfa_defconfig +0 -0
index 96efee6736..30d8a6c1c9 100644
@@ -62,3 +62,5 @@ CONFIG_USB_HOST_ETHER=y

CONFIG_USB_ETHER_RTL8152=y

Quoted 304 lines

CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y

configs/ls1046afrwy_tfa_defconfig +2 -0
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_SECURE_BOOT_defconfig +0 -0
index 6ea27c7ba4..ed25b7a680 100644
@@ -60,3 +60,5 @@ CONFIG_USB_XHCI_HCD=y  CONFIG_USB_XHCI_DWC3=y

CONFIG_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls1046aqds_SECURE_BOOT_defconfig +2 -0
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
(quoted diff) +0 -0

b/configs/ls1046aqds_defconfig index 04c1176d85..0a50bb14c0 100644

configs/ls1046aqds_defconfig +2 -0
@@ -62,3 +62,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_lpuart_defconfig +2 -0
index b0a24f297e..17d1685081 100644
@@ -64,3 +64,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_nand_defconfig +2 -0
index 3ffe6a6ef9..0bafcbe168 100644
@@ -70,3 +70,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_qspi_defconfig +2 -0
index d6253c790a..ff0fd45c9e 100644
@@ -58,3 +58,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_sdcard_ifc_defconfig +2 -0
index fad33163b6..78edb456b8 100644
@@ -80,3 +80,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_sdcard_qspi_defconfig +2 -0
index 3571a6f9e9..d085daf384 100644
@@ -74,3 +74,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_tfa_SECURE_BOOT_defconfig +0 -0
index c50e525fd3..837b016d00 100644
@@ -62,3 +62,5 @@ CONFIG_USB_XHCI_DWC3=y  CONFIG_RSA=y

CONFIG_EFI_LOADER_BOUNCE_BUFFER=y CONFIG_CMD_SETEXPR=y

configs/ls1046aqds_tfa_SECURE_BOOT_defconfig +2 -0
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046aqds_tfa_defconfig +2 -0
index 824fc518ca..04e6b2392c 100644
@@ -71,3 +71,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_emmc_defconfig +2 -0
index 768ce7a821..bbb352db31 100644
@@ -73,3 +73,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +0 -0
index aff9bf81fc..b9c8a8822c 100644
@@ -55,3 +55,5 @@ CONFIG_USB_XHCI_HCD=y  CONFIG_USB_XHCI_DWC3=y

CONFIG_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +2 -0
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_qspi_defconfig +2 -0
index b482e73bef..51edada3f8 100644
@@ -57,3 +57,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_qspi_spl_defconfig +0 -0
index 1e2770a9c0..84e059671c 100644
@@ -77,3 +77,5 @@ CONFIG_USB_XHCI_HCD=y  CONFIG_USB_XHCI_DWC3=y

CONFIG_SPL_GZIP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls1046ardb_qspi_spl_defconfig +2 -0
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +0 -0
index 1f5fa8ff03..9954e894da 100644
@@ -70,3 +70,5 @@ CONFIG_USB_XHCI_DWC3=y  CONFIG_RSA=y

CONFIG_SPL_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +2 -0
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_sdcard_defconfig +2 -0
index 197090474b..3502809756 100644
@@ -72,3 +72,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_tfa_SECURE_BOOT_defconfig +0 -0
index 43a123625c..c8c6ae9396 100644
@@ -55,3 +55,5 @@ CONFIG_USB_XHCI_DWC3=y  CONFIG_RSA=y

CONFIG_EFI_LOADER_BOUNCE_BUFFER=y CONFIG_CMD_SETEXPR=y

configs/ls1046ardb_tfa_SECURE_BOOT_defconfig +2 -0
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
configs/ls1046ardb_tfa_defconfig +2 -0
index 280ca83d42..2f7686bafd 100644
@@ -58,3 +58,5 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
drivers/power/power_i2c.c +13 -0
index bcddff2d7a..b30f223a5c 100644
@@ -7,6 +7,7 @@
  * Stefano Babic, DENX Software Engineering, sbabic at denx.de
  *
  * (C) Copyright 2008-2009 Freescale Semiconductor, Inc.
+ * (C) Copyright 2019 NXP
  */
 
 #include <common.h>
@@ -21,8 +22,20 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32
 val)
 
 	if (check_reg(p, reg))
 		return -EINVAL;
+#if defined(CONFIG_DM_I2C)
+	struct udevice *dev;
+	int ret;
 
+	ret = i2c_get_chip_for_busnum(p->bus, pmic_i2c_addr,
+				      1, &dev);
+	if (ret) {
+		printf("%s: Cannot find udev for a bus %d\n", __func__,
+		       p->bus);
+		return -ENXIO;
+	}
+#else /* Non DM I2C support - will be removed */
 	I2C_SET_BUS(p->bus);
+#endif
 
 	switch (pmic_i2c_tx_num) {
drivers/power/power_i2c.c +3 -0
 	case 3:
@@ -53,7 +66,11 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32 val)
 		return -EINVAL;
 	}
 
+#if defined(CONFIG_DM_I2C)
+	return dm_i2c_write(dev, reg, buf, pmic_i2c_tx_num); #else
 	return i2c_write(pmic_i2c_addr, reg, 1, buf, pmic_i2c_tx_num);
+#endif
 }
 
 int pmic_reg_read(struct pmic *p, u32 reg, u32 *val) @@ -65,9 +82,21

@@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)

drivers/power/power_i2c.c +27 -2
 	if (check_reg(p, reg))
 		return -EINVAL;
 
-	I2C_SET_BUS(p->bus);
+#if defined(CONFIG_DM_I2C)
+	struct udevice *dev;
 
+	ret = i2c_get_chip_for_busnum(p->bus, pmic_i2c_addr,
+				      1, &dev);
+	if (ret) {
+		printf("%s: Cannot find udev for a bus %d\n", __func__,
+		       p->bus);
+		return -ENXIO;
+	}
+	ret = dm_i2c_read(dev, reg, buf, pmic_i2c_tx_num); #else /* Non DM
+I2C support - will be removed */
+	I2C_SET_BUS(p->bus);
 	ret = i2c_read(pmic_i2c_addr, reg, 1, buf, pmic_i2c_tx_num);
+#endif
 	if (ret)
 		return ret;
@@ -100,12 +129,25 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32
 *val)
 
 int pmic_probe(struct pmic *p)
 {
-	i2c_set_bus_num(p->bus);
 	debug("Bus: %d PMIC:%s probed!\n", p->bus, p->name);
+#if defined(CONFIG_DM_I2C)
+	struct udevice *dev;
+	int ret;
+
+	ret = i2c_get_chip_for_busnum(p->bus, pmic_i2c_addr,
+				      1, &dev);
+	if (ret) {
+		printf("%s: Cannot find udev for a bus %d\n", __func__,
+		       p->bus);
+		return -ENXIO;
+	}
+#else /* Non DM I2C support - will be removed */
+	i2c_set_bus_num(p->bus);
 	if (i2c_probe(pmic_i2c_addr)) {
 		printf("Can't find PMIC:%s\n", p->name);
 		return -ENODEV;
 	}
+#endif
 
 	return 0;

}

include/configs/ls1046a_common.h +10 -2
index 6543cfd868..5d2d5e6bbf 100644
@@ -16,6 +16,7 @@
 #define SPL_NO_QSPI
 #define SPL_NO_USB
 #define SPL_NO_SATA
+#undef CONFIG_DM_I2C
 #endif
 #if defined(CONFIG_SPL_BUILD) && \
 	(defined(CONFIG_NAND_BOOT) || defined(CONFIG_QSPI_BOOT)) @@
-126,7 +127,17 @@  #endif
 
 /* I2C */
+#ifndef CONFIG_DM_I2C
 #define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
+#define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
+#define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
+#define CONFIG_SYS_I2C_MXC_I2C4		/* enable I2C bus 4 */
+#else
+#define CONFIG_I2C_SET_DEFAULT_BUS_NUM #define
+CONFIG_I2C_DEFAULT_BUS_NUMBER 0 #endif
 
 /* PCIe */
 #define CONFIG_PCIE1		/* PCIE controller 1 */
--

2.17.1

#5 lore raw

PATCH RESEND v8 6/8 dm: arm64: ls1043a: add i2c DM support

In reply to Biwen Li
Quoted 13 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Biwen Li
Sent: Wednesday, February 5, 2020 7:32 PM
To: Jagdish Gediya <[email protected]>; Priyanka Jain <[email protected]>; hs at denx.de; jagan at amarulasolutions.com; aford173 at gmail.com; Alison Wang <[email protected]>; jh80.chung at samsung.com; Pramod Kumar <[email protected]>; Rajesh Bhagat <[email protected]>; Ruchika Gupta <[email protected]>; olteanv at gmail.com
Cc: u-boot at lists.denx.de; Jiafei Pan <[email protected]>; Xiaobo Xie <[email protected]>
Subject: [RESEND v8 6/8] dm: arm64: ls1043a: add i2c DM support

Quoted 5 lines

This supports i2c DM and enables CONFIG_DM_I2C for SoC LS1043A

---

6/8, 7/8 applied to u-boot-fsl-qoriq after rebasing. Waiting upstream

Thanks
Priyanka