>-----Original Message-----
>From: Biwen Li <[email protected]>
>Sent: Thursday, December 5, 2019 11:41 AM
>To: Jagdish Gediya <[email protected]>; Priyanka Jain
><[email protected]>; [email protected]; [email protected];
>[email protected]; Alison Wang <[email protected]>;
>[email protected]; [email protected]; [email protected];
>Pramod Kumar <[email protected]>; Rajesh Bhagat
><[email protected]>; Ruchika Gupta <[email protected]>;
>[email protected]
>Cc: Xiaobo Xie <[email protected]>; Jiafei Pan <[email protected]>; u-
>[email protected]; Biwen Li <[email protected]>
>Subject: [v3 6/8] dm: arm: ls1043a: add i2c DM support
>
>This supports i2c DM and enables CONFIG_DM_I2C for SoC LS1043A
>
>Signed-off-by: Biwen Li <[email protected]>
>---
>Changes in v3:
> - none
>
>Changes in v2:
> - merge some patches to one patch
>
> arch/arm/include/asm/gpio.h | 2 +-
> board/freescale/ls1043aqds/ls1043aqds.c | 97 +++++++++++++++++--
> 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 | 5 +
> 20 files changed, 131 insertions(+), 7 deletions(-)
>
>diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
>index 9f8c9da564..45cb04801c 100644
>--- a/arch/arm/include/asm/gpio.h
>+++ b/arch/arm/include/asm/gpio.h
>@@ -3,7 +3,7 @@
> !defined(CONFIG_ARCH_BCM63158) &&
>!defined(CONFIG_ARCH_ROCKCHIP) && \
> !defined(CONFIG_ARCH_LX2160A) &&
>!defined(CONFIG_ARCH_LS1028A) && \
> !defined(CONFIG_ARCH_LS2080A) &&
>!defined(CONFIG_ARCH_LS1088A) && \
>- !defined(CONFIG_ARCH_LS1012A) && \
>+ !defined(CONFIG_ARCH_LS1012A) &&
>!defined(CONFIG_ARCH_LS1043A) && \
> !defined(CONFIG_ARCH_ASPEED)
> #include <asm/arch/gpio.h>
> #endif
>diff --git a/board/freescale/ls1043aqds/ls1043aqds.c
>b/board/freescale/ls1043aqds/ls1043aqds.c
>index 8c96b962b7..a0680d513e 100644
>--- a/board/freescale/ls1043aqds/ls1043aqds.c
>+++ b/board/freescale/ls1043aqds/ls1043aqds.c
>@@ -271,11 +271,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 +303,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 +319,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, ®, 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, ®, 1);
>+
>+ /* Read device revision and ID */
>+ dm_i2c_read(dev, 1, ®, 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, ®, 1);
>+
>+ /* Reset Channel Registers */
>+ dm_i2c_read(dev, 0, ®, 1);
>+ reg |= 0x4;
>+ dm_i2c_write(dev, 0, ®, 1);
>+
>+ /* Enable override divider select and Enable Override Output Mux */
>+ dm_i2c_read(dev, 9, ®, 1);
>+ reg |= 0x24;
>+ dm_i2c_write(dev, 9, ®, 1);
>+
>+ /* Select VCO Divider to full rate (000) */
>+ dm_i2c_read(dev, 0x18, ®, 1);
>+ reg &= 0x8f;
>+ dm_i2c_write(dev, 0x18, ®, 1);
>+
>+ /* Selects active PFD MUX Input as Re-timed Data (001) */
>+ dm_i2c_read(dev, 0x1e, ®, 1);
>+ reg &= 0x3f;
>+ reg |= 0x20;
>+ dm_i2c_write(dev, 0x1e, ®, 1);
>+
>+ /* Set data rate as 10.3125 Gbps */
>+ reg = 0x0;
>+ dm_i2c_write(dev, 0x60, ®, 1);
>+ reg = 0xb2;
>+ dm_i2c_write(dev, 0x61, ®, 1);
>+ reg = 0x90;
>+ dm_i2c_write(dev, 0x62, ®, 1);
>+ reg = 0xb3;
>+ dm_i2c_write(dev, 0x63, ®, 1);
>+ reg = 0xcd;
>+ dm_i2c_write(dev, 0x64, ®, 1);
>+#else
> i2c_write(I2C_MUX_PCA_ADDR_SEC, 0, 1, ®, 1);
>
> /* Access to Control/Shared register */ @@ -360,9 +442,10 @@ void
>board_retimer_init(void)
> i2c_write(I2C_RETIMER_ADDR, 0x63, 1, ®, 1);
> reg = 0xcd;
> i2c_write(I2C_RETIMER_ADDR, 0x64, 1, ®, 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 +458,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 +542,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
>diff --git a/configs/ls1043aqds_defconfig b/configs/ls1043aqds_defconfig
>index 038ade20bc..d73257e14a 100644
>--- a/configs/ls1043aqds_defconfig
>+++ b/configs/ls1043aqds_defconfig
>@@ -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
>diff --git a/configs/ls1043aqds_lpuart_defconfig
>b/configs/ls1043aqds_lpuart_defconfig
>index e8a750eaa9..c93c6bf825 100644
>--- a/configs/ls1043aqds_lpuart_defconfig
>+++ b/configs/ls1043aqds_lpuart_defconfig
>@@ -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
>diff --git a/configs/ls1043aqds_nand_defconfig
>b/configs/ls1043aqds_nand_defconfig
>index 8eb80dc53a..962b988922 100644
>--- a/configs/ls1043aqds_nand_defconfig
>+++ b/configs/ls1043aqds_nand_defconfig
>@@ -77,3 +77,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
>diff --git a/configs/ls1043aqds_nor_ddr3_defconfig
>b/configs/ls1043aqds_nor_ddr3_defconfig
>index 4a4834b001..e55a4de812 100644
>--- a/configs/ls1043aqds_nor_ddr3_defconfig
>+++ b/configs/ls1043aqds_nor_ddr3_defconfig
>@@ -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
>diff --git a/configs/ls1043aqds_qspi_defconfig
>b/configs/ls1043aqds_qspi_defconfig
>index 36e6f4cce4..40bb217316 100644
>--- a/configs/ls1043aqds_qspi_defconfig
>+++ b/configs/ls1043aqds_qspi_defconfig
>@@ -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
>diff --git a/configs/ls1043aqds_sdcard_ifc_defconfig
>b/configs/ls1043aqds_sdcard_ifc_defconfig
>index 7d70c4613a..61ec5f06d4 100644
>--- a/configs/ls1043aqds_sdcard_ifc_defconfig
>+++ b/configs/ls1043aqds_sdcard_ifc_defconfig
>@@ -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
>diff --git a/configs/ls1043aqds_sdcard_qspi_defconfig
>b/configs/ls1043aqds_sdcard_qspi_defconfig
>index 3ee00a87eb..1d339acecb 100644
>--- a/configs/ls1043aqds_sdcard_qspi_defconfig
>+++ b/configs/ls1043aqds_sdcard_qspi_defconfig
>@@ -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
>diff --git a/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
>b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
>index 0ece698350..b7335bcd33 100644
>--- a/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
>+++ b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
>@@ -63,3 +63,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
>diff --git a/configs/ls1043aqds_tfa_defconfig
>b/configs/ls1043aqds_tfa_defconfig
>index 4c757e28db..49783cea0d 100644
>--- a/configs/ls1043aqds_tfa_defconfig
>+++ b/configs/ls1043aqds_tfa_defconfig
>@@ -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
>diff --git a/configs/ls1043ardb_SECURE_BOOT_defconfig
>b/configs/ls1043ardb_SECURE_BOOT_defconfig
>index 4d12b9b9b8..2bfef956ef 100644
>--- a/configs/ls1043ardb_SECURE_BOOT_defconfig
>+++ b/configs/ls1043ardb_SECURE_BOOT_defconfig
>@@ -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
>diff --git a/configs/ls1043ardb_defconfig b/configs/ls1043ardb_defconfig index
>7a03dbcd40..a31927ace3 100644
>--- a/configs/ls1043ardb_defconfig
>+++ b/configs/ls1043ardb_defconfig
>@@ -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
>diff --git a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
>b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
>index 3f5af36725..4599b3eb00 100644
>--- a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
>+++ b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
>@@ -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
>diff --git a/configs/ls1043ardb_nand_defconfig
>b/configs/ls1043ardb_nand_defconfig
>index 973bda9b6e..f243a1d6ab 100644
>--- a/configs/ls1043ardb_nand_defconfig
>+++ b/configs/ls1043ardb_nand_defconfig
>@@ -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
>diff --git a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
>b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
>index efcf1698a3..753175fee9 100644
>--- a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
>+++ b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
>@@ -73,3 +73,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
>diff --git a/configs/ls1043ardb_sdcard_defconfig
>b/configs/ls1043ardb_sdcard_defconfig
>index 81b01318b2..ac2938debe 100644
>--- a/configs/ls1043ardb_sdcard_defconfig
>+++ b/configs/ls1043ardb_sdcard_defconfig
>@@ -72,3 +72,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
>diff --git a/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
>b/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
>index 94ca502f3b..36eb0fcff7 100644
>--- a/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
>+++ b/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
>@@ -56,3 +56,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
>diff --git a/configs/ls1043ardb_tfa_defconfig
>b/configs/ls1043ardb_tfa_defconfig
>index 342b14681a..f7dbf8c561 100644
>--- a/configs/ls1043ardb_tfa_defconfig
>+++ b/configs/ls1043ardb_tfa_defconfig
>@@ -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
>diff --git a/include/configs/ls1043a_common.h
>b/include/configs/ls1043a_common.h
>index bf24d4036d..e2555fed8e 100644
>--- a/include/configs/ls1043a_common.h
>+++ b/include/configs/ls1043a_common.h
>@@ -141,7 +141,12 @@
> #endif
>
> /* I2C */
>+#ifndef CONFIG_DM_I2C
> #define CONFIG_SYS_I2C
>+#else
>+#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
>+#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0 #endif
>
> /* PCIe */
> #ifndef SPL_NO_PCIE
>--
>2.17.1
Reviewed-by: Priyanka Jain <[email protected]>
