Skip to contentSkip to conversation

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

PATCH New Chuanhua Han 2 participants 7 messages Jul 24, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 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

 drivers/rtc/Kconfig  | 10 ++++++++++
 drivers/rtc/ds3231.c | 21 +++++++++++++++++++++
 include/rtc.h        |  6 ++++++
 3 files changed, 37 insertions(+)
drivers/rtc/Kconfig +10 -0
index fd0009b..040d241 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
@@ -41,6 +47,10 @@ config RTC_PCF2127
 	  has a selectable I2C-bus or SPI-bus, a backup battery switch-over circuit, a
 	  programmable watchdog function, a timestamp function, and many other features.
 
+config DS3231_BUS_NUM
+	hex "I2C bus of the DS3231 device"
+	default 0
+
 config RTC_DS1307
 	bool "Enable DS1307 driver"
 	depends on DM_RTC
drivers/rtc/ds3231.c +21 -0
index 79b026a..dbd77a6 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,25 @@ static int ds3231_probe(struct udevice *dev)
 	return 0;
 }
 
+#ifdef CONFIG_RTC_ENABLE_32KHZ_OUTPUT
+void rtc_enable_32khz_output(void)
+{
+	int ret;
+	struct udevice *dev;
+
+#ifdef CONFIG_DS3231_BUS_NUM
+	ret = i2c_get_chip_for_busnum(CONFIG_DS3231_BUS_NUM,
+				      CONFIG_SYS_I2C_RTC_ADDR, 1, &dev);
+#else
+	ret = i2c_get_chip_for_busnum(0, CONFIG_SYS_I2C_RTC_ADDR, 1, &dev);
+#endif
+	if (!ret)
+		dm_i2c_reg_write(dev, RTC_STAT_REG_ADDR,
+				 RTC_STAT_BIT_BB32KHZ |
+				 RTC_STAT_BIT_EN32KHZ);
+}
+#endif
+
 static const struct rtc_ops ds3231_rtc_ops = {
 	.get = ds3231_rtc_get,
 	.set = ds3231_rtc_set,
include/rtc.h +6 -0
index b255bdc..df7de09 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
+void rtc_enable_32khz_output(void);
+#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 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

 board/freescale/ls2080aqds/eth.c        | 75 +++++++++++++++++++++++++++++++++
 board/freescale/ls2080aqds/ls2080aqds.c |  8 ++++
 include/configs/ls2080aqds.h            |  3 ++
 3 files changed, 86 insertions(+)
board/freescale/ls2080aqds/eth.c +75 -0
index f706fd4..b1d6827 100644
@@ -107,7 +107,16 @@ static void sgmii_configure_repeater(int serdes_port)
 	int *riser_phy_addr = &xqsgii_riser_phy_addr[0];
 
 	/* 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
+
 
 	for (dpmac = 0; dpmac < 8; dpmac++) {
 		/* Check the PHY status */
@@ -120,7 +129,14 @@ static void sgmii_configure_repeater(int serdes_port)
 			mii_bus = 1;
 			dpmac_id = dpmac + 9;
 			a = 0xb;
+#ifndef CONFIG_DM_I2C
 			i2c_write(0x76, 0, 0, &a, 1);
+#else
+			ret = i2c_get_chip_for_busnum(0, 0x76, 1, &udev);
+			if (!ret)
+				dm_i2c_write(udev, 0, &a, 1);
+#endif
+
 			break;
 		}
 
@@ -153,6 +169,7 @@ 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);
 				a = 0x38;
@@ -176,6 +193,31 @@ static void sgmii_configure_repeater(int serdes_port)
 				i2c_write(i2c_addr[dpmac], 0x2d, 1, &a, 1);
 				a = 0x20;
 				i2c_write(i2c_addr[dpmac], 4, 1, &a, 1);
+#else
+				i2c_get_chip_for_busnum(0, i2c_addr[dpmac],
+							1, &udev);
+
+				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[mii_bus],
 						  riser_phy_addr[dpmac],
@@ -231,7 +273,15 @@ 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 1:
@@ -282,6 +332,7 @@ 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);
 			a = 0x38;
@@ -301,6 +352,30 @@ static void qsgmii_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
+			i2c_get_chip_for_busnum(0, i2c_phy_addr, 1, &udev);
+			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)
board/freescale/ls2080aqds/ls2080aqds.c +8 -0
index a0a3301..21038a5 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;
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 2/4 armv8: ls2088aqds: The ls2088aqds board supports the I2C driver model.

Dear Chuanhua Han,

In message <[email protected]> you wrote:
...

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

Quoted 5 lines
board/freescale/ls2080aqds/eth.c +3 -0
 	/* Set I2c to Slot 1 */
+#ifndef CONFIG_DM_I2C
 	i2c_write(0x77, 0, 0, &a, 1);
+#else
+	struct udevice *udev;

Please - no declarations in the in the middle of the code (even if #ifdef'ed).

Thanks.

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
Wherever you go...There you are.                    - Buckaroo Banzai
#3 lore raw

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

In reply to Chuanhua Han

Dear Chuanhua,

Quoted 1 line · In message <[email protected]> you wrote:

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

I have a generic question about error handling in your code:

Quoted 19 lines
board/freescale/ls2080aqds/eth.c +19 -0
+				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);

...

Quoted 1 line

i2c_write(0x77, 0, 0, &a, 1);

...

You use a large number of functions without ever checking their return codes. But all these functions can fail for a number of reasons. Should you not always check for errors?

Best regards,

Wolfgang Denk

Signature · 6 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
He had quite a powerful intellect, but it  was  as  powerful  like  a
locomotive,  and  ran on rails and was therefore almost impossible to
steer.                          - Terry Pratchett, _Lords and Ladies_
#4 lore raw

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

Quoted 44 lines

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

Caution: EXT Email

Dear Chuanhua,

Quoted 1 line · In message <[email protected]> you wrote:

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

I have a generic question about error handling in your code:

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

Quoted 12 lines
board/freescale/ls2080aqds/eth.c +12 -0
+                             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);

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

Quoted 9 lines
board/freescale/ls2080aqds/eth.c +9 -0
+                             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);
Quoted 7 lines

...

Quoted 1 line
      i2c_write(0x77, 0, 0, &a, 1);

...

You use a large number of functions without ever checking their return codes. But all these functions can fail for a number of reasons. Should you not always check for errors?

yes,should to check for errors!

Quoted 12 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 He had quite a powerful intellect, but it was as powerful like a locomotive, and ran on rails and was therefore almost impossible to
steer. - Terry Pratchett, _Lords and Ladies_

#5 lore raw

PATCH 3/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

 configs/ls2088aqds_tfa_defconfig | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
configs/ls2088aqds_tfa_defconfig +9 -1
index e798c59..95921b0 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,11 @@ 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
+CONFIG_DS3231_BUS_NUM=0
Signature · 1 line
2.9.5
#6 lore raw

PATCH 4/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

 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