This patch is updating ls1088aqds board init code to support DM_I2C.
Signed-off-by: Chuanhua Han <chuanhua....@nxp.com>
---
depends on:
- http://patchwork.ozlabs.org/project/uboot/list/?series=110856
- http://patchwork.ozlabs.org/project/uboot/list/?series=109459
- http://patchwork.ozlabs.org/project/uboot/list/?series=120936
board/freescale/ls1088a/eth_ls1088aqds.c | 74 ++++++++++++++++++++++++++++++++
include/configs/ls1088aqds.h | 4 +-
2 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c
b/board/freescale/ls1088a/eth_ls1088aqds.c
index f16b78c..3b83d5b 100644
--- a/board/freescale/ls1088a/eth_ls1088aqds.c
+++ b/board/freescale/ls1088a/eth_ls1088aqds.c
@@ -97,7 +97,16 @@ static void sgmii_configure_repeater(int dpmac)
uint8_t ch_b_ctl2[] = {0x81, 0x82, 0x83, 0x84};
/* Set I2c to Slot 1 */
+#ifndef CONFIG_DM_I2C
i2c_write(0x77, 0, 0, &a, 1);
+#else
+ struct udevice *udev;
+
+ ret = i2c_get_chip_for_busnum(0, 0x77, 1, &udev);
+ if (!ret)
+ dm_i2c_write(udev, 0, &a, 1);
+#endif
+
switch (dpmac) {
case 1:
@@ -143,8 +152,13 @@ static void sgmii_configure_repeater(int dpmac)
return;
}
+#ifdef CONFIG_DM_I2C
+ i2c_get_chip_for_busnum(0, i2c_phy_addr, 1, &udev);
+#endif
+
for (i = 0; i < 4; i++) {
for (j = 0; j < 4; j++) {
+#ifndef CONFIG_DM_I2C
a = 0x18;
i2c_write(i2c_phy_addr, 6, 1, &a, 1);
a = 0x38;
@@ -168,6 +182,28 @@ static void sgmii_configure_repeater(int dpmac)
i2c_write(i2c_phy_addr, 0x2d, 1, &a, 1);
a = 0x20;
i2c_write(i2c_phy_addr, 4, 1, &a, 1);
+#else
+ a = 0x18;
+ dm_i2c_write(udev, 6, &a, 1);
+ a = 0x38;
+ dm_i2c_write(udev, 4, &a, 1);
+ a = 0x4;
+ dm_i2c_write(udev, 8, &a, 1);
+
+ dm_i2c_write(udev, 0xf, &ch_a_eq[i], 1);
+ dm_i2c_write(udev, 0x11, &ch_a_ctl2[j], 1);
+
+ dm_i2c_write(udev, 0x16, &ch_b_eq[i], 1);
+ dm_i2c_write(udev, 0x18, &ch_b_ctl2[j], 1);
+
+ a = 0x14;
+ dm_i2c_write(udev, 0x23, &a, 1);
+ a = 0xb5;
+ dm_i2c_write(udev, 0x2d, &a, 1);
+ a = 0x20;
+ dm_i2c_write(udev, 4, &a, 1);
+
+#endif
mdelay(100);
ret = miiphy_read(dev, phy_addr, 0x11, &value);
if (ret > 0)
@@ -217,7 +253,16 @@ static void qsgmii_configure_repeater(int dpmac)
unsigned short value;
/* Set I2c to Slot 1 */
+#ifndef CONFIG_DM_I2C
i2c_write(0x77, 0, 0, &a, 1);
+#else
+ struct udevice *udev;
+
+ ret = i2c_get_chip_for_busnum(0, 0x77, 1, &udev);
+ if (!ret)
+ dm_i2c_write(udev, 0, &a, 1);
+#endif
+
switch (dpmac) {
case 7:
@@ -251,8 +296,13 @@ static void qsgmii_configure_repeater(int dpmac)
return;
}
+#ifdef CONFIG_DM_I2C
+ i2c_get_chip_for_busnum(0, i2c_phy_addr, 1, &udev);
+#endif
+
for (i = 0; i < 4; i++) {
for (j = 0; j < 4; j++) {
+#ifndef CONFIG_DM_I2C
a = 0x18;
i2c_write(i2c_phy_addr, 6, 1, &a, 1);
a = 0x38;
@@ -273,6 +323,30 @@ static void qsgmii_configure_repeater(int dpmac)
a = 0x20;
i2c_write(i2c_phy_addr, 4, 1, &a, 1);
mdelay(100);
+#else
+ a = 0x18;
+ dm_i2c_write(udev, 6, &a, 1);
+ a = 0x38;
+ dm_i2c_write(udev, 4, &a, 1);
+ a = 0x4;
+ dm_i2c_write(udev, 8, &a, 1);
+
+ dm_i2c_write(udev, 0xf, &ch_a_eq[i], 1);
+ dm_i2c_write(udev, 0x11, &ch_a_ctl2[j], 1);
+
+ dm_i2c_write(udev, 0x16, &ch_b_eq[i], 1);
+ dm_i2c_write(udev, 0x18, &ch_b_ctl2[j], 1);
+
+ a = 0x14;
+ dm_i2c_write(udev, 0x23, &a, 1);
+ a = 0xb5;
+ dm_i2c_write(udev, 0x2d, &a, 1);
+ a = 0x20;
+ dm_i2c_write(udev, 4, &a, 1);
+ mdelay(100);
+
+#endif
+
ret = miiphy_read(dev, phy_addr, 0x11, &value);
if (ret > 0)
goto error;
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index 4387862..8b62bbe 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -46,7 +46,9 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_DDR_CLK_FREQ 100000000
#else
#define CONFIG_QIXIS_I2C_ACCESS
+#ifndef CONFIG_DM_I2C
#define CONFIG_SYS_I2C_EARLY_INIT
+#endif
#define CONFIG_SYS_CLK_FREQ get_board_sys_clk()
#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk()
#endif
@@ -357,9 +359,7 @@ unsigned long get_board_ddr_clk(void);
* RTC configuration
*/
#define RTC
-#define CONFIG_RTC_PCF8563 1
#define CONFIG_SYS_I2C_RTC_ADDR 0x51 /* Channel 3*/
-#define CONFIG_CMD_DATE
/* EEPROM */
#define CONFIG_ID_EEPROM
--
2.9.5
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
