* [v3 1/8] rtc: pcf8563: support driver model
@ 2019-12-05 6:10 Biwen Li
2019-12-05 6:10 ` [v3 2/8] armv8: fsl-layerscape: spl: fix build error when DM_I2C is enabled Biwen Li
` (7 more replies)
0 siblings, 8 replies; 15+ messages in thread
From: Biwen Li @ 2019-12-05 6:10 UTC (permalink / raw)
To: u-boot
This supports driver model for pcf8563
Signed-off-by: Biwen Li <biwen.li@nxp.com>
---
Changes in v3:
- update commit messages
Changes in v2:
- none
drivers/rtc/pcf8563.c | 107 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 107 insertions(+)
diff --git a/drivers/rtc/pcf8563.c b/drivers/rtc/pcf8563.c
index a839d6cc98..44204e133e 100644
--- a/drivers/rtc/pcf8563.c
+++ b/drivers/rtc/pcf8563.c
@@ -12,9 +12,11 @@
#include <common.h>
#include <command.h>
+#include <dm.h>
#include <rtc.h>
#include <i2c.h>
+#if !CONFIG_IS_ENABLED(DM_RTC)
static uchar rtc_read (uchar reg);
static void rtc_write (uchar reg, uchar val);
@@ -115,3 +117,108 @@ static void rtc_write (uchar reg, uchar val)
{
i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
}
+#else
+static int pcf8563_rtc_get(struct udevice *dev, struct rtc_time *tmp)
+{
+ int rel = 0;
+ uchar sec, min, hour, mday, wday, mon_cent, year;
+
+ sec = dm_i2c_reg_read(dev, 0x02);
+ min = dm_i2c_reg_read(dev, 0x03);
+ hour = dm_i2c_reg_read(dev, 0x04);
+ mday = dm_i2c_reg_read(dev, 0x05);
+ wday = dm_i2c_reg_read(dev, 0x06);
+ mon_cent = dm_i2c_reg_read(dev, 0x07);
+ year = dm_i2c_reg_read(dev, 0x08);
+
+ debug ("Get RTC year: %02x mon/cent: %02x mday: %02x wday: %02x "
+ "hr: %02x min: %02x sec: %02x\n",
+ year, mon_cent, mday, wday,
+ hour, min, sec);
+ debug ("Alarms: wday: %02x day: %02x hour: %02x min: %02x\n",
+ dm_i2c_reg_read(dev, 0x0C),
+ dm_i2c_reg_read(dev, 0x0B),
+ dm_i2c_reg_read(dev, 0x0A),
+ dm_i2c_reg_read(dev, 0x09));
+
+ if (sec & 0x80) {
+ puts ("### Warning: RTC Low Voltage - date/time not reliable\n");
+ rel = -1;
+ }
+
+ tmp->tm_sec = bcd2bin (sec & 0x7F);
+ tmp->tm_min = bcd2bin (min & 0x7F);
+ tmp->tm_hour = bcd2bin (hour & 0x3F);
+ tmp->tm_mday = bcd2bin (mday & 0x3F);
+ tmp->tm_mon = bcd2bin (mon_cent & 0x1F);
+ tmp->tm_year = bcd2bin (year) + ((mon_cent & 0x80) ? 1900 : 2000);
+ tmp->tm_wday = bcd2bin (wday & 0x07);
+ tmp->tm_yday = 0;
+ tmp->tm_isdst = 0;
+
+ debug ("Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n",
+ tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+
+ return rel;
+}
+
+static int pcf8563_rtc_set(struct udevice *dev, const struct rtc_time *tmp)
+{
+ uchar century;
+
+ debug ("Set DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n",
+ tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+
+ dm_i2c_reg_write(dev, 0x08, bin2bcd(tmp->tm_year % 100));
+
+ century = (tmp->tm_year >= 2000) ? 0 : 0x80;
+ dm_i2c_reg_write(dev, 0x07, bin2bcd(tmp->tm_mon) | century);
+
+ dm_i2c_reg_write(dev, 0x06, bin2bcd(tmp->tm_wday));
+ dm_i2c_reg_write(dev, 0x05, bin2bcd(tmp->tm_mday));
+ dm_i2c_reg_write(dev, 0x04, bin2bcd(tmp->tm_hour));
+ dm_i2c_reg_write(dev, 0x03, bin2bcd(tmp->tm_min));
+ dm_i2c_reg_write(dev, 0x02, bin2bcd(tmp->tm_sec));
+
+ return 0;
+}
+
+static int pcf8563_rtc_reset(struct udevice *dev)
+{
+ /* clear all control & status registers */
+ dm_i2c_reg_write(dev, 0x00, 0x00);
+ dm_i2c_reg_write(dev, 0x01, 0x00);
+ dm_i2c_reg_write(dev, 0x0D, 0x00);
+
+ /* clear Voltage Low bit */
+ dm_i2c_reg_write(dev, 0x02, dm_i2c_reg_read (dev, 0x02) & 0x7F);
+
+ /* reset all alarms */
+ dm_i2c_reg_write(dev, 0x09, 0x00);
+ dm_i2c_reg_write(dev, 0x0A, 0x00);
+ dm_i2c_reg_write(dev, 0x0B, 0x00);
+ dm_i2c_reg_write(dev, 0x0C, 0x00);
+
+ return 0;
+}
+
+static const struct rtc_ops pcf8563_rtc_ops = {
+ .get = pcf8563_rtc_get,
+ .set = pcf8563_rtc_set,
+ .reset = pcf8563_rtc_reset,
+};
+
+static const struct udevice_id pcf8563_rtc_ids[] = {
+ { .compatible = "nxp,pcf8563" },
+ { }
+};
+
+U_BOOT_DRIVER(rtc_pcf8563) = {
+ .name = "rtc-pcf8563",
+ .id = UCLASS_RTC,
+ .of_match = pcf8563_rtc_ids,
+ .ops = &pcf8563_rtc_ops,
+};
+#endif
--
2.17.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [v3 2/8] armv8: fsl-layerscape: spl: fix build error when DM_I2C is enabled
2019-12-05 6:10 [v3 1/8] rtc: pcf8563: support driver model Biwen Li
@ 2019-12-05 6:10 ` Biwen Li
2019-12-05 6:10 ` [v3 3/8] i2c: mxc_i2c: add DM_FLAG_PRE_RELOC flag Biwen Li
` (6 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: Biwen Li @ 2019-12-05 6:10 UTC (permalink / raw)
To: u-boot
Fix below SPL build error when DM_I2C is enabled,
- arch/arm/cpu/armv8/built-in.o: In function `board_init_f:
arch/arm/cpu/armv8/fsl-layerscape/spl.c:74: undefined reference to `i2c_init_all'
arch/arm/cpu/armv8/fsl-layerscape/spl.c:74:(.text.board_init_f+0x30):
relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol
`i2c_init_all'
make[2]: *** [spl/u-boot-spl] Error 1
make[1]: *** [spl/u-boot-spl] Error 2
make: *** [sub-make] Error 2
arch/arm/cpu/armv8/fsl-layerscape/spl.c: In function 'board_init_f':
arch/arm/cpu/armv8/fsl-layerscape/spl.c:74:2: warning: implicit
declaration of function 'i2c_init_all'; did you mean 'misc_init_r'?
[-Wimplicit-function-declaration]`
Signed-off-by: Biwen Li <biwen.li@nxp.com>
---
Changes in v3:
- update commit messages
Changes in v2:
- none
arch/arm/cpu/armv8/fsl-layerscape/spl.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
index 58a39e1123..b5038f1d3b 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
@@ -71,9 +71,11 @@ void board_init_f(ulong dummy)
preloader_console_init();
spl_set_bd();
+#ifdef CONFIG_SYS_I2C
#ifdef CONFIG_SPL_I2C_SUPPORT
i2c_init_all();
#endif
+#endif
#ifdef CONFIG_VID
init_func_vid();
#endif
--
2.17.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [v3 3/8] i2c: mxc_i2c: add DM_FLAG_PRE_RELOC flag
2019-12-05 6:10 [v3 1/8] rtc: pcf8563: support driver model Biwen Li
2019-12-05 6:10 ` [v3 2/8] armv8: fsl-layerscape: spl: fix build error when DM_I2C is enabled Biwen Li
@ 2019-12-05 6:10 ` Biwen Li
2019-12-05 6:38 ` Priyanka Jain
2019-12-05 6:10 ` [v3 4/8] Kconfigs: layerscape: use a convenient default value for SYS_MALLOC_F_LEN Biwen Li
` (5 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Biwen Li @ 2019-12-05 6:10 UTC (permalink / raw)
To: u-boot
This adds DM_FLAG_PRE_RELOC flag to probe i2c driver
before relocation
Signed-off-by: Biwen Li <biwen.li@nxp.com>
---
Changes in v3:
- none
Changes in v2:
- none
drivers/i2c/mxc_i2c.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 786b5a2226..6b7ce985b3 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -1049,5 +1049,6 @@ U_BOOT_DRIVER(i2c_mxc) = {
.probe = mxc_i2c_probe,
.priv_auto_alloc_size = sizeof(struct mxc_i2c_bus),
.ops = &mxc_i2c_ops,
+ .flags = DM_FLAG_PRE_RELOC,
};
#endif
--
2.17.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [v3 4/8] Kconfigs: layerscape: use a convenient default value for SYS_MALLOC_F_LEN
2019-12-05 6:10 [v3 1/8] rtc: pcf8563: support driver model Biwen Li
2019-12-05 6:10 ` [v3 2/8] armv8: fsl-layerscape: spl: fix build error when DM_I2C is enabled Biwen Li
2019-12-05 6:10 ` [v3 3/8] i2c: mxc_i2c: add DM_FLAG_PRE_RELOC flag Biwen Li
@ 2019-12-05 6:10 ` Biwen Li
2019-12-05 6:39 ` Priyanka Jain
2019-12-05 6:10 ` [v3 5/8] dm: ls1012a: add i2c DM support Biwen Li
` (4 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Biwen Li @ 2019-12-05 6:10 UTC (permalink / raw)
To: u-boot
The default value of CONFIG_SYS_MALLOC_F_LEN (0x400)
leaves U-Boot with not enough memory to load i2c driver
before relocate, causing it to hang.
Change the default value of CONFIG_SYS_MALLOC_F_LEN
for below SoCs,
- LS1012A
- LS1021A
- LS1043A
- LS1046A
Signed-off-by: Biwen Li <biwen.li@nxp.com>
---
Changes in v3:
- update commit messages
Changes in v2:
- none
Kconfig | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Kconfig b/Kconfig
index e22417ec44..3e6d9f26ea 100644
--- a/Kconfig
+++ b/Kconfig
@@ -146,7 +146,9 @@ config SYS_MALLOC_F_LEN
default 0x1000 if AM33XX
default 0x2800 if SANDBOX
default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \
- ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5)
+ ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5 || \
+ ARCH_LS1012A || ARCH_LS1021A || ARCH_LS1043A || \
+ ARCH_LS1046A)
default 0x400
help
Before relocation, memory is very limited on many platforms. Still,
--
2.17.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [v3 5/8] dm: ls1012a: add i2c DM support
2019-12-05 6:10 [v3 1/8] rtc: pcf8563: support driver model Biwen Li
` (2 preceding siblings ...)
2019-12-05 6:10 ` [v3 4/8] Kconfigs: layerscape: use a convenient default value for SYS_MALLOC_F_LEN Biwen Li
@ 2019-12-05 6:10 ` Biwen Li
2019-12-05 6:48 ` Priyanka Jain
2019-12-05 6:10 ` [v3 6/8] dm: arm: ls1043a: " Biwen Li
` (3 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Biwen Li @ 2019-12-05 6:10 UTC (permalink / raw)
To: u-boot
This supports i2c DM and enables CONFIG_DM_I2C
for SoC LS1012A
Signed-off-by: Biwen Li <biwen.li@nxp.com>
---
Changes in v3:
- none
Changes in v2:
- merge some patches to one patch
arch/arm/include/asm/gpio.h | 1 +
board/freescale/ls1012aqds/ls1012aqds.c | 20 ++-
board/freescale/ls1012ardb/eth.c | 35 +++++
board/freescale/ls1012ardb/ls1012ardb.c | 147 +++++++++++++++---
configs/ls1012a2g5rdb_qspi_defconfig | 3 +
configs/ls1012a2g5rdb_tfa_defconfig | 3 +
configs/ls1012afrdm_qspi_defconfig | 3 +
configs/ls1012afrdm_tfa_defconfig | 3 +
.../ls1012afrwy_qspi_SECURE_BOOT_defconfig | 3 +
configs/ls1012afrwy_qspi_defconfig | 3 +
configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 3 +
configs/ls1012afrwy_tfa_defconfig | 3 +
configs/ls1012aqds_qspi_defconfig | 3 +
configs/ls1012aqds_tfa_SECURE_BOOT_defconfig | 3 +
configs/ls1012aqds_tfa_defconfig | 3 +
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 3 +
configs/ls1012ardb_qspi_defconfig | 3 +
configs/ls1012ardb_tfa_SECURE_BOOT_defconfig | 3 +
configs/ls1012ardb_tfa_defconfig | 3 +
include/configs/ls1012a_common.h | 5 +
20 files changed, 227 insertions(+), 26 deletions(-)
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
index 6ff5f42424..9f8c9da564 100644
--- a/arch/arm/include/asm/gpio.h
+++ b/arch/arm/include/asm/gpio.h
@@ -3,6 +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_ASPEED)
#include <asm/arch/gpio.h>
#endif
diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c
index 86c72ee357..30bf1047d5 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/freescale/ls1012aqds/ls1012aqds.c
@@ -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
diff --git a/board/freescale/ls1012ardb/eth.c b/board/freescale/ls1012ardb/eth.c
index b35d5343e4..0f33128996 100644
--- a/board/freescale/ls1012ardb/eth.c
+++ b/board/freescale/ls1012ardb/eth.c
@@ -27,12 +27,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
}
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index e4527c19b8..271227a976 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -32,13 +32,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 */
}
@@ -173,11 +187,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;
}
@@ -200,7 +228,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;
}
@@ -231,16 +264,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;
+ }
+ /*
+ * --------------------------------------------------------------------------------
+ * | I2C bus | I2C address | Device | Notes |
+ * --------------------------------------------------------------------------------
+ * | I2C1 | 0x24, 0x25, 0x26 | IO expander (CFG,| Provides 16bits of General |
+ * | | | 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;
@@ -248,25 +328,44 @@ 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}, 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;
}
diff --git a/configs/ls1012a2g5rdb_qspi_defconfig b/configs/ls1012a2g5rdb_qspi_defconfig
index 3c99a43ded..82dd98bed6 100644
--- a/configs/ls1012a2g5rdb_qspi_defconfig
+++ b/configs/ls1012a2g5rdb_qspi_defconfig
@@ -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
diff --git a/configs/ls1012a2g5rdb_tfa_defconfig b/configs/ls1012a2g5rdb_tfa_defconfig
index 0865ac2fdf..9f9cf5a15b 100644
--- a/configs/ls1012a2g5rdb_tfa_defconfig
+++ b/configs/ls1012a2g5rdb_tfa_defconfig
@@ -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
diff --git a/configs/ls1012afrdm_qspi_defconfig b/configs/ls1012afrdm_qspi_defconfig
index 7ff0955f1d..9f5d1ebf2d 100644
--- a/configs/ls1012afrdm_qspi_defconfig
+++ b/configs/ls1012afrdm_qspi_defconfig
@@ -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
diff --git a/configs/ls1012afrdm_tfa_defconfig b/configs/ls1012afrdm_tfa_defconfig
index 8e8ddd73ed..f6fd69bf45 100644
--- a/configs/ls1012afrdm_tfa_defconfig
+++ b/configs/ls1012afrdm_tfa_defconfig
@@ -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
diff --git a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
index a1c7c702d1..04d3d48687 100644
--- a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/ls1012afrwy_qspi_defconfig b/configs/ls1012afrwy_qspi_defconfig
index 0773857c51..0f007dc384 100644
--- a/configs/ls1012afrwy_qspi_defconfig
+++ b/configs/ls1012afrwy_qspi_defconfig
@@ -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
diff --git a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig
index 79eb801b03..f33ae350bf 100644
--- a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/ls1012afrwy_tfa_defconfig b/configs/ls1012afrwy_tfa_defconfig
index 354c521ea4..ee1f2e13f0 100644
--- a/configs/ls1012afrwy_tfa_defconfig
+++ b/configs/ls1012afrwy_tfa_defconfig
@@ -56,3 +56,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
diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig
index 0a719c30c5..958d78fd23 100644
--- a/configs/ls1012aqds_qspi_defconfig
+++ b/configs/ls1012aqds_qspi_defconfig
@@ -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
diff --git a/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
index 25d06d2919..2ae7e9eda9 100644
--- a/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/ls1012aqds_tfa_defconfig b/configs/ls1012aqds_tfa_defconfig
index bde53a420c..373ced798d 100644
--- a/configs/ls1012aqds_tfa_defconfig
+++ b/configs/ls1012aqds_tfa_defconfig
@@ -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
diff --git a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
index 9989f7b3e9..d3e762df0a 100644
--- a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
@@ -57,3 +57,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
diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig
index 80ca9bd577..78ccd1bcfe 100644
--- a/configs/ls1012ardb_qspi_defconfig
+++ b/configs/ls1012ardb_qspi_defconfig
@@ -59,3 +59,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
diff --git a/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig
index 8eb71fcf63..ae7dcd19c7 100644
--- a/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig
@@ -57,3 +57,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
diff --git a/configs/ls1012ardb_tfa_defconfig b/configs/ls1012ardb_tfa_defconfig
index 1cc358ce74..17fe571765 100644
--- a/configs/ls1012ardb_tfa_defconfig
+++ b/configs/ls1012ardb_tfa_defconfig
@@ -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
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 2579e2fb37..e9baa2a8b6 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -66,7 +66,12 @@
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
--
2.17.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [v3 6/8] dm: arm: ls1043a: add i2c DM support
2019-12-05 6:10 [v3 1/8] rtc: pcf8563: support driver model Biwen Li
` (3 preceding siblings ...)
2019-12-05 6:10 ` [v3 5/8] dm: ls1012a: add i2c DM support Biwen Li
@ 2019-12-05 6:10 ` Biwen Li
2019-12-05 6:57 ` Priyanka Jain
2019-12-05 6:10 ` [v3 7/8] dm: arm: ls1046a: " Biwen Li
` (2 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Biwen Li @ 2019-12-05 6:10 UTC (permalink / raw)
To: u-boot
This supports i2c DM and enables CONFIG_DM_I2C
for SoC LS1043A
Signed-off-by: Biwen Li <biwen.li@nxp.com>
---
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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [v3 7/8] dm: arm: ls1046a: add i2c DM support
2019-12-05 6:10 [v3 1/8] rtc: pcf8563: support driver model Biwen Li
` (4 preceding siblings ...)
2019-12-05 6:10 ` [v3 6/8] dm: arm: ls1043a: " Biwen Li
@ 2019-12-05 6:10 ` Biwen Li
2019-12-05 6:58 ` Priyanka Jain
2019-12-05 6:10 ` [v3 8/8] dm: arm: ls1021a: " Biwen Li
2019-12-05 6:36 ` [v3 1/8] rtc: pcf8563: support driver model Priyanka Jain
7 siblings, 1 reply; 15+ messages in thread
From: Biwen Li @ 2019-12-05 6:10 UTC (permalink / raw)
To: u-boot
This supports i2c DM and enables CONFIG_DM_I2C
for SoC LS1046A
Signed-off-by: Biwen Li <biwen.li@nxp.com>
---
Changes in v3:
- none
Changes in v2:
- merge some patches to one patch
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 | 1 +
board/freescale/ls1046afrwy/ls1046afrwy.c | 17 ++++++-
board/freescale/ls1046aqds/ls1046aqds.c | 24 ++++++++--
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 | 45 ++++++++++++++++++-
include/configs/ls1046a_common.h | 6 +++
26 files changed, 136 insertions(+), 8 deletions(-)
diff --git a/arch/arm/dts/fsl-ls1046a-frwy.dts b/arch/arm/dts/fsl-ls1046a-frwy.dts
index 3d41e3bd44..d39159322a 100644
--- a/arch/arm/dts/fsl-ls1046a-frwy.dts
+++ b/arch/arm/dts/fsl-ls1046a-frwy.dts
@@ -32,3 +32,6 @@
};
+&i2c0 {
+ status = "okay";
+};
diff --git a/arch/arm/dts/fsl-ls1046a-qds.dtsi b/arch/arm/dts/fsl-ls1046a-qds.dtsi
index c95f44fc36..76dc397328 100644
--- a/arch/arm/dts/fsl-ls1046a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1046a-qds.dtsi
@@ -80,3 +80,7 @@
&sata {
status = "okay";
};
+
+&i2c0 {
+ status = "okay";
+};
diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts
index a05c9e9b9e..83e34ab02a 100644
--- a/arch/arm/dts/fsl-ls1046a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1046a-rdb.dts
@@ -43,3 +43,11 @@
&sata {
status = "okay";
};
+
+&i2c0 {
+ status = "okay";
+};
+
+&i2c3 {
+ status = "okay";
+};
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
index 45cb04801c..9adebf6c04 100644
--- a/arch/arm/include/asm/gpio.h
+++ b/arch/arm/include/asm/gpio.h
@@ -4,6 +4,7 @@
!defined(CONFIG_ARCH_LX2160A) && !defined(CONFIG_ARCH_LS1028A) && \
!defined(CONFIG_ARCH_LS2080A) && !defined(CONFIG_ARCH_LS1088A) && \
!defined(CONFIG_ARCH_LS1012A) && !defined(CONFIG_ARCH_LS1043A) && \
+ !defined(CONFIG_ARCH_LS1046A) && \
!defined(CONFIG_ARCH_ASPEED)
#include <asm/arch/gpio.h>
#endif
diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c
index ac2f8ee436..4a9189b3ee 100644
--- a/board/freescale/ls1046afrwy/ls1046afrwy.c
+++ b/board/freescale/ls1046afrwy/ls1046afrwy.c
@@ -35,11 +35,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;
@@ -144,7 +157,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;
}
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
index aac5d9aa84..e8d321b6c1 100644
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/freescale/ls1046aqds/ls1046aqds.c
@@ -269,11 +269,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 +300,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 +316,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 +329,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 +410,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();
diff --git a/configs/ls1046afrwy_tfa_defconfig b/configs/ls1046afrwy_tfa_defconfig
index 4137eda995..01617f62bc 100644
--- a/configs/ls1046afrwy_tfa_defconfig
+++ b/configs/ls1046afrwy_tfa_defconfig
@@ -58,3 +58,5 @@ 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
diff --git a/configs/ls1046aqds_SECURE_BOOT_defconfig b/configs/ls1046aqds_SECURE_BOOT_defconfig
index 159ac3c367..c121af71ac 100644
--- a/configs/ls1046aqds_SECURE_BOOT_defconfig
+++ b/configs/ls1046aqds_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/ls1046aqds_defconfig b/configs/ls1046aqds_defconfig
index 96d14d4270..6ff8829279 100644
--- a/configs/ls1046aqds_defconfig
+++ b/configs/ls1046aqds_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/ls1046aqds_lpuart_defconfig b/configs/ls1046aqds_lpuart_defconfig
index 38b48e999f..db9cc5d13e 100644
--- a/configs/ls1046aqds_lpuart_defconfig
+++ b/configs/ls1046aqds_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/ls1046aqds_nand_defconfig b/configs/ls1046aqds_nand_defconfig
index 5fbb573ccc..ac3628acb4 100644
--- a/configs/ls1046aqds_nand_defconfig
+++ b/configs/ls1046aqds_nand_defconfig
@@ -69,3 +69,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/ls1046aqds_qspi_defconfig b/configs/ls1046aqds_qspi_defconfig
index 7339aba903..7690105022 100644
--- a/configs/ls1046aqds_qspi_defconfig
+++ b/configs/ls1046aqds_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/ls1046aqds_sdcard_ifc_defconfig b/configs/ls1046aqds_sdcard_ifc_defconfig
index caa7a4db82..bb8dd3273a 100644
--- a/configs/ls1046aqds_sdcard_ifc_defconfig
+++ b/configs/ls1046aqds_sdcard_ifc_defconfig
@@ -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
diff --git a/configs/ls1046aqds_sdcard_qspi_defconfig b/configs/ls1046aqds_sdcard_qspi_defconfig
index 88ed9b2aff..1aa04e61c3 100644
--- a/configs/ls1046aqds_sdcard_qspi_defconfig
+++ b/configs/ls1046aqds_sdcard_qspi_defconfig
@@ -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
diff --git a/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
index e173747923..6a9391478b 100644
--- a/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
@@ -61,3 +61,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
diff --git a/configs/ls1046aqds_tfa_defconfig b/configs/ls1046aqds_tfa_defconfig
index 83e94ec7db..1a22096aae 100644
--- a/configs/ls1046aqds_tfa_defconfig
+++ b/configs/ls1046aqds_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/ls1046ardb_emmc_defconfig b/configs/ls1046ardb_emmc_defconfig
index 4979cb3159..c35ce51360 100644
--- a/configs/ls1046ardb_emmc_defconfig
+++ b/configs/ls1046ardb_emmc_defconfig
@@ -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
diff --git a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
index 469ef7670a..e799ce1262 100644
--- a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
@@ -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
diff --git a/configs/ls1046ardb_qspi_defconfig b/configs/ls1046ardb_qspi_defconfig
index 934f04a92e..6de5ff5358 100644
--- a/configs/ls1046ardb_qspi_defconfig
+++ b/configs/ls1046ardb_qspi_defconfig
@@ -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
diff --git a/configs/ls1046ardb_qspi_spl_defconfig b/configs/ls1046ardb_qspi_spl_defconfig
index cd808d8567..1d7f4e15cf 100644
--- a/configs/ls1046ardb_qspi_spl_defconfig
+++ b/configs/ls1046ardb_qspi_spl_defconfig
@@ -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
diff --git a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
index 7551b9d7d6..8181c1117a 100644
--- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
+++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
@@ -69,3 +69,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/ls1046ardb_sdcard_defconfig b/configs/ls1046ardb_sdcard_defconfig
index 8bade9df11..2279d352f4 100644
--- a/configs/ls1046ardb_sdcard_defconfig
+++ b/configs/ls1046ardb_sdcard_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/ls1046ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
index 9aeb33138b..c2f3725603 100644
--- a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
@@ -54,3 +54,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
diff --git a/configs/ls1046ardb_tfa_defconfig b/configs/ls1046ardb_tfa_defconfig
index 2772fa5f93..8e4e5baf01 100644
--- a/configs/ls1046ardb_tfa_defconfig
+++ b/configs/ls1046ardb_tfa_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/drivers/power/power_i2c.c b/drivers/power/power_i2c.c
index bcddff2d7a..a727f7e519 100644
--- a/drivers/power/power_i2c.c
+++ b/drivers/power/power_i2c.c
@@ -21,8 +21,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 +65,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 +81,21 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)
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 +128,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;
}
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index cc8f4c0210..648e3c8027 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -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))
@@ -127,7 +128,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 */
#define CONFIG_PCIE1 /* PCIE controller 1 */
--
2.17.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [v3 8/8] dm: arm: ls1021a: add i2c DM support
2019-12-05 6:10 [v3 1/8] rtc: pcf8563: support driver model Biwen Li
` (5 preceding siblings ...)
2019-12-05 6:10 ` [v3 7/8] dm: arm: ls1046a: " Biwen Li
@ 2019-12-05 6:10 ` Biwen Li
2019-12-05 6:36 ` [v3 1/8] rtc: pcf8563: support driver model Priyanka Jain
7 siblings, 0 replies; 15+ messages in thread
From: Biwen Li @ 2019-12-05 6:10 UTC (permalink / raw)
To: u-boot
This supports i2c DM and enables CONFIG_DM_I2C
for SoC LS1021A
Signed-off-by: Biwen Li <biwen.li@nxp.com>
---
Changes in v3:
- none
Changes in v2:
- merge some patches to one patch
board/freescale/common/dcu_sii9022a.c | 94 +++++++++++++++++++
board/freescale/common/diu_ch7301.c | 79 ++++++++++++++++
board/freescale/ls1021aqds/dcu.c | 43 ++++++++-
board/freescale/ls1021aqds/ls1021aqds.c | 20 +++-
board/freescale/ls1021atwr/ls1021atwr.c | 26 ++++-
configs/ls1021aiot_qspi_defconfig | 2 +
configs/ls1021aiot_sdcard_defconfig | 2 +
configs/ls1021aqds_ddr4_nor_defconfig | 2 +
configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 2 +
configs/ls1021aqds_nand_defconfig | 2 +
configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 2 +
configs/ls1021aqds_nor_defconfig | 2 +
configs/ls1021aqds_nor_lpuart_defconfig | 2 +
configs/ls1021aqds_qspi_defconfig | 2 +
configs/ls1021aqds_sdcard_ifc_defconfig | 2 +
configs/ls1021aqds_sdcard_qspi_defconfig | 2 +
configs/ls1021atsn_qspi_defconfig | 2 +
configs/ls1021atsn_sdcard_defconfig | 2 +
configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 2 +
configs/ls1021atwr_nor_defconfig | 2 +
configs/ls1021atwr_nor_lpuart_defconfig | 2 +
configs/ls1021atwr_qspi_defconfig | 2 +
...s1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 2 +
configs/ls1021atwr_sdcard_ifc_defconfig | 2 +
configs/ls1021atwr_sdcard_qspi_defconfig | 2 +
include/configs/ls1021aiot.h | 3 +
include/configs/ls1021aqds.h | 2 +
include/configs/ls1021atsn.h | 2 +
include/configs/ls1021atwr.h | 3 +
29 files changed, 305 insertions(+), 7 deletions(-)
diff --git a/board/freescale/common/dcu_sii9022a.c b/board/freescale/common/dcu_sii9022a.c
index 3bf71abf55..736b689e08 100644
--- a/board/freescale/common/dcu_sii9022a.c
+++ b/board/freescale/common/dcu_sii9022a.c
@@ -63,7 +63,100 @@ int dcu_set_dvi_encoder(struct fb_videomode *videomode)
u8 temp;
u16 temp1, temp2;
u32 temp3;
+#ifdef CONFIG_DM_I2C
+ struct udevice *dev;
+ int ret;
+
+ ret = i2c_get_chip_for_busnum(CONFIG_SYS_I2C_DVI_BUS_NUM, CONFIG_SYS_I2C_DVI_ADDR,
+ 1, &dev);
+ if (ret) {
+ printf("%s: Cannot find udev for a bus %d\n", __func__,
+ CONFIG_SYS_I2C_DVI_BUS_NUM);
+ return ret;
+ }
+ /* Enable TPI transmitter mode */
+ temp = TPI_TRANS_MODE_ENABLE;
+ dm_i2c_write(dev, TPI_TRANS_MODE_REG, &temp, 1);
+
+ /* Enter into D0 state, full operation */
+ dm_i2c_read(dev, TPI_PWR_STAT_REG, &temp, 1);
+ temp &= ~TPI_PWR_STAT_MASK;
+ temp |= TPI_PWR_STAT_D0;
+ dm_i2c_write(dev, TPI_PWR_STAT_REG, &temp, 1);
+
+ /* Enable source termination */
+ temp = TPI_SET_PAGE_SII9022A;
+ dm_i2c_write(dev, TPI_SET_PAGE_REG, &temp, 1);
+ temp = TPI_SET_OFFSET_SII9022A;
+ dm_i2c_write(dev, TPI_SET_OFFSET_REG, &temp, 1);
+
+ dm_i2c_read(dev, TPI_RW_ACCESS_REG, &temp, 1);
+ temp |= TPI_RW_EN_SRC_TERMIN;
+ dm_i2c_write(dev, TPI_RW_ACCESS_REG, &temp, 1);
+
+ /* Set TPI system control */
+ temp = TPI_SYS_TMDS_OUTPUT | TPI_SYS_AV_NORAML | TPI_SYS_DVI_MODE;
+ dm_i2c_write(dev, TPI_SYS_CTRL_REG, &temp, 1);
+
+ /* Set pixel clock */
+ temp1 = PICOS2KHZ(videomode->pixclock) / 10;
+ temp = (u8)(temp1 & 0xFF);
+ dm_i2c_write(dev, PIXEL_CLK_LSB_REG, &temp, 1);
+ temp = (u8)(temp1 >> 8);
+ dm_i2c_write(dev, PIXEL_CLK_MSB_REG, &temp, 1);
+
+ /* Set total pixels per line */
+ temp1 = videomode->hsync_len + videomode->left_margin +
+ videomode->xres + videomode->right_margin;
+ temp = (u8)(temp1 & 0xFF);
+ dm_i2c_write(dev, TOTAL_PIXELS_LSB_REG, &temp, 1);
+ temp = (u8)(temp1 >> 8);
+ dm_i2c_write(dev, TOTAL_PIXELS_MSB_REG, &temp, 1);
+
+ /* Set total lines */
+ temp2 = videomode->vsync_len + videomode->upper_margin +
+ videomode->yres + videomode->lower_margin;
+ temp = (u8)(temp2 & 0xFF);
+ dm_i2c_write(dev, TOTAL_LINES_LSB_REG, &temp, 1);
+ temp = (u8)(temp2 >> 8);
+ dm_i2c_write(dev, TOTAL_LINES_MSB_REG, &temp, 1);
+
+ /* Set vertical frequency in Hz */
+ temp3 = temp1 * temp2;
+ temp3 = (PICOS2KHZ(videomode->pixclock) * 1000) / temp3;
+ temp1 = (u16)temp3 * 100;
+ temp = (u8)(temp1 & 0xFF);
+ dm_i2c_write(dev, VERT_FREQ_LSB_REG, &temp, 1);
+ temp = (u8)(temp1 >> 8);
+ dm_i2c_write(dev, VERT_FREQ_MSB_REG, &temp, 1);
+
+ /* Set TPI input bus and pixel repetition data */
+ temp = TPI_INBUS_CLOCK_RATIO_1 | TPI_INBUS_FULL_PIXEL_WIDE |
+ TPI_INBUS_RISING_EDGE;
+ dm_i2c_write(dev, TPI_INBUS_FMT_REG, &temp, 1);
+
+ /* Set TPI AVI Input format data */
+ temp = TPI_INPUT_CLR_DEPTH_8BIT | TPI_INPUT_VRANGE_EXPAN_AUTO |
+ TPI_INPUT_CLR_RGB;
+ dm_i2c_write(dev, TPI_INPUT_FMT_REG, &temp, 1);
+
+ /* Set TPI AVI Output format data */
+ temp = TPI_OUTPUT_CLR_DEPTH_8BIT | TPI_OUTPUT_VRANGE_COMPRE_AUTO |
+ TPI_OUTPUT_CLR_HDMI_RGB;
+ dm_i2c_write(dev, TPI_OUTPUT_FMT_REG, &temp, 1);
+
+ /* Set TPI audio configuration write data */
+ temp = TPI_AUDIO_PASS_BASIC;
+ dm_i2c_write(dev, TPI_AUDIO_HANDING_REG, &temp, 1);
+
+ temp = TPI_AUDIO_INTF_I2S | TPI_AUDIO_INTF_NORMAL |
+ TPI_AUDIO_TYPE_PCM;
+ dm_i2c_write(dev, TPI_AUDIO_INTF_REG, &temp, 1);
+
+ temp = TPI_AUDIO_SAMP_SIZE_16BIT | TPI_AUDIO_SAMP_FREQ_44K;
+ dm_i2c_write(dev, TPI_AUDIO_FREQ_REG, &temp, 1);
+#else
i2c_set_bus_num(CONFIG_SYS_I2C_DVI_BUS_NUM);
/* Enable TPI transmitter mode */
@@ -147,6 +240,7 @@ int dcu_set_dvi_encoder(struct fb_videomode *videomode)
temp = TPI_AUDIO_SAMP_SIZE_16BIT | TPI_AUDIO_SAMP_FREQ_44K;
i2c_write(CONFIG_SYS_I2C_DVI_ADDR, TPI_AUDIO_FREQ_REG, 1, &temp, 1);
+#endif
return 0;
}
diff --git a/board/freescale/common/diu_ch7301.c b/board/freescale/common/diu_ch7301.c
index 435b4a3f1a..64682f7cd5 100644
--- a/board/freescale/common/diu_ch7301.c
+++ b/board/freescale/common/diu_ch7301.c
@@ -51,6 +51,84 @@ int diu_set_dvi_encoder(unsigned int pixclock)
u8 temp;
temp = I2C_DVI_TEST_PATTERN_VAL;
+#ifdef CONFIG_DM_I2C
+ struct udevice *dev;
+
+ ret = i2c_get_chip_for_busnum(CONFIG_SYS_I2C_DVI_BUS_NUM, CONFIG_SYS_I2C_DVI_ADDR,
+ 1, &dev);
+ if (ret) {
+ printf("%s: Cannot find udev for a bus %d\n", __func__,
+ CONFIG_SYS_I2C_DVI_BUS_NUM);
+ return ret;
+ }
+ ret = dm_i2c_write(dev, I2C_DVI_TEST_PATTERN_REG, &temp, 1);
+ if (ret) {
+ puts("I2C: failed to select proper dvi test pattern\n");
+ return ret;
+ }
+ temp = I2C_DVI_INPUT_DATA_FORMAT_VAL;
+ ret = dm_i2c_write(dev, I2C_DVI_INPUT_DATA_FORMAT_REG, &temp, 1);
+ if (ret) {
+ puts("I2C: failed to select dvi input data format\n");
+ return ret;
+ }
+
+ /* Set Sync polarity register */
+ temp = I2C_DVI_SYNC_POLARITY_VAL;
+ ret = dm_i2c_write(dev, I2C_DVI_SYNC_POLARITY_REG, &temp, 1);
+ if (ret) {
+ puts("I2C: failed to select dvi syc polarity\n");
+ return ret;
+ }
+
+ /* Set PLL registers based on pixel clock rate*/
+ if (pixclock > 65000000) {
+ temp = I2C_DVI_PLL_CHARGE_CNTL_HIGH_SPEED_VAL;
+ ret = dm_i2c_write(dev, I2C_DVI_PLL_CHARGE_CNTL_REG, &temp, 1);
+ if (ret) {
+ puts("I2C: failed to select dvi pll charge_cntl\n");
+ return ret;
+ }
+ temp = I2C_DVI_PLL_DIVIDER_HIGH_SPEED_VAL;
+ ret = dm_i2c_write(dev, I2C_DVI_PLL_DIVIDER_REG, &temp, 1);
+ if (ret) {
+ puts("I2C: failed to select dvi pll divider\n");
+ return ret;
+ }
+ temp = I2C_DVI_PLL_FILTER_HIGH_SPEED_VAL;
+ ret = dm_i2c_write(dev, I2C_DVI_PLL_FILTER_REG, &temp, 1);
+ if (ret) {
+ puts("I2C: failed to select dvi pll filter\n");
+ return ret;
+ }
+ } else {
+ temp = I2C_DVI_PLL_CHARGE_CNTL_LOW_SPEED_VAL;
+ ret = dm_i2c_write(dev, I2C_DVI_PLL_CHARGE_CNTL_REG, &temp, 1);
+ if (ret) {
+ puts("I2C: failed to select dvi pll charge_cntl\n");
+ return ret;
+ }
+ temp = I2C_DVI_PLL_DIVIDER_LOW_SPEED_VAL;
+ ret = dm_i2c_write(dev, I2C_DVI_PLL_DIVIDER_REG, &temp, 1);
+ if (ret) {
+ puts("I2C: failed to select dvi pll divider\n");
+ return ret;
+ }
+ temp = I2C_DVI_PLL_FILTER_LOW_SPEED_VAL;
+ ret = dm_i2c_write(dev, I2C_DVI_PLL_FILTER_REG, &temp, 1);
+ if (ret) {
+ puts("I2C: failed to select dvi pll filter\n");
+ return ret;
+ }
+ }
+
+ temp = I2C_DVI_POWER_MGMT_VAL;
+ ret = dm_i2c_write(dev, I2C_DVI_POWER_MGMT_REG, &temp, 1);
+ if (ret) {
+ puts("I2C: failed to select dvi power mgmt\n");
+ return ret;
+ }
+#else
ret = i2c_write(CONFIG_SYS_I2C_DVI_ADDR, I2C_DVI_TEST_PATTERN_REG, 1,
&temp, 1);
if (ret) {
@@ -128,6 +206,7 @@ int diu_set_dvi_encoder(unsigned int pixclock)
puts("I2C: failed to select dvi power mgmt\n");
return ret;
}
+#endif
udelay(500);
diff --git a/board/freescale/ls1021aqds/dcu.c b/board/freescale/ls1021aqds/dcu.c
index c4eac5e302..48953d3b31 100644
--- a/board/freescale/ls1021aqds/dcu.c
+++ b/board/freescale/ls1021aqds/dcu.c
@@ -15,11 +15,23 @@
DECLARE_GLOBAL_DATA_PTR;
-static int select_i2c_ch_pca9547(u8 ch)
+static 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;
@@ -51,6 +63,28 @@ int platform_dcu_init(struct fb_info *fbinfo,
u8 ch;
/* Mux I2C3+I2C4 as HSYNC+VSYNC */
+#ifdef CONFIG_DM_I2C
+ struct udevice *dev;
+
+ /* QIXIS device mount on I2C1 bus*/
+ ret = i2c_get_chip_for_busnum(0, CONFIG_SYS_I2C_QIXIS_ADDR,
+ 1, &dev);
+ if (ret) {
+ printf("%s: Cannot find udev for a bus %d\n", __func__,
+ 0);
+ return ret;
+ }
+ ret = dm_i2c_read(dev, QIXIS_DCU_BRDCFG5, &ch, 1);
+ if (ret) {
+ printf("Error: failed to read I2C @%02x\n",
+ CONFIG_SYS_I2C_QIXIS_ADDR);
+ return ret;
+ }
+ ch &= 0x1F;
+ ch |= 0xA0;
+ ret = dm_i2c_write(dev, QIXIS_DCU_BRDCFG5, &ch, 1);
+
+#else
ret = i2c_read(CONFIG_SYS_I2C_QIXIS_ADDR, QIXIS_DCU_BRDCFG5,
1, &ch, 1);
if (ret) {
@@ -62,6 +96,7 @@ int platform_dcu_init(struct fb_info *fbinfo,
ch |= 0xA0;
ret = i2c_write(CONFIG_SYS_I2C_QIXIS_ADDR, QIXIS_DCU_BRDCFG5,
1, &ch, 1);
+#endif
if (ret) {
printf("Error: failed to write I2C @%02x\n",
CONFIG_SYS_I2C_QIXIS_ADDR);
@@ -76,10 +111,12 @@ int platform_dcu_init(struct fb_info *fbinfo,
pixval = 1000000000 / dcu_fb_videomode->pixclock;
pixval *= 1000;
+#ifndef CONFIG_DM_I2C
i2c_set_bus_num(CONFIG_SYS_I2C_DVI_BUS_NUM);
- select_i2c_ch_pca9547(I2C_MUX_CH_CH7301);
+#endif
+ select_i2c_ch_pca9547(I2C_MUX_CH_CH7301, CONFIG_SYS_I2C_DVI_BUS_NUM);
diu_set_dvi_encoder(pixval);
- select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+ select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, CONFIG_SYS_I2C_DVI_BUS_NUM);
} else {
return 0;
}
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index 3efdbe9a69..ebf0c44f44 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -137,11 +137,23 @@ 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;
@@ -156,8 +168,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(0x77) mount on I2C1 bus
*/
- select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+ select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
return fsl_initdram();
}
@@ -406,7 +420,7 @@ int board_init(void)
erratum_a009942_check_cpo();
#endif
- select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+ select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
#ifndef CONFIG_SYS_FSL_NO_SERDES
fsl_serdes_init();
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index c4ff6775c3..51c0f159d9 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -445,14 +445,37 @@ void board_init_f(ulong dummy)
/* program the regulator (MC34VR500) to support deep sleep */
void ls1twr_program_regulator(void)
{
- unsigned int i2c_bus;
u8 i2c_device_id;
#define LS1TWR_I2C_BUS_MC34VR500 1
#define MC34VR500_ADDR 0x8
#define MC34VR500_DEVICEID 0x4
#define MC34VR500_DEVICEID_MASK 0x0f
+#ifdef CONFIG_DM_I2C
+ struct udevice *dev;
+ int ret;
+
+ ret = i2c_get_chip_for_busnum(LS1TWR_I2C_BUS_MC34VR500, MC34VR500_ADDR,
+ 1, &dev);
+ if (ret) {
+ printf("%s: Cannot find udev for a bus %d\n", __func__,
+ LS1TWR_I2C_BUS_MC34VR500);
+ return;
+ }
+ i2c_device_id = dm_i2c_reg_read(dev, 0x0) &
+ MC34VR500_DEVICEID_MASK;
+ if (i2c_device_id != MC34VR500_DEVICEID) {
+ printf("The regulator (MC34VR500) does not exist. The device does not support deep sleep.\n");
+ return;
+ }
+ dm_i2c_reg_write(dev, 0x31, 0x4);
+ dm_i2c_reg_write(dev, 0x4d, 0x4);
+ dm_i2c_reg_write(dev, 0x6d, 0x38);
+ dm_i2c_reg_write(dev, 0x6f, 0x37);
+ dm_i2c_reg_write(dev, 0x71, 0x30);
+#else
+ unsigned int i2c_bus;
i2c_bus = i2c_get_bus_num();
i2c_set_bus_num(LS1TWR_I2C_BUS_MC34VR500);
i2c_device_id = i2c_reg_read(MC34VR500_ADDR, 0x0) &
@@ -469,6 +492,7 @@ void ls1twr_program_regulator(void)
i2c_reg_write(MC34VR500_ADDR, 0x71, 0x30);
i2c_set_bus_num(i2c_bus);
+#endif
}
#endif
diff --git a/configs/ls1021aiot_qspi_defconfig b/configs/ls1021aiot_qspi_defconfig
index d5e3f4ef29..e392965ca9 100644
--- a/configs/ls1021aiot_qspi_defconfig
+++ b/configs/ls1021aiot_qspi_defconfig
@@ -45,3 +45,5 @@ CONFIG_FSL_QSPI=y
CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021aiot_sdcard_defconfig b/configs/ls1021aiot_sdcard_defconfig
index 8de8b7f351..5071984384 100644
--- a/configs/ls1021aiot_sdcard_defconfig
+++ b/configs/ls1021aiot_sdcard_defconfig
@@ -50,3 +50,5 @@ CONFIG_FSL_QSPI=y
CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig
index f82623aead..a39f46ee28 100644
--- a/configs/ls1021aqds_ddr4_nor_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_defconfig
@@ -67,3 +67,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
index e4b7c24c4f..0950fb019f 100644
--- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
@@ -67,3 +67,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021aqds_nand_defconfig b/configs/ls1021aqds_nand_defconfig
index b6c0f39de3..9c70159200 100644
--- a/configs/ls1021aqds_nand_defconfig
+++ b/configs/ls1021aqds_nand_defconfig
@@ -81,3 +81,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
index 3f99035553..6b12a4e277 100644
--- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
@@ -66,3 +66,5 @@ CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_RSA=y
CONFIG_SPL_RSA=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig
index 75ef262654..13e8309cd7 100644
--- a/configs/ls1021aqds_nor_defconfig
+++ b/configs/ls1021aqds_nor_defconfig
@@ -68,3 +68,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig
index f0f3a017ae..df12150a3b 100644
--- a/configs/ls1021aqds_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_nor_lpuart_defconfig
@@ -68,3 +68,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig
index a1e0d165dd..0451bab72a 100644
--- a/configs/ls1021aqds_qspi_defconfig
+++ b/configs/ls1021aqds_qspi_defconfig
@@ -69,3 +69,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021aqds_sdcard_ifc_defconfig b/configs/ls1021aqds_sdcard_ifc_defconfig
index c57e5ff1ba..e44f7ea606 100644
--- a/configs/ls1021aqds_sdcard_ifc_defconfig
+++ b/configs/ls1021aqds_sdcard_ifc_defconfig
@@ -80,3 +80,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021aqds_sdcard_qspi_defconfig b/configs/ls1021aqds_sdcard_qspi_defconfig
index 8ed3dbd6c3..7e98170d29 100644
--- a/configs/ls1021aqds_sdcard_qspi_defconfig
+++ b/configs/ls1021aqds_sdcard_qspi_defconfig
@@ -80,3 +80,5 @@ CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021atsn_qspi_defconfig b/configs/ls1021atsn_qspi_defconfig
index 2d3641074a..bd50f3ac41 100644
--- a/configs/ls1021atsn_qspi_defconfig
+++ b/configs/ls1021atsn_qspi_defconfig
@@ -57,3 +57,5 @@ 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
diff --git a/configs/ls1021atsn_sdcard_defconfig b/configs/ls1021atsn_sdcard_defconfig
index d488a5d009..911973f93b 100644
--- a/configs/ls1021atsn_sdcard_defconfig
+++ b/configs/ls1021atsn_sdcard_defconfig
@@ -68,3 +68,5 @@ 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
diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
index dbd9d0e070..2925f37a75 100644
--- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
@@ -60,3 +60,5 @@ CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_RSA=y
CONFIG_SPL_RSA=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig
index d950bdc9be..7e3ab8259a 100644
--- a/configs/ls1021atwr_nor_defconfig
+++ b/configs/ls1021atwr_nor_defconfig
@@ -62,3 +62,5 @@ CONFIG_USB_XHCI_DWC3=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig
index 85086a8ff5..af6c8e4508 100644
--- a/configs/ls1021atwr_nor_lpuart_defconfig
+++ b/configs/ls1021atwr_nor_lpuart_defconfig
@@ -63,3 +63,5 @@ CONFIG_USB_XHCI_DWC3=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig
index 9451b3f527..8b63b35149 100644
--- a/configs/ls1021atwr_qspi_defconfig
+++ b/configs/ls1021atwr_qspi_defconfig
@@ -67,3 +67,5 @@ CONFIG_USB_XHCI_DWC3=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
index 1859a8f867..9287d28f51 100644
--- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
@@ -73,3 +73,5 @@ CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_RSA=y
CONFIG_SPL_RSA=y
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021atwr_sdcard_ifc_defconfig b/configs/ls1021atwr_sdcard_ifc_defconfig
index b330ca7c32..6bc6c26e81 100644
--- a/configs/ls1021atwr_sdcard_ifc_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_defconfig
@@ -74,3 +74,5 @@ CONFIG_USB_XHCI_DWC3=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig b/configs/ls1021atwr_sdcard_qspi_defconfig
index 7fbf82e6d3..6cbd5379cc 100644
--- a/configs/ls1021atwr_sdcard_qspi_defconfig
+++ b/configs/ls1021atwr_sdcard_qspi_defconfig
@@ -77,3 +77,5 @@ CONFIG_USB_XHCI_DWC3=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_DM_I2C=y
+CONFIG_DM_GPIO=y
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 0b2d331b9b..81d8db8153 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -97,7 +97,10 @@
* I2C
*/
#define CONFIG_CMD_I2C
+
+#ifndef CONFIG_DM_I2C
#define CONFIG_SYS_I2C
+#endif
#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 */
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 8427be5adc..3bafbd1269 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -331,7 +331,9 @@ unsigned long get_board_ddr_clk(void);
/*
* I2C
*/
+#ifndef CONFIG_DM_I2C
#define CONFIG_SYS_I2C
+#endif
#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 */
diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index bdb4273cf5..68adb9395a 100644
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -107,7 +107,9 @@
#define CONFIG_BAUDRATE 115200
/* I2C */
+#ifndef CONFIG_DM_I2C
#define CONFIG_SYS_I2C
+#endif
#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 */
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 1919d1e14f..b38f98f89d 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -209,7 +209,9 @@
/*
* I2C
*/
+#ifndef CONFIG_DM_I2C
#define CONFIG_SYS_I2C
+#endif
#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 */
@@ -446,6 +448,7 @@
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE
+#undef CONFIG_DM_I2C
#else
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
#endif
--
2.17.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [v3 1/8] rtc: pcf8563: support driver model
2019-12-05 6:10 [v3 1/8] rtc: pcf8563: support driver model Biwen Li
` (6 preceding siblings ...)
2019-12-05 6:10 ` [v3 8/8] dm: arm: ls1021a: " Biwen Li
@ 2019-12-05 6:36 ` Priyanka Jain
2019-12-09 4:40 ` Biwen Li
7 siblings, 1 reply; 15+ messages in thread
From: Priyanka Jain @ 2019-12-05 6:36 UTC (permalink / raw)
To: u-boot
>-----Original Message-----
>From: Biwen Li <biwen.li@nxp.com>
>Sent: Thursday, December 5, 2019 11:40 AM
>To: Jagdish Gediya <jagdish.gediya@nxp.com>; Priyanka Jain
><priyanka.jain@nxp.com>; hs at denx.de; jagan at amarulasolutions.com;
>aford173 at gmail.com; Alison Wang <alison.wang@nxp.com>;
>bhaskar.upadhaya at nxp.com; feng.li_2 at nxp.com; jh80.chung at samsung.com;
>Pramod Kumar <pramod.kumar_1@nxp.com>; Rajesh Bhagat
><rajesh.bhagat@nxp.com>; Ruchika Gupta <ruchika.gupta@nxp.com>;
>olteanv at gmail.com
>Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Jiafei Pan <jiafei.pan@nxp.com>; u-
>boot at lists.denx.de; Biwen Li <biwen.li@nxp.com>
>Subject: [v3 1/8] rtc: pcf8563: support driver model
Please update subject to something like : rtc: pcf8563: Add driver model support
>
>This supports driver model for pcf8563
Please update description to something like : "Add support of driver model of pcf8563"
>
>Signed-off-by: Biwen Li <biwen.li@nxp.com>
>---
>Changes in v3:
> - update commit messages
>
>Changes in v2:
> - none
>
> drivers/rtc/pcf8563.c | 107 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 107 insertions(+)
>
>diff --git a/drivers/rtc/pcf8563.c b/drivers/rtc/pcf8563.c index
>a839d6cc98..44204e133e 100644
>--- a/drivers/rtc/pcf8563.c
>+++ b/drivers/rtc/pcf8563.c
>@@ -12,9 +12,11 @@
>
As significant code changes are done, this might need change in copyright. Please check
> #include <common.h>
> #include <command.h>
>+#include <dm.h>
> #include <rtc.h>
> #include <i2c.h>
>
>+#if !CONFIG_IS_ENABLED(DM_RTC)
> static uchar rtc_read (uchar reg);
> static void rtc_write (uchar reg, uchar val);
>
>@@ -115,3 +117,108 @@ static void rtc_write (uchar reg, uchar val) {
> i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); }
>+#else
>+static int pcf8563_rtc_get(struct udevice *dev, struct rtc_time *tmp) {
>+ int rel = 0;
>+ uchar sec, min, hour, mday, wday, mon_cent, year;
>+
>+ sec = dm_i2c_reg_read(dev, 0x02);
>+ min = dm_i2c_reg_read(dev, 0x03);
>+ hour = dm_i2c_reg_read(dev, 0x04);
>+ mday = dm_i2c_reg_read(dev, 0x05);
>+ wday = dm_i2c_reg_read(dev, 0x06);
>+ mon_cent = dm_i2c_reg_read(dev, 0x07);
>+ year = dm_i2c_reg_read(dev, 0x08);
>+
>+ debug ("Get RTC year: %02x mon/cent: %02x mday: %02x wday: %02x
>"
>+ "hr: %02x min: %02x sec: %02x\n",
>+ year, mon_cent, mday, wday,
>+ hour, min, sec);
>+ debug ("Alarms: wday: %02x day: %02x hour: %02x min: %02x\n",
>+ dm_i2c_reg_read(dev, 0x0C),
>+ dm_i2c_reg_read(dev, 0x0B),
>+ dm_i2c_reg_read(dev, 0x0A),
>+ dm_i2c_reg_read(dev, 0x09));
>+
>+ if (sec & 0x80) {
>+ puts ("### Warning: RTC Low Voltage - date/time not
>reliable\n");
>+ rel = -1;
>+ }
>+
>+ tmp->tm_sec = bcd2bin (sec & 0x7F);
>+ tmp->tm_min = bcd2bin (min & 0x7F);
>+ tmp->tm_hour = bcd2bin (hour & 0x3F);
>+ tmp->tm_mday = bcd2bin (mday & 0x3F);
>+ tmp->tm_mon = bcd2bin (mon_cent & 0x1F);
>+ tmp->tm_year = bcd2bin (year) + ((mon_cent & 0x80) ? 1900 : 2000);
>+ tmp->tm_wday = bcd2bin (wday & 0x07);
>+ tmp->tm_yday = 0;
>+ tmp->tm_isdst = 0;
>+
>+ debug ("Get DATE: %4d-%02d-%02d (wday=%d) TIME:
>%2d:%02d:%02d\n",
>+ tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
>+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
>+
>+ return rel;
>+}
>+
>+static int pcf8563_rtc_set(struct udevice *dev, const struct rtc_time
>+*tmp) {
>+ uchar century;
>+
>+ debug ("Set DATE: %4d-%02d-%02d (wday=%d) TIME:
>%2d:%02d:%02d\n",
>+ tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
>+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
>+
>+ dm_i2c_reg_write(dev, 0x08, bin2bcd(tmp->tm_year % 100));
>+
>+ century = (tmp->tm_year >= 2000) ? 0 : 0x80;
>+ dm_i2c_reg_write(dev, 0x07, bin2bcd(tmp->tm_mon) | century);
>+
>+ dm_i2c_reg_write(dev, 0x06, bin2bcd(tmp->tm_wday));
>+ dm_i2c_reg_write(dev, 0x05, bin2bcd(tmp->tm_mday));
>+ dm_i2c_reg_write(dev, 0x04, bin2bcd(tmp->tm_hour));
>+ dm_i2c_reg_write(dev, 0x03, bin2bcd(tmp->tm_min));
>+ dm_i2c_reg_write(dev, 0x02, bin2bcd(tmp->tm_sec));
>+
>+ return 0;
>+}
>+
>+static int pcf8563_rtc_reset(struct udevice *dev) {
>+ /* clear all control & status registers */
>+ dm_i2c_reg_write(dev, 0x00, 0x00);
>+ dm_i2c_reg_write(dev, 0x01, 0x00);
>+ dm_i2c_reg_write(dev, 0x0D, 0x00);
>+
>+ /* clear Voltage Low bit */
>+ dm_i2c_reg_write(dev, 0x02, dm_i2c_reg_read (dev, 0x02) & 0x7F);
>+
>+ /* reset all alarms */
>+ dm_i2c_reg_write(dev, 0x09, 0x00);
>+ dm_i2c_reg_write(dev, 0x0A, 0x00);
>+ dm_i2c_reg_write(dev, 0x0B, 0x00);
>+ dm_i2c_reg_write(dev, 0x0C, 0x00);
>+
>+ return 0;
>+}
>+
>+static const struct rtc_ops pcf8563_rtc_ops = {
>+ .get = pcf8563_rtc_get,
>+ .set = pcf8563_rtc_set,
>+ .reset = pcf8563_rtc_reset,
>+};
>+
>+static const struct udevice_id pcf8563_rtc_ids[] = {
>+ { .compatible = "nxp,pcf8563" },
>+ { }
>+};
>+
>+U_BOOT_DRIVER(rtc_pcf8563) = {
>+ .name = "rtc-pcf8563",
>+ .id = UCLASS_RTC,
>+ .of_match = pcf8563_rtc_ids,
>+ .ops = &pcf8563_rtc_ops,
>+};
>+#endif
>--
>2.17.1
priyankajain
^ permalink raw reply [flat|nested] 15+ messages in thread
* [v3 3/8] i2c: mxc_i2c: add DM_FLAG_PRE_RELOC flag
2019-12-05 6:10 ` [v3 3/8] i2c: mxc_i2c: add DM_FLAG_PRE_RELOC flag Biwen Li
@ 2019-12-05 6:38 ` Priyanka Jain
0 siblings, 0 replies; 15+ messages in thread
From: Priyanka Jain @ 2019-12-05 6:38 UTC (permalink / raw)
To: u-boot
>-----Original Message-----
>From: Biwen Li <biwen.li@nxp.com>
>Sent: Thursday, December 5, 2019 11:40 AM
>To: Jagdish Gediya <jagdish.gediya@nxp.com>; Priyanka Jain
><priyanka.jain@nxp.com>; hs at denx.de; jagan at amarulasolutions.com;
>aford173 at gmail.com; Alison Wang <alison.wang@nxp.com>;
>bhaskar.upadhaya at nxp.com; feng.li_2 at nxp.com; jh80.chung at samsung.com;
>Pramod Kumar <pramod.kumar_1@nxp.com>; Rajesh Bhagat
><rajesh.bhagat@nxp.com>; Ruchika Gupta <ruchika.gupta@nxp.com>;
>olteanv at gmail.com
>Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Jiafei Pan <jiafei.pan@nxp.com>; u-
>boot at lists.denx.de; Biwen Li <biwen.li@nxp.com>
>Subject: [v3 3/8] i2c: mxc_i2c: add DM_FLAG_PRE_RELOC flag
>
>This adds DM_FLAG_PRE_RELOC flag to probe i2c driver before relocation
>
>Signed-off-by: Biwen Li <biwen.li@nxp.com>
>---
>Changes in v3:
> - none
>
>Changes in v2:
> - none
>
> drivers/i2c/mxc_i2c.c | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index
>786b5a2226..6b7ce985b3 100644
>--- a/drivers/i2c/mxc_i2c.c
>+++ b/drivers/i2c/mxc_i2c.c
>@@ -1049,5 +1049,6 @@ U_BOOT_DRIVER(i2c_mxc) = {
> .probe = mxc_i2c_probe,
> .priv_auto_alloc_size = sizeof(struct mxc_i2c_bus),
> .ops = &mxc_i2c_ops,
>+ .flags = DM_FLAG_PRE_RELOC,
> };
> #endif
>--
>2.17.1
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [v3 4/8] Kconfigs: layerscape: use a convenient default value for SYS_MALLOC_F_LEN
2019-12-05 6:10 ` [v3 4/8] Kconfigs: layerscape: use a convenient default value for SYS_MALLOC_F_LEN Biwen Li
@ 2019-12-05 6:39 ` Priyanka Jain
0 siblings, 0 replies; 15+ messages in thread
From: Priyanka Jain @ 2019-12-05 6:39 UTC (permalink / raw)
To: u-boot
>-----Original Message-----
>From: Biwen Li <biwen.li@nxp.com>
>Sent: Thursday, December 5, 2019 11:41 AM
>To: Jagdish Gediya <jagdish.gediya@nxp.com>; Priyanka Jain
><priyanka.jain@nxp.com>; hs at denx.de; jagan at amarulasolutions.com;
>aford173 at gmail.com; Alison Wang <alison.wang@nxp.com>;
>bhaskar.upadhaya at nxp.com; feng.li_2 at nxp.com; jh80.chung at samsung.com;
>Pramod Kumar <pramod.kumar_1@nxp.com>; Rajesh Bhagat
><rajesh.bhagat@nxp.com>; Ruchika Gupta <ruchika.gupta@nxp.com>;
>olteanv at gmail.com
>Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Jiafei Pan <jiafei.pan@nxp.com>; u-
>boot at lists.denx.de; Biwen Li <biwen.li@nxp.com>
>Subject: [v3 4/8] Kconfigs: layerscape: use a convenient default value for
>SYS_MALLOC_F_LEN
>
>The default value of CONFIG_SYS_MALLOC_F_LEN (0x400) leaves U-Boot with
>not enough memory to load i2c driver before relocate, causing it to hang.
>
>Change the default value of CONFIG_SYS_MALLOC_F_LEN for below SoCs,
>- LS1012A
>- LS1021A
>- LS1043A
>- LS1046A
>
>Signed-off-by: Biwen Li <biwen.li@nxp.com>
>---
>Changes in v3:
> - update commit messages
>
>Changes in v2:
> - none
>
> Kconfig | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/Kconfig b/Kconfig
>index e22417ec44..3e6d9f26ea 100644
>--- a/Kconfig
>+++ b/Kconfig
>@@ -146,7 +146,9 @@ config SYS_MALLOC_F_LEN
> default 0x1000 if AM33XX
> default 0x2800 if SANDBOX
> default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \
>- ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5)
>+ ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5 || \
>+ ARCH_LS1012A || ARCH_LS1021A || ARCH_LS1043A
>|| \
>+ ARCH_LS1046A)
> default 0x400
> help
> Before relocation, memory is very limited on many platforms. Still,
>--
>2.17.1
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [v3 5/8] dm: ls1012a: add i2c DM support
2019-12-05 6:10 ` [v3 5/8] dm: ls1012a: add i2c DM support Biwen Li
@ 2019-12-05 6:48 ` Priyanka Jain
0 siblings, 0 replies; 15+ messages in thread
From: Priyanka Jain @ 2019-12-05 6:48 UTC (permalink / raw)
To: u-boot
>-----Original Message-----
>From: Biwen Li <biwen.li@nxp.com>
>Sent: Thursday, December 5, 2019 11:41 AM
>To: Jagdish Gediya <jagdish.gediya@nxp.com>; Priyanka Jain
><priyanka.jain@nxp.com>; hs at denx.de; jagan at amarulasolutions.com;
>aford173 at gmail.com; Alison Wang <alison.wang@nxp.com>;
>bhaskar.upadhaya at nxp.com; feng.li_2 at nxp.com; jh80.chung at samsung.com;
>Pramod Kumar <pramod.kumar_1@nxp.com>; Rajesh Bhagat
><rajesh.bhagat@nxp.com>; Ruchika Gupta <ruchika.gupta@nxp.com>;
>olteanv at gmail.com
>Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Jiafei Pan <jiafei.pan@nxp.com>; u-
>boot at lists.denx.de; Biwen Li <biwen.li@nxp.com>
>Subject: [v3 5/8] dm: ls1012a: add i2c DM support
>
>This supports i2c DM and enables CONFIG_DM_I2C for SoC LS1012A
>
>Signed-off-by: Biwen Li <biwen.li@nxp.com>
>---
>Changes in v3:
> - none
>
>Changes in v2:
> - merge some patches to one patch
>
> arch/arm/include/asm/gpio.h | 1 +
> board/freescale/ls1012aqds/ls1012aqds.c | 20 ++-
> board/freescale/ls1012ardb/eth.c | 35 +++++
> board/freescale/ls1012ardb/ls1012ardb.c | 147 +++++++++++++++---
> configs/ls1012a2g5rdb_qspi_defconfig | 3 +
> configs/ls1012a2g5rdb_tfa_defconfig | 3 +
> configs/ls1012afrdm_qspi_defconfig | 3 +
> configs/ls1012afrdm_tfa_defconfig | 3 +
> .../ls1012afrwy_qspi_SECURE_BOOT_defconfig | 3 +
> configs/ls1012afrwy_qspi_defconfig | 3 +
> configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 3 +
> configs/ls1012afrwy_tfa_defconfig | 3 +
> configs/ls1012aqds_qspi_defconfig | 3 +
> configs/ls1012aqds_tfa_SECURE_BOOT_defconfig | 3 +
> configs/ls1012aqds_tfa_defconfig | 3 +
> configs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 3 +
> configs/ls1012ardb_qspi_defconfig | 3 +
> configs/ls1012ardb_tfa_SECURE_BOOT_defconfig | 3 +
> configs/ls1012ardb_tfa_defconfig | 3 +
> include/configs/ls1012a_common.h | 5 +
> 20 files changed, 227 insertions(+), 26 deletions(-)
>
>diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
>index 6ff5f42424..9f8c9da564 100644
>--- a/arch/arm/include/asm/gpio.h
>+++ b/arch/arm/include/asm/gpio.h
>@@ -3,6 +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_ASPEED)
> #include <asm/arch/gpio.h>
> #endif
>diff --git a/board/freescale/ls1012aqds/ls1012aqds.c
>b/board/freescale/ls1012aqds/ls1012aqds.c
>index 86c72ee357..30bf1047d5 100644
>--- a/board/freescale/ls1012aqds/ls1012aqds.c
>+++ b/board/freescale/ls1012aqds/ls1012aqds.c
>@@ -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
>diff --git a/board/freescale/ls1012ardb/eth.c
>b/board/freescale/ls1012ardb/eth.c
>index b35d5343e4..0f33128996 100644
>--- a/board/freescale/ls1012ardb/eth.c
>+++ b/board/freescale/ls1012ardb/eth.c
>@@ -27,12 +27,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
> }
>diff --git a/board/freescale/ls1012ardb/ls1012ardb.c
>b/board/freescale/ls1012ardb/ls1012ardb.c
>index e4527c19b8..271227a976 100644
>--- a/board/freescale/ls1012ardb/ls1012ardb.c
>+++ b/board/freescale/ls1012ardb/ls1012ardb.c
>@@ -32,13 +32,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 */
> }
>@@ -173,11 +187,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;
> }
>@@ -200,7 +228,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;
> }
>@@ -231,16 +264,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;
>+ }
>+ /*
>+ * --------------------------------------------------------------------------------
>+ * | I2C bus | I2C address | Device | Notes |
>+ * --------------------------------------------------------------------------------
>+ * | I2C1 | 0x24, 0x25, 0x26 | IO expander (CFG,| Provides 16bits of
>General |
>+ * | | | 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;
>@@ -248,25 +328,44 @@ 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}, 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;
> }
>diff --git a/configs/ls1012a2g5rdb_qspi_defconfig
>b/configs/ls1012a2g5rdb_qspi_defconfig
>index 3c99a43ded..82dd98bed6 100644
>--- a/configs/ls1012a2g5rdb_qspi_defconfig
>+++ b/configs/ls1012a2g5rdb_qspi_defconfig
>@@ -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
>diff --git a/configs/ls1012a2g5rdb_tfa_defconfig
>b/configs/ls1012a2g5rdb_tfa_defconfig
>index 0865ac2fdf..9f9cf5a15b 100644
>--- a/configs/ls1012a2g5rdb_tfa_defconfig
>+++ b/configs/ls1012a2g5rdb_tfa_defconfig
>@@ -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
>diff --git a/configs/ls1012afrdm_qspi_defconfig
>b/configs/ls1012afrdm_qspi_defconfig
>index 7ff0955f1d..9f5d1ebf2d 100644
>--- a/configs/ls1012afrdm_qspi_defconfig
>+++ b/configs/ls1012afrdm_qspi_defconfig
>@@ -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
>diff --git a/configs/ls1012afrdm_tfa_defconfig
>b/configs/ls1012afrdm_tfa_defconfig
>index 8e8ddd73ed..f6fd69bf45 100644
>--- a/configs/ls1012afrdm_tfa_defconfig
>+++ b/configs/ls1012afrdm_tfa_defconfig
>@@ -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
>diff --git a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
>b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
>index a1c7c702d1..04d3d48687 100644
>--- a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
>+++ b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
>@@ -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
>diff --git a/configs/ls1012afrwy_qspi_defconfig
>b/configs/ls1012afrwy_qspi_defconfig
>index 0773857c51..0f007dc384 100644
>--- a/configs/ls1012afrwy_qspi_defconfig
>+++ b/configs/ls1012afrwy_qspi_defconfig
>@@ -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
>diff --git a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig
>b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig
>index 79eb801b03..f33ae350bf 100644
>--- a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig
>+++ b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig
>@@ -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
>diff --git a/configs/ls1012afrwy_tfa_defconfig
>b/configs/ls1012afrwy_tfa_defconfig
>index 354c521ea4..ee1f2e13f0 100644
>--- a/configs/ls1012afrwy_tfa_defconfig
>+++ b/configs/ls1012afrwy_tfa_defconfig
>@@ -56,3 +56,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
>diff --git a/configs/ls1012aqds_qspi_defconfig
>b/configs/ls1012aqds_qspi_defconfig
>index 0a719c30c5..958d78fd23 100644
>--- a/configs/ls1012aqds_qspi_defconfig
>+++ b/configs/ls1012aqds_qspi_defconfig
>@@ -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
>diff --git a/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
>b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
>index 25d06d2919..2ae7e9eda9 100644
>--- a/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
>+++ b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
>@@ -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
>diff --git a/configs/ls1012aqds_tfa_defconfig
>b/configs/ls1012aqds_tfa_defconfig
>index bde53a420c..373ced798d 100644
>--- a/configs/ls1012aqds_tfa_defconfig
>+++ b/configs/ls1012aqds_tfa_defconfig
>@@ -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
>diff --git a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
>b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
>index 9989f7b3e9..d3e762df0a 100644
>--- a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
>+++ b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
>@@ -57,3 +57,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
>diff --git a/configs/ls1012ardb_qspi_defconfig
>b/configs/ls1012ardb_qspi_defconfig
>index 80ca9bd577..78ccd1bcfe 100644
>--- a/configs/ls1012ardb_qspi_defconfig
>+++ b/configs/ls1012ardb_qspi_defconfig
>@@ -59,3 +59,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
>diff --git a/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig
>b/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig
>index 8eb71fcf63..ae7dcd19c7 100644
>--- a/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig
>+++ b/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig
>@@ -57,3 +57,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
>diff --git a/configs/ls1012ardb_tfa_defconfig
>b/configs/ls1012ardb_tfa_defconfig
>index 1cc358ce74..17fe571765 100644
>--- a/configs/ls1012ardb_tfa_defconfig
>+++ b/configs/ls1012ardb_tfa_defconfig
>@@ -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
>diff --git a/include/configs/ls1012a_common.h
>b/include/configs/ls1012a_common.h
>index 2579e2fb37..e9baa2a8b6 100644
>--- a/include/configs/ls1012a_common.h
>+++ b/include/configs/ls1012a_common.h
>@@ -66,7 +66,12 @@
> 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
>--
>2.17.1
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [v3 6/8] dm: arm: ls1043a: add i2c DM support
2019-12-05 6:10 ` [v3 6/8] dm: arm: ls1043a: " Biwen Li
@ 2019-12-05 6:57 ` Priyanka Jain
0 siblings, 0 replies; 15+ messages in thread
From: Priyanka Jain @ 2019-12-05 6:57 UTC (permalink / raw)
To: u-boot
>-----Original Message-----
>From: Biwen Li <biwen.li@nxp.com>
>Sent: Thursday, December 5, 2019 11:41 AM
>To: Jagdish Gediya <jagdish.gediya@nxp.com>; Priyanka Jain
><priyanka.jain@nxp.com>; hs at denx.de; jagan at amarulasolutions.com;
>aford173 at gmail.com; Alison Wang <alison.wang@nxp.com>;
>bhaskar.upadhaya at nxp.com; feng.li_2 at nxp.com; jh80.chung at samsung.com;
>Pramod Kumar <pramod.kumar_1@nxp.com>; Rajesh Bhagat
><rajesh.bhagat@nxp.com>; Ruchika Gupta <ruchika.gupta@nxp.com>;
>olteanv at gmail.com
>Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Jiafei Pan <jiafei.pan@nxp.com>; u-
>boot at lists.denx.de; Biwen Li <biwen.li@nxp.com>
>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 <biwen.li@nxp.com>
>---
>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 <priyanka.jain@nxp.com>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [v3 7/8] dm: arm: ls1046a: add i2c DM support
2019-12-05 6:10 ` [v3 7/8] dm: arm: ls1046a: " Biwen Li
@ 2019-12-05 6:58 ` Priyanka Jain
0 siblings, 0 replies; 15+ messages in thread
From: Priyanka Jain @ 2019-12-05 6:58 UTC (permalink / raw)
To: u-boot
>-----Original Message-----
>From: Biwen Li <biwen.li@nxp.com>
>Sent: Thursday, December 5, 2019 11:41 AM
>To: Jagdish Gediya <jagdish.gediya@nxp.com>; Priyanka Jain
><priyanka.jain@nxp.com>; hs at denx.de; jagan at amarulasolutions.com;
>aford173 at gmail.com; Alison Wang <alison.wang@nxp.com>;
>bhaskar.upadhaya at nxp.com; feng.li_2 at nxp.com; jh80.chung at samsung.com;
>Pramod Kumar <pramod.kumar_1@nxp.com>; Rajesh Bhagat
><rajesh.bhagat@nxp.com>; Ruchika Gupta <ruchika.gupta@nxp.com>;
>olteanv at gmail.com
>Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Jiafei Pan <jiafei.pan@nxp.com>; u-
>boot at lists.denx.de; Biwen Li <biwen.li@nxp.com>
>Subject: [v3 7/8] dm: arm: ls1046a: add i2c DM support
>
>This supports i2c DM and enables CONFIG_DM_I2C for SoC LS1046A
>
>Signed-off-by: Biwen Li <biwen.li@nxp.com>
>---
>Changes in v3:
> - none
>
>Changes in v2:
> - merge some patches to one patch
>
> 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 | 1 +
> board/freescale/ls1046afrwy/ls1046afrwy.c | 17 ++++++-
> board/freescale/ls1046aqds/ls1046aqds.c | 24 ++++++++--
> 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 | 45 ++++++++++++++++++-
> include/configs/ls1046a_common.h | 6 +++
> 26 files changed, 136 insertions(+), 8 deletions(-)
>
>diff --git a/arch/arm/dts/fsl-ls1046a-frwy.dts b/arch/arm/dts/fsl-ls1046a-
>frwy.dts
>index 3d41e3bd44..d39159322a 100644
>--- a/arch/arm/dts/fsl-ls1046a-frwy.dts
>+++ b/arch/arm/dts/fsl-ls1046a-frwy.dts
>@@ -32,3 +32,6 @@
>
> };
>
>+&i2c0 {
>+ status = "okay";
>+};
>diff --git a/arch/arm/dts/fsl-ls1046a-qds.dtsi b/arch/arm/dts/fsl-ls1046a-
>qds.dtsi
>index c95f44fc36..76dc397328 100644
>--- a/arch/arm/dts/fsl-ls1046a-qds.dtsi
>+++ b/arch/arm/dts/fsl-ls1046a-qds.dtsi
>@@ -80,3 +80,7 @@
> &sata {
> status = "okay";
> };
>+
>+&i2c0 {
>+ status = "okay";
>+};
>diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-
>rdb.dts
>index a05c9e9b9e..83e34ab02a 100644
>--- a/arch/arm/dts/fsl-ls1046a-rdb.dts
>+++ b/arch/arm/dts/fsl-ls1046a-rdb.dts
>@@ -43,3 +43,11 @@
> &sata {
> status = "okay";
> };
>+
>+&i2c0 {
>+ status = "okay";
>+};
>+
>+&i2c3 {
>+ status = "okay";
>+};
>diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
>index 45cb04801c..9adebf6c04 100644
>--- a/arch/arm/include/asm/gpio.h
>+++ b/arch/arm/include/asm/gpio.h
>@@ -4,6 +4,7 @@
> !defined(CONFIG_ARCH_LX2160A) &&
>!defined(CONFIG_ARCH_LS1028A) && \
> !defined(CONFIG_ARCH_LS2080A) &&
>!defined(CONFIG_ARCH_LS1088A) && \
> !defined(CONFIG_ARCH_LS1012A) &&
>!defined(CONFIG_ARCH_LS1043A) && \
>+ !defined(CONFIG_ARCH_LS1046A) && \
> !defined(CONFIG_ARCH_ASPEED)
> #include <asm/arch/gpio.h>
> #endif
>diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c
>b/board/freescale/ls1046afrwy/ls1046afrwy.c
>index ac2f8ee436..4a9189b3ee 100644
>--- a/board/freescale/ls1046afrwy/ls1046afrwy.c
>+++ b/board/freescale/ls1046afrwy/ls1046afrwy.c
>@@ -35,11 +35,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;
>@@ -144,7 +157,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;
> }
>
>diff --git a/board/freescale/ls1046aqds/ls1046aqds.c
>b/board/freescale/ls1046aqds/ls1046aqds.c
>index aac5d9aa84..e8d321b6c1 100644
>--- a/board/freescale/ls1046aqds/ls1046aqds.c
>+++ b/board/freescale/ls1046aqds/ls1046aqds.c
>@@ -269,11 +269,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 +300,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 +316,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 +329,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 +410,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();
>diff --git a/configs/ls1046afrwy_tfa_defconfig
>b/configs/ls1046afrwy_tfa_defconfig
>index 4137eda995..01617f62bc 100644
>--- a/configs/ls1046afrwy_tfa_defconfig
>+++ b/configs/ls1046afrwy_tfa_defconfig
>@@ -58,3 +58,5 @@ 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
>diff --git a/configs/ls1046aqds_SECURE_BOOT_defconfig
>b/configs/ls1046aqds_SECURE_BOOT_defconfig
>index 159ac3c367..c121af71ac 100644
>--- a/configs/ls1046aqds_SECURE_BOOT_defconfig
>+++ b/configs/ls1046aqds_SECURE_BOOT_defconfig
>@@ -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
>diff --git a/configs/ls1046aqds_defconfig b/configs/ls1046aqds_defconfig
>index 96d14d4270..6ff8829279 100644
>--- a/configs/ls1046aqds_defconfig
>+++ b/configs/ls1046aqds_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/ls1046aqds_lpuart_defconfig
>b/configs/ls1046aqds_lpuart_defconfig
>index 38b48e999f..db9cc5d13e 100644
>--- a/configs/ls1046aqds_lpuart_defconfig
>+++ b/configs/ls1046aqds_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/ls1046aqds_nand_defconfig
>b/configs/ls1046aqds_nand_defconfig
>index 5fbb573ccc..ac3628acb4 100644
>--- a/configs/ls1046aqds_nand_defconfig
>+++ b/configs/ls1046aqds_nand_defconfig
>@@ -69,3 +69,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/ls1046aqds_qspi_defconfig
>b/configs/ls1046aqds_qspi_defconfig
>index 7339aba903..7690105022 100644
>--- a/configs/ls1046aqds_qspi_defconfig
>+++ b/configs/ls1046aqds_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/ls1046aqds_sdcard_ifc_defconfig
>b/configs/ls1046aqds_sdcard_ifc_defconfig
>index caa7a4db82..bb8dd3273a 100644
>--- a/configs/ls1046aqds_sdcard_ifc_defconfig
>+++ b/configs/ls1046aqds_sdcard_ifc_defconfig
>@@ -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
>diff --git a/configs/ls1046aqds_sdcard_qspi_defconfig
>b/configs/ls1046aqds_sdcard_qspi_defconfig
>index 88ed9b2aff..1aa04e61c3 100644
>--- a/configs/ls1046aqds_sdcard_qspi_defconfig
>+++ b/configs/ls1046aqds_sdcard_qspi_defconfig
>@@ -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
>diff --git a/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
>b/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
>index e173747923..6a9391478b 100644
>--- a/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
>+++ b/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
>@@ -61,3 +61,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
>diff --git a/configs/ls1046aqds_tfa_defconfig
>b/configs/ls1046aqds_tfa_defconfig
>index 83e94ec7db..1a22096aae 100644
>--- a/configs/ls1046aqds_tfa_defconfig
>+++ b/configs/ls1046aqds_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/ls1046ardb_emmc_defconfig
>b/configs/ls1046ardb_emmc_defconfig
>index 4979cb3159..c35ce51360 100644
>--- a/configs/ls1046ardb_emmc_defconfig
>+++ b/configs/ls1046ardb_emmc_defconfig
>@@ -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
>diff --git a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
>b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
>index 469ef7670a..e799ce1262 100644
>--- a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
>+++ b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
>@@ -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
>diff --git a/configs/ls1046ardb_qspi_defconfig
>b/configs/ls1046ardb_qspi_defconfig
>index 934f04a92e..6de5ff5358 100644
>--- a/configs/ls1046ardb_qspi_defconfig
>+++ b/configs/ls1046ardb_qspi_defconfig
>@@ -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
>diff --git a/configs/ls1046ardb_qspi_spl_defconfig
>b/configs/ls1046ardb_qspi_spl_defconfig
>index cd808d8567..1d7f4e15cf 100644
>--- a/configs/ls1046ardb_qspi_spl_defconfig
>+++ b/configs/ls1046ardb_qspi_spl_defconfig
>@@ -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
>diff --git a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
>b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
>index 7551b9d7d6..8181c1117a 100644
>--- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
>+++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
>@@ -69,3 +69,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/ls1046ardb_sdcard_defconfig
>b/configs/ls1046ardb_sdcard_defconfig
>index 8bade9df11..2279d352f4 100644
>--- a/configs/ls1046ardb_sdcard_defconfig
>+++ b/configs/ls1046ardb_sdcard_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/ls1046ardb_tfa_SECURE_BOOT_defconfig
>b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
>index 9aeb33138b..c2f3725603 100644
>--- a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
>+++ b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
>@@ -54,3 +54,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
>diff --git a/configs/ls1046ardb_tfa_defconfig
>b/configs/ls1046ardb_tfa_defconfig
>index 2772fa5f93..8e4e5baf01 100644
>--- a/configs/ls1046ardb_tfa_defconfig
>+++ b/configs/ls1046ardb_tfa_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/drivers/power/power_i2c.c b/drivers/power/power_i2c.c index
>bcddff2d7a..a727f7e519 100644
>--- a/drivers/power/power_i2c.c
>+++ b/drivers/power/power_i2c.c
>@@ -21,8 +21,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 +65,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 +81,21 @@
>int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)
> 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 +128,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;
> }
>diff --git a/include/configs/ls1046a_common.h
>b/include/configs/ls1046a_common.h
>index cc8f4c0210..648e3c8027 100644
>--- a/include/configs/ls1046a_common.h
>+++ b/include/configs/ls1046a_common.h
>@@ -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)) @@
>-127,7 +128,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 */
> #define CONFIG_PCIE1 /* PCIE controller 1 */
>--
>2.17.1
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [v3 1/8] rtc: pcf8563: support driver model
2019-12-05 6:36 ` [v3 1/8] rtc: pcf8563: support driver model Priyanka Jain
@ 2019-12-09 4:40 ` Biwen Li
0 siblings, 0 replies; 15+ messages in thread
From: Biwen Li @ 2019-12-09 4:40 UTC (permalink / raw)
To: u-boot
> Subject: RE: [v3 1/8] rtc: pcf8563: support driver model
>
>
>
> >-----Original Message-----
> >From: Biwen Li <biwen.li@nxp.com>
> >Sent: Thursday, December 5, 2019 11:40 AM
> >To: Jagdish Gediya <jagdish.gediya@nxp.com>; Priyanka Jain
> ><priyanka.jain@nxp.com>; hs at denx.de; jagan at amarulasolutions.com;
> >aford173 at gmail.com; Alison Wang <alison.wang@nxp.com>;
> >bhaskar.upadhaya at nxp.com; feng.li_2 at nxp.com;
> jh80.chung at samsung.com;
> >Pramod Kumar <pramod.kumar_1@nxp.com>; Rajesh Bhagat
> ><rajesh.bhagat@nxp.com>; Ruchika Gupta <ruchika.gupta@nxp.com>;
> >olteanv at gmail.com
> >Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Jiafei Pan <jiafei.pan@nxp.com>;
> >u- boot at lists.denx.de; Biwen Li <biwen.li@nxp.com>
> >Subject: [v3 1/8] rtc: pcf8563: support driver model
> Please update subject to something like : rtc: pcf8563: Add driver model
> support
Okay, got it, I will update subject in v4.
> >
> >This supports driver model for pcf8563
> Please update description to something like : "Add support of driver model of
> pcf8563"
> >
> >Signed-off-by: Biwen Li <biwen.li@nxp.com>
> >---
> >Changes in v3:
> > - update commit messages
> >
> >Changes in v2:
> > - none
> >
> > drivers/rtc/pcf8563.c | 107
> ++++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 107 insertions(+)
> >
> >diff --git a/drivers/rtc/pcf8563.c b/drivers/rtc/pcf8563.c index
> >a839d6cc98..44204e133e 100644
> >--- a/drivers/rtc/pcf8563.c
> >+++ b/drivers/rtc/pcf8563.c
> >@@ -12,9 +12,11 @@
> >
> As significant code changes are done, this might need change in copyright.
Got it, I will update copyright in v4.
> Please check
> > #include <common.h>
> > #include <command.h>
> >+#include <dm.h>
> > #include <rtc.h>
> > #include <i2c.h>
> >
> >+#if !CONFIG_IS_ENABLED(DM_RTC)
> > static uchar rtc_read (uchar reg);
> > static void rtc_write (uchar reg, uchar val);
> >
> >@@ -115,3 +117,108 @@ static void rtc_write (uchar reg, uchar val) {
> > i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); }
> >+#else
> >+static int pcf8563_rtc_get(struct udevice *dev, struct rtc_time *tmp) {
> >+ int rel = 0;
> >+ uchar sec, min, hour, mday, wday, mon_cent, year;
> >+
> >+ sec = dm_i2c_reg_read(dev, 0x02);
> >+ min = dm_i2c_reg_read(dev, 0x03);
> >+ hour = dm_i2c_reg_read(dev, 0x04);
> >+ mday = dm_i2c_reg_read(dev, 0x05);
> >+ wday = dm_i2c_reg_read(dev, 0x06);
> >+ mon_cent = dm_i2c_reg_read(dev, 0x07);
> >+ year = dm_i2c_reg_read(dev, 0x08);
> >+
> >+ debug ("Get RTC year: %02x mon/cent: %02x mday: %02x wday: %02x
> >"
> >+ "hr: %02x min: %02x sec: %02x\n",
> >+ year, mon_cent, mday, wday,
> >+ hour, min, sec);
> >+ debug ("Alarms: wday: %02x day: %02x hour: %02x min: %02x\n",
> >+ dm_i2c_reg_read(dev, 0x0C),
> >+ dm_i2c_reg_read(dev, 0x0B),
> >+ dm_i2c_reg_read(dev, 0x0A),
> >+ dm_i2c_reg_read(dev, 0x09));
> >+
> >+ if (sec & 0x80) {
> >+ puts ("### Warning: RTC Low Voltage - date/time not
> >reliable\n");
> >+ rel = -1;
> >+ }
> >+
> >+ tmp->tm_sec = bcd2bin (sec & 0x7F);
> >+ tmp->tm_min = bcd2bin (min & 0x7F);
> >+ tmp->tm_hour = bcd2bin (hour & 0x3F);
> >+ tmp->tm_mday = bcd2bin (mday & 0x3F);
> >+ tmp->tm_mon = bcd2bin (mon_cent & 0x1F);
> >+ tmp->tm_year = bcd2bin (year) + ((mon_cent & 0x80) ? 1900 : 2000);
> >+ tmp->tm_wday = bcd2bin (wday & 0x07);
> >+ tmp->tm_yday = 0;
> >+ tmp->tm_isdst = 0;
> >+
> >+ debug ("Get DATE: %4d-%02d-%02d (wday=%d) TIME:
> >%2d:%02d:%02d\n",
> >+ tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
> >+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
> >+
> >+ return rel;
> >+}
> >+
> >+static int pcf8563_rtc_set(struct udevice *dev, const struct rtc_time
> >+*tmp) {
> >+ uchar century;
> >+
> >+ debug ("Set DATE: %4d-%02d-%02d (wday=%d) TIME:
> >%2d:%02d:%02d\n",
> >+ tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
> >+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
> >+
> >+ dm_i2c_reg_write(dev, 0x08, bin2bcd(tmp->tm_year % 100));
> >+
> >+ century = (tmp->tm_year >= 2000) ? 0 : 0x80;
> >+ dm_i2c_reg_write(dev, 0x07, bin2bcd(tmp->tm_mon) | century);
> >+
> >+ dm_i2c_reg_write(dev, 0x06, bin2bcd(tmp->tm_wday));
> >+ dm_i2c_reg_write(dev, 0x05, bin2bcd(tmp->tm_mday));
> >+ dm_i2c_reg_write(dev, 0x04, bin2bcd(tmp->tm_hour));
> >+ dm_i2c_reg_write(dev, 0x03, bin2bcd(tmp->tm_min));
> >+ dm_i2c_reg_write(dev, 0x02, bin2bcd(tmp->tm_sec));
> >+
> >+ return 0;
> >+}
> >+
> >+static int pcf8563_rtc_reset(struct udevice *dev) {
> >+ /* clear all control & status registers */
> >+ dm_i2c_reg_write(dev, 0x00, 0x00);
> >+ dm_i2c_reg_write(dev, 0x01, 0x00);
> >+ dm_i2c_reg_write(dev, 0x0D, 0x00);
> >+
> >+ /* clear Voltage Low bit */
> >+ dm_i2c_reg_write(dev, 0x02, dm_i2c_reg_read (dev, 0x02) & 0x7F);
> >+
> >+ /* reset all alarms */
> >+ dm_i2c_reg_write(dev, 0x09, 0x00);
> >+ dm_i2c_reg_write(dev, 0x0A, 0x00);
> >+ dm_i2c_reg_write(dev, 0x0B, 0x00);
> >+ dm_i2c_reg_write(dev, 0x0C, 0x00);
> >+
> >+ return 0;
> >+}
> >+
> >+static const struct rtc_ops pcf8563_rtc_ops = {
> >+ .get = pcf8563_rtc_get,
> >+ .set = pcf8563_rtc_set,
> >+ .reset = pcf8563_rtc_reset,
> >+};
> >+
> >+static const struct udevice_id pcf8563_rtc_ids[] = {
> >+ { .compatible = "nxp,pcf8563" },
> >+ { }
> >+};
> >+
> >+U_BOOT_DRIVER(rtc_pcf8563) = {
> >+ .name = "rtc-pcf8563",
> >+ .id = UCLASS_RTC,
> >+ .of_match = pcf8563_rtc_ids,
> >+ .ops = &pcf8563_rtc_ops,
> >+};
> >+#endif
> >--
> >2.17.1
> priyankajain
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2019-12-09 4:40 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-05 6:10 [v3 1/8] rtc: pcf8563: support driver model Biwen Li
2019-12-05 6:10 ` [v3 2/8] armv8: fsl-layerscape: spl: fix build error when DM_I2C is enabled Biwen Li
2019-12-05 6:10 ` [v3 3/8] i2c: mxc_i2c: add DM_FLAG_PRE_RELOC flag Biwen Li
2019-12-05 6:38 ` Priyanka Jain
2019-12-05 6:10 ` [v3 4/8] Kconfigs: layerscape: use a convenient default value for SYS_MALLOC_F_LEN Biwen Li
2019-12-05 6:39 ` Priyanka Jain
2019-12-05 6:10 ` [v3 5/8] dm: ls1012a: add i2c DM support Biwen Li
2019-12-05 6:48 ` Priyanka Jain
2019-12-05 6:10 ` [v3 6/8] dm: arm: ls1043a: " Biwen Li
2019-12-05 6:57 ` Priyanka Jain
2019-12-05 6:10 ` [v3 7/8] dm: arm: ls1046a: " Biwen Li
2019-12-05 6:58 ` Priyanka Jain
2019-12-05 6:10 ` [v3 8/8] dm: arm: ls1021a: " Biwen Li
2019-12-05 6:36 ` [v3 1/8] rtc: pcf8563: support driver model Priyanka Jain
2019-12-09 4:40 ` Biwen Li
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.