| Message ID | 20191205061034.32790-1-biwen.li@nxp.com |
|---|---|
| State | Superseded |
| Delegated to: | Priyanka Jain |
| Headers | show |
| Series | [v3,1/8] rtc: pcf8563: support driver model | expand |
>-----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@denx.de; jagan@amarulasolutions.com; >aford173@gmail.com; Alison Wang <alison.wang@nxp.com>; >bhaskar.upadhaya@nxp.com; feng.li_2@nxp.com; jh80.chung@samsung.com; >Pramod Kumar <pramod.kumar_1@nxp.com>; Rajesh Bhagat ><rajesh.bhagat@nxp.com>; Ruchika Gupta <ruchika.gupta@nxp.com>; >olteanv@gmail.com >Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Jiafei Pan <jiafei.pan@nxp.com>; u- >boot@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
>-----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@denx.de; jagan@amarulasolutions.com; >aford173@gmail.com; Alison Wang <alison.wang@nxp.com>; >bhaskar.upadhaya@nxp.com; feng.li_2@nxp.com; jh80.chung@samsung.com; >Pramod Kumar <pramod.kumar_1@nxp.com>; Rajesh Bhagat ><rajesh.bhagat@nxp.com>; Ruchika Gupta <ruchika.gupta@nxp.com>; >olteanv@gmail.com >Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Jiafei Pan <jiafei.pan@nxp.com>; u- >boot@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>
>-----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@denx.de; jagan@amarulasolutions.com; >aford173@gmail.com; Alison Wang <alison.wang@nxp.com>; >bhaskar.upadhaya@nxp.com; feng.li_2@nxp.com; jh80.chung@samsung.com; >Pramod Kumar <pramod.kumar_1@nxp.com>; Rajesh Bhagat ><rajesh.bhagat@nxp.com>; Ruchika Gupta <ruchika.gupta@nxp.com>; >olteanv@gmail.com >Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Jiafei Pan <jiafei.pan@nxp.com>; u- >boot@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>
> 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@denx.de; jagan@amarulasolutions.com; > >aford173@gmail.com; Alison Wang <alison.wang@nxp.com>; > >bhaskar.upadhaya@nxp.com; feng.li_2@nxp.com; > jh80.chung@samsung.com; > >Pramod Kumar <pramod.kumar_1@nxp.com>; Rajesh Bhagat > ><rajesh.bhagat@nxp.com>; Ruchika Gupta <ruchika.gupta@nxp.com>; > >olteanv@gmail.com > >Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Jiafei Pan <jiafei.pan@nxp.com>; > >u- boot@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
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
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(+)