]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
dm: arm64: ls1012a: add i2c DM support
authorBiwen Li <biwen.li@nxp.com>
Tue, 31 Dec 2019 07:33:41 +0000 (15:33 +0800)
committerPriyanka Jain <priyanka.jain@nxp.com>
Tue, 4 Feb 2020 10:50:25 +0000 (16:20 +0530)
This supports i2c DM and enables CONFIG_DM_I2C
for SoC LS1012A

Signed-off-by: Biwen Li <biwen.li@nxp.com>
Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
21 files changed:
arch/arm/cpu/armv8/fsl-layerscape/Kconfig
arch/arm/include/asm/gpio.h
board/freescale/ls1012aqds/ls1012aqds.c
board/freescale/ls1012ardb/eth.c
board/freescale/ls1012ardb/ls1012ardb.c
configs/ls1012a2g5rdb_qspi_defconfig
configs/ls1012a2g5rdb_tfa_defconfig
configs/ls1012afrdm_qspi_defconfig
configs/ls1012afrdm_tfa_defconfig
configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
configs/ls1012afrwy_qspi_defconfig
configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig
configs/ls1012afrwy_tfa_defconfig
configs/ls1012aqds_qspi_defconfig
configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
configs/ls1012aqds_tfa_defconfig
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
configs/ls1012ardb_qspi_defconfig
configs/ls1012ardb_tfa_SECURE_BOOT_defconfig
configs/ls1012ardb_tfa_defconfig
include/configs/ls1012a_common.h

index e2b92f0eabb0cc940703bbf031032d2a7126008e..275c66d99291686798405a464fb0e62ebb5e718f 100644 (file)
@@ -16,8 +16,8 @@ config ARCH_LS1012A
        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_I2C1 if !DM_I2C
+       select SYS_I2C_MXC_I2C2 if !DM_I2C
        imply PANIC_HANG
 
 config ARCH_LS1028A
index acb7ea9a3eb47788ab4794313ceea8b227689c14..39ffc18e29ef6562153cbc705c41e67664a92d71 100644 (file)
@@ -4,6 +4,7 @@
        !defined(CONFIG_ARCH_ROCKCHIP) && !defined(CONFIG_ARCH_LX2160A) && \
        !defined(CONFIG_ARCH_LS1028A) && !defined(CONFIG_ARCH_LS2080A) && \
        !defined(CONFIG_ARCH_LS1088A) && !defined(CONFIG_ARCH_ASPEED) && \
+       !defined(CONFIG_ARCH_LS1012A) && \
        !defined(CONFIG_ARCH_U8500)
 #include <asm/arch/gpio.h>
 #endif
index 86c72ee357ebeca405c9aca5138ea319014efa61..30bf1047d53470b5d2715ffa711d1bdfd8a358dd 100644 (file)
@@ -107,10 +107,26 @@ int board_early_init_f(void)
 int misc_init_r(void)
 {
        u8 mux_sdhc_cd = 0x80;
-
-       i2c_set_bus_num(0);
+       int bus_num = 0;
+
+#ifdef CONFIG_DM_I2C
+       struct udevice *dev;
+       int ret;
+
+       ret = i2c_get_chip_for_busnum(bus_num, CONFIG_SYS_I2C_FPGA_ADDR,
+                                     1, &dev);
+       if (ret) {
+               printf("%s: Cannot find udev for a bus %d\n", __func__,
+                      bus_num);
+               return ret;
+       }
+       dm_i2c_write(dev, 0x5a, &mux_sdhc_cd, 1);
+#else
+       i2c_set_bus_num(bus_num);
 
        i2c_write(CONFIG_SYS_I2C_FPGA_ADDR, 0x5a, 1, &mux_sdhc_cd, 1);
+#endif
+
        return 0;
 }
 #endif
index 3cc0a65cb91881541010126538f20cfa8982ac15..5edcfcf1ceafb136ce383a9708b5c607879d06ab 100644 (file)
@@ -28,12 +28,47 @@ static inline void ls1012ardb_reset_phy(void)
 {
 #ifdef CONFIG_TARGET_LS1012ARDB
        /* Through reset IO expander reset both RGMII and SGMII PHYs */
+#ifdef CONFIG_DM_I2C
+       struct udevice *dev;
+       int ret;
+
+       /*
+        * The I2C IO-expander PCAL9555A is mouted on I2C1 bus(bus number is 0).
+        */
+       ret = i2c_get_chip_for_busnum(0, I2C_MUX_IO2_ADDR,
+                                     1, &dev);
+       if (ret) {
+               printf("%s: Cannot find udev for a bus %d\n", __func__,
+                      0);
+               return;
+       }
+       /* Config port 0
+        * - config pin IOXP_RST_ETH1_B and IOXP_RST_ETH2_B
+        *   are enabled as an output.
+        */
+       dm_i2c_reg_write(dev, 6, __PHY_MASK);
+
+       /*
+        * Set port 0 output a value to reset ETH2 interface
+        * - pin IOXP_RST_ETH2_B output 0b0
+        */
+       dm_i2c_reg_write(dev, 2, __PHY_ETH2_MASK);
+       mdelay(10);
+       dm_i2c_reg_write(dev, 2, __PHY_ETH1_MASK);
+       /*
+        * Set port 0 output a value to reset ETH1 interface
+        * - pin IOXP_RST_ETH1_B output 0b0
+        */
+       mdelay(10);
+       dm_i2c_reg_write(dev, 2, 0xFF);
+#else
        i2c_reg_write(I2C_MUX_IO2_ADDR, 6, __PHY_MASK);
        i2c_reg_write(I2C_MUX_IO2_ADDR, 2, __PHY_ETH2_MASK);
        mdelay(10);
        i2c_reg_write(I2C_MUX_IO2_ADDR, 2, __PHY_ETH1_MASK);
        mdelay(10);
        i2c_reg_write(I2C_MUX_IO2_ADDR, 2, 0xFF);
+#endif
        mdelay(50);
 #endif
 }
index 0f665c7bc68fa94445c14d7c05ab1532ddb5a22b..ab83ef11a098b1b0437366ccc498d8c831ce28f0 100644 (file)
@@ -34,13 +34,27 @@ int checkboard(void)
 {
 #ifdef CONFIG_TARGET_LS1012ARDB
        u8 in1;
+       int ret, bus_num = 0;
 
        puts("Board: LS1012ARDB ");
 
        /* Initialize i2c early for Serial flash bank information */
-       i2c_set_bus_num(0);
+#if defined(CONFIG_DM_I2C)
+       struct udevice *dev;
 
-       if (i2c_read(I2C_MUX_IO_ADDR, I2C_MUX_IO_1, 1, &in1, 1) < 0) {
+       ret = i2c_get_chip_for_busnum(bus_num, I2C_MUX_IO_ADDR,
+                                     1, &dev);
+       if (ret) {
+               printf("%s: Cannot find udev for a bus %d\n", __func__,
+                      bus_num);
+               return -ENXIO;
+       }
+       ret = dm_i2c_read(dev, I2C_MUX_IO_1, &in1, 1);
+#else /* Non DM I2C support - will be removed */
+       i2c_set_bus_num(bus_num);
+       ret = i2c_read(I2C_MUX_IO_ADDR, I2C_MUX_IO_1, 1, &in1, 1);
+#endif
+       if (ret < 0) {
                printf("Error reading i2c boot information!\n");
                return 0; /* Don't want to hang() on this error */
        }
@@ -175,11 +189,25 @@ int esdhc_status_fixup(void *blob, const char *compat)
        bool sdhc2_en = false;
        u8 mux_sdhc2;
        u8 io = 0;
+       int ret, bus_num = 0;
 
-       i2c_set_bus_num(0);
+#if defined(CONFIG_DM_I2C)
+       struct udevice *dev;
 
+       ret = i2c_get_chip_for_busnum(bus_num, I2C_MUX_IO_ADDR,
+                                     1, &dev);
+       if (ret) {
+               printf("%s: Cannot find udev for a bus %d\n", __func__,
+                      bus_num);
+               return -ENXIO;
+       }
+       ret = dm_i2c_read(dev, I2C_MUX_IO_1, &io, 1);
+#else
+       i2c_set_bus_num(bus_num);
        /* IO1[7:3] is the field of board revision info. */
-       if (i2c_read(I2C_MUX_IO_ADDR, I2C_MUX_IO_1, 1, &io, 1) < 0) {
+       ret = i2c_read(I2C_MUX_IO_ADDR, I2C_MUX_IO_1, 1, &io, 1);
+#endif
+       if (ret < 0) {
                printf("Error reading i2c boot information!\n");
                return 0;
        }
@@ -202,7 +230,12 @@ int esdhc_status_fixup(void *blob, const char *compat)
                 *      10 - eMMC Memory
                 *      11 - SPI
                 */
-               if (i2c_read(I2C_MUX_IO_ADDR, I2C_MUX_IO_0, 1, &io, 1) < 0) {
+#if defined(CONFIG_DM_I2C)
+               ret = dm_i2c_read(dev, I2C_MUX_IO_0, &io, 1);
+#else
+               ret = i2c_read(I2C_MUX_IO_ADDR, I2C_MUX_IO_0, 1, &io, 1);
+#endif
+               if (ret < 0) {
                        printf("Error reading i2c boot information!\n");
                        return 0;
                }
@@ -233,16 +266,63 @@ int ft_board_setup(void *blob, bd_t *bd)
 
 static int switch_to_bank1(void)
 {
-       u8 data;
-       int ret;
+       u8 data = 0xf4, chip_addr = 0x24, offset_addr = 0x03;
+       int ret, bus_num = 0;
 
-       i2c_set_bus_num(0);
+#if defined(CONFIG_DM_I2C)
+       struct udevice *dev;
+
+       ret = i2c_get_chip_for_busnum(bus_num, chip_addr,
+                                     1, &dev);
+       if (ret) {
+               printf("%s: Cannot find udev for a bus %d\n", __func__,
+                      bus_num);
+               return -ENXIO;
+       }
+       /*
+        * --------------------------------------------------------------------
+        * |bus |I2C address|       Device     |          Notes               |
+        * --------------------------------------------------------------------
+        * |I2C1|0x24, 0x25,| IO expander (CFG,| Provides 16bits of General   |
+        * |    |0x26       | RESET, and INT/  | Purpose parallel Input/Output|
+        * |    |           | KW41GPIO) - NXP  | (GPIO) expansion for the     |
+        * |    |           | PCAL9555AHF      | I2C bus                      |
+        * ----- --------------------------------------------------------------
+        * - mount three IO expander(PCAL9555AHF) on I2C1
+        *
+        * PCAL9555A device address
+        *           slave address
+        *  --------------------------------------
+        *  | 0 | 1 | 0 | 0 | A2 | A1 | A0 | R/W |
+        *  --------------------------------------
+        *  |     fixed     | hardware selectable|
+        *
+        * Output port 1(Pinter register bits = 0x03)
+        *
+        * P1_[7~0] = 0xf4
+        * P1_0 <---> CFG_MUX_QSPI_S0
+        * P1_1 <---> CFG_MUX_QSPI_S1
+        * CFG_MUX_QSPI_S[1:0] = 0b00
+        *
+        * QSPI chip-select demultiplexer select
+        * ---------------------------------------------------------------------
+        * CFG_MUX_QSPI_S1|CFG_MUX_QSPI_S0|              Values
+        * ---------------------------------------------------------------------
+        *    0           | 0            |CS routed to SPI memory bank1(default)
+        * ---------------------------------------------------------------------
+        *    0           | 1             |CS routed to SPI memory bank2
+        * ---------------------------------------------------------------------
+        *
+        */
+       ret = dm_i2c_write(dev, offset_addr, &data, 1);
+#else /* Non DM I2C support - will be removed */
+       i2c_set_bus_num(bus_num);
+       ret = i2c_write(chip_addr, offset_addr, 1, &data, 1);
+#endif
 
-       data = 0xf4;
-       ret = i2c_write(0x24, 0x3, 1, &data, 1);
        if (ret) {
                printf("i2c write error to chip : %u, addr : %u, data : %u\n",
-                      0x24, 0x3, data);
+                      chip_addr, offset_addr, data);
        }
 
        return ret;
@@ -250,25 +330,45 @@ static int switch_to_bank1(void)
 
 static int switch_to_bank2(void)
 {
-       u8 data;
-       int ret;
+       u8 data[2] = {0xfc, 0xf5}, offset_addr[2] = {0x7, 0x3};
+       u8 chip_addr = 0x24;
+       int ret, i, bus_num = 0;
 
-       i2c_set_bus_num(0);
+#if defined(CONFIG_DM_I2C)
+       struct udevice *dev;
 
-       data = 0xfc;
-       ret = i2c_write(0x24, 0x7, 1, &data, 1);
+       ret = i2c_get_chip_for_busnum(bus_num, chip_addr,
+                                     1, &dev);
        if (ret) {
-               printf("i2c write error to chip : %u, addr : %u, data : %u\n",
-                      0x24, 0x7, data);
-               goto err;
+               printf("%s: Cannot find udev for a bus %d\n", __func__,
+                      bus_num);
+               return -ENXIO;
        }
+#else /* Non DM I2C support - will be removed */
+       i2c_set_bus_num(bus_num);
+#endif
 
-       data = 0xf5;
-       ret = i2c_write(0x24, 0x3, 1, &data, 1);
-       if (ret) {
-               printf("i2c write error to chip : %u, addr : %u, data : %u\n",
-                      0x24, 0x3, data);
+       /*
+        * 1th step: config port 1
+        *      - the port 1 pin is enabled as an output
+        * 2th step: output port 1
+        *      - P1_[7:0] output 0xf5,
+        *        then CFG_MUX_QSPI_S[1:0] equal to 0b01,
+        *        CS routed to SPI memory bank2
+        */
+       for (i = 0; i < sizeof(data); i++) {
+#if defined(CONFIG_DM_I2C)
+               ret = dm_i2c_write(dev, offset_addr[i], &data[i], 1);
+#else /* Non DM I2C support - will be removed */
+               ret = i2c_write(chip_addr, offset_addr[i], 1, &data[i], 1);
+#endif
+               if (ret) {
+                       printf("i2c write error to chip : %u, addr : %u, data : %u\n",
+                              chip_addr, offset_addr[i], data[i]);
+                       goto err;
+               }
        }
+
 err:
        return ret;
 }
index be8b2e51eff6d4d241fccad1b0f984bcdfe357f3..dabe2b52d5589d7f86b42f35ac56aa27fe43a7c0 100644 (file)
@@ -52,3 +52,6 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_RTC=y
index 0a035a83faa3ef35f50350f07dcdd6e0de951a88..2a5713b852148af72aec6d7fc2d89cbc44dfc3d2 100644 (file)
@@ -52,3 +52,6 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_RTC=y
index 7258d47dfca09af285646b3d1c9bc99ae6fa3eaa..e5196defac2edc520480b0dc2f3a3e893460d420 100644 (file)
@@ -52,3 +52,6 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_RTC=y
index 85f87ba238f63b062220a523e8d5f33e53f6de1f..4b55b0c485f9f050d5f5e33fd4fbed6f927b520a 100644 (file)
@@ -52,3 +52,6 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_RTC=y
index a3c6fe7d8f6f7172e0a25d7d8f15c513904bc916..14fdef4ad452aeea08c25ef31c09efeaf4977a73 100644 (file)
@@ -54,3 +54,6 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_RSA_SOFTWARE_EXP=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_RTC=y
index eb732a1964b19ffed3994402fc126f3b742387d6..6ca5599dfa5308768ea07f77813012a7e6679cc3 100644 (file)
@@ -54,3 +54,6 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_RTC=y
index 92d85994a3570e6a552d79c89b742cd27857d93f..79e4de9fc0098f77fa90f7a090892c839f0257c1 100644 (file)
@@ -55,3 +55,6 @@ CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_RSA_SOFTWARE_EXP=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_RTC=y
index ca732c4b4839f43ff49ee66e3b5f645f5205db1c..5f1469e6716f4fde63514567947b6b3226124ba2 100644 (file)
@@ -60,3 +60,6 @@ CONFIG_USB_ETHER_ASIX88179=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_RTC=y
index 1d6bcc51c442ef9580efc4afddfa8458222415bd..3708f42e2fb5ffe51b00bf8a04c0e590f4ce5a1b 100644 (file)
@@ -76,3 +76,6 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_RTC=y
index f525544ccf27b7b5b8504bf8ad43907334eab92e..ac9e92036c8cdd07263fedd26185af5620d304a1 100644 (file)
@@ -68,3 +68,6 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_RSA_SOFTWARE_EXP=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_RTC=y
index 656de21adbf66eb893d6b0af7effe6900f3ade37..b1e3e51754d4bb1dfece28f06d65087c780c7875 100644 (file)
@@ -76,3 +76,6 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_RTC=y
index a7d1f959fb46296a41867f11882353f314b35a57..c59d74408db29184bdffbbfb71e427bc3755fcbf 100644 (file)
@@ -58,3 +58,6 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_RSA_SOFTWARE_EXP=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_RTC=y
index f3fede7b621c07a19f344af09b98ca2563a325cd..8ae63ef73dc3571dec24051fe6750d6df4142524 100644 (file)
@@ -60,3 +60,6 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_RTC=y
index 2ecd50762564c03a3b6b3df7c691ba6efdbf35ed..19a2e5bfbee5b038e433b2e90217c0660e182b94 100644 (file)
@@ -58,3 +58,6 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_RSA_SOFTWARE_EXP=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_RTC=y
index cb457abc648062a7a5bb3c6daf18cd9f17f7fbf4..b47a47d56b87e5d3a7fe92db34daf89a914dfe19 100644 (file)
@@ -61,3 +61,6 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_RTC=y
index 2579e2fb37ee4b4f99225fa0ed19712a9ead7cc8..e9baa2a8b66c663707fea25aeb267259353d6e16 100644 (file)
                                                CONFIG_SYS_SCSI_MAX_LUN)
 
 /* 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
 
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE     1