Skip to contentSkip to conversation

rtc: ds3232/ds3231: Add support to generate 32KHz output for driver module

PATCH Superseded Chuanhua Han 2 participants 6 messages Jul 26, 2019

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/4 rtc: ds3232/ds3231: Add support to generate 32KHz output for driver module

This patch add an implementation of the rtc_enable_32khz_output() that uses the driver model i2c APIs.

---
depends on:
- http://patchwork.ozlabs.org/project/uboot/list/?series=118772
- http://patchwork.ozlabs.org/project/uboot/list/?series=117226

Changes in v3:
- Delete something about DS3231_BUS_NUM
- Modify the interface and definition of rtc_enable_32khz_output function
Changes in v2:
- No change.

 drivers/rtc/Kconfig  |  6 ++++++
 drivers/rtc/ds3231.c | 17 +++++++++++++++++
 include/rtc.h        |  6 ++++++
 3 files changed, 29 insertions(+)
drivers/rtc/Kconfig +6 -0
index fd0009b..cf15914 100644
@@ -31,6 +31,12 @@ config TPL_DM_RTC
 	  drivers to perform the actual functions. See rtc.h for a
 	  description of the API.
 
+config RTC_ENABLE_32KHZ_OUTPUT
+	bool "Enable RTC 32Khz output"
+	help
+	   Some real-time clocks support the output of 32kHz square waves (such as ds3231),
+	   the config symbol choose Real Time Clock device 32Khz output feature.
+
 config RTC_PCF2127
 	bool "Enable PCF2127 driver"
 	depends on DM_RTC
drivers/rtc/ds3231.c +17 -0
index 79b026a..fde4d86 100644
@@ -148,11 +148,13 @@ void rtc_reset (void)
 /*
  * Enable 32KHz output
  */
+#ifdef CONFIG_RTC_ENABLE_32KHZ_OUTPUT
 void rtc_enable_32khz_output(void)
 {
 	rtc_write(RTC_STAT_REG_ADDR,
 		  RTC_STAT_BIT_BB32KHZ | RTC_STAT_BIT_EN32KHZ);
 }
+#endif
 
 /*
  * Helper functions
@@ -251,6 +253,21 @@ static int ds3231_probe(struct udevice *dev)
 	return 0;
 }
 
+#ifdef CONFIG_RTC_ENABLE_32KHZ_OUTPUT
+int rtc_enable_32khz_output(int busnum, int chip_addr)
+{
+	int ret;
+	struct udevice *dev;
+
+	ret = i2c_get_chip_for_busnum(busnum, chip_addr, 1, &dev);
+	if (!ret)
+		ret = dm_i2c_reg_write(dev, RTC_STAT_REG_ADDR,
+				       RTC_STAT_BIT_BB32KHZ |
+				       RTC_STAT_BIT_EN32KHZ);
+	return ret;
+}
+#endif
+
 static const struct rtc_ops ds3231_rtc_ops = {
 	.get = ds3231_rtc_get,
 	.set = ds3231_rtc_set,
include/rtc.h +6 -0
index b255bdc..7386d52 100644
@@ -166,11 +166,17 @@ int rtc_read32(struct udevice *dev, unsigned int reg, u32 *valuep);
  */
 int rtc_write32(struct udevice *dev, unsigned int reg, u32 value);
 
+#ifdef CONFIG_RTC_ENABLE_32KHZ_OUTPUT
+int rtc_enable_32khz_output(int busnum, int chip_addr);
+#endif
+
 #else
 int rtc_get (struct rtc_time *);
 int rtc_set (struct rtc_time *);
 void rtc_reset (void);
+#ifdef CONFIG_RTC_ENABLE_32KHZ_OUTPUT
 void rtc_enable_32khz_output(void);
+#endif
 
 /**
  * rtc_read8() - Read an 8-bit register
Signature · 1 line
2.9.5
#1 lore raw

PATCH v3 2/4 armv8: ls2088aqds: The ls2088aqds board supports the I2C driver model.

This patch is updating ls2088aqds board init code to support DM_I2C.

---
depends on:
- http://patchwork.ozlabs.org/project/uboot/list/?series=118772
- http://patchwork.ozlabs.org/project/uboot/list/?series=117226

Changes in v3:
- Delete something about DS3231_BUS_NUM
- Modify the interface and definition of rtc_enable_32khz_output function
Changes in v2:
- No change.

 board/freescale/ls2080aqds/eth.c        | 236 ++++++++++++++++++++++++++++----
 board/freescale/ls2080aqds/ls2080aqds.c |  16 +++
 include/configs/ls2080aqds.h            |   3 +
 3 files changed, 228 insertions(+), 27 deletions(-)
board/freescale/ls2080aqds/eth.c +209 -27
index f706fd4..710f075 100644
@@ -105,9 +105,20 @@ static void sgmii_configure_repeater(int serdes_port)
 	uint8_t ch_b_ctl2[] = {0x81, 0x82, 0x83, 0x84};
 
 	int *riser_phy_addr = &xqsgii_riser_phy_addr[0];
+#ifdef CONFIG_DM_I2C
+	struct udevice *udev;
+#endif
 
 	/* Set I2c to Slot 1 */
-	i2c_write(0x77, 0, 0, &a, 1);
+#ifndef CONFIG_DM_I2C
+	ret = i2c_write(0x77, 0, 0, &a, 1);
+#else
+	ret = i2c_get_chip_for_busnum(0, 0x77, 1, &udev);
+	if (!ret)
+		ret = dm_i2c_write(udev, 0, &a, 1);
+#endif
+	if (ret)
+		goto error;
 
 	for (dpmac = 0; dpmac < 8; dpmac++) {
 		/* Check the PHY status */
@@ -120,7 +131,15 @@ static void sgmii_configure_repeater(int serdes_port)
 			mii_bus = 1;
 			dpmac_id = dpmac + 9;
 			a = 0xb;
-			i2c_write(0x76, 0, 0, &a, 1);
+#ifndef CONFIG_DM_I2C
+			ret = i2c_write(0x76, 0, 0, &a, 1);
+#else
+			ret = i2c_get_chip_for_busnum(0, 0x76, 1, &udev);
+			if (!ret)
+				ret = dm_i2c_write(udev, 0, &a, 1);
+#endif
+			if (ret)
+				goto error;
 			break;
 		}
 
@@ -153,29 +172,102 @@ static void sgmii_configure_repeater(int serdes_port)
 
 		for (i = 0; i < 4; i++) {
 			for (j = 0; j < 4; j++) {
+#ifndef CONFIG_DM_I2C
 				a = 0x18;
-				i2c_write(i2c_addr[dpmac], 6, 1, &a, 1);
+				ret = i2c_write(i2c_addr[dpmac], 6, 1, &a, 1);
+				if (ret)
+					goto error;
 				a = 0x38;
-				i2c_write(i2c_addr[dpmac], 4, 1, &a, 1);
+				ret = i2c_write(i2c_addr[dpmac], 4, 1, &a, 1);
+				if (ret)
+					goto error;
 				a = 0x4;
-				i2c_write(i2c_addr[dpmac], 8, 1, &a, 1);
+				ret = i2c_write(i2c_addr[dpmac], 8, 1, &a, 1);
+				if (ret)
+					goto error;
 
-				i2c_write(i2c_addr[dpmac], 0xf, 1,
-					  &ch_a_eq[i], 1);
-				i2c_write(i2c_addr[dpmac], 0x11, 1,
-					  &ch_a_ctl2[j], 1);
+				ret = i2c_write(i2c_addr[dpmac], 0xf,
+						1, &ch_a_eq[i], 1);
+				if (ret)
+					goto error;
+				ret = i2c_write(i2c_addr[dpmac], 0x11,
+						1, &ch_a_ctl2[j], 1);
+				if (ret)
+					goto error;
 
-				i2c_write(i2c_addr[dpmac], 0x16, 1,
-					  &ch_b_eq[i], 1);
-				i2c_write(i2c_addr[dpmac], 0x18, 1,
-					  &ch_b_ctl2[j], 1);
+				ret = i2c_write(i2c_addr[dpmac], 0x16,
+						1, &ch_b_eq[i], 1);
+				if (ret)
+					goto error;
+				ret = i2c_write(i2c_addr[dpmac], 0x18,
+						1, &ch_b_ctl2[j], 1);
+				if (ret)
+					goto error;
 
 				a = 0x14;
-				i2c_write(i2c_addr[dpmac], 0x23, 1, &a, 1);
+				ret = i2c_write(i2c_addr[dpmac],
+						0x23, 1, &a, 1);
+				if (ret)
+					goto error;
 				a = 0xb5;
-				i2c_write(i2c_addr[dpmac], 0x2d, 1, &a, 1);
+				ret = i2c_write(i2c_addr[dpmac],
+						0x2d, 1, &a, 1);
+				if (ret)
+					goto error;
 				a = 0x20;
-				i2c_write(i2c_addr[dpmac], 4, 1, &a, 1);
+				ret = i2c_write(i2c_addr[dpmac], 4, 1, &a, 1);
+				if (ret)
+					goto error;
+#else
+				ret = i2c_get_chip_for_busnum(0,
+							      i2c_addr[dpmac],
+							      1, &udev);
+				if (!ret) {
+					a = 0x18;
+					ret = dm_i2c_write(udev, 6, &a, 1);
+					if (ret)
+						goto error;
+					a = 0x38;
+					ret = dm_i2c_write(udev, 4, &a, 1);
+					if (ret)
+						goto error;
+					a = 0x4;
+					ret = dm_i2c_write(udev, 8, &a, 1);
+					if (ret)
+						goto error;
+
+					ret = dm_i2c_write(udev, 0xf,
+							   &ch_a_eq[i], 1);
+					if (ret)
+						goto error;
+					ret = dm_i2c_write(udev, 0x11,
+							   &ch_a_ctl2[j], 1);
+					if (ret)
+						goto error;
+
+					ret = dm_i2c_write(udev, 0x16,
+							   &ch_b_eq[i], 1);
+					if (ret)
+						goto error;
+					ret = dm_i2c_write(udev, 0x18,
+							   &ch_b_ctl2[j], 1);
+					if (ret)
+						goto error;
+					a = 0x14;
+					ret = dm_i2c_write(udev, 0x23, &a, 1);
+					if (ret)
+						goto error;
+					a = 0xb5;
+					ret = dm_i2c_write(udev, 0x2d, &a, 1);
+					if (ret)
+						goto error;
+					a = 0x20;
+					ret = dm_i2c_write(udev, 4, &a, 1);
+					if (ret)
+						goto error;
+				}
+
+#endif
 				mdelay(100);
 				ret = miiphy_read(dev[mii_bus],
 						  riser_phy_addr[dpmac],
@@ -229,9 +321,20 @@ static void qsgmii_configure_repeater(int dpmac)
 	const char *dev = "LS2080A_QDS_MDIO0";
 	int ret = 0;
 	unsigned short value;
+#ifdef CONFIG_DM_I2C
+	struct udevice *udev;
+#endif
 
 	/* Set I2c to Slot 1 */
-	i2c_write(0x77, 0, 0, &a, 1);
+#ifndef CONFIG_DM_I2C
+	ret = i2c_write(0x77, 0, 0, &a, 1);
+#else
+	ret = i2c_get_chip_for_busnum(0, 0x77, 1, &udev);
+	if (!ret)
+		ret = dm_i2c_write(udev, 0, &a, 1);
+#endif
+	if (ret)
+		goto error;
 
 	switch (dpmac) {
 	case 1:
@@ -282,25 +385,104 @@ static void qsgmii_configure_repeater(int dpmac)
 
 	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);
+			ret = i2c_write(i2c_phy_addr, 6, 1, &a, 1);
+			if (ret)
+				goto error;
 			a = 0x38;
-			i2c_write(i2c_phy_addr, 4, 1, &a, 1);
+			ret = i2c_write(i2c_phy_addr, 4, 1, &a, 1);
+			if (ret)
+				goto error;
 			a = 0x4;
-			i2c_write(i2c_phy_addr, 8, 1, &a, 1);
+			ret = i2c_write(i2c_phy_addr, 8, 1, &a, 1);
+			if (ret)
+				goto error;
 
-			i2c_write(i2c_phy_addr, 0xf, 1, &ch_a_eq[i], 1);
-			i2c_write(i2c_phy_addr, 0x11, 1, &ch_a_ctl2[j], 1);
+			ret = i2c_write(i2c_phy_addr, 0xf, 1, &ch_a_eq[i], 1);
+			if (ret)
+				goto error;
+			ret = i2c_write(i2c_phy_addr, 0x11, 1,
+					&ch_a_ctl2[j], 1);
+			if (ret)
+				goto error;
 
-			i2c_write(i2c_phy_addr, 0x16, 1, &ch_b_eq[i], 1);
-			i2c_write(i2c_phy_addr, 0x18, 1, &ch_b_ctl2[j], 1);
+			ret = i2c_write(i2c_phy_addr, 0x16, 1, &ch_b_eq[i], 1);
+			if (ret)
+				goto error;
+			ret = i2c_write(i2c_phy_addr, 0x18, 1,
+					&ch_b_ctl2[j], 1);
+			if (ret)
+				goto error;
 
 			a = 0x14;
-			i2c_write(i2c_phy_addr, 0x23, 1, &a, 1);
+			ret = i2c_write(i2c_phy_addr, 0x23, 1, &a, 1);
+			if (ret)
+				goto error;
 			a = 0xb5;
-			i2c_write(i2c_phy_addr, 0x2d, 1, &a, 1);
+			ret = i2c_write(i2c_phy_addr, 0x2d, 1, &a, 1);
+			if (ret)
+				goto error;
 			a = 0x20;
-			i2c_write(i2c_phy_addr, 4, 1, &a, 1);
+			ret = i2c_write(i2c_phy_addr, 4, 1, &a, 1);
+			if (ret)
+				goto error;
+#else
+			ret = i2c_get_chip_for_busnum(0,
+						      i2c_phy_addr,
+							  1, &udev);
+			if (!ret) {
+				a = 0x18;
+				ret = dm_i2c_write(udev, 6, &a, 1);
+				if (ret)
+					goto error;
+				a = 0x38;
+				ret = dm_i2c_write(udev, 4, &a, 1);
+				if (ret)
+					goto error;
+				a = 0x4;
+				ret = dm_i2c_write(udev, 8, &a, 1);
+				if (ret)
+					goto error;
+
+				ret = dm_i2c_write(udev, 0xf,
+						   &ch_a_eq[i],
+						   1);
+				if (ret)
+					goto error;
+				ret = dm_i2c_write(udev, 0x11,
+						   &ch_a_ctl2[j],
+						   1);
+				if (ret)
+					goto error;
+
+				ret = dm_i2c_write(udev, 0x16,
+						   &ch_b_eq[i],
+						   1);
+				if (ret)
+					goto error;
+				ret = dm_i2c_write(udev, 0x18,
+						   &ch_b_ctl2[j],
+						   1);
+				if (ret)
+					goto error;
+
+				a = 0x14;
+				ret = dm_i2c_write(udev, 0x23, &a, 1);
+				if (ret)
+					goto error;
+				a = 0xb5;
+				ret = dm_i2c_write(udev, 0x2d, &a, 1);
+				if (ret)
+					goto error;
+				a = 0x20;
+				ret = dm_i2c_write(udev, 4, &a, 1);
+				if (ret)
+					goto error;
+			}
+
+#endif
+
 			mdelay(100);
 			ret = miiphy_read(dev, phy_addr, 0x11, &value);
 			if (ret > 0)
board/freescale/ls2080aqds/ls2080aqds.c +16 -0
index a0a3301..ec22cf8 100644
@@ -161,7 +161,15 @@ int select_i2c_ch_pca9547(u8 ch)
 {
 	int ret;
 
+#ifndef CONFIG_DM_I2C
 	ret = i2c_write(I2C_MUX_PCA_ADDR_PRI, 0, 1, &ch, 1);
+#else
+	struct udevice *dev;
+
+	ret = i2c_get_chip_for_busnum(0, I2C_MUX_PCA_ADDR_PRI, 1, &dev);
+	if (!ret)
+		ret = dm_i2c_write(dev, 0, &ch, 1);
+#endif
 	if (ret) {
 		puts("PCA: failed to select proper channel\n");
 		return ret;
@@ -224,7 +232,15 @@ int board_init(void)
 	gd->env_addr = (ulong)&default_environment[0];
 #endif
 	select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
+
+#ifdef CONFIG_RTC_ENABLE_32KHZ_OUTPUT
+#ifdef CONFIG_DM_I2C
+	rtc_enable_32khz_output(0, CONFIG_SYS_I2C_RTC_ADDR);
+#else
 	rtc_enable_32khz_output();
+#endif
+#endif
+
 #ifdef CONFIG_FSL_CAAM
 	sec_init();
 #endif
include/configs/ls2080aqds.h +3 -0
index 18f30b5..05ff770 100644
@@ -16,7 +16,9 @@ unsigned long get_board_ddr_clk(void);
 
 #ifdef CONFIG_FSL_QSPI
 #define CONFIG_QIXIS_I2C_ACCESS
+#ifndef CONFIG_DM_I2C
 #define CONFIG_SYS_I2C_EARLY_INIT
+#endif
 #define CONFIG_SYS_I2C_IFDR_DIV		0x7e
 #endif
 
@@ -324,6 +326,7 @@ unsigned long get_board_ddr_clk(void);
  */
 #define RTC
 #define CONFIG_RTC_DS3231               1
+#define CONFIG_RTC_ENABLE_32KHZ_OUTPUT
 #define CONFIG_SYS_I2C_RTC_ADDR         0x68
 
 /* EEPROM */
Signature · 1 line
2.9.5
#2 lore raw

PATCH v3 2/4 armv8: ls2088aqds: The ls2088aqds board supports the I2C driver model.

Dear Chuanhua Han,

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port) · line 119

Quoted 10 lines · In message <[email protected]> you wrote:
board/freescale/ls2080aqds/eth.c +7 -1
 	/* Set I2c to Slot 1 */
-	i2c_write(0x77, 0, 0, &a, 1);
+#ifndef CONFIG_DM_I2C
+	ret = i2c_write(0x77, 0, 0, &a, 1);
+#else
+	ret = i2c_get_chip_for_busnum(0, 0x77, 1, &udev);
+	if (!ret)
+		ret = dm_i2c_write(udev, 0, &a, 1);
+#endif

See my other comment. You should add error checking for the i2c_write(), too.

Quoted 96 lines
board/freescale/ls2080aqds/eth.c +75 -13
+				ret = i2c_write(i2c_addr[dpmac], 6, 1, &a, 1);
+				if (ret)
+					goto error;
 				a = 0x38;
-				i2c_write(i2c_addr[dpmac], 4, 1, &a, 1);
+				ret = i2c_write(i2c_addr[dpmac], 4, 1, &a, 1);
+				if (ret)
+					goto error;
 				a = 0x4;
-				i2c_write(i2c_addr[dpmac], 8, 1, &a, 1);
+				ret = i2c_write(i2c_addr[dpmac], 8, 1, &a, 1);
+				if (ret)
+					goto error;
 
-				i2c_write(i2c_addr[dpmac], 0xf, 1,
-					  &ch_a_eq[i], 1);
-				i2c_write(i2c_addr[dpmac], 0x11, 1,
-					  &ch_a_ctl2[j], 1);
+				ret = i2c_write(i2c_addr[dpmac], 0xf,
+						1, &ch_a_eq[i], 1);
+				if (ret)
+					goto error;
+				ret = i2c_write(i2c_addr[dpmac], 0x11,
+						1, &ch_a_ctl2[j], 1);
+				if (ret)
+					goto error;
 
-				i2c_write(i2c_addr[dpmac], 0x16, 1,
-					  &ch_b_eq[i], 1);
-				i2c_write(i2c_addr[dpmac], 0x18, 1,
-					  &ch_b_ctl2[j], 1);
+				ret = i2c_write(i2c_addr[dpmac], 0x16,
+						1, &ch_b_eq[i], 1);
+				if (ret)
+					goto error;
+				ret = i2c_write(i2c_addr[dpmac], 0x18,
+						1, &ch_b_ctl2[j], 1);
+				if (ret)
+					goto error;
 
 				a = 0x14;
-				i2c_write(i2c_addr[dpmac], 0x23, 1, &a, 1);
+				ret = i2c_write(i2c_addr[dpmac],
+						0x23, 1, &a, 1);
+				if (ret)
+					goto error;
 				a = 0xb5;
-				i2c_write(i2c_addr[dpmac], 0x2d, 1, &a, 1);
+				ret = i2c_write(i2c_addr[dpmac],
+						0x2d, 1, &a, 1);
+				if (ret)
+					goto error;
 				a = 0x20;
-				i2c_write(i2c_addr[dpmac], 4, 1, &a, 1);
+				ret = i2c_write(i2c_addr[dpmac], 4, 1, &a, 1);
+				if (ret)
+					goto error;
+#else
+				ret = i2c_get_chip_for_busnum(0,
+							      i2c_addr[dpmac],
+							      1, &udev);
+				if (!ret) {
+					a = 0x18;
+					ret = dm_i2c_write(udev, 6, &a, 1);
+					if (ret)
+						goto error;
+					a = 0x38;
+					ret = dm_i2c_write(udev, 4, &a, 1);
+					if (ret)
+						goto error;
+					a = 0x4;
+					ret = dm_i2c_write(udev, 8, &a, 1);
+					if (ret)
+						goto error;
+
+					ret = dm_i2c_write(udev, 0xf,
+							   &ch_a_eq[i], 1);
+					if (ret)
+						goto error;
+					ret = dm_i2c_write(udev, 0x11,
+							   &ch_a_ctl2[j], 1);
+					if (ret)
+						goto error;
+
+					ret = dm_i2c_write(udev, 0x16,
+							   &ch_b_eq[i], 1);
+					if (ret)
+						goto error;
+					ret = dm_i2c_write(udev, 0x18,
+							   &ch_b_ctl2[j], 1);
+					if (ret)
+						goto error;
+					a = 0x14;
+					ret = dm_i2c_write(udev, 0x23, &a, 1);
+					if (ret)
+						goto error;

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port) · line 269

Quoted 10 lines
board/freescale/ls2080aqds/eth.c +10 -0
+					a = 0xb5;
+					ret = dm_i2c_write(udev, 0x2d, &a, 1);
+					if (ret)
+						goto error;
+					a = 0x20;
+					ret = dm_i2c_write(udev, 4, &a, 1);
+					if (ret)
+						goto error;
+				}
+

NAK. You really want to change this ugly code, please.

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port) · line 119

Quoted 9 lines
board/freescale/ls2080aqds/eth.c +7 -1
 	/* Set I2c to Slot 1 */
-	i2c_write(0x77, 0, 0, &a, 1);
+#ifndef CONFIG_DM_I2C
+	ret = i2c_write(0x77, 0, 0, &a, 1);
+#else
+	ret = i2c_get_chip_for_busnum(0, 0x77, 1, &udev);
+	if (!ret)
+		ret = dm_i2c_write(udev, 0, &a, 1);
+#endif

Why do you do it here, but not above? You need to work more consisntently!

board/freescale/ls2080aqds/ls2080aqds.c int select_i2c_ch_pca9547(u8 ch) · line 167

Quoted 12 lines
board/freescale/ls2080aqds/ls2080aqds.c +3 -0
index a0a3301..ec22cf8 100644
@@ -161,7 +161,15 @@ int select_i2c_ch_pca9547(u8 ch)
 {
 	int ret;
 
+#ifndef CONFIG_DM_I2C
 	ret = i2c_write(I2C_MUX_PCA_ADDR_PRI, 0, 1, &ch, 1);
+#else
+	struct udevice *dev;

No declarations after code, please!

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Single tasking: Just Say No.
#3 lore raw

[U-Boot] [EXT] Re: [PATCH v3 2/4] armv8: ls2088aqds: The ls2088aqds board supports the I2C driver model.

Hi, Wolfgang Denk

Quoted 172 lines

-----Original Message-----
From: Wolfgang Denk <[email protected]>
Sent: 2019年7月26日 14:34
To: Chuanhua Han <[email protected]>
Cc: albert.u.boot at aribaud.net; Prabhakar Kushwaha <[email protected]>; Rajesh Bhagat <[email protected]>; Priyanka Jain <[email protected]>; u-boot at lists.denx.de; lukma at denx.de; trini at konsulko.com
Subject: [EXT] Re: [PATCH v3 2/4] armv8: ls2088aqds: The ls2088aqds board supports the I2C driver model.

Caution: EXT Email

Dear Chuanhua Han,

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port)

Quoted 8 lines · In message <[email protected]> you wrote:
      /* Set I2c to Slot 1 */
board/freescale/ls2080aqds/eth.c +5 -1
-     i2c_write(0x77, 0, 0, &a, 1);
+#ifndef CONFIG_DM_I2C
+     ret = i2c_write(0x77, 0, 0, &a, 1); #else
+     ret = i2c_get_chip_for_busnum(0, 0x77, 1, &udev);
+     if (!ret)
+             ret = dm_i2c_write(udev, 0, &a, 1); #endif

See my other comment. You should add error checking for the i2c_write(), too.

Quoted 1 line

+ ret = i2c_write(i2c_addr[dpmac], 6, 1, &a,

1);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port)

Quoted 5 lines
board/freescale/ls2080aqds/eth.c +3 -1
+                             if (ret)
+                                     goto error;
                              a = 0x38;
-                             i2c_write(i2c_addr[dpmac], 4, 1, &a, 1);
+                             ret = i2c_write(i2c_addr[dpmac], 4, 1, &a,

1);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port)

Quoted 5 lines
board/freescale/ls2080aqds/eth.c +3 -1
+                             if (ret)
+                                     goto error;
                              a = 0x4;
-                             i2c_write(i2c_addr[dpmac], 8, 1, &a, 1);
+                             ret = i2c_write(i2c_addr[dpmac], 8, 1, &a,

1);

Quoted 21 lines
board/freescale/ls2080aqds/eth.c +11 -8
+                             if (ret)
+                                     goto error;
 
-                             i2c_write(i2c_addr[dpmac], 0xf, 1,
-                                       &ch_a_eq[i], 1);
-                             i2c_write(i2c_addr[dpmac], 0x11, 1,
-                                       &ch_a_ctl2[j], 1);
+                             ret = i2c_write(i2c_addr[dpmac], 0xf,
+                                             1, &ch_a_eq[i], 1);
+                             if (ret)
+                                     goto error;
+                             ret = i2c_write(i2c_addr[dpmac], 0x11,
+                                             1, &ch_a_ctl2[j], 1);
+                             if (ret)
+                                     goto error;
 
-                             i2c_write(i2c_addr[dpmac], 0x16, 1,
-                                       &ch_b_eq[i], 1);
-                             i2c_write(i2c_addr[dpmac], 0x18, 1,
-                                       &ch_b_ctl2[j], 1);
+                             ret = i2c_write(i2c_addr[dpmac], 0x16,

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port)

Quoted 10 lines
board/freescale/ls2080aqds/eth.c +7 -1
+                                             1, &ch_b_eq[i], 1);
+                             if (ret)
+                                     goto error;
+                             ret = i2c_write(i2c_addr[dpmac], 0x18,
+                                             1, &ch_b_ctl2[j], 1);
+                             if (ret)
+                                     goto error;
 
                              a = 0x14;
-                             i2c_write(i2c_addr[dpmac], 0x23, 1, &a,

1);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port)

Quoted 6 lines
board/freescale/ls2080aqds/eth.c +4 -1
+                             ret = i2c_write(i2c_addr[dpmac],
+                                             0x23, 1, &a, 1);
+                             if (ret)
+                                     goto error;
                              a = 0xb5;
-                             i2c_write(i2c_addr[dpmac], 0x2d, 1, &a,

1);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port)

Quoted 7 lines
board/freescale/ls2080aqds/eth.c +5 -1
+                             ret = i2c_write(i2c_addr[dpmac],
+                                             0x2d, 1, &a, 1);
+                             if (ret)
+                                     goto error;
                              a = 0x20;
-                             i2c_write(i2c_addr[dpmac], 4, 1, &a, 1);
+                             ret = i2c_write(i2c_addr[dpmac], 4, 1, &a,

1);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port) · line 238

Quoted 4 lines
board/freescale/ls2080aqds/eth.c +4 -0
+                             if (ret)
+                                     goto error; #else
+                             ret = i2c_get_chip_for_busnum(0,
+

i2c_addr[dpmac],

Quoted 1 line

+ 1,

&udev);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port)

Quoted 3 lines
board/freescale/ls2080aqds/eth.c +3 -0
+                             if (!ret) {
+                                     a = 0x18;
+                                     ret = dm_i2c_write(udev, 6, &a,

1);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port)

Quoted 4 lines
board/freescale/ls2080aqds/eth.c +4 -0
+                                     if (ret)
+                                             goto error;
+                                     a = 0x38;
+                                     ret = dm_i2c_write(udev, 4, &a,

1);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port)

Quoted 4 lines
board/freescale/ls2080aqds/eth.c +4 -0
+                                     if (ret)
+                                             goto error;
+                                     a = 0x4;
+                                     ret = dm_i2c_write(udev, 8, &a,

1);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port) · line 247

Quoted 5 lines
board/freescale/ls2080aqds/eth.c +5 -0
+                                     if (ret)
+                                             goto error;
+
+                                     ret = dm_i2c_write(udev, 0xf,
+

&ch_a_eq[i], 1);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port) · line 247

Quoted 4 lines
board/freescale/ls2080aqds/eth.c +4 -0
+                                     if (ret)
+                                             goto error;
+                                     ret = dm_i2c_write(udev, 0x11,
+

&ch_a_ctl2[j], 1);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port) · line 269

Quoted 5 lines
board/freescale/ls2080aqds/eth.c +5 -0
+                                     if (ret)
+                                             goto error;
+
+                                     ret = dm_i2c_write(udev, 0x16,
+

&ch_b_eq[i], 1);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port) · line 269

Quoted 4 lines
board/freescale/ls2080aqds/eth.c +4 -0
+                                     if (ret)
+                                             goto error;
+                                     ret = dm_i2c_write(udev, 0x18,
+

&ch_b_ctl2[j], 1);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port)

Quoted 4 lines
board/freescale/ls2080aqds/eth.c +4 -0
+                                     if (ret)
+                                             goto error;
+                                     a = 0x14;
+                                     ret = dm_i2c_write(udev, 0x23,

&a, 1);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port)

Quoted 4 lines
board/freescale/ls2080aqds/eth.c +4 -0
+                                     if (ret)
+                                             goto error;
+                                     a = 0xb5;
+                                     ret = dm_i2c_write(udev, 0x2d,

&a, 1);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port)

Quoted 4 lines
board/freescale/ls2080aqds/eth.c +4 -0
+                                     if (ret)
+                                             goto error;
+                                     a = 0x20;
+                                     ret = dm_i2c_write(udev, 4, &a,

1);

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port) · line 269

Quoted 4 lines
board/freescale/ls2080aqds/eth.c +4 -0
+                                     if (ret)
+                                             goto error;
+                             }
+

NAK. You really want to change this ugly code, please.

board/freescale/ls2080aqds/eth.c static void sgmii_configure_repeater(int serdes_port)

Quoted 7 lines
      /* Set I2c to Slot 1 */
board/freescale/ls2080aqds/eth.c +5 -1
-     i2c_write(0x77, 0, 0, &a, 1);
+#ifndef CONFIG_DM_I2C
+     ret = i2c_write(0x77, 0, 0, &a, 1); #else
+     ret = i2c_get_chip_for_busnum(0, 0x77, 1, &udev);
+     if (!ret)
+             ret = dm_i2c_write(udev, 0, &a, 1); #endif

Why do you do it here, but not above? You need to work more consisntently!

Quoted 8 lines
board/freescale/ls2080aqds/ls2080aqds.c +0 -0
index a0a3301..ec22cf8 100644
@@ -161,7 +161,15 @@ int select_i2c_ch_pca9547(u8 ch)  {
      int ret;
 
Quoted 6 lines

board/freescale/ls2080aqds/ls2080aqds.c int select_i2c_ch_pca9547(u8 ch) · line 167

Quoted 4 lines
board/freescale/ls2080aqds/ls2080aqds.c +3 -0
+#ifndef CONFIG_DM_I2C
      ret = i2c_write(I2C_MUX_PCA_ADDR_PRI, 0, 1, &ch, 1);
+#else
+     struct udevice *dev;

No declarations after code, please!

All these I will check and modify, thank you!

Quoted 11 lines

Best regards,

Wolfgang Denk

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Single tasking: Just Say No.

#4 lore raw

PATCH v3 3/4 armv8: ls2088aqds : Add ds3232 node

In reply to Chuanhua Han

This patch adds the ds3232-rtc node under the i2c0->i2c-mux at 77->i2c at 0 for ls2088aqds boards.

---
depends on:
- http://patchwork.ozlabs.org/project/uboot/list/?series=118772
- http://patchwork.ozlabs.org/project/uboot/list/?series=117226

Changes in v3:
- Change the order of the config and device tree patch files
Changes in v2:
- No change.

 arch/arm/dts/fsl-ls2080a-qds.dts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
arch/arm/dts/fsl-ls2080a-qds.dts +19 -0
index 2a0a528..13461b5 100644
@@ -19,6 +19,25 @@
 	};
 };
 
+&i2c0 {
+	status = "okay";
+	pca9547 at 77 {
+		compatible = "nxp,pca9547";
+		reg = <0x77>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		i2c at 0 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x00>;
+			rtc at 68 {
+				compatible = "dallas,ds3232";
+				reg = <0x68>;
+			};
+		};
+	};
+};
+
 &dspi {
 	bus-num = <0>;
 	status = "okay";
Signature · 1 line
2.9.5
#5 lore raw

PATCH v3 4/4 configs: ls2088aqds: Enable DM support for ds3231 rtc

In reply to Chuanhua Han

Enable related configs on all ls2088aqds boards to support ds3231 rtc DM function.

---
depends on:
- http://patchwork.ozlabs.org/project/uboot/list/?series=118772
- http://patchwork.ozlabs.org/project/uboot/list/?series=117226

Changes in v3:
- Change the order of the config and device tree patch files
Changes in v2:
- No change.

 configs/ls2088aqds_tfa_defconfig | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
configs/ls2088aqds_tfa_defconfig +8 -1
index e798c59..caa3425 100644
@@ -1,12 +1,12 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS2080AQDS=y
+CONFIG_SYS_MALLOC_F_LEN=0x6000
 CONFIG_SYS_TEXT_BASE=0x82000000
 CONFIG_TFABOOT=y
 CONFIG_NR_DRAM_BANKS=3
 CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
 CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
 CONFIG_AHCI=y
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
@@ -63,3 +63,10 @@ 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_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_I2C_DEFAULT_BUS_NUMBER=0
+CONFIG_DM_GPIO=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
+CONFIG_DM_RTC=y
Signature · 1 line
2.9.5