rtc: pcf8563: Add driver model support
Subsystems (4)
PATCH v7 1/8 rtc: pcf8563: Add driver model support
Add support of driver model of pcf8563
---
Changes in v7:
- remove copyright
Changes in v6:
- none
Changes in v5:
- none
Changes in v4:
- update commit messages
- update copyright
Changes in v3:
- update commit messages
Changes in v2:
- none
drivers/rtc/pcf8563.c | 107 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+)
drivers/rtc/pcf8563.c +107 -0
@@ -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
Signature · 1 line
2.17.1
PATCH v7 2/8 armv8: fsl-layerscape: spl: fix build error when DM_I2C is enabled
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]`
---
Changes in v7:
- remove copyright
Changes in v6:
- none
Changes in v5:
- none
Changes in v4:
- update copyright
Changes in v3:
- update commit messages
Changes in v2:
- none
arch/arm/cpu/armv8/fsl-layerscape/spl.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/cpu/armv8/fsl-layerscape/spl.c +2 -0
@@ -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
Signature · 1 line
2.17.1
PATCH v7 3/8 i2c: mxc_i2c: add DM_FLAG_PRE_RELOC flag
In reply to Biwen LiThis adds DM_FLAG_PRE_RELOC flag to probe i2c driver before relocation
---
Changes in v7:
- remove copyright
Changes in v6:
- none
Changes in v5:
- none
Changes in v4:
- update copyright
Changes in v3:
- none
Changes in v2:
- none
drivers/i2c/mxc_i2c.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/mxc_i2c.c +1 -0
@@ -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
Signature · 1 line
2.17.1
PATCH v7 4/8 Kconfigs: layerscape: use a convenient default value for SYS_MALLOC_F_LEN
In reply to Biwen LiThe 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
---
Changes in v7:
- none
Changes in v6:
- none
Changes in v5:
- none
Changes in v4:
- none
Changes in v3:
- update commit messages
Changes in v2:
- none
Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Kconfig +3 -1
@@ -147,7 +147,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,
Signature · 1 line
2.17.1
PATCH v7 5/8 dm: arm64: ls1012a: add i2c DM support
In reply to Biwen LiThis supports i2c DM and enables CONFIG_DM_I2C
for SoC LS1012A
---
Changes in v7:
- remove copyright
Changes in v6:
- correct dependencies
Changes in v5:
- update subject
Changes in v4:
- update copyright
Changes in v3:
- none
Changes in v2:
- merge some patches to one patch
arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 4 +- 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 + 21 files changed, 229 insertions(+), 28 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +2 -2
@@ -16,8 +16,8 @@ config ARCH_LS1012A select ARCH_EARLY_INIT_R select BOARD_EARLY_INIT_F select SYS_I2C_MXC - select SYS_I2C_MXC_I2C1 - select SYS_I2C_MXC_I2C2 + select SYS_I2C_MXC_I2C1 if !DM_I2C + select SYS_I2C_MXC_I2C2 if !DM_I2C imply PANIC_HANG config ARCH_LS1028A
arch/arm/include/asm/gpio.h +1 -0
@@ -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
board/freescale/ls1012aqds/ls1012aqds.c +18 -2
@@ -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
board/freescale/ls1012ardb/eth.c +35 -0
@@ -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 }
board/freescale/ls1012ardb/ls1012ardb.c +123 -24
195 lines not on this page · raw message
configs/ls1012a2g5rdb_qspi_defconfig +3 -0
@@ -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
configs/ls1012a2g5rdb_tfa_defconfig +3 -0
@@ -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
configs/ls1012afrdm_qspi_defconfig +3 -0
@@ -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
configs/ls1012afrdm_tfa_defconfig +3 -0
@@ -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
configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig +3 -0
@@ -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
configs/ls1012afrwy_qspi_defconfig +3 -0
@@ -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
configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig +3 -0
@@ -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
configs/ls1012afrwy_tfa_defconfig +3 -0
@@ -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
configs/ls1012aqds_qspi_defconfig +3 -0
@@ -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
configs/ls1012aqds_tfa_SECURE_BOOT_defconfig +3 -0
@@ -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
configs/ls1012aqds_tfa_defconfig +3 -0
@@ -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
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +3 -0
@@ -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
configs/ls1012ardb_qspi_defconfig +3 -0
@@ -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
configs/ls1012ardb_tfa_SECURE_BOOT_defconfig +3 -0
@@ -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
configs/ls1012ardb_tfa_defconfig +3 -0
@@ -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
include/configs/ls1012a_common.h +5 -0
@@ -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
Signature · 1 line
2.17.1
PATCH v7 6/8 dm: arm64: ls1043a: add i2c DM support
In reply to Biwen LiThis supports i2c DM and enables CONFIG_DM_I2C
for SoC LS1043A
---
Changes in v7:
- remove copyright
Changes in v6:
- correct dependencies
Changes in v5:
- update subject
Changes in v4:
- update copyright
Changes in v3:
- none
Changes in v2:
- merge some patches to one patch
arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 8 +- 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 + 21 files changed, 135 insertions(+), 11 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +4 -4
@@ -75,10 +75,10 @@ config ARCH_LS1043A select ARCH_EARLY_INIT_R select BOARD_EARLY_INIT_F select SYS_I2C_MXC - select SYS_I2C_MXC_I2C1 - select SYS_I2C_MXC_I2C2 - select SYS_I2C_MXC_I2C3 - select SYS_I2C_MXC_I2C4 + select SYS_I2C_MXC_I2C1 if !DM_I2C + select SYS_I2C_MXC_I2C2 if !DM_I2C + select SYS_I2C_MXC_I2C3 if !DM_I2C + select SYS_I2C_MXC_I2C4 if !DM_I2C imply CMD_PCI config ARCH_LS1046A
arch/arm/include/asm/gpio.h +1 -1
@@ -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
board/freescale/ls1043aqds/ls1043aqds.c +91 -6
150 lines not on this page · raw message
configs/ls1043aqds_defconfig +2 -0
@@ -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
configs/ls1043aqds_lpuart_defconfig +2 -0
@@ -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
configs/ls1043aqds_nand_defconfig +2 -0
@@ -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
configs/ls1043aqds_nor_ddr3_defconfig +2 -0
@@ -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
configs/ls1043aqds_qspi_defconfig +2 -0
@@ -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
configs/ls1043aqds_sdcard_ifc_defconfig +2 -0
@@ -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
configs/ls1043aqds_sdcard_qspi_defconfig +2 -0
@@ -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
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig +2 -0
@@ -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
configs/ls1043aqds_tfa_defconfig +2 -0
@@ -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
configs/ls1043ardb_SECURE_BOOT_defconfig +2 -0
@@ -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
configs/ls1043ardb_defconfig +2 -0
@@ -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
configs/ls1043ardb_nand_SECURE_BOOT_defconfig +2 -0
@@ -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
configs/ls1043ardb_nand_defconfig +2 -0
@@ -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
configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +2 -0
@@ -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
configs/ls1043ardb_sdcard_defconfig +2 -0
@@ -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
configs/ls1043ardb_tfa_SECURE_BOOT_defconfig +2 -0
@@ -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
configs/ls1043ardb_tfa_defconfig +2 -0
@@ -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
include/configs/ls1043a_common.h +5 -0
@@ -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
Signature · 1 line
2.17.1
PATCH v7 7/8 dm: arm64: ls1046a: add i2c DM support
In reply to Biwen LiThis supports i2c DM and enables CONFIG_DM_I2C
for SoC LS1046A
---
Changes in v7:
- remove copyright
Changes in v6:
- correct dependencies
Changes in v5:
- update subject
Changes in v4:
- update copyright
Changes in v3:
- none
Changes in v2:
- merge some patches to one patch
arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 8 ++-- 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 +++ 27 files changed, 140 insertions(+), 12 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +4 -4
@@ -108,10 +108,10 @@ config ARCH_LS1046A select ARCH_EARLY_INIT_R select BOARD_EARLY_INIT_F select SYS_I2C_MXC - select SYS_I2C_MXC_I2C1 - select SYS_I2C_MXC_I2C2 - select SYS_I2C_MXC_I2C3 - select SYS_I2C_MXC_I2C4 + select SYS_I2C_MXC_I2C1 if !DM_I2C + select SYS_I2C_MXC_I2C2 if !DM_I2C + select SYS_I2C_MXC_I2C3 if !DM_I2C + select SYS_I2C_MXC_I2C4 if !DM_I2C imply SCSI imply SCSI_AHCI
arch/arm/dts/fsl-ls1046a-frwy.dts +3 -0
@@ -32,3 +32,6 @@ }; +&i2c0 { + status = "okay"; +};
arch/arm/dts/fsl-ls1046a-qds.dtsi +4 -0
@@ -80,3 +80,7 @@ &sata { status = "okay"; }; + +&i2c0 { + status = "okay"; +};
arch/arm/dts/fsl-ls1046a-rdb.dts +8 -0
@@ -43,3 +43,11 @@ &sata { status = "okay"; }; + +&i2c0 { + status = "okay"; +}; + +&i2c3 { + status = "okay"; +};
arch/arm/include/asm/gpio.h +1 -0
@@ -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
board/freescale/ls1046afrwy/ls1046afrwy.c +15 -2
@@ -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 ; }
board/freescale/ls1046aqds/ls1046aqds.c +20 -4
@@ -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 ();
configs/ls1046afrwy_tfa_defconfig +2 -0
@@ -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
configs/ls1046aqds_SECURE_BOOT_defconfig +2 -0
@@ -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
configs/ls1046aqds_defconfig +2 -0
@@ -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
configs/ls1046aqds_lpuart_defconfig +2 -0
@@ -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
configs/ls1046aqds_nand_defconfig +2 -0
@@ -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
configs/ls1046aqds_qspi_defconfig +2 -0
@@ -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
configs/ls1046aqds_sdcard_ifc_defconfig +2 -0
@@ -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
configs/ls1046aqds_sdcard_qspi_defconfig +2 -0
@@ -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
configs/ls1046aqds_tfa_SECURE_BOOT_defconfig +2 -0
@@ -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
configs/ls1046aqds_tfa_defconfig +2 -0
@@ -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
configs/ls1046ardb_emmc_defconfig +2 -0
@@ -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
configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +2 -0
@@ -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
configs/ls1046ardb_qspi_defconfig +2 -0
@@ -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
configs/ls1046ardb_qspi_spl_defconfig +2 -0
@@ -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
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +2 -0
@@ -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
configs/ls1046ardb_sdcard_defconfig +2 -0
@@ -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
configs/ls1046ardb_tfa_SECURE_BOOT_defconfig +2 -0
@@ -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
configs/ls1046ardb_tfa_defconfig +2 -0
@@ -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
drivers/power/power_i2c.c +43 -2
79 lines not on this page · raw message
include/configs/ls1046a_common.h +6 -0
@@ -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 */
Signature · 1 line
2.17.1
PATCH v7 8/8 dm: arm: ls1021a: add i2c DM support
In reply to Biwen LiThis supports i2c DM and enables CONFIG_DM_I2C
for SoC LS1021A
---
Changes in v7:
- remove copyright
Changes in v6:
- correct dependencies
Changes in v5:
- none
Changes in v4:
- update copyright
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(-)
board/freescale/common/dcu_sii9022a.c +94 -0
@@ -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 ; }
board/freescale/common/diu_ch7301.c +79 -0
91 lines not on this page · raw message
board/freescale/ls1021aqds/dcu.c +40 -3
73 lines not on this page · raw message
board/freescale/ls1021aqds/ls1021aqds.c +17 -3
@@ -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 ();
board/freescale/ls1021atwr/ls1021atwr.c +25 -1
@@ -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
configs/ls1021aiot_qspi_defconfig +2 -0
@@ -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
configs/ls1021aiot_sdcard_defconfig +2 -0
@@ -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
configs/ls1021aqds_ddr4_nor_defconfig +2 -0
@@ -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
configs/ls1021aqds_ddr4_nor_lpuart_defconfig +2 -0
@@ -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
configs/ls1021aqds_nand_defconfig +2 -0
@@ -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
configs/ls1021aqds_nor_SECURE_BOOT_defconfig +2 -0
@@ -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
configs/ls1021aqds_nor_defconfig +2 -0
@@ -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
configs/ls1021aqds_nor_lpuart_defconfig +2 -0
@@ -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
configs/ls1021aqds_qspi_defconfig +2 -0
@@ -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
configs/ls1021aqds_sdcard_ifc_defconfig +2 -0
@@ -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
configs/ls1021aqds_sdcard_qspi_defconfig +2 -0
@@ -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
configs/ls1021atsn_qspi_defconfig +2 -0
@@ -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
configs/ls1021atsn_sdcard_defconfig +2 -0
@@ -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
configs/ls1021atwr_nor_SECURE_BOOT_defconfig +2 -0
@@ -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
configs/ls1021atwr_nor_defconfig +2 -0
@@ -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
configs/ls1021atwr_nor_lpuart_defconfig +2 -0
@@ -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
configs/ls1021atwr_qspi_defconfig +2 -0
@@ -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
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +2 -0
@@ -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
configs/ls1021atwr_sdcard_ifc_defconfig +2 -0
@@ -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
configs/ls1021atwr_sdcard_qspi_defconfig +2 -0
@@ -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
include/configs/ls1021aiot.h +3 -0
@@ -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 */
include/configs/ls1021aqds.h +2 -0
@@ -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 */
include/configs/ls1021atsn.h +2 -0
@@ -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 */
include/configs/ls1021atwr.h +3 -0
@@ -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
Signature · 1 line
2.17.1
PATCH v7 1/8 rtc: pcf8563: Add driver model support
In reply to Biwen LiQuoted 167 lines
-----Original Message-----
From: Biwen Li <[email protected]>
Sent: Tuesday, December 24, 2019 8:01 AM
To: Jagdish Gediya <[email protected]>; Priyanka Jain <[email protected]>; hs at denx.de; jagan at amarulasolutions.com; aford173 at gmail.com; Alison Wang <[email protected]>; jh80.chung at samsung.com; Pramod Kumar <[email protected]>; Rajesh Bhagat <[email protected]>; Ruchika Gupta <[email protected]>; olteanv at gmail.com
Cc: Xiaobo Xie <[email protected]>; Jiafei Pan <[email protected]>; u- boot at lists.denx.de; Biwen Li <[email protected]>
Subject: [v7 1/8] rtc: pcf8563: Add driver model supportAdd support of driver model of pcf8563
Signed-off-by Biwen Li <[email protected]>---
Changes in v7:
- remove copyrightChanges in v6:
- noneChanges in v5:
- noneChanges in v4:
- update commit messages
- update copyrightChanges in v3:
- update commit messagesChanges in v2:
- none
drivers/rtc/pcf8563.c| 107 ++++++++++++++++++++++++++++++++++++++++++1 file changed, 107 insertions(+)drivers/rtc/pcf8563.c index renamed from drivers/rtc/pcf8563.c +0
-0
a839d6cc98..44204e133e100644drivers/rtc/pcf8563.c +16
-0@@ -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"
drivers/rtc/pcf8563.c +11
-0+"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 notreliable\n");
drivers/rtc/pcf8563.c +14
-0+ 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",
drivers/rtc/pcf8563.c +11
-0+ 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",
drivers/rtc/pcf8563.c +53
-1+ 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 --
Quoted 1 line
2.17.1
Biwen,
Adding/updating copyright depends on the contribution that you are making to particular file. NXP policy is in-lined with open-source policy which also suggest to add/update copyright when you are making significant changes.
In review, Fabio has raised concern over copyright addition in case of one line addition. But he has not suggested to remove all copyright changes.
Thanks
Priyanka
PATCH v7 1/8 rtc: pcf8563: Add driver model support
Quoted 156 lines
Quoted 19 lines
Subject: [v7 1/8] rtc: pcf8563: Add driver model support
Add support of driver model of pcf8563
Signed-off-by Biwen Li <[email protected]>---
Changes in v7:
- remove copyrightChanges in v6:
- noneChanges in v5:
- noneChanges in v4:
- update commit messages
- update copyrightQuoted 7 lines
Changes in v3:
- update commit messagesChanges in v2:
- none
drivers/rtc/pcf8563.c| 107++++++++++++++++++++++++++++++++++++++++++
Quoted 128 lines
1 file changed, 107 insertions(+)drivers/rtc/pcf8563.c index renamed from drivers/rtc/pcf8563.c +0
-0
a839d6cc98..44204e133e100644drivers/rtc/pcf8563.c +16
-0@@ -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"
drivers/rtc/pcf8563.c +11
-0+"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 notreliable\n");
drivers/rtc/pcf8563.c +14
-0+ 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",
drivers/rtc/pcf8563.c +11
-0+ 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",
drivers/rtc/pcf8563.c +53
-1+ 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 --Quoted 1 line
2.17.1
Quoted 8 lines
Biwen,
Adding/updating copyright depends on the contribution that you are making to particular file.
NXP policy is in-lined with open-source policy which also suggest to add/update copyright when you are making significant changes.
In review, Fabio has raised concern over copyright addition in case of one line addition.
But he has not suggested to remove all copyright changes.
Oh, get it, I will resend the v7
Quoted 3 lines
Thanks
Priyanka