sunxi: Introduce H616 support
Subsystems (11)
cover sunxi: Introduce H616 support
This series introduces H616 support. Later patches add also OrangePi Zero2 support but since H616 DT is not merged into Linux yet, I don't expect them to land yet.
Patches 1-13 are ready to land, while 14-17 depends on non-upstreamed DT yet.
This work relies on https://patchwork.ozlabs.org/project/uboot/list/?series=215309
otherwise image won't be built properly due to bigger SPL size.
Please take a look.
Best regards,
Jernej
Andre Przywara (2):
sunxi: support loading with SPL > 32KB
net: sun8i-emac: Determine pinmux based on SoC, not EMAC type
Jernej Skrabec (15):
sunxi: Add support for AXP305 PMIC
sunxi: Introduce common symbol for H6 like SoCs
mmc: sunxi: Replace H6 ifdefs with H6 gen macro
i2c: mvtwsi: sunxi: update macro
sunxi: prcm: Add memory map for H6 like SoCs
sunxi: Add support for I2C on H6 like SoCs
sunxi: introduce support for H616 clocks
sunxi: add support for H616 uart0
sunxi: add support for R_I2C on H616
sunxi: Add H616 DRAM support
sunxi: Add support for H616 SoC
arm: sunxi: add initial H616 DTSI and headers
sunxi: gpio: introduce compatible for H616
clk: sunxi: Add support for H616 clocks
sunxi: Add support for OrangePi Zero2
arch/arm/dts/Makefile | 2 + arch/arm/dts/sun50i-h616-orangepi-zero2.dts | 240 ++++ arch/arm/dts/sun50i-h616.dtsi | 716 ++++++++++++ arch/arm/dts/sunxi-u-boot.dtsi | 9 + arch/arm/include/asm/arch-sunxi/boot0.h | 2 +- arch/arm/include/asm/arch-sunxi/clock.h | 2 +- .../include/asm/arch-sunxi/clock_sun50i_h6.h | 19 +- arch/arm/include/asm/arch-sunxi/cpu.h | 2 +- .../include/asm/arch-sunxi/cpu_sun50i_h6.h | 7 + arch/arm/include/asm/arch-sunxi/dram.h | 2 + .../include/asm/arch-sunxi/dram_sun50i_h616.h | 159 +++ arch/arm/include/asm/arch-sunxi/gpio.h | 2 + arch/arm/include/asm/arch-sunxi/mmc.h | 2 +- arch/arm/include/asm/arch-sunxi/prcm.h | 249 +--- arch/arm/include/asm/arch-sunxi/prcm_sun50i.h | 41 + arch/arm/include/asm/arch-sunxi/prcm_sun6i.h | 247 ++++ arch/arm/include/asm/arch-sunxi/timer.h | 2 +- arch/arm/mach-sunxi/Kconfig | 77 +- arch/arm/mach-sunxi/Makefile | 4 +- arch/arm/mach-sunxi/board.c | 20 +- arch/arm/mach-sunxi/clock_sun50i_h6.c | 39 +- arch/arm/mach-sunxi/cpu_info.c | 2 + arch/arm/mach-sunxi/dram_sun50i_h616.c | 1023 +++++++++++++++++ arch/arm/mach-sunxi/dram_timings/Makefile | 2 + .../mach-sunxi/dram_timings/h616_ddr3_1333.c | 94 ++ arch/arm/mach-sunxi/pmic_bus.c | 6 + arch/arm/mach-sunxi/rmr_switch.S | 2 +- board/sunxi/MAINTAINERS | 5 + board/sunxi/board.c | 14 +- common/spl/Kconfig | 4 +- configs/orangepi_zero2_defconfig | 15 + drivers/clk/sunxi/Kconfig | 7 + drivers/clk/sunxi/Makefile | 1 + drivers/clk/sunxi/clk_h616.c | 120 ++ drivers/gpio/sunxi_gpio.c | 1 + drivers/i2c/mvtwsi.c | 2 +- drivers/mmc/sunxi_mmc.c | 12 +- drivers/net/sun8i_emac.c | 28 +- drivers/power/Kconfig | 14 +- drivers/power/Makefile | 1 + drivers/power/axp305.c | 80 ++ include/axp305.h | 17 + include/axp_pmic.h | 3 + include/configs/sun50i.h | 2 +- include/configs/sunxi-common.h | 10 + include/dt-bindings/clock/sun50i-h616-ccu.h | 115 ++ include/dt-bindings/reset/sun50i-h616-ccu.h | 70 ++ 47 files changed, 3211 insertions(+), 282 deletions(-) create mode 100644 arch/arm/dts/sun50i-h616-orangepi-zero2.dts create mode 100644 arch/arm/dts/sun50i-h616.dtsi create mode 100644 arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h create mode 100644 arch/arm/include/asm/arch-sunxi/prcm_sun50i.h create mode 100644 arch/arm/include/asm/arch-sunxi/prcm_sun6i.h create mode 100644 arch/arm/mach-sunxi/dram_sun50i_h616.c create mode 100644 arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c create mode 100644 configs/orangepi_zero2_defconfig create mode 100644 drivers/clk/sunxi/clk_h616.c create mode 100644 drivers/power/axp305.c create mode 100644 include/axp305.h create mode 100644 include/dt-bindings/clock/sun50i-h616-ccu.h create mode 100644 include/dt-bindings/reset/sun50i-h616-ccu.h
Signature · 1 line
2.30.0
PATCH 1/17 sunxi: Add support for AXP305 PMIC
This PMIC can be found on H616 boards and it's very similar to AXP805 and AXP806.
--- arch/arm/mach-sunxi/pmic_bus.c | 6 +++ board/sunxi/board.c | 10 +++-- drivers/power/Kconfig | 13 +++++- drivers/power/Makefile | 1 + drivers/power/axp305.c | 80 ++++++++++++++++++++++++++++++++++ include/axp305.h | 17 ++++++++ include/axp_pmic.h | 3 ++ 7 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 drivers/power/axp305.c create mode 100644 include/axp305.h
arch/arm/mach-sunxi/pmic_bus.c +6 -0
@@ -18,6 +18,8 @@#define AXP209_I2C_ADDR 0x34 +#define AXP305_I2C_ADDR 0x36 +#define AXP221_CHIP_ADDR 0x68#define AXP221_CTRL_ADDR 0x3e#define AXP221_INIT_DATA 0x3e
@@ -64,6 +66,8 @@ int pmic_bus_read(u8 reg, u8 *data)return i2c_read (AXP152_I2C_ADDR , reg,1 , data,1 );#elif definedCONFIG_AXP209_POWER return i2c_read (AXP209_I2C_ADDR , reg,1 , data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_read (AXP305_I2C_ADDR , reg,1 , data,1 );#elif definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_read (reg, data);
@@ -81,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data)return i2c_write (AXP152_I2C_ADDR , reg,1 , &data,1 );#elif definedCONFIG_AXP209_POWER return i2c_write (AXP209_I2C_ADDR , reg,1 , &data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_write (AXP305_I2C_ADDR , reg,1 , &data,1 );#elif definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_write (reg, data);
board/sunxi/board.c +7 -3
@@ -634,16 +634,18 @@ void sunxi_board_init(void)#endif #if definedCONFIG_AXP152_POWER || definedCONFIG_AXP209_POWER || \ - definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER + definedCONFIG_AXP221_POWER || definedCONFIG_AXP305_POWER || \ + definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER power_failed =axp_init ();#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ definedCONFIG_AXP818_POWER power_failed |=axp_set_dcdc1 (CONFIG_AXP_DCDC1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_dcdc2 (CONFIG_AXP_DCDC2_VOLT ); power_failed |=axp_set_dcdc3 (CONFIG_AXP_DCDC3_VOLT ); +#endif #if !defined(CONFIG_AXP209_POWER ) && !defined(CONFIG_AXP818_POWER ) power_failed |=axp_set_dcdc4 (CONFIG_AXP_DCDC4_VOLT );#endif
@@ -656,8 +658,10 @@ void sunxi_board_init(void) defined CONFIG_AXP818_POWER power_failed |=axp_set_aldo1 (CONFIG_AXP_ALDO1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo2 (CONFIG_AXP_ALDO2_VOLT ); -#if !defined(CONFIG_AXP152_POWER ) +#endif +#if !defined(CONFIG_AXP152_POWER ) && !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo3 (CONFIG_AXP_ALDO3_VOLT );#endif #ifdef CONFIG_AXP209_POWER
drivers/power/Kconfig +12 -1
@@ -48,6 +48,15 @@ config AXP221_POWER Select this to enable support for the axp221/axp223 pmic found on most A23 and A31 boards. +config AXP305_POWER + bool "axp305 pmic support" + depends on MACH_SUN50I_H616 + select AXP_PMIC_BUS + select CMD_POWEROFF + ---help--- + Select this to enable support for the axp305 pmic found on most + H616 boards. + config AXP809_POWER bool "axp809 pmic support" depends on MACH_SUN9I
@@ -127,11 +136,12 @@ config AXP_DCDC3_VOLT config AXP_DCDC4_VOLT int "axp pmic dcdc4 voltage" - depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER + depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER || AXP305_POWER default 1250 if AXP152_POWER default 1200 if MACH_SUN6I default 0 if MACH_SUN8I default 900 if MACH_SUN9I + default 1500 if AXP305_POWER ---help--- Set the voltage (mV) to program the axp pmic dcdc4 at, set to 0 to disable dcdc4.
@@ -140,6 +150,7 @@ config AXP_DCDC4_VOLT On A23 / A33 boards dcdc4 is unused and should be disabled. On A80 boards dcdc4 powers VDD-SYS, HDMI, USB OTG and should be 0.9V. On A83T boards dcdc4 is used for VDD-GPU. + On H616 boards dcdcd is used for VCC-DRAM. config AXP_DCDC5_VOLT int "axp pmic dcdc5 voltage"
drivers/power/Makefile +1 -0
@@ -6,6 +6,7 @@ obj-$(CONFIG_AXP152_POWER) += axp152.o obj-$(CONFIG_AXP209_POWER) += axp209.o obj-$(CONFIG_AXP221_POWER) += axp221.o +obj-$(CONFIG_AXP305_POWER) += axp305.o obj-$(CONFIG_AXP809_POWER) += axp809.o obj-$(CONFIG_AXP818_POWER) += axp818.o obj-$(CONFIG_EXYNOS_TMU) += exynos-tmu.o
drivers/power/axp305.c new file +80 -0
80 lines not on this page · raw message
include/axp305.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +*/ + +enum axp305_reg { +AXP305_CHIP_VERSION =0x3 , +AXP305_OUTPUT_CTRL1 =0x10 , +AXP305_DCDCD_VOLTAGE =0x15 , +AXP305_SHUTDOWN =0x32 , +}; + +#define AXP305_CHIP_VERSION_MASK 0xcf + +#define AXP305_OUTPUT_CTRL1_DCDCD_EN (1 << 3) + +#define AXP305_POWEROFF (1 << 7)
include/axp_pmic.h +3 -0
@@ -15,6 +15,9 @@#ifdef CONFIG_AXP221_POWER #include <axp221.h> #endif +#ifdef CONFIG_AXP305_POWER +#include <axp305.h> +#endif #ifdef CONFIG_AXP809_POWER #include <axp809.h> #endif
Signature · 1 line
2.30.0
PATCH 1/17 sunxi: Add support for AXP305 PMIC
Hi Jernej
Quoted 2 lines · Jernej Skrabec
This PMIC can be found on H616 boards and it's very similar to AXP805 and AXP806.
Is there any plan to cleanup codes?
Quoted 162 lines
Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/mach-sunxi/pmic_bus.c | 6 +++ board/sunxi/board.c | 10 +++-- drivers/power/Kconfig | 13 +++++- drivers/power/Makefile | 1 + drivers/power/axp305.c | 80 ++++++++++++++++++++++++++++++++++ include/axp305.h | 17 ++++++++ include/axp_pmic.h | 3 ++ 7 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 drivers/power/axp305.c create mode 100644 include/axp305.harch/arm/mach-sunxi/pmic_bus.c +6
-0@@ -18,6 +18,8 @@#define AXP209_I2C_ADDR 0x34 +#define AXP305_I2C_ADDR 0x36 +#define AXP221_CHIP_ADDR 0x68#define AXP221_CTRL_ADDR 0x3e#define AXP221_INIT_DATA 0x3e@@ -64,6 +66,8 @@ int pmic_bus_read(u8 reg, u8 *data)return i2c_read (AXP152_I2C_ADDR , reg,1 , data,1 );#elif definedCONFIG_AXP209_POWER return i2c_read (AXP209_I2C_ADDR , reg,1 , data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_read (AXP305_I2C_ADDR , reg,1 , data,1 );#elif definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_read (reg, data);@@ -81,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data)return i2c_write (AXP152_I2C_ADDR , reg,1 , &data,1 );#elif definedCONFIG_AXP209_POWER return i2c_write (AXP209_I2C_ADDR , reg,1 , &data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_write (AXP305_I2C_ADDR , reg,1 , &data,1 );#elif definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_write (reg, data);board/sunxi/board.c +7
-3@@ -634,16 +634,18 @@ void sunxi_board_init(void)#endif #if definedCONFIG_AXP152_POWER || definedCONFIG_AXP209_POWER || \ - definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER + definedCONFIG_AXP221_POWER || definedCONFIG_AXP305_POWER || \ + definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER power_failed =axp_init ();#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ definedCONFIG_AXP818_POWER power_failed |=axp_set_dcdc1 (CONFIG_AXP_DCDC1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_dcdc2 (CONFIG_AXP_DCDC2_VOLT ); power_failed |=axp_set_dcdc3 (CONFIG_AXP_DCDC3_VOLT ); +#endif #if !defined(CONFIG_AXP209_POWER ) && !defined(CONFIG_AXP818_POWER ) power_failed |=axp_set_dcdc4 (CONFIG_AXP_DCDC4_VOLT );#endif @@ -656,8 +658,10 @@ void sunxi_board_init(void) defined CONFIG_AXP818_POWER power_failed |=axp_set_aldo1 (CONFIG_AXP_ALDO1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo2 (CONFIG_AXP_ALDO2_VOLT ); -#if !defined(CONFIG_AXP152_POWER ) +#endif +#if !defined(CONFIG_AXP152_POWER ) && !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo3 (CONFIG_AXP_ALDO3_VOLT );#endif #ifdef CONFIG_AXP209_POWER drivers/power/Kconfig +12
-1@@ -48,6 +48,15 @@ config AXP221_POWER Select this to enable support for the axp221/axp223 pmic found on most A23 and A31 boards. +config AXP305_POWER + bool "axp305 pmic support" + depends on MACH_SUN50I_H616 + select AXP_PMIC_BUS + select CMD_POWEROFF + ---help--- + Select this to enable support for the axp305 pmic found on most + H616 boards. + config AXP809_POWER bool "axp809 pmic support" depends on MACH_SUN9I@@ -127,11 +136,12 @@ config AXP_DCDC3_VOLT config AXP_DCDC4_VOLT int "axp pmic dcdc4 voltage" - depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER + depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER || AXP305_POWER default 1250 if AXP152_POWER default 1200 if MACH_SUN6I default 0 if MACH_SUN8I default 900 if MACH_SUN9I + default 1500 if AXP305_POWER ---help--- Set the voltage (mV) to program the axp pmic dcdc4 at, set to 0 to disable dcdc4.@@ -140,6 +150,7 @@ config AXP_DCDC4_VOLT On A23 / A33 boards dcdc4 is unused and should be disabled. On A80 boards dcdc4 powers VDD-SYS, HDMI, USB OTG and should be 0.9V. On A83T boards dcdc4 is used for VDD-GPU. + On H616 boards dcdcd is used for VCC-DRAM. config AXP_DCDC5_VOLT int "axp pmic dcdc5 voltage"drivers/power/Makefile +1
-0@@ -6,6 +6,7 @@ obj-$(CONFIG_AXP152_POWER) += axp152.o obj-$(CONFIG_AXP209_POWER) += axp209.o obj-$(CONFIG_AXP221_POWER) += axp221.o +obj-$(CONFIG_AXP305_POWER) += axp305.o obj-$(CONFIG_AXP809_POWER) += axp809.o obj-$(CONFIG_AXP818_POWER) += axp818.o obj-$(CONFIG_EXYNOS_TMU) += exynos-tmu.odrivers/power/axp305.c new file +20
-0@@ -0,0 +1,80 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* AXP305 driver +* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +* +* Based on axp221.c +* (C) Copyright 2014 Hans de Goede <[email protected]> +* (C) Copyright 2013 Oliver Schinagl <[email protected]> +*/ + +#include <common.h> +#include <command.h> +#include <errno.h> +#include <asm/arch/pmic_bus.h> +#include <axp_pmic.h> + +static u8 axp305_mvolt_to_cfg (int mvolt,int min,int max,int div) +{ +if (mvolt < min)
drivers/power/axp305.c line 30
Quoted 10 lines
drivers/power/axp305.c new file +10
-0+ mvolt = min; + else if (mvolt > max) + mvolt = max; + +return (mvolt - min) / div; +} + +int axp_set_dcdc4 (unsigned int mvolt) +{ +int ret;
Initialized ret value to 0.
drivers/power/axp305.c line 34
Quoted 4 lines
drivers/power/axp305.c new file +4
-0+u8 cfg; + +if (mvolt >=1600 ) + cfg =46 +axp305_mvolt_to_cfg (mvolt,1600 ,3300 ,100 );
Could you use macro instead of 46 (magic code)?
Quoted 19 lines
drivers/power/axp305.c new file +19
-0+else + cfg =axp305_mvolt_to_cfg (mvolt,600 ,1500 ,20 ); + +if (mvolt ==0 ) +return pmic_bus_clrbits (AXP305_OUTPUT_CTRL1 , +AXP305_OUTPUT_CTRL1_DCDCD_EN ); + + ret =pmic_bus_write (AXP305_DCDCD_VOLTAGE , cfg); +if (ret) +return ret; + +return pmic_bus_setbits (AXP305_OUTPUT_CTRL1 , +AXP305_OUTPUT_CTRL1_DCDCD_EN ); +} + +int axp_init (void ) +{ +u8 axp_chip_id; +int ret;
drivers/power/axp305.c line 63
Quoted 10 lines
drivers/power/axp305.c new file +10
-0+ + ret =pmic_bus_init (); +if (ret) +return ret; + + ret =pmic_bus_read (AXP305_CHIP_VERSION , &axp_chip_id); +if (ret) +return ret; + +if ((axp_chip_id &AXP305_CHIP_VERSION_MASK ) !=0x40 )
Ditto, use macro instead of 0x40.
Quoted 55 lines
drivers/power/axp305.c new file +17
-0+return -ENODEV ; + +return ret; +} + +#ifndef CONFIG_PSCI_RESET +int do_poweroff (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) +{ +pmic_bus_write (AXP305_SHUTDOWN ,AXP305_POWEROFF ); + +/* infinite loop during shutdown */ +while (1 ) {} + +/* not reached */ +return 0 ; +} +#endif include/axp305.h new file +17
-0@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +*/ + +enum axp305_reg { +AXP305_CHIP_VERSION =0x3 , +AXP305_OUTPUT_CTRL1 =0x10 , +AXP305_DCDCD_VOLTAGE =0x15 , +AXP305_SHUTDOWN =0x32 , +}; + +#define AXP305_CHIP_VERSION_MASK 0xcf + +#define AXP305_OUTPUT_CTRL1_DCDCD_EN (1 << 3) + +#define AXP305_POWEROFF (1 << 7)include/axp_pmic.h +3
-0@@ -15,6 +15,9 @@#ifdef CONFIG_AXP221_POWER #include <axp221.h> #endif +#ifdef CONFIG_AXP305_POWER +#include <axp305.h> +#endif #ifdef CONFIG_AXP809_POWER #include <axp809.h> #endif
PATCH 1/17 sunxi: Add support for AXP305 PMIC
On 05/01/2021 22:36, Jaehoon Chung wrote:
Hi,
thanks for having a look!
Quoted 7 lines
Hi Jernej
Quoted 2 lines · Jernej Skrabec
This PMIC can be found on H616 boards and it's very similar to AXP805 and AXP806.
Is there any plan to cleanup codes?
There is no support for either of these, we use the PMICs only in Trusted Firmware or Linux. So nothing to consolidate, yet. This might change in the future, and then of course we will use a common code base.
Quoted 167 lines
Quoted 167 lines
Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/mach-sunxi/pmic_bus.c | 6 +++ board/sunxi/board.c | 10 +++-- drivers/power/Kconfig | 13 +++++- drivers/power/Makefile | 1 + drivers/power/axp305.c | 80 ++++++++++++++++++++++++++++++++++ include/axp305.h | 17 ++++++++ include/axp_pmic.h | 3 ++ 7 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 drivers/power/axp305.c create mode 100644 include/axp305.harch/arm/mach-sunxi/pmic_bus.c +6
-0@@ -18,6 +18,8 @@#define AXP209_I2C_ADDR 0x34 +#define AXP305_I2C_ADDR 0x36 +#define AXP221_CHIP_ADDR 0x68#define AXP221_CTRL_ADDR 0x3e#define AXP221_INIT_DATA 0x3e@@ -64,6 +66,8 @@ int pmic_bus_read(u8 reg, u8 *data)return i2c_read (AXP152_I2C_ADDR , reg,1 , data,1 );#elif definedCONFIG_AXP209_POWER return i2c_read (AXP209_I2C_ADDR , reg,1 , data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_read (AXP305_I2C_ADDR , reg,1 , data,1 );#elif definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_read (reg, data);@@ -81,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data)return i2c_write (AXP152_I2C_ADDR , reg,1 , &data,1 );#elif definedCONFIG_AXP209_POWER return i2c_write (AXP209_I2C_ADDR , reg,1 , &data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_write (AXP305_I2C_ADDR , reg,1 , &data,1 );#elif definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_write (reg, data);board/sunxi/board.c +7
-3@@ -634,16 +634,18 @@ void sunxi_board_init(void)#endif #if definedCONFIG_AXP152_POWER || definedCONFIG_AXP209_POWER || \ - definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER + definedCONFIG_AXP221_POWER || definedCONFIG_AXP305_POWER || \ + definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER power_failed =axp_init ();#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ definedCONFIG_AXP818_POWER power_failed |=axp_set_dcdc1 (CONFIG_AXP_DCDC1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_dcdc2 (CONFIG_AXP_DCDC2_VOLT ); power_failed |=axp_set_dcdc3 (CONFIG_AXP_DCDC3_VOLT ); +#endif #if !defined(CONFIG_AXP209_POWER ) && !defined(CONFIG_AXP818_POWER ) power_failed |=axp_set_dcdc4 (CONFIG_AXP_DCDC4_VOLT );#endif @@ -656,8 +658,10 @@ void sunxi_board_init(void) defined CONFIG_AXP818_POWER power_failed |=axp_set_aldo1 (CONFIG_AXP_ALDO1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo2 (CONFIG_AXP_ALDO2_VOLT ); -#if !defined(CONFIG_AXP152_POWER ) +#endif +#if !defined(CONFIG_AXP152_POWER ) && !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo3 (CONFIG_AXP_ALDO3_VOLT );#endif #ifdef CONFIG_AXP209_POWER drivers/power/Kconfig +12
-1@@ -48,6 +48,15 @@ config AXP221_POWER Select this to enable support for the axp221/axp223 pmic found on most A23 and A31 boards. +config AXP305_POWER + bool "axp305 pmic support" + depends on MACH_SUN50I_H616 + select AXP_PMIC_BUS + select CMD_POWEROFF + ---help--- + Select this to enable support for the axp305 pmic found on most + H616 boards. + config AXP809_POWER bool "axp809 pmic support" depends on MACH_SUN9I@@ -127,11 +136,12 @@ config AXP_DCDC3_VOLT config AXP_DCDC4_VOLT int "axp pmic dcdc4 voltage" - depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER + depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER || AXP305_POWER default 1250 if AXP152_POWER default 1200 if MACH_SUN6I default 0 if MACH_SUN8I default 900 if MACH_SUN9I + default 1500 if AXP305_POWER ---help--- Set the voltage (mV) to program the axp pmic dcdc4 at, set to 0 to disable dcdc4.@@ -140,6 +150,7 @@ config AXP_DCDC4_VOLT On A23 / A33 boards dcdc4 is unused and should be disabled. On A80 boards dcdc4 powers VDD-SYS, HDMI, USB OTG and should be 0.9V. On A83T boards dcdc4 is used for VDD-GPU. + On H616 boards dcdcd is used for VCC-DRAM. config AXP_DCDC5_VOLT int "axp pmic dcdc5 voltage"drivers/power/Makefile +1
-0@@ -6,6 +6,7 @@ obj-$(CONFIG_AXP152_POWER) += axp152.o obj-$(CONFIG_AXP209_POWER) += axp209.o obj-$(CONFIG_AXP221_POWER) += axp221.o +obj-$(CONFIG_AXP305_POWER) += axp305.o obj-$(CONFIG_AXP809_POWER) += axp809.o obj-$(CONFIG_AXP818_POWER) += axp818.o obj-$(CONFIG_EXYNOS_TMU) += exynos-tmu.odrivers/power/axp305.c new file +24
-0@@ -0,0 +1,80 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* AXP305 driver +* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +* +* Based on axp221.c +* (C) Copyright 2014 Hans de Goede <[email protected]> +* (C) Copyright 2013 Oliver Schinagl <[email protected]> +*/ + +#include <common.h> +#include <command.h> +#include <errno.h> +#include <asm/arch/pmic_bus.h> +#include <axp_pmic.h> + +static u8 axp305_mvolt_to_cfg (int mvolt,int min,int max,int div) +{ +if (mvolt < min) + mvolt = min; +else if (mvolt > max) + mvolt = max; +
Quoted 8 lines
drivers/power/axp305.c line 30
Quoted 6 lines
drivers/power/axp305.c new file +6
-0+return (mvolt - min) / div; +} + +int axp_set_dcdc4 (unsigned int mvolt) +{ +int ret;Initialized ret value to 0.
Why? We set it unconditionally below, so initialising it here would be pointless and might actually be warned upon by astute compilers.
Quoted 31 lines
drivers/power/axp305.c line 34
Quoted 5 lines
drivers/power/axp305.c new file +4
-0+u8 cfg; + +if (mvolt >=1600 ) + cfg =46 +axp305_mvolt_to_cfg (mvolt,1600 ,3300 ,100 );Could you use macro instead of 46 (magic code)?
Quoted 23 lines
drivers/power/axp305.c new file +23
-0+else + cfg =axp305_mvolt_to_cfg (mvolt,600 ,1500 ,20 ); + +if (mvolt ==0 ) +return pmic_bus_clrbits (AXP305_OUTPUT_CTRL1 , +AXP305_OUTPUT_CTRL1_DCDCD_EN ); + + ret =pmic_bus_write (AXP305_DCDCD_VOLTAGE , cfg); +if (ret) +return ret; + +return pmic_bus_setbits (AXP305_OUTPUT_CTRL1 , +AXP305_OUTPUT_CTRL1_DCDCD_EN ); +} + +int axp_init (void ) +{ +u8 axp_chip_id; +int ret; + + ret =pmic_bus_init (); +if (ret) +return ret;
Quoted 8 lines
drivers/power/axp305.c line 63
Quoted 6 lines
drivers/power/axp305.c new file +6
-0+ + ret =pmic_bus_read (AXP305_CHIP_VERSION , &axp_chip_id); +if (ret) +return ret; + +if ((axp_chip_id &AXP305_CHIP_VERSION_MASK ) !=0x40 )Ditto, use macro instead of
0x40.
Not sure a macro is too useful here. I think the statement is pretty clear in that this must be the chip version, which is given as this value in the manual.
Cheers,
Andre
Quoted 56 lines
Quoted 55 lines
drivers/power/axp305.c new file +17
-0+return -ENODEV ; + +return ret; +} + +#ifndef CONFIG_PSCI_RESET +int do_poweroff (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) +{ +pmic_bus_write (AXP305_SHUTDOWN ,AXP305_POWEROFF ); + +/* infinite loop during shutdown */ +while (1 ) {} + +/* not reached */ +return 0 ; +} +#endif include/axp305.h new file +17
-0@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +*/ + +enum axp305_reg { +AXP305_CHIP_VERSION =0x3 , +AXP305_OUTPUT_CTRL1 =0x10 , +AXP305_DCDCD_VOLTAGE =0x15 , +AXP305_SHUTDOWN =0x32 , +}; + +#define AXP305_CHIP_VERSION_MASK 0xcf + +#define AXP305_OUTPUT_CTRL1_DCDCD_EN (1 << 3) + +#define AXP305_POWEROFF (1 << 7)include/axp_pmic.h +3
-0@@ -15,6 +15,9 @@#ifdef CONFIG_AXP221_POWER #include <axp221.h> #endif +#ifdef CONFIG_AXP305_POWER +#include <axp305.h> +#endif #ifdef CONFIG_AXP809_POWER #include <axp809.h> #endif
PATCH 1/17 sunxi: Add support for AXP305 PMIC
Quoted 194 lines · Andr? Przywara
On 05/01/2021 22:36, Jaehoon Chung wrote:
Hi,
thanks for having a look!
Quoted 7 lines
Hi Jernej
Quoted 2 lines · Jernej Skrabec
This PMIC can be found on H616 boards and it's very similar to AXP805 and AXP806.
Is there any plan to cleanup codes?
There is no support for either of these, we use the PMICs only in Trusted Firmware or Linux. So nothing to consolidate, yet. This might change in the future, and then of course we will use a common code base.
Quoted 167 lines
Quoted 167 lines
Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/mach-sunxi/pmic_bus.c | 6 +++ board/sunxi/board.c | 10 +++-- drivers/power/Kconfig | 13 +++++- drivers/power/Makefile | 1 + drivers/power/axp305.c | 80 ++++++++++++++++++++++++++++++++++ include/axp305.h | 17 ++++++++ include/axp_pmic.h | 3 ++ 7 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 drivers/power/axp305.c create mode 100644 include/axp305.harch/arm/mach-sunxi/pmic_bus.c +6
-0@@ -18,6 +18,8 @@#define AXP209_I2C_ADDR 0x34 +#define AXP305_I2C_ADDR 0x36 +#define AXP221_CHIP_ADDR 0x68#define AXP221_CTRL_ADDR 0x3e#define AXP221_INIT_DATA 0x3e@@ -64,6 +66,8 @@ int pmic_bus_read(u8 reg, u8 *data)return i2c_read (AXP152_I2C_ADDR , reg,1 , data,1 );#elif definedCONFIG_AXP209_POWER return i2c_read (AXP209_I2C_ADDR , reg,1 , data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_read (AXP305_I2C_ADDR , reg,1 , data,1 );#elif definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_read (reg, data);@@ -81,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data)return i2c_write (AXP152_I2C_ADDR , reg,1 , &data,1 );#elif definedCONFIG_AXP209_POWER return i2c_write (AXP209_I2C_ADDR , reg,1 , &data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_write (AXP305_I2C_ADDR , reg,1 , &data,1 );#elif definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_write (reg, data);board/sunxi/board.c +7
-3@@ -634,16 +634,18 @@ void sunxi_board_init(void)#endif #if definedCONFIG_AXP152_POWER || definedCONFIG_AXP209_POWER || \ - definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER + definedCONFIG_AXP221_POWER || definedCONFIG_AXP305_POWER || \ + definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER power_failed =axp_init ();#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ definedCONFIG_AXP818_POWER power_failed |=axp_set_dcdc1 (CONFIG_AXP_DCDC1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_dcdc2 (CONFIG_AXP_DCDC2_VOLT ); power_failed |=axp_set_dcdc3 (CONFIG_AXP_DCDC3_VOLT ); +#endif #if !defined(CONFIG_AXP209_POWER ) && !defined(CONFIG_AXP818_POWER ) power_failed |=axp_set_dcdc4 (CONFIG_AXP_DCDC4_VOLT );#endif @@ -656,8 +658,10 @@ void sunxi_board_init(void) defined CONFIG_AXP818_POWER power_failed |=axp_set_aldo1 (CONFIG_AXP_ALDO1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo2 (CONFIG_AXP_ALDO2_VOLT ); -#if !defined(CONFIG_AXP152_POWER ) +#endif +#if !defined(CONFIG_AXP152_POWER ) && !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo3 (CONFIG_AXP_ALDO3_VOLT );#endif #ifdef CONFIG_AXP209_POWER drivers/power/Kconfig +12
-1@@ -48,6 +48,15 @@ config AXP221_POWER Select this to enable support for the axp221/axp223 pmic found on most A23 and A31 boards. +config AXP305_POWER + bool "axp305 pmic support" + depends on MACH_SUN50I_H616 + select AXP_PMIC_BUS + select CMD_POWEROFF + ---help--- + Select this to enable support for the axp305 pmic found on most + H616 boards. + config AXP809_POWER bool "axp809 pmic support" depends on MACH_SUN9I@@ -127,11 +136,12 @@ config AXP_DCDC3_VOLT config AXP_DCDC4_VOLT int "axp pmic dcdc4 voltage" - depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER + depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER || AXP305_POWER default 1250 if AXP152_POWER default 1200 if MACH_SUN6I default 0 if MACH_SUN8I default 900 if MACH_SUN9I + default 1500 if AXP305_POWER ---help--- Set the voltage (mV) to program the axp pmic dcdc4 at, set to 0 to disable dcdc4.@@ -140,6 +150,7 @@ config AXP_DCDC4_VOLT On A23 / A33 boards dcdc4 is unused and should be disabled. On A80 boards dcdc4 powers VDD-SYS, HDMI, USB OTG and should be 0.9V. On A83T boards dcdc4 is used for VDD-GPU. + On H616 boards dcdcd is used for VCC-DRAM. config AXP_DCDC5_VOLT int "axp pmic dcdc5 voltage"drivers/power/Makefile +1
-0@@ -6,6 +6,7 @@ obj-$(CONFIG_AXP152_POWER) += axp152.o obj-$(CONFIG_AXP209_POWER) += axp209.o obj-$(CONFIG_AXP221_POWER) += axp221.o +obj-$(CONFIG_AXP305_POWER) += axp305.o obj-$(CONFIG_AXP809_POWER) += axp809.o obj-$(CONFIG_AXP818_POWER) += axp818.o obj-$(CONFIG_EXYNOS_TMU) += exynos-tmu.odrivers/power/axp305.c new file +24
-0@@ -0,0 +1,80 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* AXP305 driver +* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +* +* Based on axp221.c +* (C) Copyright 2014 Hans de Goede <[email protected]> +* (C) Copyright 2013 Oliver Schinagl <[email protected]> +*/ + +#include <common.h> +#include <command.h> +#include <errno.h> +#include <asm/arch/pmic_bus.h> +#include <axp_pmic.h> + +static u8 axp305_mvolt_to_cfg (int mvolt,int min,int max,int div) +{ +if (mvolt < min) + mvolt = min; +else if (mvolt > max) + mvolt = max; +Quoted 8 lines
drivers/power/axp305.c line 30
Quoted 6 lines
drivers/power/axp305.c new file +6
-0+return (mvolt - min) / div; +} + +int axp_set_dcdc4 (unsigned int mvolt) +{ +int ret;Initialized ret value to 0.
Quoted 2 lines
Why? We set it unconditionally below, so initialising it here would be pointless and might actually be warned upon by astute compilers.
Sorry. It's my misunderstanding. you're right.
Quoted 41 lines
Quoted 32 lines
drivers/power/axp305.c line 34
Quoted 6 lines
drivers/power/axp305.c new file +4
-0+u8 cfg; + +if (mvolt >=1600 ) + cfg =46 +axp305_mvolt_to_cfg (mvolt,1600 ,3300 ,100 );Could you use macro instead of 46 (magic code)?
Quoted 23 lines
drivers/power/axp305.c new file +23
-0+else + cfg =axp305_mvolt_to_cfg (mvolt,600 ,1500 ,20 ); + +if (mvolt ==0 ) +return pmic_bus_clrbits (AXP305_OUTPUT_CTRL1 , +AXP305_OUTPUT_CTRL1_DCDCD_EN ); + + ret =pmic_bus_write (AXP305_DCDCD_VOLTAGE , cfg); +if (ret) +return ret; + +return pmic_bus_setbits (AXP305_OUTPUT_CTRL1 , +AXP305_OUTPUT_CTRL1_DCDCD_EN ); +} + +int axp_init (void ) +{ +u8 axp_chip_id; +int ret; + + ret =pmic_bus_init (); +if (ret) +return ret;Quoted 8 lines
drivers/power/axp305.c line 63
Quoted 6 lines
drivers/power/axp305.c new file +6
-0+ + ret =pmic_bus_read (AXP305_CHIP_VERSION , &axp_chip_id); +if (ret) +return ret; + +if ((axp_chip_id &AXP305_CHIP_VERSION_MASK ) !=0x40 )Ditto, use macro instead of
0x40.
Quoted 3 lines
Not sure a macro is too useful here. I think the statement is pretty clear in that this must be the chip version, which is given as this value in the manual.
0x40 is chip version? When i saw 0x40, i thought it mean some bit values. Thanks for kindly explanation.
Best Regards,
Jaehoon Chung
Quoted 62 lines
Cheers,
AndreQuoted 56 lines
Quoted 55 lines
drivers/power/axp305.c new file +17
-0+return -ENODEV ; + +return ret; +} + +#ifndef CONFIG_PSCI_RESET +int do_poweroff (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) +{ +pmic_bus_write (AXP305_SHUTDOWN ,AXP305_POWEROFF ); + +/* infinite loop during shutdown */ +while (1 ) {} + +/* not reached */ +return 0 ; +} +#endif include/axp305.h new file +17
-0@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +*/ + +enum axp305_reg { +AXP305_CHIP_VERSION =0x3 , +AXP305_OUTPUT_CTRL1 =0x10 , +AXP305_DCDCD_VOLTAGE =0x15 , +AXP305_SHUTDOWN =0x32 , +}; + +#define AXP305_CHIP_VERSION_MASK 0xcf + +#define AXP305_OUTPUT_CTRL1_DCDCD_EN (1 << 3) + +#define AXP305_POWEROFF (1 << 7)include/axp_pmic.h +3
-0@@ -15,6 +15,9 @@#ifdef CONFIG_AXP221_POWER #include <axp221.h> #endif +#ifdef CONFIG_AXP305_POWER +#include <axp305.h> +#endif #ifdef CONFIG_AXP809_POWER #include <axp809.h> #endif
PATCH 1/17 sunxi: Add support for AXP305 PMIC
Quoted 241 lines · Jaehoon Chung
Quoted 194 lines · Andr? Przywara
On 05/01/2021 22:36, Jaehoon Chung wrote:
Hi,
thanks for having a look!
Quoted 7 lines
Hi Jernej
Quoted 2 lines · Jernej Skrabec
This PMIC can be found on H616 boards and it's very similar to AXP805 and AXP806.
Is there any plan to cleanup codes?
There is no support for either of these, we use the PMICs only in Trusted Firmware or Linux. So nothing to consolidate, yet. This might change in the future, and then of course we will use a common code base.
Quoted 167 lines
Quoted 167 lines
Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/mach-sunxi/pmic_bus.c | 6 +++ board/sunxi/board.c | 10 +++-- drivers/power/Kconfig | 13 +++++- drivers/power/Makefile | 1 + drivers/power/axp305.c | 80 ++++++++++++++++++++++++++++++++++ include/axp305.h | 17 ++++++++ include/axp_pmic.h | 3 ++ 7 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 drivers/power/axp305.c create mode 100644 include/axp305.harch/arm/mach-sunxi/pmic_bus.c +6
-0@@ -18,6 +18,8 @@#define AXP209_I2C_ADDR 0x34 +#define AXP305_I2C_ADDR 0x36 +#define AXP221_CHIP_ADDR 0x68#define AXP221_CTRL_ADDR 0x3e#define AXP221_INIT_DATA 0x3e@@ -64,6 +66,8 @@ int pmic_bus_read(u8 reg, u8 *data)return i2c_read (AXP152_I2C_ADDR , reg,1 , data,1 );#elif definedCONFIG_AXP209_POWER return i2c_read (AXP209_I2C_ADDR , reg,1 , data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_read (AXP305_I2C_ADDR , reg,1 , data,1 );#elif definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_read (reg, data);@@ -81,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data)return i2c_write (AXP152_I2C_ADDR , reg,1 , &data,1 );#elif definedCONFIG_AXP209_POWER return i2c_write (AXP209_I2C_ADDR , reg,1 , &data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_write (AXP305_I2C_ADDR , reg,1 , &data,1 );#elif definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_write (reg, data);board/sunxi/board.c +7
-3@@ -634,16 +634,18 @@ void sunxi_board_init(void)#endif #if definedCONFIG_AXP152_POWER || definedCONFIG_AXP209_POWER || \ - definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER + definedCONFIG_AXP221_POWER || definedCONFIG_AXP305_POWER || \ + definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER power_failed =axp_init ();#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ definedCONFIG_AXP818_POWER power_failed |=axp_set_dcdc1 (CONFIG_AXP_DCDC1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_dcdc2 (CONFIG_AXP_DCDC2_VOLT ); power_failed |=axp_set_dcdc3 (CONFIG_AXP_DCDC3_VOLT ); +#endif #if !defined(CONFIG_AXP209_POWER ) && !defined(CONFIG_AXP818_POWER ) power_failed |=axp_set_dcdc4 (CONFIG_AXP_DCDC4_VOLT );#endif @@ -656,8 +658,10 @@ void sunxi_board_init(void) defined CONFIG_AXP818_POWER power_failed |=axp_set_aldo1 (CONFIG_AXP_ALDO1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo2 (CONFIG_AXP_ALDO2_VOLT ); -#if !defined(CONFIG_AXP152_POWER ) +#endif +#if !defined(CONFIG_AXP152_POWER ) && !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo3 (CONFIG_AXP_ALDO3_VOLT );#endif #ifdef CONFIG_AXP209_POWER drivers/power/Kconfig +12
-1@@ -48,6 +48,15 @@ config AXP221_POWER Select this to enable support for the axp221/axp223 pmic found on most A23 and A31 boards. +config AXP305_POWER + bool "axp305 pmic support" + depends on MACH_SUN50I_H616 + select AXP_PMIC_BUS + select CMD_POWEROFF + ---help--- + Select this to enable support for the axp305 pmic found on most + H616 boards. + config AXP809_POWER bool "axp809 pmic support" depends on MACH_SUN9I@@ -127,11 +136,12 @@ config AXP_DCDC3_VOLT config AXP_DCDC4_VOLT int "axp pmic dcdc4 voltage" - depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER + depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER || AXP305_POWER default 1250 if AXP152_POWER default 1200 if MACH_SUN6I default 0 if MACH_SUN8I default 900 if MACH_SUN9I + default 1500 if AXP305_POWER ---help--- Set the voltage (mV) to program the axp pmic dcdc4 at, set to 0 to disable dcdc4.@@ -140,6 +150,7 @@ config AXP_DCDC4_VOLT On A23 / A33 boards dcdc4 is unused and should be disabled. On A80 boards dcdc4 powers VDD-SYS, HDMI, USB OTG and should be 0.9V. On A83T boards dcdc4 is used for VDD-GPU. + On H616 boards dcdcd is used for VCC-DRAM. config AXP_DCDC5_VOLT int "axp pmic dcdc5 voltage"drivers/power/Makefile +1
-0@@ -6,6 +6,7 @@ obj-$(CONFIG_AXP152_POWER) += axp152.o obj-$(CONFIG_AXP209_POWER) += axp209.o obj-$(CONFIG_AXP221_POWER) += axp221.o +obj-$(CONFIG_AXP305_POWER) += axp305.o obj-$(CONFIG_AXP809_POWER) += axp809.o obj-$(CONFIG_AXP818_POWER) += axp818.o obj-$(CONFIG_EXYNOS_TMU) += exynos-tmu.odrivers/power/axp305.c new file +24
-0@@ -0,0 +1,80 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* AXP305 driver +* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +* +* Based on axp221.c +* (C) Copyright 2014 Hans de Goede <[email protected]> +* (C) Copyright 2013 Oliver Schinagl <[email protected]> +*/ + +#include <common.h> +#include <command.h> +#include <errno.h> +#include <asm/arch/pmic_bus.h> +#include <axp_pmic.h> + +static u8 axp305_mvolt_to_cfg (int mvolt,int min,int max,int div) +{ +if (mvolt < min) + mvolt = min; +else if (mvolt > max) + mvolt = max; +Quoted 8 lines
drivers/power/axp305.c line 30
Quoted 6 lines
drivers/power/axp305.c new file +6
-0+return (mvolt - min) / div; +} + +int axp_set_dcdc4 (unsigned int mvolt) +{ +int ret;Initialized ret value to 0.
Quoted 2 lines
Why? We set it unconditionally below, so initialising it here would be pointless and might actually be warned upon by astute compilers.
Sorry. It's my misunderstanding. you're right.
Quoted 41 lines
Quoted 40 lines
drivers/power/axp305.c line 34
Quoted 6 lines
drivers/power/axp305.c new file +4
-0+u8 cfg; + +if (mvolt >=1600 ) + cfg =46 +axp305_mvolt_to_cfg (mvolt,1600 ,3300 ,100 );Could you use macro instead of 46 (magic code)?
Quoted 19 lines
drivers/power/axp305.c new file +19
-0+else + cfg =axp305_mvolt_to_cfg (mvolt,600 ,1500 ,20 ); + +if (mvolt ==0 ) +return pmic_bus_clrbits (AXP305_OUTPUT_CTRL1 , +AXP305_OUTPUT_CTRL1_DCDCD_EN ); + + ret =pmic_bus_write (AXP305_DCDCD_VOLTAGE , cfg); +if (ret) +return ret; + +return pmic_bus_setbits (AXP305_OUTPUT_CTRL1 , +AXP305_OUTPUT_CTRL1_DCDCD_EN ); +} + +int axp_init (void ) +{ +u8 axp_chip_id; +int ret;drivers/power/axp305.c line 63
Quoted 10 lines
drivers/power/axp305.c new file +10
-0+ + ret =pmic_bus_init (); +if (ret) +return ret; + + ret =pmic_bus_read (AXP305_CHIP_VERSION , &axp_chip_id); +if (ret) +return ret; + +if ((axp_chip_id &AXP305_CHIP_VERSION_MASK ) !=0x40 )Ditto, use macro instead of
0x40.
Quoted 6 lines
Quoted 3 lines
Not sure a macro is too useful here. I think the statement is pretty clear in that this must be the chip version, which is given as this value in the manual.
0x40is chip version? When i saw0x40, i thought it mean some bit values. Thanks for kindly explanation.
Well, it's both, welcome to Allwinner :-D
This is what the manual says:
bits 7-6 & 3-0: IC Type NO.
010000: IC is AXP305 Others: Reserved
So it's a mess, and that number is not really unique (the AXP805 and AXP806 also use the same bits), but it's just a safety measure to avoid talking to the wrong device.
Cheers,
Andre
Quoted 63 lines
Quoted 62 lines
Cheers,
AndreQuoted 56 lines
Quoted 55 lines
drivers/power/axp305.c new file +17
-0+return -ENODEV ; + +return ret; +} + +#ifndef CONFIG_PSCI_RESET +int do_poweroff (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) +{ +pmic_bus_write (AXP305_SHUTDOWN ,AXP305_POWEROFF ); + +/* infinite loop during shutdown */ +while (1 ) {} + +/* not reached */ +return 0 ; +} +#endif include/axp305.h new file +17
-0@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +*/ + +enum axp305_reg { +AXP305_CHIP_VERSION =0x3 , +AXP305_OUTPUT_CTRL1 =0x10 , +AXP305_DCDCD_VOLTAGE =0x15 , +AXP305_SHUTDOWN =0x32 , +}; + +#define AXP305_CHIP_VERSION_MASK 0xcf + +#define AXP305_OUTPUT_CTRL1_DCDCD_EN (1 << 3) + +#define AXP305_POWEROFF (1 << 7)include/axp_pmic.h +3
-0@@ -15,6 +15,9 @@#ifdef CONFIG_AXP221_POWER #include <axp221.h> #endif +#ifdef CONFIG_AXP305_POWER +#include <axp305.h> +#endif #ifdef CONFIG_AXP809_POWER #include <axp809.h> #endif
PATCH 1/17 sunxi: Add support for AXP305 PMIC
In reply to Jernej SkrabecQuoted 3 lines · Jernej Skrabec
This PMIC can be found on H616 boards and it's very similar to AXP805 and AXP806.
Quoted 1 line
Signed-off-by Jernej Skrabec <[email protected]>
The existing sunxi PMIC code is the typical U-Boot mess, but I don't want to block this series on a rework. I put some comments and ideas below how to improve the whole "framework".
For this actual patch I checked the bits against the AXP305 datasheet, it does what we need.
(reluctantly)
Thanks,
Andre
Quoted 48 lines
--- arch/arm/mach-sunxi/pmic_bus.c | 6 +++ board/sunxi/board.c | 10 +++-- drivers/power/Kconfig | 13 +++++- drivers/power/Makefile | 1 + drivers/power/axp305.c | 80 ++++++++++++++++++++++++++++++++++ include/axp305.h | 17 ++++++++ include/axp_pmic.h | 3 ++ 7 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 drivers/power/axp305.c create mode 100644 include/axp305.harch/arm/mach-sunxi/pmic_bus.c +6
-0@@ -18,6 +18,8 @@#define AXP209_I2C_ADDR 0x34 +#define AXP305_I2C_ADDR 0x36 +#define AXP221_CHIP_ADDR 0x68#define AXP221_CTRL_ADDR 0x3e#define AXP221_INIT_DATA 0x3e@@ -64,6 +66,8 @@ int pmic_bus_read(u8 reg, u8 *data)return i2c_read (AXP152_I2C_ADDR , reg,1 , data,1 );#elif definedCONFIG_AXP209_POWER return i2c_read (AXP209_I2C_ADDR , reg,1 , data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_read (AXP305_I2C_ADDR , reg,1 , data,1 );#elif definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_read (reg, data);@@ -81,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data)return i2c_write (AXP152_I2C_ADDR , reg,1 , &data,1 );#elif definedCONFIG_AXP209_POWER return i2c_write (AXP209_I2C_ADDR , reg,1 , &data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_write (AXP305_I2C_ADDR , reg,1 , &data,1 );#elif definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_write (reg, data);board/sunxi/board.c +0
-0
board/sunxi/board.c void sunxi_board_init(void) · line 634
Quoted 1 line
board/sunxi/board.c +0
-0@@ -634,16 +634,18 @@ void sunxi_board_init(void)#endif
This whole function is really a mess, but we can clean this up later. I wonder if we can guard with the actual CONFIG_AXP_*_VOLT symbols directly instead of specifying the list of PMICs requiring this rail (this list is already in Kconfig).
Maybe with some macro magic to avoid the repetitions and move the ifdefs out of the function?
power_failed |= axp_set_rail(dcdc1, DCDC1);
and assemble the function name and CONFIG_ symbol in that macro, plus having the guard there?
Quoted 21 lines
board/sunxi/board.c +4
-2#if definedCONFIG_AXP152_POWER || definedCONFIG_AXP209_POWER || \ - definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER + definedCONFIG_AXP221_POWER || definedCONFIG_AXP305_POWER || \ + definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER power_failed =axp_init ();#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ definedCONFIG_AXP818_POWER power_failed |=axp_set_dcdc1 (CONFIG_AXP_DCDC1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_dcdc2 (CONFIG_AXP_DCDC2_VOLT ); power_failed |=axp_set_dcdc3 (CONFIG_AXP_DCDC3_VOLT ); +#endif #if !defined(CONFIG_AXP209_POWER ) && !defined(CONFIG_AXP818_POWER ) power_failed |=axp_set_dcdc4 (CONFIG_AXP_DCDC4_VOLT );#endif @@ -656,8 +658,10 @@ void sunxi_board_init(void)defined CONFIG_AXP818_POWER
board/sunxi/board.c void sunxi_board_init(void) · line 667
Quoted 10 lines
board/sunxi/board.c +3
-1power_failed |=axp_set_aldo1 (CONFIG_AXP_ALDO1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo2 (CONFIG_AXP_ALDO2_VOLT ); -#if !defined(CONFIG_AXP152_POWER ) +#endif +#if !defined(CONFIG_AXP152_POWER ) && !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo3 (CONFIG_AXP_ALDO3_VOLT );#endif #ifdef CONFIG_AXP209_POWER
Verified this hunk by playing CPP and removing all non-applicable calls. This ended up in:
power_failed = axp_init(); power_failed |= axp_set_dcdc4(CONFIG_AXP_DCDC4_VOLT);
Which looks like the idea behind this patch, but is totally non-obvious from the diff.
Quoted 60 lines
drivers/power/Kconfig +12
-1@@ -48,6 +48,15 @@ config AXP221_POWER Select this to enable support for the axp221/axp223 pmic found on most A23 and A31 boards. +config AXP305_POWER + bool "axp305 pmic support" + depends on MACH_SUN50I_H616 + select AXP_PMIC_BUS + select CMD_POWEROFF + ---help--- + Select this to enable support for the axp305 pmic found on most + H616 boards. + config AXP809_POWER bool "axp809 pmic support" depends on MACH_SUN9I@@ -127,11 +136,12 @@ config AXP_DCDC3_VOLT config AXP_DCDC4_VOLT int "axp pmic dcdc4 voltage" - depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER + depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER || AXP305_POWER default 1250 if AXP152_POWER default 1200 if MACH_SUN6I default 0 if MACH_SUN8I default 900 if MACH_SUN9I + default 1500 if AXP305_POWER ---help--- Set the voltage (mV) to program the axp pmic dcdc4 at, set to 0 to disable dcdc4.@@ -140,6 +150,7 @@ config AXP_DCDC4_VOLT On A23 / A33 boards dcdc4 is unused and should be disabled. On A80 boards dcdc4 powers VDD-SYS, HDMI, USB OTG and should be 0.9V. On A83T boards dcdc4 is used for VDD-GPU. + On H616 boards dcdcd is used for VCC-DRAM. config AXP_DCDC5_VOLT int "axp pmic dcdc5 voltage"drivers/power/Makefile +1
-0@@ -6,6 +6,7 @@ obj-$(CONFIG_AXP152_POWER) += axp152.o obj-$(CONFIG_AXP209_POWER) += axp209.o obj-$(CONFIG_AXP221_POWER) += axp221.o +obj-$(CONFIG_AXP305_POWER) += axp305.o obj-$(CONFIG_AXP809_POWER) += axp809.o obj-$(CONFIG_AXP818_POWER) += axp818.o obj-$(CONFIG_EXYNOS_TMU) += exynos-tmu.odrivers/power/axp305.c new file +0
-0
drivers/power/axp305.c line 7
Quoted 7 lines
drivers/power/axp305.c new file +7
-0@@ -0,0 +1,80 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* AXP305 driver +* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +* +* Based on axp221.c
Given that, I wonder if we can (later) simplify this, ideally we end up at something like this:
const struct axp_regulator axp_regulators[] = {
{"dcdc1", 1600, 3400, 100, NA, 0x20, 0x10, 0},
...https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/tree/drivers/allwinner/axp/axp803.c
Not sure that can cover all AXP chips, but it's worth a try to remove all this boilerplate.
Cheers,
Andre
Quoted 111 lines
drivers/power/axp305.c new file +73
-0+* (C) Copyright 2014 Hans de Goede <[email protected]> +* (C) Copyright 2013 Oliver Schinagl <[email protected]> +*/ + +#include <common.h> +#include <command.h> +#include <errno.h> +#include <asm/arch/pmic_bus.h> +#include <axp_pmic.h> + +static u8 axp305_mvolt_to_cfg (int mvolt,int min,int max,int div) +{ +if (mvolt < min) + mvolt = min; +else if (mvolt > max) + mvolt = max; + +return (mvolt - min) / div; +} + +int axp_set_dcdc4 (unsigned int mvolt) +{ +int ret; +u8 cfg; + +if (mvolt >=1600 ) + cfg =46 +axp305_mvolt_to_cfg (mvolt,1600 ,3300 ,100 ); +else + cfg =axp305_mvolt_to_cfg (mvolt,600 ,1500 ,20 ); + +if (mvolt ==0 ) +return pmic_bus_clrbits (AXP305_OUTPUT_CTRL1 , +AXP305_OUTPUT_CTRL1_DCDCD_EN ); + + ret =pmic_bus_write (AXP305_DCDCD_VOLTAGE , cfg); +if (ret) +return ret; + +return pmic_bus_setbits (AXP305_OUTPUT_CTRL1 , +AXP305_OUTPUT_CTRL1_DCDCD_EN ); +} + +int axp_init (void ) +{ +u8 axp_chip_id; +int ret; + + ret =pmic_bus_init (); +if (ret) +return ret; + + ret =pmic_bus_read (AXP305_CHIP_VERSION , &axp_chip_id); +if (ret) +return ret; + +if ((axp_chip_id &AXP305_CHIP_VERSION_MASK ) !=0x40 ) +return -ENODEV ; + +return ret; +} + +#ifndef CONFIG_PSCI_RESET +int do_poweroff (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) +{ +pmic_bus_write (AXP305_SHUTDOWN ,AXP305_POWEROFF ); + +/* infinite loop during shutdown */ +while (1 ) {} + +/* not reached */ +return 0 ; +} +#endif include/axp305.h new file +17
-0@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +*/ + +enum axp305_reg { +AXP305_CHIP_VERSION =0x3 , +AXP305_OUTPUT_CTRL1 =0x10 , +AXP305_DCDCD_VOLTAGE =0x15 , +AXP305_SHUTDOWN =0x32 , +}; + +#define AXP305_CHIP_VERSION_MASK 0xcf + +#define AXP305_OUTPUT_CTRL1_DCDCD_EN (1 << 3) + +#define AXP305_POWEROFF (1 << 7)include/axp_pmic.h +3
-0@@ -15,6 +15,9 @@#ifdef CONFIG_AXP221_POWER #include <axp221.h> #endif +#ifdef CONFIG_AXP305_POWER +#include <axp305.h> +#endif #ifdef CONFIG_AXP809_POWER #include <axp809.h> #endif
PATCH 1/17 sunxi: Add support for AXP305 PMIC
Quoted 8 lines · Andr? Przywara
Quoted 3 lines · Jernej Skrabec
This PMIC can be found on H616 boards and it's very similar to AXP805 and AXP806.
Quoted 1 line
Signed-off-by Jernej Skrabec <[email protected]>The existing sunxi PMIC code is the typical U-Boot mess, but I don't want to block this series on a rework. I put some comments and ideas below how to improve the whole "framework".
Agreed. it seems that it needs to make more time about refactoring whole codes.
Quoted 6 lines
For this actual patch I checked the bits against the AXP305 datasheet, it does what we need.
(reluctantly)
Reviewed-by Andre Przywara <[email protected]>
Best Regards,
Jaehoon Chung
Quoted 299 lines
Thanks,
AndreQuoted 48 lines
--- arch/arm/mach-sunxi/pmic_bus.c | 6 +++ board/sunxi/board.c | 10 +++-- drivers/power/Kconfig | 13 +++++- drivers/power/Makefile | 1 + drivers/power/axp305.c | 80 ++++++++++++++++++++++++++++++++++ include/axp305.h | 17 ++++++++ include/axp_pmic.h | 3 ++ 7 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 drivers/power/axp305.c create mode 100644 include/axp305.harch/arm/mach-sunxi/pmic_bus.c +6
-0@@ -18,6 +18,8 @@#define AXP209_I2C_ADDR 0x34 +#define AXP305_I2C_ADDR 0x36 +#define AXP221_CHIP_ADDR 0x68#define AXP221_CTRL_ADDR 0x3e#define AXP221_INIT_DATA 0x3e@@ -64,6 +66,8 @@ int pmic_bus_read(u8 reg, u8 *data)return i2c_read (AXP152_I2C_ADDR , reg,1 , data,1 );#elif definedCONFIG_AXP209_POWER return i2c_read (AXP209_I2C_ADDR , reg,1 , data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_read (AXP305_I2C_ADDR , reg,1 , data,1 );#elif definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_read (reg, data);@@ -81,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data)return i2c_write (AXP152_I2C_ADDR , reg,1 , &data,1 );#elif definedCONFIG_AXP209_POWER return i2c_write (AXP209_I2C_ADDR , reg,1 , &data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_write (AXP305_I2C_ADDR , reg,1 , &data,1 );#elif definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_write (reg, data);board/sunxi/board.c +0
-0board/sunxi/board.c void sunxi_board_init(void) · line 634
Quoted 1 line
board/sunxi/board.c +0
-0@@ -634,16 +634,18 @@ void sunxi_board_init(void)#endif This whole function is really a mess, but we can clean this up later. I wonder if we can guard with the actual CONFIG_AXP_*_VOLT symbols directly instead of specifying the list of PMICs requiring this rail (this list is already in
Kconfig).
Maybe with some macro magic to avoid the repetitions and move the ifdefs out of the function?power_failed |= axp_set_rail(dcdc1, DCDC1);and assemble the function name and
CONFIG_symbol in that macro, plus having the guard there?Quoted 21 lines
board/sunxi/board.c +4
-2#if definedCONFIG_AXP152_POWER || definedCONFIG_AXP209_POWER || \ - definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER + definedCONFIG_AXP221_POWER || definedCONFIG_AXP305_POWER || \ + definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER power_failed =axp_init ();#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ definedCONFIG_AXP818_POWER power_failed |=axp_set_dcdc1 (CONFIG_AXP_DCDC1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_dcdc2 (CONFIG_AXP_DCDC2_VOLT ); power_failed |=axp_set_dcdc3 (CONFIG_AXP_DCDC3_VOLT ); +#endif #if !defined(CONFIG_AXP209_POWER ) && !defined(CONFIG_AXP818_POWER ) power_failed |=axp_set_dcdc4 (CONFIG_AXP_DCDC4_VOLT );#endif @@ -656,8 +658,10 @@ void sunxi_board_init(void)defined CONFIG_AXP818_POWER board/sunxi/board.c void sunxi_board_init(void) · line 667
Quoted 10 lines
board/sunxi/board.c +3
-1power_failed |=axp_set_aldo1 (CONFIG_AXP_ALDO1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo2 (CONFIG_AXP_ALDO2_VOLT ); -#if !defined(CONFIG_AXP152_POWER ) +#endif +#if !defined(CONFIG_AXP152_POWER ) && !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo3 (CONFIG_AXP_ALDO3_VOLT );#endif #ifdef CONFIG_AXP209_POWER Verified this hunk by playing CPP and removing all non-applicable calls. This ended up in:
power_failed = axp_init(); power_failed |= axp_set_dcdc4(CONFIG_AXP_DCDC4_VOLT);Which looks like the idea behind this patch, but is totally non-obvious from the diff.
Quoted 60 lines
drivers/power/Kconfig +12
-1@@ -48,6 +48,15 @@ config AXP221_POWER Select this to enable support for the axp221/axp223 pmic found on most A23 and A31 boards. +config AXP305_POWER + bool "axp305 pmic support" + depends on MACH_SUN50I_H616 + select AXP_PMIC_BUS + select CMD_POWEROFF + ---help--- + Select this to enable support for the axp305 pmic found on most + H616 boards. + config AXP809_POWER bool "axp809 pmic support" depends on MACH_SUN9I@@ -127,11 +136,12 @@ config AXP_DCDC3_VOLT config AXP_DCDC4_VOLT int "axp pmic dcdc4 voltage" - depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER + depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER || AXP305_POWER default 1250 if AXP152_POWER default 1200 if MACH_SUN6I default 0 if MACH_SUN8I default 900 if MACH_SUN9I + default 1500 if AXP305_POWER ---help--- Set the voltage (mV) to program the axp pmic dcdc4 at, set to 0 to disable dcdc4.@@ -140,6 +150,7 @@ config AXP_DCDC4_VOLT On A23 / A33 boards dcdc4 is unused and should be disabled. On A80 boards dcdc4 powers VDD-SYS, HDMI, USB OTG and should be 0.9V. On A83T boards dcdc4 is used for VDD-GPU. + On H616 boards dcdcd is used for VCC-DRAM. config AXP_DCDC5_VOLT int "axp pmic dcdc5 voltage"drivers/power/Makefile +1
-0@@ -6,6 +6,7 @@ obj-$(CONFIG_AXP152_POWER) += axp152.o obj-$(CONFIG_AXP209_POWER) += axp209.o obj-$(CONFIG_AXP221_POWER) += axp221.o +obj-$(CONFIG_AXP305_POWER) += axp305.o obj-$(CONFIG_AXP809_POWER) += axp809.o obj-$(CONFIG_AXP818_POWER) += axp818.o obj-$(CONFIG_EXYNOS_TMU) += exynos-tmu.odrivers/power/axp305.c new file +0
-0drivers/power/axp305.c line 7
Quoted 7 lines
drivers/power/axp305.c new file +7
-0@@ -0,0 +1,80 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* AXP305 driver +* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +* +* Based on axp221.c Given that, I wonder if we can (later) simplify this, ideally we end up at something like this:
const struct axp_regulator axp_regulators[] = { {"dcdc1", 1600, 3400, 100, NA, 0x20, 0x10, 0}, ...Not sure that can cover all AXP chips, but it's worth a try to remove all this boilerplate.
Cheers,
AndreQuoted 111 lines
drivers/power/axp305.c new file +73
-0+* (C) Copyright 2014 Hans de Goede <[email protected]> +* (C) Copyright 2013 Oliver Schinagl <[email protected]> +*/ + +#include <common.h> +#include <command.h> +#include <errno.h> +#include <asm/arch/pmic_bus.h> +#include <axp_pmic.h> + +static u8 axp305_mvolt_to_cfg (int mvolt,int min,int max,int div) +{ +if (mvolt < min) + mvolt = min; +else if (mvolt > max) + mvolt = max; + +return (mvolt - min) / div; +} + +int axp_set_dcdc4 (unsigned int mvolt) +{ +int ret; +u8 cfg; + +if (mvolt >=1600 ) + cfg =46 +axp305_mvolt_to_cfg (mvolt,1600 ,3300 ,100 ); +else + cfg =axp305_mvolt_to_cfg (mvolt,600 ,1500 ,20 ); + +if (mvolt ==0 ) +return pmic_bus_clrbits (AXP305_OUTPUT_CTRL1 , +AXP305_OUTPUT_CTRL1_DCDCD_EN ); + + ret =pmic_bus_write (AXP305_DCDCD_VOLTAGE , cfg); +if (ret) +return ret; + +return pmic_bus_setbits (AXP305_OUTPUT_CTRL1 , +AXP305_OUTPUT_CTRL1_DCDCD_EN ); +} + +int axp_init (void ) +{ +u8 axp_chip_id; +int ret; + + ret =pmic_bus_init (); +if (ret) +return ret; + + ret =pmic_bus_read (AXP305_CHIP_VERSION , &axp_chip_id); +if (ret) +return ret; + +if ((axp_chip_id &AXP305_CHIP_VERSION_MASK ) !=0x40 ) +return -ENODEV ; + +return ret; +} + +#ifndef CONFIG_PSCI_RESET +int do_poweroff (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) +{ +pmic_bus_write (AXP305_SHUTDOWN ,AXP305_POWEROFF ); + +/* infinite loop during shutdown */ +while (1 ) {} + +/* not reached */ +return 0 ; +} +#endif include/axp305.h new file +17
-0@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +*/ + +enum axp305_reg { +AXP305_CHIP_VERSION =0x3 , +AXP305_OUTPUT_CTRL1 =0x10 , +AXP305_DCDCD_VOLTAGE =0x15 , +AXP305_SHUTDOWN =0x32 , +}; + +#define AXP305_CHIP_VERSION_MASK 0xcf + +#define AXP305_OUTPUT_CTRL1_DCDCD_EN (1 << 3) + +#define AXP305_POWEROFF (1 << 7)include/axp_pmic.h +3
-0@@ -15,6 +15,9 @@#ifdef CONFIG_AXP221_POWER #include <axp221.h> #endif +#ifdef CONFIG_AXP305_POWER +#include <axp305.h> +#endif #ifdef CONFIG_AXP809_POWER #include <axp809.h> #endif
PATCH 1/17 sunxi: Add support for AXP305 PMIC
In reply to André PrzywaraDne ponedeljek, 11. januar 2021 ob 01:02:07 CET je Andr? Przywara napisal(a):
Quoted 30 lines · Jernej Skrabec
Quoted 3 lines
This PMIC can be found on H616 boards and it's very similar to AXP805 and AXP806.
Quoted 1 line
Signed-off-by Jernej Skrabec <[email protected]>The existing sunxi PMIC code is the typical U-Boot mess, but I don't want to block this series on a rework. I put some comments and ideas below how to improve the whole "framework".
For this actual patch I checked the bits against the AXP305 datasheet, it does what we need.
(reluctantly)
Reviewed-by Andre Przywara <[email protected]>Thanks,
AndreQuoted 12 lines
--- arch/arm/mach-sunxi/pmic_bus.c | 6 +++ board/sunxi/board.c | 10 +++-- drivers/power/Kconfig | 13 +++++- drivers/power/Makefile | 1 + drivers/power/axp305.c | 80 ++++++++++++++++++++++++++++++++++ include/axp305.h | 17 ++++++++ include/axp_pmic.h | 3 ++ 7 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 drivers/power/axp305.c create mode 100644 include/axp305.h
Quoted 1 line
arch/arm/mach-sunxi/
Quoted 1 line
arch/arm/mach-sunxi/ renamed from arch/arm/mach-sunxi/pmic_bus.c +0
-0
pmic_bus.c
Quoted 7 lines
Quoted 7 lines
index
dea42de833f1..0394ce856448100644arch/arm/mach-sunxi/pmic_bus.c +0
-0@@ -18,6 +18,8 @@#define AXP209_I2C_ADDR 0x34
Quoted 12 lines
arch/arm/mach-sunxi/pmic_bus.c int pmic_bus_read(u8 reg, u8 *data) · line 71
Quoted 12 lines
arch/arm/mach-sunxi/pmic_bus.c +4
-0+#define AXP305_I2C_ADDR 0x36 +#define AXP221_CHIP_ADDR 0x68#define AXP221_CTRL_ADDR 0x3e#define AXP221_INIT_DATA 0x3e@@ -64,6 +66,8 @@ int pmic_bus_read(u8 reg, u8 *data)return i2c_read (AXP152_I2C_ADDR , reg,1 , data,1 );#elif definedCONFIG_AXP209_POWER return i2c_read (AXP209_I2C_ADDR , reg,1 , data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_read (AXP305_I2C_ADDR , reg,1 , data,1 ); #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined
CONFIG_AXP818_POWER
Quoted 9 lines
arch/arm/mach-sunxi/pmic_bus.c int pmic_bus_write(u8 reg, u8 data) · line 90
Quoted 9 lines
arch/arm/mach-sunxi/pmic_bus.c +2
-0# ifdef CONFIG_MACH_SUN6I return p2wi_read (reg, data);@@ -81,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data)return i2c_write (AXP152_I2C_ADDR , reg,1 , &data,1 );#elif definedCONFIG_AXP209_POWER return i2c_write (AXP209_I2C_ADDR , reg,1 , &data,1 ); +#elif definedCONFIG_AXP305_POWER +return i2c_write (AXP305_I2C_ADDR , reg,1 , &data,1 ); #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined
CONFIG_AXP818_POWER
Quoted 53 lines
board/sunxi/board.c void sunxi_board_init(void) · line 634
Quoted 8 lines
arch/arm/mach-sunxi/pmic_bus.c +0
-0# ifdef CONFIG_MACH_SUN6I return p2wi_write (reg, data);board/sunxi/board.c +0
-0@@ -634,16 +634,18 @@ void sunxi_board_init(void)#endif This whole function is really a mess, but we can clean this up later. I wonder if we can guard with the actual CONFIG_AXP_*_VOLT symbols directly instead of specifying the list of PMICs requiring this rail (this list is already in
Kconfig).
Maybe with some macro magic to avoid the repetitions and move the ifdefs out of the function?power_failed |= axp_set_rail(dcdc1, DCDC1);and assemble the function name and
CONFIG_symbol in that macro, plus having the guard there?Quoted 21 lines
board/sunxi/board.c +4
-2#if definedCONFIG_AXP152_POWER || definedCONFIG_AXP209_POWER || \ - definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER + definedCONFIG_AXP221_POWER || definedCONFIG_AXP305_POWER || \ + definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER power_failed =axp_init ();#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ definedCONFIG_AXP818_POWER power_failed |=axp_set_dcdc1 (CONFIG_AXP_DCDC1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_dcdc2 (CONFIG_AXP_DCDC2_VOLT ); power_failed |=axp_set_dcdc3 (CONFIG_AXP_DCDC3_VOLT ); +#endif #if !defined(CONFIG_AXP209_POWER ) && !defined(CONFIG_AXP818_POWER ) power_failed |=axp_set_dcdc4 (CONFIG_AXP_DCDC4_VOLT );#endif @@ -656,8 +658,10 @@ void sunxi_board_init(void)defined CONFIG_AXP818_POWER board/sunxi/board.c void sunxi_board_init(void) · line 667
Quoted 10 lines
board/sunxi/board.c +3
-1power_failed |=axp_set_aldo1 (CONFIG_AXP_ALDO1_VOLT );#endif +#if !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo2 (CONFIG_AXP_ALDO2_VOLT ); -#if !defined(CONFIG_AXP152_POWER ) +#endif +#if !defined(CONFIG_AXP152_POWER ) && !defined(CONFIG_AXP305_POWER ) power_failed |=axp_set_aldo3 (CONFIG_AXP_ALDO3_VOLT );#endif #ifdef CONFIG_AXP209_POWER Verified this hunk by playing CPP and removing all non-applicable calls. This ended up in:
Quoted 5 lines
power_failed = axp_init(); power_failed |= axp_set_dcdc4(CONFIG_AXP_DCDC4_VOLT);Which looks like the idea behind this patch, but is totally non-obvious from the diff.
Yes, that's correct. I wonder if we need all these power rails to be really enabled at this time? IMO we need only those which powers DRAM and probably CPU, all others can be moved to U-Boot proper.
Every potential boot source must be already powered before SPL even begins execution, so first stage bootloader (BROM) can even load SPL from it.
Best regards,
Jernej
Quoted 7 lines
drivers/power/Kconfig config AXP221_POWER · line 48
Quoted 7 lines
drivers/power/Kconfig +0
-0@@ -48,6 +48,15 @@ config AXP221_POWER Select this to enable support for the axp221/axp223 pmic found on
most
Quoted 16 lines
Quoted 16 lines
drivers/power/Kconfig +9
-0A23 and A31 boards. +config AXP305_POWER + bool "axp305 pmic support" + depends on MACH_SUN50I_H616 + select AXP_PMIC_BUS + select CMD_POWEROFF + ---help--- + Select this to enable support for the axp305 pmic found on most + H616 boards. + config AXP809_POWER bool "axp809 pmic support" depends on MACH_SUN9I@@ -127,11 +136,12 @@ config AXP_DCDC3_VOLT
Quoted 3 lines
drivers/power/Kconfig config AXP_DCDC3_VOLT
Quoted 3 lines
drivers/power/Kconfig +0
-1config AXP_DCDC4_VOLT int "axp pmic dcdc4 voltage" - depends on AXP152_POWER || AXP221_POWER || AXP809_POWER ||
AXP818_POWER
Quoted 1 line
drivers/power/Kconfig config AXP_DCDC3_VOLT · line 139
Quoted 1 line
drivers/power/Kconfig +1
-0+ depends on AXP152_POWER || AXP221_POWER || AXP809_POWER ||
AXP818_POWER || AXP305_POWER
Quoted 11 lines
drivers/power/Kconfig config AXP_DCDC4_VOLT · line 151
Quoted 11 lines
drivers/power/Kconfig +1
-0default 1250 if AXP152_POWER default 1200 if MACH_SUN6I default 0 if MACH_SUN8I default 900 if MACH_SUN9I + default 1500 if AXP305_POWER ---help--- Set the voltage (mV) to program the axp pmic dcdc4 at, set to 0 to disable dcdc4.@@ -140,6 +150,7 @@ config AXP_DCDC4_VOLT On A23 / A33 boards dcdc4 is unused and should be disabled. On A80 boards dcdc4 powers VDD-SYS, HDMI, USB OTG and should be
0.9V.
Quoted 33 lines
Quoted 23 lines
drivers/power/Kconfig +1
-0On A83T boards dcdc4 is used for VDD-GPU. + On H616 boards dcdcd is used for VCC-DRAM. config AXP_DCDC5_VOLT int "axp pmic dcdc5 voltage"drivers/power/Makefile +1
-0@@ -6,6 +6,7 @@ obj-$(CONFIG_AXP152_POWER) += axp152.o obj-$(CONFIG_AXP209_POWER) += axp209.o obj-$(CONFIG_AXP221_POWER) += axp221.o +obj-$(CONFIG_AXP305_POWER) += axp305.o obj-$(CONFIG_AXP809_POWER) += axp809.o obj-$(CONFIG_AXP818_POWER) += axp818.o obj-$(CONFIG_EXYNOS_TMU) += exynos-tmu.odrivers/power/axp305.c new file +0
-0drivers/power/axp305.c line 7
Quoted 7 lines
drivers/power/axp305.c new file +7
-0@@ -0,0 +1,80 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* AXP305 driver +* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +* +* Based on axp221.c Given that, I wonder if we can (later) simplify this, ideally we end up at something like this:
Quoted 4 lines
const struct axp_regulator axp_regulators[] = { {"dcdc1", 1600, 3400, 100, NA, 0x20, 0x10, 0}, ...https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/tree/drivers/
allwinner/axp/axp803.c
Quoted 33 lines
Not sure that can cover all AXP chips, but it's worth a try to remove all this boilerplate.
Cheers,
AndreQuoted 25 lines
drivers/power/axp305.c new file +25
-0+* (C) Copyright 2014 Hans de Goede <[email protected]> +* (C) Copyright 2013 Oliver Schinagl <[email protected]> +*/ + +#include <common.h> +#include <command.h> +#include <errno.h> +#include <asm/arch/pmic_bus.h> +#include <axp_pmic.h> + +static u8 axp305_mvolt_to_cfg (int mvolt,int min,int max,int div) +{ +if (mvolt < min) + mvolt = min; +else if (mvolt > max) + mvolt = max; + +return (mvolt - min) / div; +} + +int axp_set_dcdc4 (unsigned int mvolt) +{ +int ret; +u8 cfg; +
Quoted 8 lines
drivers/power/axp305.c line 41
Quoted 8 lines
drivers/power/axp305.c new file +8
-0+if (mvolt >=1600 ) + cfg =46 +axp305_mvolt_to_cfg (mvolt,1600 ,3300 ,100 ); +else + cfg =axp305_mvolt_to_cfg (mvolt,600 ,1500 ,20 ); + +if (mvolt ==0 ) + return pmic_bus_clrbits(AXP305_OUTPUT_CTRL1, +
AXP305_OUTPUT_CTRL1_DCDCD_EN);
Quoted 22 lines
Quoted 22 lines
drivers/power/axp305.c new file +22
-0+ + ret =pmic_bus_write (AXP305_DCDCD_VOLTAGE , cfg); +if (ret) +return ret; + +return pmic_bus_setbits (AXP305_OUTPUT_CTRL1 , +AXP305_OUTPUT_CTRL1_DCDCD_EN ); +} + +int axp_init (void ) +{ +u8 axp_chip_id; +int ret; + + ret =pmic_bus_init (); +if (ret) +return ret; + + ret =pmic_bus_read (AXP305_CHIP_VERSION , &axp_chip_id); +if (ret) +return ret; +
Quoted 8 lines
drivers/power/axp305.c
Quoted 8 lines
drivers/power/axp305.c new file +8
-0+if ((axp_chip_id &AXP305_CHIP_VERSION_MASK ) !=0x40 ) +return -ENODEV ; + +return ret; +} + +#ifndef CONFIG_PSCI_RESET +int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const
argv[])
Quoted 50 lines
Quoted 48 lines
drivers/power/axp305.c new file +10
-0+{ +pmic_bus_write (AXP305_SHUTDOWN ,AXP305_POWEROFF ); + +/* infinite loop during shutdown */ +while (1 ) {} + +/* not reached */ +return 0 ; +} +#endif include/axp305.h new file +17
-0@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +*/ + +enum axp305_reg { +AXP305_CHIP_VERSION =0x3 , +AXP305_OUTPUT_CTRL1 =0x10 , +AXP305_DCDCD_VOLTAGE =0x15 , +AXP305_SHUTDOWN =0x32 , +}; + +#define AXP305_CHIP_VERSION_MASK 0xcf + +#define AXP305_OUTPUT_CTRL1_DCDCD_EN (1 << 3) + +#define AXP305_POWEROFF (1 << 7)include/axp_pmic.h +3
-0@@ -15,6 +15,9 @@#ifdef CONFIG_AXP221_POWER #include <axp221.h> #endif +#ifdef CONFIG_AXP305_POWER +#include <axp305.h> +#endif #ifdef CONFIG_AXP809_POWER #include <axp809.h> #endif
PATCH 2/17 sunxi: Introduce common symbol for H6 like SoCs
In reply to Jernej SkrabecIt turns out that there are at least 2 other SoCs which have basically the same memory map, similar clocks and other features as H6. It's very likely that we'll see more such SoCs in the future. In order to ease porting to new SoCs and lower ifdef clutter, introduce common symbol for them.
--- arch/arm/include/asm/arch-sunxi/boot0.h | 2 +- arch/arm/include/asm/arch-sunxi/clock.h | 2 +- arch/arm/include/asm/arch-sunxi/cpu.h | 2 +- arch/arm/include/asm/arch-sunxi/timer.h | 2 +- arch/arm/mach-sunxi/Kconfig | 21 +++++++++++++-------- arch/arm/mach-sunxi/Makefile | 2 +- arch/arm/mach-sunxi/board.c | 4 ++-- arch/arm/mach-sunxi/rmr_switch.S | 2 +- common/spl/Kconfig | 4 ++-- include/configs/sun50i.h | 2 +- 10 files changed, 24 insertions(+), 19 deletions(-)
arch/arm/include/asm/arch-sunxi/boot0.h +1 -1
@@ -39,7 +39,7 @@ .word 0xf57ff06f // isb sy .word 0xe320f003 // wfi .word 0xeafffffd // b @wfi -#ifndef CONFIG_MACH_SUN50I_H6 +#ifndef CONFIG_SUN50I_GEN_H6 .word 0x017000a0 // writeable RVBAR mapping address #else .word 0x09010040 // writeable RVBAR mapping address
arch/arm/include/asm/arch-sunxi/clock.h +1 -1
@@ -16,7 +16,7 @@/* clock control module regs definition */ #if defined(CONFIG_MACH_SUN8I_A83T )#include <asm/arch/clock_sun8i_a83t.h> -#elif defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUN50I_GEN_H6 )#include <asm/arch/clock_sun50i_h6.h> #elif defined(CONFIG_MACH_SUN6I ) || defined(CONFIG_MACH_SUN8I ) || \ defined(CONFIG_MACH_SUN50I )
arch/arm/include/asm/arch-sunxi/cpu.h +1 -1
@@ -8,7 +8,7 @@#if defined(CONFIG_MACH_SUN9I )#include <asm/arch/cpu_sun9i.h> -#elif defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUN50I_GEN_H6 )#include <asm/arch/cpu_sun50i_h6.h> #else #include <asm/arch/cpu_sun4i.h>
arch/arm/include/asm/arch-sunxi/timer.h +1 -1
@@ -76,7 +76,7 @@ struct sunxi_timer_reg {struct sunxi_tgp tgp[4 ];u8 res5[8 ];u32 cpu_cfg; -#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 )u8 res3[16 ];struct sunxi_wdog wdog[5 ];/* We have 5 watchdogs */ #endif
arch/arm/mach-sunxi/Kconfig +13 -8
@@ -82,7 +82,7 @@ config SUN8I_RSB config SUNXI_SRAM_ADDRESS hex default 0x10000 if MACH_SUN9I || MACH_SUN50I || MACH_SUN50I_H5 - default 0x20000 if MACH_SUN50I_H6 + default 0x20000 if SUN50I_GEN_H6 default 0x0 ---help--- Older Allwinner SoCs have their mask boot ROM mapped just below 4GB,
@@ -108,6 +108,15 @@ config SUNXI_GEN_SUN6I separate ahb reset control registers, custom pmic bus, new style watchdog, etc. +config SUN50I_GEN_H6 + bool + select FIT + select SPL_LOAD_FIT + select SUPPORT_SPL + ---help--- + Select this for sunxi SoCs which have H6 like peripherals, clocks + and memory map. + config SUNXI_DRAM_DW bool ---help---
@@ -302,10 +311,7 @@ config MACH_SUN50I_H5 config MACH_SUN50I_H6 bool "sun50i (Allwinner H6)" select ARM64 - select SUPPORT_SPL - select FIT select PHY_SUN4I_USB - select SPL_LOAD_FIT select DRAM_SUN50I_H6 endchoice
@@ -540,7 +546,6 @@ config SYS_CLK_FREQ default 816000000 if MACH_SUN50I || MACH_SUN50I_H5 default 1008000000 if MACH_SUN8I default 1008000000 if MACH_SUN9I - default 888000000 if MACH_SUN50I_H6 config SYS_CONFIG_NAME default "sun4i" if MACH_SUN4I
@@ -756,7 +761,7 @@ config VIDEO_SUNXI depends on !MACH_SUN8I_V3S depends on !MACH_SUN9I depends on !MACH_SUN50I - depends on !MACH_SUN50I_H6 + depends on !SUN50I_GEN_H6 select VIDEO imply VIDEO_DT_SIMPLEFB default y
@@ -989,11 +994,11 @@ config SPL_STACK_R_ADDR default 0x4fe00000 if MACH_SUN8I default 0x2fe00000 if MACH_SUN9I default 0x4fe00000 if MACH_SUN50I - default 0x4fe00000 if MACH_SUN50I_H6 + default 0x4fe00000 if SUN50I_GEN_H6 config SPL_SPI_SUNXI bool "Support for SPI Flash on Allwinner SoCs in SPL" - depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_R40 || MACH_SUN50I_H6 + depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_R40 || SUN50I_GEN_H6 help Enable support for SPI Flash. This option allows SPL to read from sunxi SPI Flash. It uses the same method as the boot ROM, so does
arch/arm/mach-sunxi/Makefile +1 -1
@@ -26,7 +26,7 @@ else obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o -obj-$(CONFIG_MACH_SUN50I_H6) += clock_sun50i_h6.o +obj-$(CONFIG_SUN50I_GEN_H6) += clock_sun50i_h6.o ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.o
arch/arm/mach-sunxi/board.c +2 -2
@@ -144,7 +144,7 @@ static int gpio_init(void)#error Unsupported console port number. Please fix pin mux settings in board.c#endif -#ifdef CONFIG_MACH_SUN50I_H6 +#ifdef CONFIG_SUN50I_GEN_H6 /* Update PIO power bias configuration by copy hardware detected value */ val =readl (SUNXI_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_VAL );writel (val,SUNXI_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_SEL );
@@ -329,7 +329,7 @@ void reset_cpu(ulong addr)/* sun5i sometimes gets stuck without this */ writel (WDT_MODE_RESET_EN |WDT_MODE_EN , &wdog->mode); } -#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 )#if defined(CONFIG_MACH_SUN50I_H6 )/* WDOG is broken for some H6 rev. use the R_WDOG instead */ static const struct sunxi_wdog *wdog =
arch/arm/mach-sunxi/rmr_switch.S +1 -1
@@ -30,7 +30,7 @@ .text -#ifndef CONFIG_MACH_SUN50I_H6 +#ifndef CONFIG_SUN50I_GEN_H6 ldr r1, =0x017000a0 @ MMIO mapped RVBAR[0] register #else ldr r1, =0x09010040 @ MMIO mapped RVBAR[0] register
common/spl/Kconfig +2 -2
@@ -150,7 +150,7 @@ config SPL_TEXT_BASE hex "SPL Text Base" default ISW_ENTRY_ADDR if AM43XX || AM33XX || OMAP54XX || ARCH_KEYSTONE default 0x10060 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN9I - default 0x20060 if MACH_SUN50I_H6 + default 0x20060 if SUN50I_GEN_H6 default 0x00060 if ARCH_SUNXI default 0xfffc0000 if ARCH_ZYNQMP default 0x0
@@ -459,7 +459,7 @@ config SPL_SHA512_SUPPORT config SPL_FIT_IMAGE_TINY bool "Remove functionality from SPL FIT loading to reduce size" depends on SPL_FIT - default y if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN50I_H6 + default y if MACH_SUN50I || MACH_SUN50I_H5 || SUN50I_GEN_H6 default y if ARCH_IMX8M help Enable this to reduce the size of the FIT image loading code
include/configs/sun50i.h +1 -1
@@ -10,7 +10,7 @@* A64 specific configuration */ -#ifndef CONFIG_MACH_SUN50I_H6 +#ifndef CONFIG_SUN50I_GEN_H6 #define GICD_BASE 0x1c81000#define GICC_BASE 0x1c82000#else
Signature · 1 line
2.30.0
Samuel Holland
maintainerPATCH 2/17 sunxi: Introduce common symbol for H6 like SoCs
Quoted 86 lines · Jernej Skrabec
It turns out that there are at least 2 other SoCs which have basically the same memory map, similar clocks and other features as H6. It's very likely that we'll see more such SoCs in the future. In order to ease porting to new SoCs and lower ifdef clutter, introduce common symbol for them.
Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/include/asm/arch-sunxi/boot0.h | 2 +- arch/arm/include/asm/arch-sunxi/clock.h | 2 +- arch/arm/include/asm/arch-sunxi/cpu.h | 2 +- arch/arm/include/asm/arch-sunxi/timer.h | 2 +- arch/arm/mach-sunxi/Kconfig | 21 +++++++++++++-------- arch/arm/mach-sunxi/Makefile | 2 +- arch/arm/mach-sunxi/board.c | 4 ++-- arch/arm/mach-sunxi/rmr_switch.S | 2 +- common/spl/Kconfig | 4 ++-- include/configs/sun50i.h | 2 +- 10 files changed, 24 insertions(+), 19 deletions(-)arch/arm/include/asm/arch-sunxi/boot0.h +1
-1@@ -39,7 +39,7 @@ .word 0xf57ff06f // isb sy .word 0xe320f003 // wfi .word 0xeafffffd // b @wfi -#ifndef CONFIG_MACH_SUN50I_H6 +#ifndef CONFIG_SUN50I_GEN_H6 .word 0x017000a0 // writeable RVBAR mapping address #else .word 0x09010040 // writeable RVBAR mapping addressarch/arm/include/asm/arch-sunxi/clock.h +1
-1@@ -16,7 +16,7 @@/* clock control module regs definition */ #if defined(CONFIG_MACH_SUN8I_A83T )#include <asm/arch/clock_sun8i_a83t.h> -#elif defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUN50I_GEN_H6 )#include <asm/arch/clock_sun50i_h6.h> #elif defined(CONFIG_MACH_SUN6I ) || defined(CONFIG_MACH_SUN8I ) || \ defined(CONFIG_MACH_SUN50I )arch/arm/include/asm/arch-sunxi/cpu.h +1
-1@@ -8,7 +8,7 @@#if defined(CONFIG_MACH_SUN9I )#include <asm/arch/cpu_sun9i.h> -#elif defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUN50I_GEN_H6 )#include <asm/arch/cpu_sun50i_h6.h> #else #include <asm/arch/cpu_sun4i.h> arch/arm/include/asm/arch-sunxi/timer.h +1
-1@@ -76,7 +76,7 @@ struct sunxi_timer_reg {struct sunxi_tgp tgp[4 ];u8 res5[8 ];u32 cpu_cfg; -#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 )u8 res3[16 ];struct sunxi_wdog wdog[5 ];/* We have 5 watchdogs */ #endif arch/arm/mach-sunxi/Kconfig +1
-1@@ -82,7 +82,7 @@ config SUN8I_RSB config SUNXI_SRAM_ADDRESS hex default 0x10000 if MACH_SUN9I || MACH_SUN50I || MACH_SUN50I_H5 - default 0x20000 if MACH_SUN50I_H6 + default 0x20000 if SUN50I_GEN_H6 default 0x0 ---help--- Older Allwinner SoCs have their mask boot ROM mapped just below 4GB,
arch/arm/mach-sunxi/Kconfig config SUNXI_GEN_SUN6I · line 111
Quoted 4 lines
arch/arm/mach-sunxi/Kconfig +1
-0@@ -108,6 +108,15 @@ config SUNXI_GEN_SUN6I separate ahb reset control registers, custom pmic bus, new style watchdog, etc. +config SUN50I_GEN_H6
The new memory map is also used for 32-bit SoCs V5 (sun8iw12p1) and newer. So this is not sun50i-specific, and I'd suggest SUNXI_GEN_H6 (or even SUNXI_GEN_H6_V5). It is unfortunate there appears to be no name for this family.
Quoted 12 lines
arch/arm/mach-sunxi/Kconfig +8
-0+ bool + select FIT + select SPL_LOAD_FIT + select SUPPORT_SPL + ---help--- + Select this for sunxi SoCs which have H6 like peripherals, clocks + and memory map. + config SUNXI_DRAM_DW bool ---help---
arch/arm/mach-sunxi/Kconfig config MACH_SUN50I_H5 · line 315
Quoted 8 lines
arch/arm/mach-sunxi/Kconfig +0
-3@@ -302,10 +311,7 @@ config MACH_SUN50I_H5 config MACH_SUN50I_H6 bool "sun50i (Allwinner H6)" select ARM64 - select SUPPORT_SPL - select FIT select PHY_SUN4I_USB - select SPL_LOAD_FIT select DRAM_SUN50I_H6
I would expect this to select SUN50I_GEN_H6.
arch/arm/mach-sunxi/Kconfig config SYS_CLK_FREQ · line 543
Quoted 6 lines
arch/arm/mach-sunxi/Kconfig +0
-1endchoice@@ -540,7 +546,6 @@ config SYS_CLK_FREQ default 816000000 if MACH_SUN50I || MACH_SUN50I_H5 default 1008000000 if MACH_SUN8I default 1008000000 if MACH_SUN9I - default 888000000 if MACH_SUN50I_H6
Was this removal intentional? You later add a different value for H616 only.
Quoted 87 lines
arch/arm/mach-sunxi/Kconfig +3
-3config SYS_CONFIG_NAME default "sun4i" if MACH_SUN4I@@ -756,7 +761,7 @@ config VIDEO_SUNXI depends on !MACH_SUN8I_V3S depends on !MACH_SUN9I depends on !MACH_SUN50I - depends on !MACH_SUN50I_H6 + depends on !SUN50I_GEN_H6 select VIDEO imply VIDEO_DT_SIMPLEFB default y@@ -989,11 +994,11 @@ config SPL_STACK_R_ADDR default 0x4fe00000 if MACH_SUN8I default 0x2fe00000 if MACH_SUN9I default 0x4fe00000 if MACH_SUN50I - default 0x4fe00000 if MACH_SUN50I_H6 + default 0x4fe00000 if SUN50I_GEN_H6 config SPL_SPI_SUNXI bool "Support for SPI Flash on Allwinner SoCs in SPL" - depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_R40 || MACH_SUN50I_H6 + depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_R40 || SUN50I_GEN_H6 help Enable support for SPI Flash. This option allows SPL to read from sunxi SPI Flash. It uses the same method as the boot ROM, so doesarch/arm/mach-sunxi/Makefile +1
-1@@ -26,7 +26,7 @@ else obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o -obj-$(CONFIG_MACH_SUN50I_H6) += clock_sun50i_h6.o +obj-$(CONFIG_SUN50I_GEN_H6) += clock_sun50i_h6.o ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.oarch/arm/mach-sunxi/board.c +2
-2@@ -144,7 +144,7 @@ static int gpio_init(void)#error Unsupported console port number. Please fix pin mux settings in board.c#endif -#ifdef CONFIG_MACH_SUN50I_H6 +#ifdef CONFIG_SUN50I_GEN_H6 /* Update PIO power bias configuration by copy hardware detected value */ val =readl (SUNXI_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_VAL );writel (val,SUNXI_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_SEL );@@ -329,7 +329,7 @@ void reset_cpu(ulong addr)/* sun5i sometimes gets stuck without this */ writel (WDT_MODE_RESET_EN |WDT_MODE_EN , &wdog->mode); } -#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 )#if defined(CONFIG_MACH_SUN50I_H6 )/* WDOG is broken for some H6 rev. use the R_WDOG instead */ static const struct sunxi_wdog *wdog =arch/arm/mach-sunxi/rmr_switch.S +1
-1@@ -30,7 +30,7 @@ .text -#ifndef CONFIG_MACH_SUN50I_H6 +#ifndef CONFIG_SUN50I_GEN_H6 ldr r1, =0x017000a0 @ MMIO mapped RVBAR[0] register #else ldr r1, =0x09010040 @ MMIO mapped RVBAR[0] registercommon/spl/Kconfig +1
-1@@ -150,7 +150,7 @@ config SPL_TEXT_BASE hex "SPL Text Base" default ISW_ENTRY_ADDR if AM43XX || AM33XX || OMAP54XX || ARCH_KEYSTONE default 0x10060 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN9I - default 0x20060 if MACH_SUN50I_H6 + default 0x20060 if SUN50I_GEN_H6 default 0x00060 if ARCH_SUNXI default 0xfffc0000 if ARCH_ZYNQMP default 0x0
common/spl/Kconfig config SPL_SHA512_SUPPORT · line 462
Quoted 5 lines
common/spl/Kconfig +1
-1@@ -459,7 +459,7 @@ config SPL_SHA512_SUPPORT config SPL_FIT_IMAGE_TINY bool "Remove functionality from SPL FIT loading to reduce size" depends on SPL_FIT - default y if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN50I_H6 + default y if MACH_SUN50I || MACH_SUN50I_H5 || SUN50I_GEN_H6
This can probably be simplified to ARCH_SUNXI.
Quoted 9 lines
common/spl/Kconfig +0
-0default y if ARCH_IMX8M help Enable this to reduce the size of the FIT image loading codeinclude/configs/sun50i.h +0
-0
include/configs/sun50i.h line 16
Quoted 8 lines
include/configs/sun50i.h +1
-1@@ -10,7 +10,7 @@* A64 specific configuration */ -#ifndef CONFIG_MACH_SUN50I_H6 +#ifndef CONFIG_SUN50I_GEN_H6 #define GICD_BASE 0x1c81000#define GICC_BASE 0x1c82000#else
Cheers,
Samuel
PATCH 2/17 sunxi: Introduce common symbol for H6 like SoCs
On 03/01/2021 23:43, Samuel Holland wrote:
Hi Jernej,
thanks for that patch, that's a nice solution to avoid those long #ifdef chains!
Quoted 90 lines · Jernej Skrabec
Quoted 89 lines
It turns out that there are at least 2 other SoCs which have basically the same memory map, similar clocks and other features as H6. It's very likely that we'll see more such SoCs in the future. In order to ease porting to new SoCs and lower ifdef clutter, introduce common symbol for them.
Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/include/asm/arch-sunxi/boot0.h | 2 +- arch/arm/include/asm/arch-sunxi/clock.h | 2 +- arch/arm/include/asm/arch-sunxi/cpu.h | 2 +- arch/arm/include/asm/arch-sunxi/timer.h | 2 +- arch/arm/mach-sunxi/Kconfig | 21 +++++++++++++-------- arch/arm/mach-sunxi/Makefile | 2 +- arch/arm/mach-sunxi/board.c | 4 ++-- arch/arm/mach-sunxi/rmr_switch.S | 2 +- common/spl/Kconfig | 4 ++-- include/configs/sun50i.h | 2 +- 10 files changed, 24 insertions(+), 19 deletions(-)arch/arm/include/asm/arch-sunxi/boot0.h +1
-1@@ -39,7 +39,7 @@ .word 0xf57ff06f // isb sy .word 0xe320f003 // wfi .word 0xeafffffd // b @wfi -#ifndef CONFIG_MACH_SUN50I_H6 +#ifndef CONFIG_SUN50I_GEN_H6 .word 0x017000a0 // writeable RVBAR mapping address #else .word 0x09010040 // writeable RVBAR mapping addressarch/arm/include/asm/arch-sunxi/clock.h +1
-1@@ -16,7 +16,7 @@/* clock control module regs definition */ #if defined(CONFIG_MACH_SUN8I_A83T )#include <asm/arch/clock_sun8i_a83t.h> -#elif defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUN50I_GEN_H6 )#include <asm/arch/clock_sun50i_h6.h> #elif defined(CONFIG_MACH_SUN6I ) || defined(CONFIG_MACH_SUN8I ) || \ defined(CONFIG_MACH_SUN50I )arch/arm/include/asm/arch-sunxi/cpu.h +1
-1@@ -8,7 +8,7 @@#if defined(CONFIG_MACH_SUN9I )#include <asm/arch/cpu_sun9i.h> -#elif defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUN50I_GEN_H6 )#include <asm/arch/cpu_sun50i_h6.h> #else #include <asm/arch/cpu_sun4i.h> arch/arm/include/asm/arch-sunxi/timer.h +1
-1@@ -76,7 +76,7 @@ struct sunxi_timer_reg {struct sunxi_tgp tgp[4 ];u8 res5[8 ];u32 cpu_cfg; -#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 )u8 res3[16 ];struct sunxi_wdog wdog[5 ];/* We have 5 watchdogs */ #endif arch/arm/mach-sunxi/Kconfig +1
-1@@ -82,7 +82,7 @@ config SUN8I_RSB config SUNXI_SRAM_ADDRESS hex default 0x10000 if MACH_SUN9I || MACH_SUN50I || MACH_SUN50I_H5 - default 0x20000 if MACH_SUN50I_H6 + default 0x20000 if SUN50I_GEN_H6 default 0x0 ---help--- Older Allwinner SoCs have their mask boot ROM mapped just below 4GB,@@ -108,6 +108,15 @@ config SUNXI_GEN_SUN6I separate ahb reset control registers, custom pmic bus, new style watchdog, etc.
Quoted 6 lines
arch/arm/mach-sunxi/Kconfig config SUNXI_GEN_SUN6I · line 111
Quoted 1 line
arch/arm/mach-sunxi/Kconfig +1
-0+config SUN50I_GEN_H6The new memory map is also used for 32-bit SoCs V5 (sun8iw12p1) and newer. So this is not sun50i-specific, and I'd suggest
SUNXI_GEN_H6(or evenSUNXI_GEN_H6_V5). It is unfortunate there appears to be no name for this family.
Yeah, the Allwinner generation naming being *core* dependent is really annyoing and not helpful.
I am fine with a rename, but then it would be very close to "CONFIG_SUNXI_GEN_SUN6I", which is quite confusing to any readers (already stumbled upon it myself in patch 04/17).
Any opinions?
Quoted 15 lines
Quoted 15 lines
arch/arm/mach-sunxi/Kconfig +8
-0+ bool + select FIT + select SPL_LOAD_FIT + select SUPPORT_SPL + ---help--- + Select this for sunxi SoCs which have H6 like peripherals, clocks + and memory map. + config SUNXI_DRAM_DW bool ---help---@@ -302,10 +311,7 @@ config MACH_SUN50I_H5 config MACH_SUN50I_H6 bool "sun50i (Allwinner H6)"
Quoted 8 lines
arch/arm/mach-sunxi/Kconfig config MACH_SUN50I_H5 · line 315
Quoted 6 lines
arch/arm/mach-sunxi/Kconfig +0
-3select ARM64 - select SUPPORT_SPL - select FIT select PHY_SUN4I_USB - select SPL_LOAD_FIT select DRAM_SUN50I_H6I would expect this to select
SUN50I_GEN_H6.
Indeed, that breaks H6 builds.
Quoted 27 lines
arch/arm/mach-sunxi/Kconfig config SYS_CLK_FREQ · line 543
Quoted 6 lines
arch/arm/mach-sunxi/Kconfig +0
-1endchoice@@ -540,7 +546,6 @@ config SYS_CLK_FREQ default 816000000 if MACH_SUN50I || MACH_SUN50I_H5 default 1008000000 if MACH_SUN8I default 1008000000 if MACH_SUN9I - default 888000000 if MACH_SUN50I_H6Was this removal intentional? You later add a different value for H616 only.
Quoted 18 lines
arch/arm/mach-sunxi/Kconfig +2
-2config SYS_CONFIG_NAME default "sun4i" if MACH_SUN4I@@ -756,7 +761,7 @@ config VIDEO_SUNXI depends on !MACH_SUN8I_V3S depends on !MACH_SUN9I depends on !MACH_SUN50I - depends on !MACH_SUN50I_H6 + depends on !SUN50I_GEN_H6 select VIDEO imply VIDEO_DT_SIMPLEFB default y@@ -989,11 +994,11 @@ config SPL_STACK_R_ADDR default 0x4fe00000 if MACH_SUN8I default 0x2fe00000 if MACH_SUN9I default 0x4fe00000 if MACH_SUN50I - default 0x4fe00000 if MACH_SUN50I_H6 + default 0x4fe00000 if SUN50I_GEN_H6
Quoted 4 lines
arch/arm/mach-sunxi/Kconfig config SPL_STACK_R_ADDR · line 1001
Quoted 4 lines
arch/arm/mach-sunxi/Kconfig +1
-1config SPL_SPI_SUNXI bool "Support for SPI Flash on Allwinner SoCs in SPL" - depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_R40 || MACH_SUN50I_H6 + depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_R40 || SUN50I_GEN_H6
I know I suggested this, but it was a bit premature. The SPL SPI code needs some adjustments first. I have a patch, will send it ASAP. But for now you can just drop this change.
Thanks!
Andre
Quoted 94 lines
Quoted 65 lines
arch/arm/mach-sunxi/Kconfig +0
-0help Enable support for SPI Flash. This option allows SPL to read from sunxi SPI Flash. It uses the same method as the boot ROM, so doesarch/arm/mach-sunxi/Makefile +1
-1@@ -26,7 +26,7 @@ else obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o -obj-$(CONFIG_MACH_SUN50I_H6) += clock_sun50i_h6.o +obj-$(CONFIG_SUN50I_GEN_H6) += clock_sun50i_h6.o ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.oarch/arm/mach-sunxi/board.c +2
-2@@ -144,7 +144,7 @@ static int gpio_init(void)#error Unsupported console port number. Please fix pin mux settings in board.c#endif -#ifdef CONFIG_MACH_SUN50I_H6 +#ifdef CONFIG_SUN50I_GEN_H6 /* Update PIO power bias configuration by copy hardware detected value */ val =readl (SUNXI_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_VAL );writel (val,SUNXI_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_SEL );@@ -329,7 +329,7 @@ void reset_cpu(ulong addr)/* sun5i sometimes gets stuck without this */ writel (WDT_MODE_RESET_EN |WDT_MODE_EN , &wdog->mode); } -#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 )#if defined(CONFIG_MACH_SUN50I_H6 )/* WDOG is broken for some H6 rev. use the R_WDOG instead */ static const struct sunxi_wdog *wdog =arch/arm/mach-sunxi/rmr_switch.S +1
-1@@ -30,7 +30,7 @@ .text -#ifndef CONFIG_MACH_SUN50I_H6 +#ifndef CONFIG_SUN50I_GEN_H6 ldr r1, =0x017000a0 @ MMIO mapped RVBAR[0] register #else ldr r1, =0x09010040 @ MMIO mapped RVBAR[0] registercommon/spl/Kconfig +1
-1@@ -150,7 +150,7 @@ config SPL_TEXT_BASE hex "SPL Text Base" default ISW_ENTRY_ADDR if AM43XX || AM33XX || OMAP54XX || ARCH_KEYSTONE default 0x10060 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN9I - default 0x20060 if MACH_SUN50I_H6 + default 0x20060 if SUN50I_GEN_H6 default 0x00060 if ARCH_SUNXI default 0xfffc0000 if ARCH_ZYNQMP default 0x0common/spl/Kconfig config SPL_SHA512_SUPPORT · line 462
Quoted 5 lines
common/spl/Kconfig +1
-1@@ -459,7 +459,7 @@ config SPL_SHA512_SUPPORT config SPL_FIT_IMAGE_TINY bool "Remove functionality from SPL FIT loading to reduce size" depends on SPL_FIT - default y if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN50I_H6 + default y if MACH_SUN50I || MACH_SUN50I_H5 || SUN50I_GEN_H6This can probably be simplified to
ARCH_SUNXI.Quoted 9 lines
common/spl/Kconfig +0
-0default y if ARCH_IMX8M help Enable this to reduce the size of the FIT image loading codeinclude/configs/sun50i.h +0
-0include/configs/sun50i.h line 16
Quoted 8 lines
include/configs/sun50i.h +1
-1@@ -10,7 +10,7 @@* A64 specific configuration */ -#ifndef CONFIG_MACH_SUN50I_H6 +#ifndef CONFIG_SUN50I_GEN_H6 #define GICD_BASE 0x1c81000#define GICC_BASE 0x1c82000#else Cheers,
Samuel
PATCH 2/17 sunxi: Introduce common symbol for H6 like SoCs
Dne ponedeljek, 04. januar 2021 ob 11:35:41 CET je Andr? Przywara napisal(a):
Quoted 115 lines · Samuel Holland
Hi Jernej,
thanks for that patch, that's a nice solution to avoid those long #ifdef chains!
Quoted 108 lines · Jernej Skrabec
Quoted 107 lines
It turns out that there are at least 2 other SoCs which have basically the same memory map, similar clocks and other features as H6. It's very likely that we'll see more such SoCs in the future. In order to ease porting to new SoCs and lower ifdef clutter, introduce common symbol for them.
Signed-off-by Jernej Skrabec <[email protected]>---
arch/arm/include/asm/arch-sunxi/boot0.h | 2 +- arch/arm/include/asm/arch-sunxi/clock.h | 2 +- arch/arm/include/asm/arch-sunxi/cpu.h | 2 +- arch/arm/include/asm/arch-sunxi/timer.h | 2 +- arch/arm/mach-sunxi/Kconfig | 21 +++++++++++++-------- arch/arm/mach-sunxi/Makefile | 2 +- arch/arm/mach-sunxi/board.c | 4 ++-- arch/arm/mach-sunxi/rmr_switch.S | 2 +- common/spl/Kconfig | 4 ++-- include/configs/sun50i.h | 2 +- 10 files changed, 24 insertions(+), 19 deletions(-)(quoted diff) +0
-0
b/arch/arm/include/asm/arch-sunxi/boot0.hindex46d0f0666c2b..e8e8e38f0556100644arch/arm/include/asm/arch-sunxi/boot0.h +1
-1@@ -39,7 +39,7 @@ .word 0xf57ff06f // isb sy .word 0xe320f003 // wfi .word 0xeafffffd // b @wfi -#ifndef CONFIG_MACH_SUN50I_H6 +#ifndef CONFIG_SUN50I_GEN_H6 arch/arm/include/asm/arch-sunxi/boot0.h +0
-0.word 0x017000a0 // writeable RVBAR mapping address #else .word 0x09010040 // writeable RVBAR mapping address(quoted diff) +0
-0
b/arch/arm/include/asm/arch-sunxi/clock.hindex5994130e6b54..cbbe5c7a1e68100644arch/arm/include/asm/arch-sunxi/clock.h +1
-1@@ -16,7 +16,7 @@/* clock control module regs definition */ #if defined(CONFIG_MACH_SUN8I_A83T )#include <asm/arch/clock_sun8i_a83t.h> -#elif defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUN50I_GEN_H6 )#include <
asm/arch/clock_sun50i_h6.h>
#elifdefined(CONFIG_MACH_SUN6I)||defined(CONFIG_MACH_SUN8I)|| \
defined(CONFIG_MACH_SUN50I)(quoted diff) +0
-0
b/arch/arm/include/asm/arch-sunxi/cpu.hindex8b57d24e2f0c..b08f2023748c100644arch/arm/include/asm/arch-sunxi/cpu.h +1
-1@@ -8,7 +8,7 @@#if defined(CONFIG_MACH_SUN9I )#include <asm/arch/cpu_sun9i.h> -#elif defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUN50I_GEN_H6 )#include <asm/arch/cpu_sun50i_h6.h> #else
#include <asm/arch/cpu_sun4i.h>(quoted diff) +0
-0
b/arch/arm/include/asm/arch-sunxi/timer.hindex6f138d04b806..bb5626d893bb100644arch/arm/include/asm/arch-sunxi/timer.h +1
-1@@ -76,7 +76,7 @@ struct sunxi_timer_reg {struct sunxi_tgp tgp[4 ];u8 res5[8 ];u32 cpu_cfg; -#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 )arch/arm/include/asm/arch-sunxi/timer.h +0
-0u8 res3[16 ];struct sunxi_wdog wdog[5 ];/* We have 5 watchdogs */ #endif arch/arm/mach-sunxi/Kconfig +0
-0@@ -82,7 +82,7 @@ config SUN8I_RSB config SUNXI_SRAM_ADDRESS hex default 0x10000 if MACH_SUN9I || MACH_SUN50I || MACH_SUN50I_H5
Quoted 6 lines
Quoted 6 lines
arch/arm/mach-sunxi/Kconfig config SUN8I_RSB
Quoted 6 lines
arch/arm/mach-sunxi/Kconfig +1
-1- default 0x20000 if MACH_SUN50I_H6 + default 0x20000 if SUN50I_GEN_H6arch/arm/mach-sunxi/Kconfig +0
-0default 0x0 ---help--- Older Allwinner SoCs have their mask boot ROM mapped just below
4GB,
Quoted 13 lines
Quoted 6 lines
Quoted 6 lines
arch/arm/mach-sunxi/Kconfig +0
-0@@ -108,6 +108,15 @@ config SUNXI_GEN_SUN6I separate ahb reset control registers, custom pmic bus, new style watchdog, etc.Quoted 6 lines
arch/arm/mach-sunxi/Kconfig config SUNXI_GEN_SUN6I · line 111
Quoted 1 line
arch/arm/mach-sunxi/Kconfig +1
-0+config SUN50I_GEN_H6The new memory map is also used for 32-bit SoCs V5 (sun8iw12p1) and newer. So this is not sun50i-specific, and I'd suggest
SUNXI_GEN_H6(or evenSUNXI_GEN_H6_V5). It is unfortunate there appears to be no name for this family.
Quoted 7 lines
Yeah, the Allwinner generation naming being *core* dependent is really annyoing and not helpful.
I am fine with a rename, but then it would be very close to "CONFIG_SUNXI_GEN_SUN6I", which is quite confusing to any readers (already stumbled upon it myself in patch 04/17).Any opinions?
I would leave it as it is, it's common to name something, usually driver, but in this case symbol, after first known device that implemented particular feature.
Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
arch/arm/mach-sunxi/Kconfig +8
-0+ bool + select FIT + select SPL_LOAD_FIT + select SUPPORT_SPL + ---help--- + Select this for sunxi SoCs which have H6 like peripherals, clocks + and memory map. + config SUNXI_DRAM_DWarch/arm/mach-sunxi/Kconfig +0
-2bool ---help---@@ -302,10 +311,7 @@ config MACH_SUN50I_H5 config MACH_SUN50I_H6 bool "sun50i (Allwinner H6)" select ARM64 - select SUPPORT_SPL - select FIT select PHY_SUN4I_USB
Quoted 7 lines
Quoted 5 lines
arch/arm/mach-sunxi/Kconfig config MACH_SUN50I_H5
Quoted 3 lines
arch/arm/mach-sunxi/Kconfig +0
-1- select SPL_LOAD_FIT select DRAM_SUN50I_H6I would expect this to select
SUN50I_GEN_H6.Indeed, that breaks H6 builds.
Ops, leftover after refactoring.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
endchoice
arch/arm/mach-sunxi/Kconfig +0
-0@@ -540,7 +546,6 @@ config SYS_CLK_FREQ
Quoted 8 lines
Quoted 8 lines
arch/arm/mach-sunxi/Kconfig config SYS_CLK_FREQ
Quoted 5 lines
arch/arm/mach-sunxi/Kconfig +0
-1default 816000000 if MACH_SUN50I || MACH_SUN50I_H5 default 1008000000 if MACH_SUN8I default 1008000000 if MACH_SUN9I - default 888000000 if MACH_SUN50I_H6Was this removal intentional? You later add a different value for H616 only.>
That's also an oversight after refactoring.
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
arch/arm/mach-sunxi/Kconfig +0
-0config SYS_CONFIG_NAMEarch/arm/mach-sunxi/Kconfig +1
-1default "sun4i" if MACH_SUN4I@@ -756,7 +761,7 @@ config VIDEO_SUNXI depends on !MACH_SUN8I_V3S depends on !MACH_SUN9I depends on !MACH_SUN50I - depends on !MACH_SUN50I_H6 + depends on !SUN50I_GEN_H6arch/arm/mach-sunxi/Kconfig +0
-0select VIDEO imply VIDEO_DT_SIMPLEFB default y@@ -989,11 +994,11 @@ config SPL_STACK_R_ADDR default 0x4fe00000 if MACH_SUN8I default 0x2fe00000 if MACH_SUN9I default 0x4fe00000 if MACH_SUN50I
Quoted 8 lines
Quoted 8 lines
arch/arm/mach-sunxi/Kconfig config SPL_STACK_R_ADDR
Quoted 8 lines
arch/arm/mach-sunxi/Kconfig +1
-2- default 0x4fe00000 if MACH_SUN50I_H6 + default 0x4fe00000 if SUN50I_GEN_H6 config SPL_SPI_SUNXI bool "Support for SPI Flash on Allwinner SoCs in SPL" - depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I ||
MACH_SUNXI_H3_H5
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
|| MACH_SUN50I || MACH_SUN8I_R40 || MACH_SUN50I_H6 + depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_R40 || SUN50I_GEN_H6I know I suggested this, but it was a bit premature. The SPL SPI code needs some adjustments first. I have a patch, will send it ASAP. But for now you can just drop this change.
Ok,
Best regards,
Jernej
Quoted 7 lines
Thanks!
AndreQuoted 3 lines
Quoted 3 lines
arch/arm/mach-sunxi/Kconfig +0
-0help Enable support for SPI Flash. This option allows SPL to read
from
Quoted 1 line
Quoted 1 line
Quoted 1 line
sunxi SPI Flash. It uses the same method as the boot ROM, so
does
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
arch/arm/mach-sunxi/Makefile +1
-1@@ -26,7 +26,7 @@ else obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o -obj-$(CONFIG_MACH_SUN50I_H6) += clock_sun50i_h6.o +obj-$(CONFIG_SUN50I_GEN_H6) += clock_sun50i_h6.oifdef
CONFIG_SPL_BUILD
obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.oarch/arm/mach-sunxi/board.c +0
-0@@ -144,7 +144,7 @@ static int gpio_init(void)
Quoted 7 lines
Quoted 7 lines
arch/arm/mach-sunxi/board.c static int gpio_init(void) · line 150
Quoted 7 lines
arch/arm/mach-sunxi/board.c +1
-1#error Unsupported console port number. Please fix pin mux settings in board.c #endif -#ifdef CONFIG_MACH_SUN50I_H6 +#ifdef CONFIG_SUN50I_GEN_H6 /* Update PIO power bias configuration by copy hardware detected
value
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
arch/arm/mach-sunxi/board.c +1
-1*/ val =readl (SUNXI_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_VAL );writel (val,SUNXI_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_SEL );@@ -329,7 +329,7 @@ void reset_cpu(ulong addr)/* sun5i sometimes gets stuck without this */ writel(WDT_MODE_RESET_EN | WDT_MODE_EN, &wdog->mode); } -#elif defined(CONFIG_SUNXI_GEN_SUN6I) || defined(CONFIG_MACH_SUN50I_H6) +#elif defined(CONFIG_SUNXI_GEN_SUN6I) || defined(CONFIG_SUN50I_GEN_H6)#if
defined(CONFIG_MACH_SUN50I_H6)arch/arm/mach-sunxi/board.c +0
-0/* WDOG is broken for some H6 rev. use the R_WDOG instead */ static const struct sunxi_wdog *wdog =(quoted diff) +0
-0
b/arch/arm/mach-sunxi/rmr_switch.Sindexfafd306f95b1..33e55d496865100644arch/arm/mach-sunxi/rmr_switch.S +0
-0@@ -30,7 +30,7 @@
Quoted 6 lines
Quoted 6 lines
arch/arm/mach-sunxi/rmr_switch.S
Quoted 6 lines
arch/arm/mach-sunxi/rmr_switch.S +1
-1.text -#ifndef CONFIG_MACH_SUN50I_H6 +#ifndef CONFIG_SUN50I_GEN_H6 ldr r1, =0x017000a0 @ MMIO mapped
RVBAR[0] register
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
arch/arm/mach-sunxi/rmr_switch.S +0
-0#elseldr r1, =0x09010040 @ MMIO mapped
RVBAR[0] register
Quoted 9 lines
Quoted 9 lines
common/spl/Kconfig config SPL_TEXT_BASE · line 152
Quoted 9 lines
common/spl/Kconfig +0
-0@@ -150,7 +150,7 @@ config SPL_TEXT_BASE hex "SPL Text Base" default ISW_ENTRY_ADDR if AM43XX || AM33XX || OMAP54XX ||
ARCH_KEYSTONE
Quoted 44 lines
Quoted 44 lines
Quoted 10 lines
common/spl/Kconfig +1
-1default 0x10060 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN9I - default 0x20060 if MACH_SUN50I_H6 + default 0x20060 if SUN50I_GEN_H6common/spl/Kconfig +0
-0default 0x00060 if ARCH_SUNXI default 0xfffc0000 if ARCH_ZYNQMP default 0x0common/spl/Kconfig config SPL_SHA512_SUPPORT · line 465
Quoted 8 lines
common/spl/Kconfig +1
-1@@ -459,7 +459,7 @@ config SPL_SHA512_SUPPORT config SPL_FIT_IMAGE_TINY bool "Remove functionality from SPL FIT loading to reduce size" depends on SPL_FIT - default y if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN50I_H6 + default y if MACH_SUN50I || MACH_SUN50I_H5 || SUN50I_GEN_H6This can probably be simplified to
ARCH_SUNXI.Quoted 18 lines
common/spl/Kconfig +0
-0default y if ARCH_IMX8M help Enable this to reduce the size of the FIT image loading codeinclude/configs/sun50i.h +1
-1@@ -10,7 +10,7 @@* A64 specific configuration */ -#ifndef CONFIG_MACH_SUN50I_H6 +#ifndef CONFIG_SUN50I_GEN_H6 #define GICD_BASE 0x1c81000Quoted 2 lines
#define
GICC_BASE0x1c82000
#elseCheers,
Samuel
PATCH 2/17 sunxi: Introduce common symbol for H6 like SoCs
Quoted 142 lines · Jernej ?krabec
Dne ponedeljek, 04. januar 2021 ob 11:35:41 CET je Andr? Przywara napisal(a):
Quoted 115 lines · Samuel Holland
Hi Jernej,
thanks for that patch, that's a nice solution to avoid those long #ifdef chains!
Quoted 108 lines · Jernej Skrabec
Quoted 107 lines
It turns out that there are at least 2 other SoCs which have basically the same memory map, similar clocks and other features as H6. It's very likely that we'll see more such SoCs in the future. In order to ease porting to new SoCs and lower ifdef clutter, introduce common symbol for them.
Signed-off-by Jernej Skrabec <[email protected]>---
arch/arm/include/asm/arch-sunxi/boot0.h | 2 +- arch/arm/include/asm/arch-sunxi/clock.h | 2 +- arch/arm/include/asm/arch-sunxi/cpu.h | 2 +- arch/arm/include/asm/arch-sunxi/timer.h | 2 +- arch/arm/mach-sunxi/Kconfig | 21 +++++++++++++-------- arch/arm/mach-sunxi/Makefile | 2 +- arch/arm/mach-sunxi/board.c | 4 ++-- arch/arm/mach-sunxi/rmr_switch.S | 2 +- common/spl/Kconfig | 4 ++-- include/configs/sun50i.h | 2 +- 10 files changed, 24 insertions(+), 19 deletions(-)(quoted diff) +0
-0
b/arch/arm/include/asm/arch-sunxi/boot0.hindex46d0f0666c2b..e8e8e38f0556100644arch/arm/include/asm/arch-sunxi/boot0.h +1
-1@@ -39,7 +39,7 @@ .word 0xf57ff06f // isb sy .word 0xe320f003 // wfi .word 0xeafffffd // b @wfi -#ifndef CONFIG_MACH_SUN50I_H6 +#ifndef CONFIG_SUN50I_GEN_H6 arch/arm/include/asm/arch-sunxi/boot0.h +0
-0.word 0x017000a0 // writeable RVBAR mapping address #else .word 0x09010040 // writeable RVBAR mapping address(quoted diff) +0
-0
b/arch/arm/include/asm/arch-sunxi/clock.hindex5994130e6b54..cbbe5c7a1e68100644arch/arm/include/asm/arch-sunxi/clock.h +1
-1@@ -16,7 +16,7 @@/* clock control module regs definition */ #if defined(CONFIG_MACH_SUN8I_A83T )#include <asm/arch/clock_sun8i_a83t.h> -#elif defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUN50I_GEN_H6 )#include <
asm/arch/clock_sun50i_h6.h>
#elifdefined(CONFIG_MACH_SUN6I)||defined(CONFIG_MACH_SUN8I)|| \
defined(CONFIG_MACH_SUN50I)(quoted diff) +0
-0
b/arch/arm/include/asm/arch-sunxi/cpu.hindex8b57d24e2f0c..b08f2023748c100644arch/arm/include/asm/arch-sunxi/cpu.h +1
-1@@ -8,7 +8,7 @@#if defined(CONFIG_MACH_SUN9I )#include <asm/arch/cpu_sun9i.h> -#elif defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUN50I_GEN_H6 )#include <asm/arch/cpu_sun50i_h6.h> #else
#include <asm/arch/cpu_sun4i.h>(quoted diff) +0
-0
b/arch/arm/include/asm/arch-sunxi/timer.hindex6f138d04b806..bb5626d893bb100644arch/arm/include/asm/arch-sunxi/timer.h +1
-1@@ -76,7 +76,7 @@ struct sunxi_timer_reg {struct sunxi_tgp tgp[4 ];u8 res5[8 ];u32 cpu_cfg; -#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 )arch/arm/include/asm/arch-sunxi/timer.h +0
-0u8 res3[16 ];struct sunxi_wdog wdog[5 ];/* We have 5 watchdogs */ #endif arch/arm/mach-sunxi/Kconfig +0
-0@@ -82,7 +82,7 @@ config SUN8I_RSB config SUNXI_SRAM_ADDRESS hex default 0x10000 if MACH_SUN9I || MACH_SUN50I || MACH_SUN50I_H5Quoted 6 lines
Quoted 6 lines
arch/arm/mach-sunxi/Kconfig config SUN8I_RSB
Quoted 6 lines
arch/arm/mach-sunxi/Kconfig +1
-1- default 0x20000 if MACH_SUN50I_H6 + default 0x20000 if SUN50I_GEN_H6arch/arm/mach-sunxi/Kconfig +0
-0default 0x0 ---help--- Older Allwinner SoCs have their mask boot ROM mapped just below4GB,
Quoted 19 lines
Quoted 6 lines
Quoted 6 lines
arch/arm/mach-sunxi/Kconfig +0
-0@@ -108,6 +108,15 @@ config SUNXI_GEN_SUN6I separate ahb reset control registers, custom pmic bus, new style watchdog, etc.Quoted 6 lines
arch/arm/mach-sunxi/Kconfig config SUNXI_GEN_SUN6I · line 111
Quoted 1 line
arch/arm/mach-sunxi/Kconfig +1
-0+config SUN50I_GEN_H6The new memory map is also used for 32-bit SoCs V5 (sun8iw12p1) and newer. So this is not sun50i-specific, and I'd suggest
SUNXI_GEN_H6(or evenSUNXI_GEN_H6_V5). It is unfortunate there appears to be no name for this family.Yeah, the Allwinner generation naming being *core* dependent is really annyoing and not helpful.
I am fine with a rename, but then it would be very close to "CONFIG_SUNXI_GEN_SUN6I", which is quite confusing to any readers (already stumbled upon it myself in patch 04/17).
Quoted 5 lines
Quoted 1 line
Any opinions?
I would leave it as it is, it's common to name something, usually driver, but in this case symbol, after first known device that implemented particular feature.
Yes, but typically that's for drivers, and here this is specifying a group of SoCs, like CONFIG_SUNXI_GEN_SUN6I does (where we also use _SUNXI_).
But this is really nitpicking, since there is no ABI, we can rename it easily later with a simple patch, should we agree on the right name for that baby.
Cheers,
Andre.
Quoted 235 lines
Quoted 28 lines
Quoted 28 lines
Quoted 28 lines
arch/arm/mach-sunxi/Kconfig +8
-0+ bool + select FIT + select SPL_LOAD_FIT + select SUPPORT_SPL + ---help--- + Select this for sunxi SoCs which have H6 like peripherals, clocks + and memory map. + config SUNXI_DRAM_DWarch/arm/mach-sunxi/Kconfig +0
-2bool ---help---@@ -302,10 +311,7 @@ config MACH_SUN50I_H5 config MACH_SUN50I_H6 bool "sun50i (Allwinner H6)" select ARM64 - select SUPPORT_SPL - select FIT select PHY_SUN4I_USBQuoted 7 lines
Quoted 5 lines
arch/arm/mach-sunxi/Kconfig config MACH_SUN50I_H5
Quoted 3 lines
arch/arm/mach-sunxi/Kconfig +0
-1- select SPL_LOAD_FIT select DRAM_SUN50I_H6I would expect this to select
SUN50I_GEN_H6.Indeed, that breaks H6 builds.
Ops, leftover after refactoring.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
endchoice
arch/arm/mach-sunxi/Kconfig +0
-0@@ -540,7 +546,6 @@ config SYS_CLK_FREQQuoted 8 lines
Quoted 8 lines
arch/arm/mach-sunxi/Kconfig config SYS_CLK_FREQ
Quoted 5 lines
arch/arm/mach-sunxi/Kconfig +0
-1default 816000000 if MACH_SUN50I || MACH_SUN50I_H5 default 1008000000 if MACH_SUN8I default 1008000000 if MACH_SUN9I - default 888000000 if MACH_SUN50I_H6Was this removal intentional? You later add a different value for H616 only.>
That's also an oversight after refactoring.
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
arch/arm/mach-sunxi/Kconfig +0
-0config SYS_CONFIG_NAMEarch/arm/mach-sunxi/Kconfig +1
-1default "sun4i" if MACH_SUN4I@@ -756,7 +761,7 @@ config VIDEO_SUNXI depends on !MACH_SUN8I_V3S depends on !MACH_SUN9I depends on !MACH_SUN50I - depends on !MACH_SUN50I_H6 + depends on !SUN50I_GEN_H6arch/arm/mach-sunxi/Kconfig +0
-0select VIDEO imply VIDEO_DT_SIMPLEFB default y@@ -989,11 +994,11 @@ config SPL_STACK_R_ADDR default 0x4fe00000 if MACH_SUN8I default 0x2fe00000 if MACH_SUN9I default 0x4fe00000 if MACH_SUN50IQuoted 8 lines
Quoted 8 lines
arch/arm/mach-sunxi/Kconfig config SPL_STACK_R_ADDR
Quoted 8 lines
arch/arm/mach-sunxi/Kconfig +1
-2- default 0x4fe00000 if MACH_SUN50I_H6 + default 0x4fe00000 if SUN50I_GEN_H6 config SPL_SPI_SUNXI bool "Support for SPI Flash on Allwinner SoCs in SPL" - depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I ||
MACH_SUNXI_H3_H5Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
|| MACH_SUN50I || MACH_SUN8I_R40 || MACH_SUN50I_H6 + depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_R40 || SUN50I_GEN_H6I know I suggested this, but it was a bit premature. The SPL SPI code needs some adjustments first. I have a patch, will send it ASAP. But for now you can just drop this change.
Ok,
Best regards,
JernejQuoted 7 lines
Thanks!
AndreQuoted 3 lines
Quoted 3 lines
arch/arm/mach-sunxi/Kconfig +0
-0help Enable support for SPI Flash. This option allows SPL to readfrom
Quoted 1 line
Quoted 1 line
Quoted 1 line
sunxi SPI Flash. It uses the same method as the boot ROM, so
does
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
arch/arm/mach-sunxi/Makefile +1
-1@@ -26,7 +26,7 @@ else obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o -obj-$(CONFIG_MACH_SUN50I_H6) += clock_sun50i_h6.o +obj-$(CONFIG_SUN50I_GEN_H6) += clock_sun50i_h6.oifdef
CONFIG_SPL_BUILD
obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.oarch/arm/mach-sunxi/board.c +0
-0@@ -144,7 +144,7 @@ static int gpio_init(void)Quoted 7 lines
Quoted 7 lines
arch/arm/mach-sunxi/board.c static int gpio_init(void) · line 150
Quoted 7 lines
arch/arm/mach-sunxi/board.c +1
-1#error Unsupported console port number. Please fix pin mux settings in board.c #endif -#ifdef CONFIG_MACH_SUN50I_H6 +#ifdef CONFIG_SUN50I_GEN_H6 /* Update PIO power bias configuration by copy hardware detected value
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
arch/arm/mach-sunxi/board.c +1
-1*/ val =readl (SUNXI_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_VAL );writel (val,SUNXI_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_SEL );@@ -329,7 +329,7 @@ void reset_cpu(ulong addr)/* sun5i sometimes gets stuck without this */ writel(WDT_MODE_RESET_EN | WDT_MODE_EN, &wdog->mode); } -#elif defined(CONFIG_SUNXI_GEN_SUN6I) || defined(CONFIG_MACH_SUN50I_H6) +#elif defined(CONFIG_SUNXI_GEN_SUN6I) || defined(CONFIG_SUN50I_GEN_H6)#if
defined(CONFIG_MACH_SUN50I_H6)arch/arm/mach-sunxi/board.c +0
-0/* WDOG is broken for some H6 rev. use the R_WDOG instead */ static const struct sunxi_wdog *wdog =(quoted diff) +0
-0
b/arch/arm/mach-sunxi/rmr_switch.Sindexfafd306f95b1..33e55d496865100644arch/arm/mach-sunxi/rmr_switch.S +0
-0@@ -30,7 +30,7 @@Quoted 6 lines
Quoted 6 lines
arch/arm/mach-sunxi/rmr_switch.S
Quoted 6 lines
arch/arm/mach-sunxi/rmr_switch.S +1
-1.text -#ifndef CONFIG_MACH_SUN50I_H6 +#ifndef CONFIG_SUN50I_GEN_H6 ldr r1, =0x017000a0 @ MMIO mappedRVBAR[0] register
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
arch/arm/mach-sunxi/rmr_switch.S +0
-0#elseldr r1, =0x09010040 @ MMIO mapped
RVBAR[0] register
Quoted 9 lines
Quoted 9 lines
common/spl/Kconfig config SPL_TEXT_BASE · line 152
Quoted 9 lines
common/spl/Kconfig +0
-0@@ -150,7 +150,7 @@ config SPL_TEXT_BASE hex "SPL Text Base" default ISW_ENTRY_ADDR if AM43XX || AM33XX || OMAP54XX ||
ARCH_KEYSTONEQuoted 44 lines
Quoted 44 lines
Quoted 10 lines
common/spl/Kconfig +1
-1default 0x10060 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN9I - default 0x20060 if MACH_SUN50I_H6 + default 0x20060 if SUN50I_GEN_H6common/spl/Kconfig +0
-0default 0x00060 if ARCH_SUNXI default 0xfffc0000 if ARCH_ZYNQMP default 0x0common/spl/Kconfig config SPL_SHA512_SUPPORT · line 465
Quoted 8 lines
common/spl/Kconfig +1
-1@@ -459,7 +459,7 @@ config SPL_SHA512_SUPPORT config SPL_FIT_IMAGE_TINY bool "Remove functionality from SPL FIT loading to reduce size" depends on SPL_FIT - default y if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN50I_H6 + default y if MACH_SUN50I || MACH_SUN50I_H5 || SUN50I_GEN_H6This can probably be simplified to
ARCH_SUNXI.Quoted 18 lines
common/spl/Kconfig +0
-0default y if ARCH_IMX8M help Enable this to reduce the size of the FIT image loading codeinclude/configs/sun50i.h +1
-1@@ -10,7 +10,7 @@* A64 specific configuration */ -#ifndef CONFIG_MACH_SUN50I_H6 +#ifndef CONFIG_SUN50I_GEN_H6 #define GICD_BASE 0x1c81000Quoted 2 lines
#define
GICC_BASE0x1c82000
#elseCheers,
Samuel
PATCH 3/17 mmc: sunxi: Replace H6 ifdefs with H6 gen macro
In reply to Jernej SkrabecIt turns out that several SoCs share same mmc configuration as H6. In order to lower ifdef clutter replace H6 specific macro with common one.
--- arch/arm/include/asm/arch-sunxi/mmc.h | 2 +- drivers/mmc/sunxi_mmc.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/include/asm/arch-sunxi/mmc.h +1 -1
@@ -45,7 +45,7 @@ struct sunxi_mmc {u32 chda;/* 0x90 */ u32 cbda;/* 0x94 */ u32 res2[26 ]; -#if defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#if defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 )u32 res3[17 ];u32 samp_dl;u32 res4[46 ];
drivers/mmc/sunxi_mmc.c +6 -6
@@ -122,7 +122,7 @@ static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, unsigned int hz)if (IS_ENABLED (CONFIG_MACH_SUN8I_A83T ) && priv->mmc_no !=2 ) new_mode = false; -#if defined(CONFIG_MACH_SUN50I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#if defined(CONFIG_MACH_SUN50I ) || defined(CONFIG_SUN50I_GEN_H6 ) calibrate = true;#endif
@@ -133,7 +133,7 @@ static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, unsigned int hz)#ifdef CONFIG_MACH_SUN9I pll =CCM_MMC_CTRL_PLL_PERIPH0 ; pll_hz =clock_get_pll4_periph0 (); -#elif defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUN50I_GEN_H6 ) pll =CCM_MMC_CTRL_PLL6X2 ; pll_hz =clock_get_pll6 () *2 ;#else
@@ -249,7 +249,7 @@ static int mmc_config_clock(struct sunxi_mmc_priv *priv, struct mmc *mmc) rval &= ~SUNXI_MMC_CLK_DIVIDER_MASK ;writel (rval, &priv->reg->clkcr); -#if defined(CONFIG_MACH_SUN50I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#if defined(CONFIG_MACH_SUN50I ) || defined(CONFIG_SUN50I_GEN_H6 )/* A64 supports calibration of delays on MMC controller and we * have to set delay of zero before starting calibration. * Allwinner BSP driver sets a delay only in the case of
@@ -530,7 +530,7 @@ struct mmc *sunxi_mmc_init(int sdc_no) cfg->voltages =MMC_VDD_32_33 |MMC_VDD_33_34 ; cfg->host_caps =MMC_MODE_4BIT ; -#if defined(CONFIG_MACH_SUN50I ) || defined(CONFIG_MACH_SUN8I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#if defined(CONFIG_MACH_SUN50I ) || defined(CONFIG_MACH_SUN8I ) || defined(CONFIG_SUN50I_GEN_H6 )if (sdc_no ==2 ) cfg->host_caps =MMC_MODE_8BIT ;#endif
@@ -545,7 +545,7 @@ struct mmc *sunxi_mmc_init(int sdc_no)/* config ahb clock */ debug ("init mmc %d clock and io\n" , sdc_no); -#if !defined(CONFIG_MACH_SUN50I_H6 ) +#if !defined(CONFIG_SUN50I_GEN_H6 )setbits_le32 (&ccm->ahb_gate0,1 <<AHB_GATE_OFFSET_MMC (sdc_no));#ifdef CONFIG_SUNXI_GEN_SUN6I
@@ -557,7 +557,7 @@ struct mmc *sunxi_mmc_init(int sdc_no)writel (SUNXI_MMC_COMMON_CLK_GATE |SUNXI_MMC_COMMON_RESET ,SUNXI_MMC_COMMON_BASE +4 * sdc_no);#endif -#else /* CONFIG_MACH_SUN50I_H6 */ +#else /* CONFIG_SUN50I_GEN_H6 */ setbits_le32 (&ccm->sd_gate_reset,1 << sdc_no);/* unassert reset */ setbits_le32 (&ccm->sd_gate_reset,1 << (RESET_SHIFT + sdc_no));
Signature · 1 line
2.30.0
PATCH 3/17 mmc: sunxi: Replace H6 ifdefs with H6 gen macro
Quoted 4 lines · Jernej Skrabec
It turns out that several SoCs share same mmc configuration as H6. In order to lower ifdef clutter replace H6 specific macro with common one.
Signed-off-by Jernej Skrabec <[email protected]>
Shame we need to do this, but the SPL requires this ifdef orgy.
Cheers,
Andre
Quoted 77 lines
--- arch/arm/include/asm/arch-sunxi/mmc.h | 2 +- drivers/mmc/sunxi_mmc.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)arch/arm/include/asm/arch-sunxi/mmc.h +1
-1@@ -45,7 +45,7 @@ struct sunxi_mmc {u32 chda;/* 0x90 */ u32 cbda;/* 0x94 */ u32 res2[26 ]; -#if defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#if defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 )u32 res3[17 ];u32 samp_dl;u32 res4[46 ];drivers/mmc/sunxi_mmc.c +6
-6@@ -122,7 +122,7 @@ static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, unsigned int hz)if (IS_ENABLED (CONFIG_MACH_SUN8I_A83T ) && priv->mmc_no !=2 ) new_mode = false; -#if defined(CONFIG_MACH_SUN50I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#if defined(CONFIG_MACH_SUN50I ) || defined(CONFIG_SUN50I_GEN_H6 ) calibrate = true;#endif @@ -133,7 +133,7 @@ static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, unsigned int hz)#ifdef CONFIG_MACH_SUN9I pll =CCM_MMC_CTRL_PLL_PERIPH0 ; pll_hz =clock_get_pll4_periph0 (); -#elif defined(CONFIG_MACH_SUN50I_H6 ) +#elif defined(CONFIG_SUN50I_GEN_H6 ) pll =CCM_MMC_CTRL_PLL6X2 ; pll_hz =clock_get_pll6 () *2 ;#else @@ -249,7 +249,7 @@ static int mmc_config_clock(struct sunxi_mmc_priv *priv, struct mmc *mmc) rval &= ~SUNXI_MMC_CLK_DIVIDER_MASK ;writel (rval, &priv->reg->clkcr); -#if defined(CONFIG_MACH_SUN50I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#if defined(CONFIG_MACH_SUN50I ) || defined(CONFIG_SUN50I_GEN_H6 )/* A64 supports calibration of delays on MMC controller and we * have to set delay of zero before starting calibration. * Allwinner BSP driver sets a delay only in the case of @@ -530,7 +530,7 @@ struct mmc *sunxi_mmc_init(int sdc_no) cfg->voltages =MMC_VDD_32_33 |MMC_VDD_33_34 ; cfg->host_caps =MMC_MODE_4BIT ; -#if defined(CONFIG_MACH_SUN50I ) || defined(CONFIG_MACH_SUN8I ) || defined(CONFIG_MACH_SUN50I_H6 ) +#if defined(CONFIG_MACH_SUN50I ) || defined(CONFIG_MACH_SUN8I ) || defined(CONFIG_SUN50I_GEN_H6 )if (sdc_no ==2 ) cfg->host_caps =MMC_MODE_8BIT ;#endif @@ -545,7 +545,7 @@ struct mmc *sunxi_mmc_init(int sdc_no)/* config ahb clock */ debug ("init mmc %d clock and io\n" , sdc_no); -#if !defined(CONFIG_MACH_SUN50I_H6 ) +#if !defined(CONFIG_SUN50I_GEN_H6 )setbits_le32 (&ccm->ahb_gate0,1 <<AHB_GATE_OFFSET_MMC (sdc_no));#ifdef CONFIG_SUNXI_GEN_SUN6I @@ -557,7 +557,7 @@ struct mmc *sunxi_mmc_init(int sdc_no)writel (SUNXI_MMC_COMMON_CLK_GATE |SUNXI_MMC_COMMON_RESET ,SUNXI_MMC_COMMON_BASE +4 * sdc_no);#endif -#else /* CONFIG_MACH_SUN50I_H6 */ +#else /* CONFIG_SUN50I_GEN_H6 */ setbits_le32 (&ccm->sd_gate_reset,1 << sdc_no);/* unassert reset */ setbits_le32 (&ccm->sd_gate_reset,1 << (RESET_SHIFT + sdc_no));
PATCH 4/17 i2c: mvtwsi: sunxi: update macro
In reply to Jernej SkrabecWhile currently none of the newer Allwinner SoCs currently has I2C support implemented in U-Boot, this will change soon. mvtwsi driver is good as it is for them except one macro. Update it to be ready once I2C support lands for those SoCs.
--- drivers/i2c/mvtwsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/mvtwsi.c +1 -1
@@ -121,7 +121,7 @@ enum mvtwsi_ctrl_register_fields {* on other platforms, it is a normal r/w bit, which is cleared by writing 0. */ -#ifdef CONFIG_SUNXI_GEN_SUN6I +#if defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 )#define MVTWSI_CONTROL_CLEAR_IFLG 0x00000008#else #define MVTWSI_CONTROL_CLEAR_IFLG 0x00000000
Signature · 1 line
2.30.0
Samuel Holland
maintainerPATCH 4/17 i2c: mvtwsi: sunxi: update macro
Quoted 6 lines · Jernej Skrabec
While currently none of the newer Allwinner SoCs currently has I2C support implemented in U-Boot, this will change soon. mvtwsi driver is good as it is for them except one macro. Update it to be ready once I2C support lands for those SoCs.
Signed-off-by Jernej Skrabec <[email protected]>
PATCH 4/17 i2c: mvtwsi: sunxi: update macro
In reply to Jernej SkrabecHello Jernej,
Am 03.01.21 um 10:26 schrieb Jernej Skrabec:
Quoted 9 lines
While currently none of the newer Allwinner SoCs currently has I2C support implemented in U-Boot, this will change soon. mvtwsi driver is good as it is for them except one macro. Update it to be ready once I2C support lands for those SoCs.
Signed-off-by Jernej Skrabec <[email protected]>--- drivers/i2c/mvtwsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH 5/17 sunxi: prcm: Add memory map for H6 like SoCs
In reply to Jernej SkrabecThere was no need to have prcm definitions for H6 and similar SoCs till now. However, support R_I2C will be needed soon in SPL.
Move old definitions to prcm_sun6i.h and add new ones in prcm_sun50i.h. One of those files will be selected in common prcm.h based on defined macros.
This commit doesn't do any functional change.
--- arch/arm/include/asm/arch-sunxi/prcm.h | 249 +----------------- arch/arm/include/asm/arch-sunxi/prcm_sun50i.h | 41 +++ arch/arm/include/asm/arch-sunxi/prcm_sun6i.h | 247 +++++++++++++++++ 3 files changed, 298 insertions(+), 239 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/prcm_sun50i.h create mode 100644 arch/arm/include/asm/arch-sunxi/prcm_sun6i.h
arch/arm/include/asm/arch-sunxi/prcm.h +10 -239
@@ -1,247 +1,18 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Sunxi A31 Power Management Unit register definition. +* (C) Copyright 2020 Jernej Skrabec <[email protected]> * -* (C) Copyright 2013 Oliver Schinagl <[email protected]> -* http://linux-sunxi.org -* Allwinner Technology Co., Ltd. <www.allwinnertech.com> -* Berg Xing <[email protected]> -* Tom Cubie <[email protected]> +* Sunxi platform prcm register definition. */ #ifndef _SUNXI_PRCM_H#define _SUNXI_PRCM_H -#define __PRCM_CPUS_CFG_PRE (n) (((n) & 0x3) << 4) -#define PRCM_CPUS_CFG_PRE_MASK __PRCM_CPUS_CFG_PRE(0x3) -#define __PRCM_CPUS_CFG_PRE_DIV (n) (((n) >> 1) - 1) -#define PRCM_CPUS_CFG_PRE_DIV (n) \ - __PRCM_CPUS_CFG_PRE(__PRCM_CPUS_CFG_CLK_PRE(n)) -#define __PRCM_CPUS_CFG_POST (n) (((n) & 0x1f) << 8) -#define PRCM_CPUS_CFG_POST_MASK __PRCM_CPUS_CFG_POST(0x1f) -#define __PRCM_CPUS_CFG_POST_DIV (n) ((n) - 1) -#define PRCM_CPUS_CFG_POST_DIV (n) \ - __PRCM_CPUS_CFG_POST_DIV(__PRCM_CPUS_CFG_POST_DIV(n)) -#define __PRCM_CPUS_CFG_CLK_SRC (n) (((n) & 0x3) << 16) -#define PRCM_CPUS_CFG_CLK_SRC_MASK __PRCM_CPUS_CFG_CLK_SRC(0x3) -#define __PRCM_CPUS_CFG_CLK_SRC_LOSC 0x0 -#define __PRCM_CPUS_CFG_CLK_SRC_HOSC 0x1 -#define __PRCM_CPUS_CFG_CLK_SRC_PLL6 0x2 -#define __PRCM_CPUS_CFG_CLK_SRC_PDIV 0x3 -#define PRCM_CPUS_CFG_CLK_SRC_LOSC \ - __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_LOSC) -#define PRCM_CPUS_CFG_CLK_SRC_HOSC \ - __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_HOSC) -#define PRCM_CPUS_CFG_CLK_SRC_PLL6 \ - __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_PLL6) -#define PRCM_CPUS_CFG_CLK_SRC_PDIV \ - __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_PDIV) - -#define __PRCM_APB0_RATIO (n) (((n) & 0x3) << 0) -#define PRCM_APB0_RATIO_DIV_MASK __PRCM_APB0_RATIO_DIV(0x3) -#define __PRCM_APB0_RATIO_DIV (n) (((n) >> 1) - 1) -#define PRCM_APB0_RATIO_DIV (n) \ - __PRCM_APB0_RATIO(__PRCM_APB0_RATIO_DIV(n)) - -#define PRCM_CPU_CFG_NEON_CLK_EN (0x1 << 0) -#define PRCM_CPU_CFG_CPU_CLK_EN (0x1 << 1) - -#define PRCM_APB0_GATE_PIO (0x1 << 0) -#define PRCM_APB0_GATE_IR (0x1 << 1) -#define PRCM_APB0_GATE_TIMER01 (0x1 << 2) -#define PRCM_APB0_GATE_P2WI (0x1 << 3)/* sun6i */ -#define PRCM_APB0_GATE_RSB (0x1 << 3)/* sun8i */ -#define PRCM_APB0_GATE_UART (0x1 << 4) -#define PRCM_APB0_GATE_1WIRE (0x1 << 5) -#define PRCM_APB0_GATE_I2C (0x1 << 6) - -#define PRCM_APB0_RESET_PIO (0x1 << 0) -#define PRCM_APB0_RESET_IR (0x1 << 1) -#define PRCM_APB0_RESET_TIMER01 (0x1 << 2) -#define PRCM_APB0_RESET_P2WI (0x1 << 3) -#define PRCM_APB0_RESET_UART (0x1 << 4) -#define PRCM_APB0_RESET_1WIRE (0x1 << 5) -#define PRCM_APB0_RESET_I2C (0x1 << 6) - -#define PRCM_PLL_CTRL_PLL_BIAS (0x1 << 0) -#define PRCM_PLL_CTRL_HOSC_GAIN_ENH (0x1 << 1) -#define __PRCM_PLL_CTRL_USB_CLK_SRC (n) (((n) & 0x3) << 4) -#define PRCM_PLL_CTRL_USB_CLK_SRC_MASK \ - __PRCM_PLL_CTRL_USB_CLK_SRC(0x3) -#define __PRCM_PLL_CTRL_USB_CLK_0 0x0 -#define __PRCM_PLL_CTRL_USB_CLK_1 0x1 -#define __PRCM_PLL_CTRL_USB_CLK_2 0x2 -#define __PRCM_PLL_CTRL_USB_CLK_3 0x3 -#define PRCM_PLL_CTRL_USB_CLK_0 \ - __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_0) -#define PRCM_PLL_CTRL_USB_CLK_1 \ - __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_1) -#define PRCM_PLL_CTRL_USB_CLK_2 \ - __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_2) -#define PRCM_PLL_CTRL_USB_CLK_3 \ - __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_3) -#define __PRCM_PLL_CTRL_INT_PLL_IN_SEL (n) (((n) & 0x3) << 12) -#define PRCM_PLL_CTRL_INT_PLL_IN_SEL_MASK \ - __PRCM_PLL_CTRL_INT_PLL_IN_SEL(0x3) -#define PRCM_PLL_CTRL_INT_PLL_IN_SEL (n) \ - __PRCM_PLL_CTRL_INT_PLL_IN_SEL(n) -#define __PRCM_PLL_CTRL_HOSC_CLK_SEL (n) (((n) & 0x3) << 20) -#define PRCM_PLL_CTRL_HOSC_CLK_SEL_MASK \ - __PRCM_PLL_CTRL_HOSC_CLK_SEL(0x3) -#define __PRCM_PLL_CTRL_HOSC_CLK_0 0x0 -#define __PRCM_PLL_CTRL_HOSC_CLK_1 0x1 -#define __PRCM_PLL_CTRL_HOSC_CLK_2 0x2 -#define __PRCM_PLL_CTRL_HOSC_CLK_3 0x3 -#define PRCM_PLL_CTRL_HOSC_CLK_0 \ - __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_0) -#define PRCM_PLL_CTRL_HOSC_CLK_1 \ - __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_1) -#define PRCM_PLL_CTRL_HOSC_CLK_2 \ - __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_2) -#define PRCM_PLL_CTRL_HOSC_CLK_3 \ - __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_3) -#define PRCM_PLL_CTRL_PLL_TST_SRC_EXT (0x1 << 24) -#define PRCM_PLL_CTRL_LDO_DIGITAL_EN (0x1 << 0) -#define PRCM_PLL_CTRL_LDO_ANALOG_EN (0x1 << 1) -#define PRCM_PLL_CTRL_EXT_OSC_EN (0x1 << 2) -#define PRCM_PLL_CTRL_CLK_TST_EN (0x1 << 3) -#define PRCM_PLL_CTRL_IN_PWR_HIGH (0x1 << 15)/* 3.3 for hi 2.5 for lo */ -#define __PRCM_PLL_CTRL_VDD_LDO_OUT (n) (((n) & 0x7) << 16) -#define PRCM_PLL_CTRL_LDO_OUT_MASK \ - __PRCM_PLL_CTRL_LDO_OUT(0x7) -/* When using the low voltage 20 mV steps, and high voltage 30 mV steps */ -#define PRCM_PLL_CTRL_LDO_OUT_L (n) \ - __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) - 1000) / 20) & 0x7) -#define PRCM_PLL_CTRL_LDO_OUT_H (n) \ - __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) - 1160) / 30) & 0x7) -#define PRCM_PLL_CTRL_LDO_OUT_LV (n) \ - __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) & 0x7) * 20) + 1000) -#define PRCM_PLL_CTRL_LDO_OUT_HV (n) \ - __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) & 0x7) * 30) + 1160) -#define PRCM_PLL_CTRL_LDO_KEY (0xa7 << 24) -#define PRCM_PLL_CTRL_LDO_KEY_MASK (0xff << 24) - -#define PRCM_CLK_1WIRE_GATE (0x1 << 31) - -#define __PRCM_CLK_MOD0_M (n) (((n) & 0xf) << 0) -#define PRCM_CLK_MOD0_M_MASK __PRCM_CLK_MOD0_M(0xf) -#define __PRCM_CLK_MOD0_M_X (n) (n - 1) -#define PRCM_CLK_MOD0_M (n) __PRCM_CLK_MOD0_M(__PRCM_CLK_MOD0_M_X(n)) -#define PRCM_CLK_MOD0_OUT_PHASE (n) (((n) & 0x7) << 8) -#define PRCM_CLK_MOD0_OUT_PHASE_MASK (n) PRCM_CLK_MOD0_OUT_PHASE(0x7) -#define _PRCM_CLK_MOD0_N (n) (((n) & 0x3) << 16) -#define PRCM_CLK_MOD0_N_MASK __PRCM_CLK_MOD_N(0x3) -#define __PRCM_CLK_MOD0_N_X (n) (((n) >> 1) - 1) -#define PRCM_CLK_MOD0_N (n) __PRCM_CLK_MOD0_N(__PRCM_CLK_MOD0_N_X(n)) -#define PRCM_CLK_MOD0_SMPL_PHASE (n) (((n) & 0x7) << 20) -#define PRCM_CLK_MOD0_SMPL_PHASE_MASK PRCM_CLK_MOD0_SMPL_PHASE(0x7) -#define PRCM_CLK_MOD0_SRC_SEL (n) (((n) & 0x7) << 24) -#define PRCM_CLK_MOD0_SRC_SEL_MASK PRCM_CLK_MOD0_SRC_SEL(0x7) -#define PRCM_CLK_MOD0_GATE_EN (0x1 << 31) - -#define PRCM_APB0_RESET_PIO (0x1 << 0) -#define PRCM_APB0_RESET_IR (0x1 << 1) -#define PRCM_APB0_RESET_TIMER01 (0x1 << 2) -#define PRCM_APB0_RESET_P2WI (0x1 << 3) -#define PRCM_APB0_RESET_UART (0x1 << 4) -#define PRCM_APB0_RESET_1WIRE (0x1 << 5) -#define PRCM_APB0_RESET_I2C (0x1 << 6) - -#define __PRCM_CLK_OUTD_M (n) (((n) & 0x7) << 8) -#define PRCM_CLK_OUTD_M_MASK __PRCM_CLK_OUTD_M(0x7) -#define __PRCM_CLK_OUTD_M_X () ((n) - 1) -#define PRCM_CLK_OUTD_M (n) __PRCM_CLK_OUTD_M(__PRCM_CLK_OUTD_M_X(n)) -#define __PRCM_CLK_OUTD_N (n) (((n) & 0x7) << 20) -#define PRCM_CLK_OUTD_N_MASK __PRCM_CLK_OUTD_N(0x7) -#define __PRCM_CLK_OUTD_N_X (n) (((n) >> 1) - 1) -#define PRCM_CLK_OUTD_N (n) __PRCM_CLK_OUTD_N(__PRCM_CLK_OUTD_N_X(n) -#define __PRCM_CLK_OUTD_SRC_SEL (n) (((n) & 0x3) << 24) -#define PRCM_CLK_OUTD_SRC_SEL_MASK __PRCM_CLK_OUTD_SRC_SEL(0x3) -#define __PRCM_CLK_OUTD_SRC_LOSC2 0x0 -#define __PRCM_CLK_OUTD_SRC_LOSC 0x1 -#define __PRCM_CLK_OUTD_SRC_HOSC 0x2 -#define __PRCM_CLK_OUTD_SRC_ERR 0x3 -#define PRCM_CLK_OUTD_SRC_LOSC2 \ -#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_LOSC2) -#define PRCM_CLK_OUTD_SRC_LOSC \ -#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_LOSC) -#define PRCM_CLK_OUTD_SRC_HOSC \ -#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_HOSC) -#define PRCM_CLK_OUTD_SRC_ERR \ -#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_ERR) -#define PRCM_CLK_OUTD_EN (0x1 << 31) - -#define PRCM_CPU0_PWROFF (0x1 << 0) -#define PRCM_CPU1_PWROFF (0x1 << 1) -#define PRCM_CPU2_PWROFF (0x1 << 2) -#define PRCM_CPU3_PWROFF (0x1 << 3) -#define PRCM_CPU_ALL_PWROFF (0xf << 0) - -#define PRCM_VDD_SYS_DRAM_CH0_PAD_HOLD_PWROFF (0x1 << 0) -#define PRCM_VDD_SYS_DRAM_CH1_PAD_HOLD_PWROFF (0x1 << 1) -#define PRCM_VDD_SYS_AVCC_A_PWROFF (0x1 << 2) -#define PRCM_VDD_SYS_CPU0_VDD_PWROFF (0x1 << 3) - -#define PRCM_VDD_GPU_PWROFF (0x1 << 0) - -#define PRCM_VDD_SYS_RESET (0x1 << 0) - -#define PRCM_CPU1_PWR_CLAMP (n) (((n) & 0xff) << 0) -#define PRCM_CPU1_PWR_CLAMP_MASK PRCM_CPU1_PWR_CLAMP(0xff) - -#define PRCM_CPU2_PWR_CLAMP (n) (((n) & 0xff) << 0) -#define PRCM_CPU2_PWR_CLAMP_MASK PRCM_CPU2_PWR_CLAMP(0xff) - -#define PRCM_CPU3_PWR_CLAMP (n) (((n) & 0xff) << 0) -#define PRCM_CPU3_PWR_CLAMP_MASK PRCM_CPU3_PWR_CLAMP(0xff) - -#define PRCM_SEC_SWITCH_APB0_CLK_NONSEC (0x1 << 0) -#define PRCM_SEC_SWITCH_PLL_CFG_NONSEC (0x1 << 1) -#define PRCM_SEC_SWITCH_PWR_GATE_NONSEC (0x1 << 2) - -#ifndef __ASSEMBLY__ -#include <linux/compiler.h> - -struct sunxi_prcm_reg { -u32 cpus_cfg;/* 0x000 */ -u8 res0[0x8 ];/* 0x004 */ -u32 apb0_ratio;/* 0x00c */ -u32 cpu0_cfg;/* 0x010 */ -u32 cpu1_cfg;/* 0x014 */ -u32 cpu2_cfg;/* 0x018 */ -u32 cpu3_cfg;/* 0x01c */ -u8 res1[0x8 ];/* 0x020 */ -u32 apb0_gate;/* 0x028 */ -u8 res2[0x14 ];/* 0x02c */ -u32 pll_ctrl0;/* 0x040 */ -u32 pll_ctrl1;/* 0x044 */ -u8 res3[0x8 ];/* 0x048 */ -u32 clk_1wire;/* 0x050 */ -u32 clk_ir;/* 0x054 */ -u8 res4[0x58 ];/* 0x058 */ -u32 apb0_reset;/* 0x0b0 */ -u8 res5[0x3c ];/* 0x0b4 */ -u32 clk_outd;/* 0x0f0 */ -u8 res6[0xc ];/* 0x0f4 */ -u32 cpu_pwroff;/* 0x100 */ -u8 res7[0xc ];/* 0x104 */ -u32 vdd_sys_pwroff;/* 0x110 */ -u8 res8[0x4 ];/* 0x114 */ -u32 gpu_pwroff;/* 0x118 */ -u8 res9[0x4 ];/* 0x11c */ -u32 vdd_pwr_reset;/* 0x120 */ -u8 res10[0x1c ];/* 0x124 */ -u32 cpu_pwr_clamp[4 ];/* 0x140 but first one is actually unused */ -u8 res11[0x30 ];/* 0x150 */ -u32 dram_pwr;/* 0x180 */ -u8 res12[0xc ];/* 0x184 */ -u32 dram_tst;/* 0x190 */ -u8 res13[0x3c ];/* 0x194 */ -u32 prcm_sec_switch;/* 0x1d0 */ -}; - -void prcm_apb0_enable (u32 flags); -void prcm_apb0_disable (u32 flags); - -#endif /* __ASSEMBLY__ */ -#endif /* _PRCM_H */ +/* prcm regs definition */ +#if defined(CONFIG_SUN50I_GEN_H6 ) +#include <asm/arch/prcm_sun50i.h> +#else +#include <asm/arch/prcm_sun6i.h> +#endif + +#endif /* _SUNXI_PRCM_H */
arch/arm/include/asm/arch-sunxi/prcm_sun50i.h new file +41 -0
41 lines not on this page · raw message
arch/arm/include/asm/arch-sunxi/prcm_sun6i.h new file +247 -0
247 lines not on this page · raw message
Signature · 1 line
2.30.0
Samuel Holland
maintainerPATCH 5/17 sunxi: prcm: Add memory map for H6 like SoCs
Quoted 296 lines · Jernej Skrabec
There was no need to have prcm definitions for H6 and similar SoCs till now. However, support
R_I2Cwill be needed soon in SPL.Move old definitions to
prcm_sun6i.hand add new ones inprcm_sun50i.h. One of those files will be selected in commonprcm.hbased on defined macros.This commit doesn't do any functional change.
Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/include/asm/arch-sunxi/prcm.h | 249 +----------------- arch/arm/include/asm/arch-sunxi/prcm_sun50i.h | 41 +++ arch/arm/include/asm/arch-sunxi/prcm_sun6i.h | 247 +++++++++++++++++ 3 files changed, 298 insertions(+), 239 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/prcm_sun50i.h create mode 100644 arch/arm/include/asm/arch-sunxi/prcm_sun6i.harch/arm/include/asm/arch-sunxi/prcm.h +10
-239@@ -1,247 +1,18 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Sunxi A31 Power Management Unit register definition. +* (C) Copyright 2020 Jernej Skrabec <[email protected]> * -* (C) Copyright 2013 Oliver Schinagl <[email protected]> -* http://linux-sunxi.org -* Allwinner Technology Co., Ltd. <www.allwinnertech.com> -* Berg Xing <[email protected]> -* Tom Cubie <[email protected]> +* Sunxi platform prcm register definition. */ #ifndef _SUNXI_PRCM_H#define _SUNXI_PRCM_H -#define __PRCM_CPUS_CFG_PRE (n) (((n) & 0x3) << 4) -#define PRCM_CPUS_CFG_PRE_MASK __PRCM_CPUS_CFG_PRE(0x3) -#define __PRCM_CPUS_CFG_PRE_DIV (n) (((n) >> 1) - 1) -#define PRCM_CPUS_CFG_PRE_DIV (n) \ - __PRCM_CPUS_CFG_PRE(__PRCM_CPUS_CFG_CLK_PRE(n)) -#define __PRCM_CPUS_CFG_POST (n) (((n) & 0x1f) << 8) -#define PRCM_CPUS_CFG_POST_MASK __PRCM_CPUS_CFG_POST(0x1f) -#define __PRCM_CPUS_CFG_POST_DIV (n) ((n) - 1) -#define PRCM_CPUS_CFG_POST_DIV (n) \ - __PRCM_CPUS_CFG_POST_DIV(__PRCM_CPUS_CFG_POST_DIV(n)) -#define __PRCM_CPUS_CFG_CLK_SRC (n) (((n) & 0x3) << 16) -#define PRCM_CPUS_CFG_CLK_SRC_MASK __PRCM_CPUS_CFG_CLK_SRC(0x3) -#define __PRCM_CPUS_CFG_CLK_SRC_LOSC 0x0 -#define __PRCM_CPUS_CFG_CLK_SRC_HOSC 0x1 -#define __PRCM_CPUS_CFG_CLK_SRC_PLL6 0x2 -#define __PRCM_CPUS_CFG_CLK_SRC_PDIV 0x3 -#define PRCM_CPUS_CFG_CLK_SRC_LOSC \ - __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_LOSC) -#define PRCM_CPUS_CFG_CLK_SRC_HOSC \ - __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_HOSC) -#define PRCM_CPUS_CFG_CLK_SRC_PLL6 \ - __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_PLL6) -#define PRCM_CPUS_CFG_CLK_SRC_PDIV \ - __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_PDIV) - -#define __PRCM_APB0_RATIO (n) (((n) & 0x3) << 0) -#define PRCM_APB0_RATIO_DIV_MASK __PRCM_APB0_RATIO_DIV(0x3) -#define __PRCM_APB0_RATIO_DIV (n) (((n) >> 1) - 1) -#define PRCM_APB0_RATIO_DIV (n) \ - __PRCM_APB0_RATIO(__PRCM_APB0_RATIO_DIV(n)) - -#define PRCM_CPU_CFG_NEON_CLK_EN (0x1 << 0) -#define PRCM_CPU_CFG_CPU_CLK_EN (0x1 << 1) - -#define PRCM_APB0_GATE_PIO (0x1 << 0) -#define PRCM_APB0_GATE_IR (0x1 << 1) -#define PRCM_APB0_GATE_TIMER01 (0x1 << 2) -#define PRCM_APB0_GATE_P2WI (0x1 << 3)/* sun6i */ -#define PRCM_APB0_GATE_RSB (0x1 << 3)/* sun8i */ -#define PRCM_APB0_GATE_UART (0x1 << 4) -#define PRCM_APB0_GATE_1WIRE (0x1 << 5) -#define PRCM_APB0_GATE_I2C (0x1 << 6) - -#define PRCM_APB0_RESET_PIO (0x1 << 0) -#define PRCM_APB0_RESET_IR (0x1 << 1) -#define PRCM_APB0_RESET_TIMER01 (0x1 << 2) -#define PRCM_APB0_RESET_P2WI (0x1 << 3) -#define PRCM_APB0_RESET_UART (0x1 << 4) -#define PRCM_APB0_RESET_1WIRE (0x1 << 5) -#define PRCM_APB0_RESET_I2C (0x1 << 6) - -#define PRCM_PLL_CTRL_PLL_BIAS (0x1 << 0) -#define PRCM_PLL_CTRL_HOSC_GAIN_ENH (0x1 << 1) -#define __PRCM_PLL_CTRL_USB_CLK_SRC (n) (((n) & 0x3) << 4) -#define PRCM_PLL_CTRL_USB_CLK_SRC_MASK \ - __PRCM_PLL_CTRL_USB_CLK_SRC(0x3) -#define __PRCM_PLL_CTRL_USB_CLK_0 0x0 -#define __PRCM_PLL_CTRL_USB_CLK_1 0x1 -#define __PRCM_PLL_CTRL_USB_CLK_2 0x2 -#define __PRCM_PLL_CTRL_USB_CLK_3 0x3 -#define PRCM_PLL_CTRL_USB_CLK_0 \ - __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_0) -#define PRCM_PLL_CTRL_USB_CLK_1 \ - __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_1) -#define PRCM_PLL_CTRL_USB_CLK_2 \ - __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_2) -#define PRCM_PLL_CTRL_USB_CLK_3 \ - __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_3) -#define __PRCM_PLL_CTRL_INT_PLL_IN_SEL (n) (((n) & 0x3) << 12) -#define PRCM_PLL_CTRL_INT_PLL_IN_SEL_MASK \ - __PRCM_PLL_CTRL_INT_PLL_IN_SEL(0x3) -#define PRCM_PLL_CTRL_INT_PLL_IN_SEL (n) \ - __PRCM_PLL_CTRL_INT_PLL_IN_SEL(n) -#define __PRCM_PLL_CTRL_HOSC_CLK_SEL (n) (((n) & 0x3) << 20) -#define PRCM_PLL_CTRL_HOSC_CLK_SEL_MASK \ - __PRCM_PLL_CTRL_HOSC_CLK_SEL(0x3) -#define __PRCM_PLL_CTRL_HOSC_CLK_0 0x0 -#define __PRCM_PLL_CTRL_HOSC_CLK_1 0x1 -#define __PRCM_PLL_CTRL_HOSC_CLK_2 0x2 -#define __PRCM_PLL_CTRL_HOSC_CLK_3 0x3 -#define PRCM_PLL_CTRL_HOSC_CLK_0 \ - __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_0) -#define PRCM_PLL_CTRL_HOSC_CLK_1 \ - __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_1) -#define PRCM_PLL_CTRL_HOSC_CLK_2 \ - __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_2) -#define PRCM_PLL_CTRL_HOSC_CLK_3 \ - __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_3) -#define PRCM_PLL_CTRL_PLL_TST_SRC_EXT (0x1 << 24) -#define PRCM_PLL_CTRL_LDO_DIGITAL_EN (0x1 << 0) -#define PRCM_PLL_CTRL_LDO_ANALOG_EN (0x1 << 1) -#define PRCM_PLL_CTRL_EXT_OSC_EN (0x1 << 2) -#define PRCM_PLL_CTRL_CLK_TST_EN (0x1 << 3) -#define PRCM_PLL_CTRL_IN_PWR_HIGH (0x1 << 15)/* 3.3 for hi 2.5 for lo */ -#define __PRCM_PLL_CTRL_VDD_LDO_OUT (n) (((n) & 0x7) << 16) -#define PRCM_PLL_CTRL_LDO_OUT_MASK \ - __PRCM_PLL_CTRL_LDO_OUT(0x7) -/* When using the low voltage 20 mV steps, and high voltage 30 mV steps */ -#define PRCM_PLL_CTRL_LDO_OUT_L (n) \ - __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) - 1000) / 20) & 0x7) -#define PRCM_PLL_CTRL_LDO_OUT_H (n) \ - __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) - 1160) / 30) & 0x7) -#define PRCM_PLL_CTRL_LDO_OUT_LV (n) \ - __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) & 0x7) * 20) + 1000) -#define PRCM_PLL_CTRL_LDO_OUT_HV (n) \ - __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) & 0x7) * 30) + 1160) -#define PRCM_PLL_CTRL_LDO_KEY (0xa7 << 24) -#define PRCM_PLL_CTRL_LDO_KEY_MASK (0xff << 24) - -#define PRCM_CLK_1WIRE_GATE (0x1 << 31) - -#define __PRCM_CLK_MOD0_M (n) (((n) & 0xf) << 0) -#define PRCM_CLK_MOD0_M_MASK __PRCM_CLK_MOD0_M(0xf) -#define __PRCM_CLK_MOD0_M_X (n) (n - 1) -#define PRCM_CLK_MOD0_M (n) __PRCM_CLK_MOD0_M(__PRCM_CLK_MOD0_M_X(n)) -#define PRCM_CLK_MOD0_OUT_PHASE (n) (((n) & 0x7) << 8) -#define PRCM_CLK_MOD0_OUT_PHASE_MASK (n) PRCM_CLK_MOD0_OUT_PHASE(0x7) -#define _PRCM_CLK_MOD0_N (n) (((n) & 0x3) << 16) -#define PRCM_CLK_MOD0_N_MASK __PRCM_CLK_MOD_N(0x3) -#define __PRCM_CLK_MOD0_N_X (n) (((n) >> 1) - 1) -#define PRCM_CLK_MOD0_N (n) __PRCM_CLK_MOD0_N(__PRCM_CLK_MOD0_N_X(n)) -#define PRCM_CLK_MOD0_SMPL_PHASE (n) (((n) & 0x7) << 20) -#define PRCM_CLK_MOD0_SMPL_PHASE_MASK PRCM_CLK_MOD0_SMPL_PHASE(0x7) -#define PRCM_CLK_MOD0_SRC_SEL (n) (((n) & 0x7) << 24) -#define PRCM_CLK_MOD0_SRC_SEL_MASK PRCM_CLK_MOD0_SRC_SEL(0x7) -#define PRCM_CLK_MOD0_GATE_EN (0x1 << 31) - -#define PRCM_APB0_RESET_PIO (0x1 << 0) -#define PRCM_APB0_RESET_IR (0x1 << 1) -#define PRCM_APB0_RESET_TIMER01 (0x1 << 2) -#define PRCM_APB0_RESET_P2WI (0x1 << 3) -#define PRCM_APB0_RESET_UART (0x1 << 4) -#define PRCM_APB0_RESET_1WIRE (0x1 << 5) -#define PRCM_APB0_RESET_I2C (0x1 << 6) - -#define __PRCM_CLK_OUTD_M (n) (((n) & 0x7) << 8) -#define PRCM_CLK_OUTD_M_MASK __PRCM_CLK_OUTD_M(0x7) -#define __PRCM_CLK_OUTD_M_X () ((n) - 1) -#define PRCM_CLK_OUTD_M (n) __PRCM_CLK_OUTD_M(__PRCM_CLK_OUTD_M_X(n)) -#define __PRCM_CLK_OUTD_N (n) (((n) & 0x7) << 20) -#define PRCM_CLK_OUTD_N_MASK __PRCM_CLK_OUTD_N(0x7) -#define __PRCM_CLK_OUTD_N_X (n) (((n) >> 1) - 1) -#define PRCM_CLK_OUTD_N (n) __PRCM_CLK_OUTD_N(__PRCM_CLK_OUTD_N_X(n) -#define __PRCM_CLK_OUTD_SRC_SEL (n) (((n) & 0x3) << 24) -#define PRCM_CLK_OUTD_SRC_SEL_MASK __PRCM_CLK_OUTD_SRC_SEL(0x3) -#define __PRCM_CLK_OUTD_SRC_LOSC2 0x0 -#define __PRCM_CLK_OUTD_SRC_LOSC 0x1 -#define __PRCM_CLK_OUTD_SRC_HOSC 0x2 -#define __PRCM_CLK_OUTD_SRC_ERR 0x3 -#define PRCM_CLK_OUTD_SRC_LOSC2 \ -#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_LOSC2) -#define PRCM_CLK_OUTD_SRC_LOSC \ -#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_LOSC) -#define PRCM_CLK_OUTD_SRC_HOSC \ -#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_HOSC) -#define PRCM_CLK_OUTD_SRC_ERR \ -#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_ERR) -#define PRCM_CLK_OUTD_EN (0x1 << 31) - -#define PRCM_CPU0_PWROFF (0x1 << 0) -#define PRCM_CPU1_PWROFF (0x1 << 1) -#define PRCM_CPU2_PWROFF (0x1 << 2) -#define PRCM_CPU3_PWROFF (0x1 << 3) -#define PRCM_CPU_ALL_PWROFF (0xf << 0) - -#define PRCM_VDD_SYS_DRAM_CH0_PAD_HOLD_PWROFF (0x1 << 0) -#define PRCM_VDD_SYS_DRAM_CH1_PAD_HOLD_PWROFF (0x1 << 1) -#define PRCM_VDD_SYS_AVCC_A_PWROFF (0x1 << 2) -#define PRCM_VDD_SYS_CPU0_VDD_PWROFF (0x1 << 3) - -#define PRCM_VDD_GPU_PWROFF (0x1 << 0) - -#define PRCM_VDD_SYS_RESET (0x1 << 0) - -#define PRCM_CPU1_PWR_CLAMP (n) (((n) & 0xff) << 0) -#define PRCM_CPU1_PWR_CLAMP_MASK PRCM_CPU1_PWR_CLAMP(0xff) - -#define PRCM_CPU2_PWR_CLAMP (n) (((n) & 0xff) << 0) -#define PRCM_CPU2_PWR_CLAMP_MASK PRCM_CPU2_PWR_CLAMP(0xff) - -#define PRCM_CPU3_PWR_CLAMP (n) (((n) & 0xff) << 0) -#define PRCM_CPU3_PWR_CLAMP_MASK PRCM_CPU3_PWR_CLAMP(0xff) - -#define PRCM_SEC_SWITCH_APB0_CLK_NONSEC (0x1 << 0) -#define PRCM_SEC_SWITCH_PLL_CFG_NONSEC (0x1 << 1) -#define PRCM_SEC_SWITCH_PWR_GATE_NONSEC (0x1 << 2) - -#ifndef __ASSEMBLY__ -#include <linux/compiler.h> - -struct sunxi_prcm_reg { -u32 cpus_cfg;/* 0x000 */ -u8 res0[0x8 ];/* 0x004 */ -u32 apb0_ratio;/* 0x00c */ -u32 cpu0_cfg;/* 0x010 */ -u32 cpu1_cfg;/* 0x014 */ -u32 cpu2_cfg;/* 0x018 */ -u32 cpu3_cfg;/* 0x01c */ -u8 res1[0x8 ];/* 0x020 */ -u32 apb0_gate;/* 0x028 */ -u8 res2[0x14 ];/* 0x02c */ -u32 pll_ctrl0;/* 0x040 */ -u32 pll_ctrl1;/* 0x044 */ -u8 res3[0x8 ];/* 0x048 */ -u32 clk_1wire;/* 0x050 */ -u32 clk_ir;/* 0x054 */ -u8 res4[0x58 ];/* 0x058 */ -u32 apb0_reset;/* 0x0b0 */ -u8 res5[0x3c ];/* 0x0b4 */ -u32 clk_outd;/* 0x0f0 */ -u8 res6[0xc ];/* 0x0f4 */ -u32 cpu_pwroff;/* 0x100 */ -u8 res7[0xc ];/* 0x104 */ -u32 vdd_sys_pwroff;/* 0x110 */ -u8 res8[0x4 ];/* 0x114 */ -u32 gpu_pwroff;/* 0x118 */ -u8 res9[0x4 ];/* 0x11c */ -u32 vdd_pwr_reset;/* 0x120 */ -u8 res10[0x1c ];/* 0x124 */ -u32 cpu_pwr_clamp[4 ];/* 0x140 but first one is actually unused */ -u8 res11[0x30 ];/* 0x150 */ -u32 dram_pwr;/* 0x180 */ -u8 res12[0xc ];/* 0x184 */ -u32 dram_tst;/* 0x190 */ -u8 res13[0x3c ];/* 0x194 */ -u32 prcm_sec_switch;/* 0x1d0 */ -}; - -void prcm_apb0_enable (u32 flags); -void prcm_apb0_disable (u32 flags); - -#endif /* __ASSEMBLY__ */ -#endif /* _PRCM_H */ +/* prcm regs definition */ +#if defined(CONFIG_SUN50I_GEN_H6 ) +#include <asm/arch/prcm_sun50i.h> +#else +#include <asm/arch/prcm_sun6i.h> +#endif + +#endif /* _SUNXI_PRCM_H */ arch/arm/include/asm/arch-sunxi/prcm_sun50i.h new file +10
-0@@ -0,0 +1,41 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Sunxi H6 Power Management Unit register definition. +* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +*/ + +#ifndef _SUN50I_PRCM_H +#define _SUN50I_PRCM_H +
arch/arm/include/asm/arch-sunxi/prcm_sun50i.h line 20
Quoted 10 lines
arch/arm/include/asm/arch-sunxi/prcm_sun50i.h new file +10
-0+#ifndef __ASSEMBLY__ +#include <linux/compiler.h> + +struct sunxi_prcm_reg { + u32 cpus_cfg; /* 0x000 */ + u8 res0[0x8]; /* 0x004 */ + u32 apbs1_cfg; /* 0x00c */ + u32 apbs2_cfg; /* 0x010 */ + u8 res1[0x118]; /* 0x014 */ + u32 wdg_gate_reset; /* 0x12c */
This is the register for R_TWD, not R_WDOG.
And out of curiosity, were you intending to include all PRCM registers, or just those present on both H6 and H616? (H6 also has TIMER, PWM and UART.)
Quoted 275 lines
arch/arm/include/asm/arch-sunxi/prcm_sun50i.h new file +21
-0+u8 res2[0x6c ];/* 0x130 */ +u32 twi_gate_reset;/* 0x19c */ +u8 res3[0x1c ];/* 0x1a0 */ +u32 rsb_gate_reset;/* 0x1bc */ +u32 cir_cfg;/* 0x1c0 */ +u8 res4[0x8 ];/* 0x1c4 */ +u32 cir_gate_reset;/* 0x1cc */ +u8 res5[0x10 ];/* 0x1d0 */ +u32 w1_cfg;/* 0x1e0 */ +u8 res6[0x8 ];/* 0x1e4 */ +u32 w1_gate_reset;/* 0x1ec */ +u8 res7[0x1c ];/* 0x1f0 */ +u32 rtc_gate_reset;/* 0x20c */ +}; +check_member (sunxi_prcm_reg, rtc_gate_reset,0x20c ); + +#define PRCM_TWI_GATE (1 << 0) +#define PRCM_TWI_RESET (1 << 16) + +#endif /* __ASSEMBLY__ */ +#endif /* _PRCM_H */ arch/arm/include/asm/arch-sunxi/prcm_sun6i.h new file +247
-0@@ -0,0 +1,247 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Sunxi A31 Power Management Unit register definition. +* +* (C) Copyright 2013 Oliver Schinagl <[email protected]> +* http://linux-sunxi.org +* Allwinner Technology Co., Ltd. <www.allwinnertech.com> +* Berg Xing <[email protected]> +* Tom Cubie <[email protected]> +*/ + +#ifndef _SUN6I_PRCM_H +#define _SUN6I_PRCM_H + +#define __PRCM_CPUS_CFG_PRE (n) (((n) & 0x3) << 4) +#define PRCM_CPUS_CFG_PRE_MASK __PRCM_CPUS_CFG_PRE(0x3) +#define __PRCM_CPUS_CFG_PRE_DIV (n) (((n) >> 1) - 1) +#define PRCM_CPUS_CFG_PRE_DIV (n) \ + __PRCM_CPUS_CFG_PRE(__PRCM_CPUS_CFG_CLK_PRE(n)) +#define __PRCM_CPUS_CFG_POST (n) (((n) & 0x1f) << 8) +#define PRCM_CPUS_CFG_POST_MASK __PRCM_CPUS_CFG_POST(0x1f) +#define __PRCM_CPUS_CFG_POST_DIV (n) ((n) - 1) +#define PRCM_CPUS_CFG_POST_DIV (n) \ + __PRCM_CPUS_CFG_POST_DIV(__PRCM_CPUS_CFG_POST_DIV(n)) +#define __PRCM_CPUS_CFG_CLK_SRC (n) (((n) & 0x3) << 16) +#define PRCM_CPUS_CFG_CLK_SRC_MASK __PRCM_CPUS_CFG_CLK_SRC(0x3) +#define __PRCM_CPUS_CFG_CLK_SRC_LOSC 0x0 +#define __PRCM_CPUS_CFG_CLK_SRC_HOSC 0x1 +#define __PRCM_CPUS_CFG_CLK_SRC_PLL6 0x2 +#define __PRCM_CPUS_CFG_CLK_SRC_PDIV 0x3 +#define PRCM_CPUS_CFG_CLK_SRC_LOSC \ + __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_LOSC) +#define PRCM_CPUS_CFG_CLK_SRC_HOSC \ + __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_HOSC) +#define PRCM_CPUS_CFG_CLK_SRC_PLL6 \ + __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_PLL6) +#define PRCM_CPUS_CFG_CLK_SRC_PDIV \ + __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_PDIV) + +#define __PRCM_APB0_RATIO (n) (((n) & 0x3) << 0) +#define PRCM_APB0_RATIO_DIV_MASK __PRCM_APB0_RATIO_DIV(0x3) +#define __PRCM_APB0_RATIO_DIV (n) (((n) >> 1) - 1) +#define PRCM_APB0_RATIO_DIV (n) \ + __PRCM_APB0_RATIO(__PRCM_APB0_RATIO_DIV(n)) + +#define PRCM_CPU_CFG_NEON_CLK_EN (0x1 << 0) +#define PRCM_CPU_CFG_CPU_CLK_EN (0x1 << 1) + +#define PRCM_APB0_GATE_PIO (0x1 << 0) +#define PRCM_APB0_GATE_IR (0x1 << 1) +#define PRCM_APB0_GATE_TIMER01 (0x1 << 2) +#define PRCM_APB0_GATE_P2WI (0x1 << 3)/* sun6i */ +#define PRCM_APB0_GATE_RSB (0x1 << 3)/* sun8i */ +#define PRCM_APB0_GATE_UART (0x1 << 4) +#define PRCM_APB0_GATE_1WIRE (0x1 << 5) +#define PRCM_APB0_GATE_I2C (0x1 << 6) + +#define PRCM_APB0_RESET_PIO (0x1 << 0) +#define PRCM_APB0_RESET_IR (0x1 << 1) +#define PRCM_APB0_RESET_TIMER01 (0x1 << 2) +#define PRCM_APB0_RESET_P2WI (0x1 << 3) +#define PRCM_APB0_RESET_UART (0x1 << 4) +#define PRCM_APB0_RESET_1WIRE (0x1 << 5) +#define PRCM_APB0_RESET_I2C (0x1 << 6) + +#define PRCM_PLL_CTRL_PLL_BIAS (0x1 << 0) +#define PRCM_PLL_CTRL_HOSC_GAIN_ENH (0x1 << 1) +#define __PRCM_PLL_CTRL_USB_CLK_SRC (n) (((n) & 0x3) << 4) +#define PRCM_PLL_CTRL_USB_CLK_SRC_MASK \ + __PRCM_PLL_CTRL_USB_CLK_SRC(0x3) +#define __PRCM_PLL_CTRL_USB_CLK_0 0x0 +#define __PRCM_PLL_CTRL_USB_CLK_1 0x1 +#define __PRCM_PLL_CTRL_USB_CLK_2 0x2 +#define __PRCM_PLL_CTRL_USB_CLK_3 0x3 +#define PRCM_PLL_CTRL_USB_CLK_0 \ + __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_0) +#define PRCM_PLL_CTRL_USB_CLK_1 \ + __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_1) +#define PRCM_PLL_CTRL_USB_CLK_2 \ + __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_2) +#define PRCM_PLL_CTRL_USB_CLK_3 \ + __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_3) +#define __PRCM_PLL_CTRL_INT_PLL_IN_SEL (n) (((n) & 0x3) << 12) +#define PRCM_PLL_CTRL_INT_PLL_IN_SEL_MASK \ + __PRCM_PLL_CTRL_INT_PLL_IN_SEL(0x3) +#define PRCM_PLL_CTRL_INT_PLL_IN_SEL (n) \ + __PRCM_PLL_CTRL_INT_PLL_IN_SEL(n) +#define __PRCM_PLL_CTRL_HOSC_CLK_SEL (n) (((n) & 0x3) << 20) +#define PRCM_PLL_CTRL_HOSC_CLK_SEL_MASK \ + __PRCM_PLL_CTRL_HOSC_CLK_SEL(0x3) +#define __PRCM_PLL_CTRL_HOSC_CLK_0 0x0 +#define __PRCM_PLL_CTRL_HOSC_CLK_1 0x1 +#define __PRCM_PLL_CTRL_HOSC_CLK_2 0x2 +#define __PRCM_PLL_CTRL_HOSC_CLK_3 0x3 +#define PRCM_PLL_CTRL_HOSC_CLK_0 \ + __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_0) +#define PRCM_PLL_CTRL_HOSC_CLK_1 \ + __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_1) +#define PRCM_PLL_CTRL_HOSC_CLK_2 \ + __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_2) +#define PRCM_PLL_CTRL_HOSC_CLK_3 \ + __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_3) +#define PRCM_PLL_CTRL_PLL_TST_SRC_EXT (0x1 << 24) +#define PRCM_PLL_CTRL_LDO_DIGITAL_EN (0x1 << 0) +#define PRCM_PLL_CTRL_LDO_ANALOG_EN (0x1 << 1) +#define PRCM_PLL_CTRL_EXT_OSC_EN (0x1 << 2) +#define PRCM_PLL_CTRL_CLK_TST_EN (0x1 << 3) +#define PRCM_PLL_CTRL_IN_PWR_HIGH (0x1 << 15)/* 3.3 for hi 2.5 for lo */ +#define __PRCM_PLL_CTRL_VDD_LDO_OUT (n) (((n) & 0x7) << 16) +#define PRCM_PLL_CTRL_LDO_OUT_MASK \ + __PRCM_PLL_CTRL_LDO_OUT(0x7) +/* When using the low voltage 20 mV steps, and high voltage 30 mV steps */ +#define PRCM_PLL_CTRL_LDO_OUT_L (n) \ + __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) - 1000) / 20) & 0x7) +#define PRCM_PLL_CTRL_LDO_OUT_H (n) \ + __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) - 1160) / 30) & 0x7) +#define PRCM_PLL_CTRL_LDO_OUT_LV (n) \ + __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) & 0x7) * 20) + 1000) +#define PRCM_PLL_CTRL_LDO_OUT_HV (n) \ + __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) & 0x7) * 30) + 1160) +#define PRCM_PLL_CTRL_LDO_KEY (0xa7 << 24) +#define PRCM_PLL_CTRL_LDO_KEY_MASK (0xff << 24) + +#define PRCM_CLK_1WIRE_GATE (0x1 << 31) + +#define __PRCM_CLK_MOD0_M (n) (((n) & 0xf) << 0) +#define PRCM_CLK_MOD0_M_MASK __PRCM_CLK_MOD0_M(0xf) +#define __PRCM_CLK_MOD0_M_X (n) (n - 1) +#define PRCM_CLK_MOD0_M (n) __PRCM_CLK_MOD0_M(__PRCM_CLK_MOD0_M_X(n)) +#define PRCM_CLK_MOD0_OUT_PHASE (n) (((n) & 0x7) << 8) +#define PRCM_CLK_MOD0_OUT_PHASE_MASK (n) PRCM_CLK_MOD0_OUT_PHASE(0x7) +#define _PRCM_CLK_MOD0_N (n) (((n) & 0x3) << 16) +#define PRCM_CLK_MOD0_N_MASK __PRCM_CLK_MOD_N(0x3) +#define __PRCM_CLK_MOD0_N_X (n) (((n) >> 1) - 1) +#define PRCM_CLK_MOD0_N (n) __PRCM_CLK_MOD0_N(__PRCM_CLK_MOD0_N_X(n)) +#define PRCM_CLK_MOD0_SMPL_PHASE (n) (((n) & 0x7) << 20) +#define PRCM_CLK_MOD0_SMPL_PHASE_MASK PRCM_CLK_MOD0_SMPL_PHASE(0x7) +#define PRCM_CLK_MOD0_SRC_SEL (n) (((n) & 0x7) << 24) +#define PRCM_CLK_MOD0_SRC_SEL_MASK PRCM_CLK_MOD0_SRC_SEL(0x7) +#define PRCM_CLK_MOD0_GATE_EN (0x1 << 31) + +#define PRCM_APB0_RESET_PIO (0x1 << 0) +#define PRCM_APB0_RESET_IR (0x1 << 1) +#define PRCM_APB0_RESET_TIMER01 (0x1 << 2) +#define PRCM_APB0_RESET_P2WI (0x1 << 3) +#define PRCM_APB0_RESET_UART (0x1 << 4) +#define PRCM_APB0_RESET_1WIRE (0x1 << 5) +#define PRCM_APB0_RESET_I2C (0x1 << 6) + +#define __PRCM_CLK_OUTD_M (n) (((n) & 0x7) << 8) +#define PRCM_CLK_OUTD_M_MASK __PRCM_CLK_OUTD_M(0x7) +#define __PRCM_CLK_OUTD_M_X () ((n) - 1) +#define PRCM_CLK_OUTD_M (n) __PRCM_CLK_OUTD_M(__PRCM_CLK_OUTD_M_X(n)) +#define __PRCM_CLK_OUTD_N (n) (((n) & 0x7) << 20) +#define PRCM_CLK_OUTD_N_MASK __PRCM_CLK_OUTD_N(0x7) +#define __PRCM_CLK_OUTD_N_X (n) (((n) >> 1) - 1) +#define PRCM_CLK_OUTD_N (n) __PRCM_CLK_OUTD_N(__PRCM_CLK_OUTD_N_X(n) +#define __PRCM_CLK_OUTD_SRC_SEL (n) (((n) & 0x3) << 24) +#define PRCM_CLK_OUTD_SRC_SEL_MASK __PRCM_CLK_OUTD_SRC_SEL(0x3) +#define __PRCM_CLK_OUTD_SRC_LOSC2 0x0 +#define __PRCM_CLK_OUTD_SRC_LOSC 0x1 +#define __PRCM_CLK_OUTD_SRC_HOSC 0x2 +#define __PRCM_CLK_OUTD_SRC_ERR 0x3 +#define PRCM_CLK_OUTD_SRC_LOSC2 \ +#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_LOSC2) +#define PRCM_CLK_OUTD_SRC_LOSC \ +#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_LOSC) +#define PRCM_CLK_OUTD_SRC_HOSC \ +#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_HOSC) +#define PRCM_CLK_OUTD_SRC_ERR \ +#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_ERR) +#define PRCM_CLK_OUTD_EN (0x1 << 31) + +#define PRCM_CPU0_PWROFF (0x1 << 0) +#define PRCM_CPU1_PWROFF (0x1 << 1) +#define PRCM_CPU2_PWROFF (0x1 << 2) +#define PRCM_CPU3_PWROFF (0x1 << 3) +#define PRCM_CPU_ALL_PWROFF (0xf << 0) + +#define PRCM_VDD_SYS_DRAM_CH0_PAD_HOLD_PWROFF (0x1 << 0) +#define PRCM_VDD_SYS_DRAM_CH1_PAD_HOLD_PWROFF (0x1 << 1) +#define PRCM_VDD_SYS_AVCC_A_PWROFF (0x1 << 2) +#define PRCM_VDD_SYS_CPU0_VDD_PWROFF (0x1 << 3) + +#define PRCM_VDD_GPU_PWROFF (0x1 << 0) + +#define PRCM_VDD_SYS_RESET (0x1 << 0) + +#define PRCM_CPU1_PWR_CLAMP (n) (((n) & 0xff) << 0) +#define PRCM_CPU1_PWR_CLAMP_MASK PRCM_CPU1_PWR_CLAMP(0xff) + +#define PRCM_CPU2_PWR_CLAMP (n) (((n) & 0xff) << 0) +#define PRCM_CPU2_PWR_CLAMP_MASK PRCM_CPU2_PWR_CLAMP(0xff) + +#define PRCM_CPU3_PWR_CLAMP (n) (((n) & 0xff) << 0) +#define PRCM_CPU3_PWR_CLAMP_MASK PRCM_CPU3_PWR_CLAMP(0xff) + +#define PRCM_SEC_SWITCH_APB0_CLK_NONSEC (0x1 << 0) +#define PRCM_SEC_SWITCH_PLL_CFG_NONSEC (0x1 << 1) +#define PRCM_SEC_SWITCH_PWR_GATE_NONSEC (0x1 << 2) + +#ifndef __ASSEMBLY__ +#include <linux/compiler.h> + +struct sunxi_prcm_reg { +u32 cpus_cfg;/* 0x000 */ +u8 res0[0x8 ];/* 0x004 */ +u32 apb0_ratio;/* 0x00c */ +u32 cpu0_cfg;/* 0x010 */ +u32 cpu1_cfg;/* 0x014 */ +u32 cpu2_cfg;/* 0x018 */ +u32 cpu3_cfg;/* 0x01c */ +u8 res1[0x8 ];/* 0x020 */ +u32 apb0_gate;/* 0x028 */ +u8 res2[0x14 ];/* 0x02c */ +u32 pll_ctrl0;/* 0x040 */ +u32 pll_ctrl1;/* 0x044 */ +u8 res3[0x8 ];/* 0x048 */ +u32 clk_1wire;/* 0x050 */ +u32 clk_ir;/* 0x054 */ +u8 res4[0x58 ];/* 0x058 */ +u32 apb0_reset;/* 0x0b0 */ +u8 res5[0x3c ];/* 0x0b4 */ +u32 clk_outd;/* 0x0f0 */ +u8 res6[0xc ];/* 0x0f4 */ +u32 cpu_pwroff;/* 0x100 */ +u8 res7[0xc ];/* 0x104 */ +u32 vdd_sys_pwroff;/* 0x110 */ +u8 res8[0x4 ];/* 0x114 */ +u32 gpu_pwroff;/* 0x118 */ +u8 res9[0x4 ];/* 0x11c */ +u32 vdd_pwr_reset;/* 0x120 */ +u8 res10[0x1c ];/* 0x124 */ +u32 cpu_pwr_clamp[4 ];/* 0x140 but first one is actually unused */ +u8 res11[0x30 ];/* 0x150 */ +u32 dram_pwr;/* 0x180 */ +u8 res12[0xc ];/* 0x184 */ +u32 dram_tst;/* 0x190 */ +u8 res13[0x3c ];/* 0x194 */ +u32 prcm_sec_switch;/* 0x1d0 */ +}; + +void prcm_apb0_enable (u32 flags); +void prcm_apb0_disable (u32 flags); + +#endif /* __ASSEMBLY__ */ +#endif /* _PRCM_H */
PATCH 5/17 sunxi: prcm: Add memory map for H6 like SoCs
Dne ponedeljek, 04. januar 2021 ob 01:03:17 CET je Samuel Holland napisal(a):
Quoted 19 lines · Jernej Skrabec
Quoted 18 lines
There was no need to have prcm definitions for H6 and similar SoCs till now. However, support
R_I2Cwill be needed soon in SPL.Move old definitions to
prcm_sun6i.hand add new ones inprcm_sun50i.h. One of those files will be selected in commonprcm.hbased on defined macros.This commit doesn't do any functional change.
Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/include/asm/arch-sunxi/prcm.h | 249 +----------------- arch/arm/include/asm/arch-sunxi/prcm_sun50i.h | 41 +++ arch/arm/include/asm/arch-sunxi/prcm_sun6i.h | 247 +++++++++++++++++ 3 files changed, 298 insertions(+), 239 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/prcm_sun50i.h create mode 100644 arch/arm/include/asm/arch-sunxi/prcm_sun6i.h
Quoted 1 line
arch/arm/include/asm/
Quoted 1 line
arch/arm/include/asm/ renamed from arch/arm/include/asm/arch-sunxi/prcm.h +0
-0
arch-sunxi/prcm.h
Quoted 110 lines
Quoted 110 lines
index
767d1ff98d74..5106076f5e91100644arch/arm/include/asm/arch-sunxi/prcm.h +2
-96@@ -1,247 +1,18 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Sunxi A31 Power Management Unit register definition. +* (C) Copyright 2020 Jernej Skrabec <[email protected]> * -* (C) Copyright 2013 Oliver Schinagl <[email protected]> -* http://linux-sunxi.org -* Allwinner Technology Co., Ltd. <www.allwinnertech.com> -* Berg Xing <[email protected]> -* Tom Cubie <[email protected]> +* Sunxi platform prcm register definition. */ #ifndef _SUNXI_PRCM_H#define _SUNXI_PRCM_H -#define __PRCM_CPUS_CFG_PRE (n) (((n) & 0x3) << 4) -#define PRCM_CPUS_CFG_PRE_MASK __PRCM_CPUS_CFG_PRE(0x3) -#define __PRCM_CPUS_CFG_PRE_DIV (n) (((n) >> 1) - 1) -#define PRCM_CPUS_CFG_PRE_DIV (n) \ - __PRCM_CPUS_CFG_PRE(__PRCM_CPUS_CFG_CLK_PRE(n)) -#define __PRCM_CPUS_CFG_POST (n) (((n) & 0x1f) << 8) -#define PRCM_CPUS_CFG_POST_MASK __PRCM_CPUS_CFG_POST(0x1f) -#define __PRCM_CPUS_CFG_POST_DIV (n) ((n) - 1) -#define PRCM_CPUS_CFG_POST_DIV (n) \ - __PRCM_CPUS_CFG_POST_DIV(__PRCM_CPUS_CFG_POST_DIV(n)) -#define __PRCM_CPUS_CFG_CLK_SRC (n) (((n) & 0x3) << 16) -#define PRCM_CPUS_CFG_CLK_SRC_MASK __PRCM_CPUS_CFG_CLK_SRC(0x3) -#define __PRCM_CPUS_CFG_CLK_SRC_LOSC 0x0 -#define __PRCM_CPUS_CFG_CLK_SRC_HOSC 0x1 -#define __PRCM_CPUS_CFG_CLK_SRC_PLL6 0x2 -#define __PRCM_CPUS_CFG_CLK_SRC_PDIV 0x3 -#define PRCM_CPUS_CFG_CLK_SRC_LOSC \ - __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_LOSC) -#define PRCM_CPUS_CFG_CLK_SRC_HOSC \ - __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_HOSC) -#define PRCM_CPUS_CFG_CLK_SRC_PLL6 \ - __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_PLL6) -#define PRCM_CPUS_CFG_CLK_SRC_PDIV \ - __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_PDIV) - -#define __PRCM_APB0_RATIO (n) (((n) & 0x3) << 0) -#define PRCM_APB0_RATIO_DIV_MASK __PRCM_APB0_RATIO_DIV(0x3) -#define __PRCM_APB0_RATIO_DIV (n) (((n) >> 1) - 1) -#define PRCM_APB0_RATIO_DIV (n) \ - __PRCM_APB0_RATIO(__PRCM_APB0_RATIO_DIV(n)) - -#define PRCM_CPU_CFG_NEON_CLK_EN (0x1 << 0) -#define PRCM_CPU_CFG_CPU_CLK_EN (0x1 << 1) - -#define PRCM_APB0_GATE_PIO (0x1 << 0) -#define PRCM_APB0_GATE_IR (0x1 << 1) -#define PRCM_APB0_GATE_TIMER01 (0x1 << 2) -#define PRCM_APB0_GATE_P2WI (0x1 << 3)/* sun6i */ -#define PRCM_APB0_GATE_RSB (0x1 << 3)/* sun8i */ -#define PRCM_APB0_GATE_UART (0x1 << 4) -#define PRCM_APB0_GATE_1WIRE (0x1 << 5) -#define PRCM_APB0_GATE_I2C (0x1 << 6) - -#define PRCM_APB0_RESET_PIO (0x1 << 0) -#define PRCM_APB0_RESET_IR (0x1 << 1) -#define PRCM_APB0_RESET_TIMER01 (0x1 << 2) -#define PRCM_APB0_RESET_P2WI (0x1 << 3) -#define PRCM_APB0_RESET_UART (0x1 << 4) -#define PRCM_APB0_RESET_1WIRE (0x1 << 5) -#define PRCM_APB0_RESET_I2C (0x1 << 6) - -#define PRCM_PLL_CTRL_PLL_BIAS (0x1 << 0) -#define PRCM_PLL_CTRL_HOSC_GAIN_ENH (0x1 << 1) -#define __PRCM_PLL_CTRL_USB_CLK_SRC (n) (((n) & 0x3) << 4) -#define PRCM_PLL_CTRL_USB_CLK_SRC_MASK \ - __PRCM_PLL_CTRL_USB_CLK_SRC(0x3) -#define __PRCM_PLL_CTRL_USB_CLK_0 0x0 -#define __PRCM_PLL_CTRL_USB_CLK_1 0x1 -#define __PRCM_PLL_CTRL_USB_CLK_2 0x2 -#define __PRCM_PLL_CTRL_USB_CLK_3 0x3 -#define PRCM_PLL_CTRL_USB_CLK_0 \ - __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_0) -#define PRCM_PLL_CTRL_USB_CLK_1 \ - __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_1) -#define PRCM_PLL_CTRL_USB_CLK_2 \ - __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_2) -#define PRCM_PLL_CTRL_USB_CLK_3 \ - __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_3) -#define __PRCM_PLL_CTRL_INT_PLL_IN_SEL (n) (((n) & 0x3) << 12) -#define PRCM_PLL_CTRL_INT_PLL_IN_SEL_MASK \ - __PRCM_PLL_CTRL_INT_PLL_IN_SEL(0x3) -#define PRCM_PLL_CTRL_INT_PLL_IN_SEL (n) \ - __PRCM_PLL_CTRL_INT_PLL_IN_SEL(n) -#define __PRCM_PLL_CTRL_HOSC_CLK_SEL (n) (((n) & 0x3) << 20) -#define PRCM_PLL_CTRL_HOSC_CLK_SEL_MASK \ - __PRCM_PLL_CTRL_HOSC_CLK_SEL(0x3) -#define __PRCM_PLL_CTRL_HOSC_CLK_0 0x0 -#define __PRCM_PLL_CTRL_HOSC_CLK_1 0x1 -#define __PRCM_PLL_CTRL_HOSC_CLK_2 0x2 -#define __PRCM_PLL_CTRL_HOSC_CLK_3 0x3 -#define PRCM_PLL_CTRL_HOSC_CLK_0 \ - __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_0) -#define PRCM_PLL_CTRL_HOSC_CLK_1 \ - __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_1) -#define PRCM_PLL_CTRL_HOSC_CLK_2 \ - __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_2) -#define PRCM_PLL_CTRL_HOSC_CLK_3 \ - __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_3) -#define PRCM_PLL_CTRL_PLL_TST_SRC_EXT (0x1 << 24) -#define PRCM_PLL_CTRL_LDO_DIGITAL_EN (0x1 << 0)
Quoted 8 lines
arch/arm/include/asm/arch-sunxi/prcm.h
Quoted 8 lines
arch/arm/include/asm/arch-sunxi/prcm.h +0
-8-#define PRCM_PLL_CTRL_LDO_ANALOG_EN (0x1 << 1) -#define PRCM_PLL_CTRL_EXT_OSC_EN (0x1 << 2) -#define PRCM_PLL_CTRL_CLK_TST_EN (0x1 << 3) -#define PRCM_PLL_CTRL_IN_PWR_HIGH (0x1 << 15)/* 3.3 for hi 2.5 for lo */ -#define __PRCM_PLL_CTRL_VDD_LDO_OUT (n) (((n) & 0x7) << 16) -#define PRCM_PLL_CTRL_LDO_OUT_MASK \ - __PRCM_PLL_CTRL_LDO_OUT(0x7) -/* When using the low voltage 20 mV steps, and high voltage 30 mV steps
*/
Quoted 114 lines
Quoted 114 lines
arch/arm/include/asm/arch-sunxi/prcm.h +0
-114-#define PRCM_PLL_CTRL_LDO_OUT_L (n) \ - __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) - 1000) / 20) & 0x7) -#define PRCM_PLL_CTRL_LDO_OUT_H (n) \ - __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) - 1160) / 30) & 0x7) -#define PRCM_PLL_CTRL_LDO_OUT_LV (n) \ - __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) & 0x7) * 20) + 1000) -#define PRCM_PLL_CTRL_LDO_OUT_HV (n) \ - __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) & 0x7) * 30) + 1160) -#define PRCM_PLL_CTRL_LDO_KEY (0xa7 << 24) -#define PRCM_PLL_CTRL_LDO_KEY_MASK (0xff << 24) - -#define PRCM_CLK_1WIRE_GATE (0x1 << 31) - -#define __PRCM_CLK_MOD0_M (n) (((n) & 0xf) << 0) -#define PRCM_CLK_MOD0_M_MASK __PRCM_CLK_MOD0_M(0xf) -#define __PRCM_CLK_MOD0_M_X (n) (n - 1) -#define PRCM_CLK_MOD0_M (n) __PRCM_CLK_MOD0_M(__PRCM_CLK_MOD0_M_X(n)) -#define PRCM_CLK_MOD0_OUT_PHASE (n) (((n) & 0x7) << 8) -#define PRCM_CLK_MOD0_OUT_PHASE_MASK (n) PRCM_CLK_MOD0_OUT_PHASE(0x7) -#define _PRCM_CLK_MOD0_N (n) (((n) & 0x3) << 16) -#define PRCM_CLK_MOD0_N_MASK __PRCM_CLK_MOD_N(0x3) -#define __PRCM_CLK_MOD0_N_X (n) (((n) >> 1) - 1) -#define PRCM_CLK_MOD0_N (n) __PRCM_CLK_MOD0_N(__PRCM_CLK_MOD0_N_X(n)) -#define PRCM_CLK_MOD0_SMPL_PHASE (n) (((n) & 0x7) << 20) -#define PRCM_CLK_MOD0_SMPL_PHASE_MASK PRCM_CLK_MOD0_SMPL_PHASE(0x7) -#define PRCM_CLK_MOD0_SRC_SEL (n) (((n) & 0x7) << 24) -#define PRCM_CLK_MOD0_SRC_SEL_MASK PRCM_CLK_MOD0_SRC_SEL(0x7) -#define PRCM_CLK_MOD0_GATE_EN (0x1 << 31) - -#define PRCM_APB0_RESET_PIO (0x1 << 0) -#define PRCM_APB0_RESET_IR (0x1 << 1) -#define PRCM_APB0_RESET_TIMER01 (0x1 << 2) -#define PRCM_APB0_RESET_P2WI (0x1 << 3) -#define PRCM_APB0_RESET_UART (0x1 << 4) -#define PRCM_APB0_RESET_1WIRE (0x1 << 5) -#define PRCM_APB0_RESET_I2C (0x1 << 6) - -#define __PRCM_CLK_OUTD_M (n) (((n) & 0x7) << 8) -#define PRCM_CLK_OUTD_M_MASK __PRCM_CLK_OUTD_M(0x7) -#define __PRCM_CLK_OUTD_M_X () ((n) - 1) -#define PRCM_CLK_OUTD_M (n) __PRCM_CLK_OUTD_M(__PRCM_CLK_OUTD_M_X(n)) -#define __PRCM_CLK_OUTD_N (n) (((n) & 0x7) << 20) -#define PRCM_CLK_OUTD_N_MASK __PRCM_CLK_OUTD_N(0x7) -#define __PRCM_CLK_OUTD_N_X (n) (((n) >> 1) - 1) -#define PRCM_CLK_OUTD_N (n) __PRCM_CLK_OUTD_N(__PRCM_CLK_OUTD_N_X(n) -#define __PRCM_CLK_OUTD_SRC_SEL (n) (((n) & 0x3) << 24) -#define PRCM_CLK_OUTD_SRC_SEL_MASK __PRCM_CLK_OUTD_SRC_SEL(0x3) -#define __PRCM_CLK_OUTD_SRC_LOSC2 0x0 -#define __PRCM_CLK_OUTD_SRC_LOSC 0x1 -#define __PRCM_CLK_OUTD_SRC_HOSC 0x2 -#define __PRCM_CLK_OUTD_SRC_ERR 0x3 -#define PRCM_CLK_OUTD_SRC_LOSC2 \ -#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_LOSC2) -#define PRCM_CLK_OUTD_SRC_LOSC \ -#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_LOSC) -#define PRCM_CLK_OUTD_SRC_HOSC \ -#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_HOSC) -#define PRCM_CLK_OUTD_SRC_ERR \ -#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_ERR) -#define PRCM_CLK_OUTD_EN (0x1 << 31) - -#define PRCM_CPU0_PWROFF (0x1 << 0) -#define PRCM_CPU1_PWROFF (0x1 << 1) -#define PRCM_CPU2_PWROFF (0x1 << 2) -#define PRCM_CPU3_PWROFF (0x1 << 3) -#define PRCM_CPU_ALL_PWROFF (0xf << 0) - -#define PRCM_VDD_SYS_DRAM_CH0_PAD_HOLD_PWROFF (0x1 << 0) -#define PRCM_VDD_SYS_DRAM_CH1_PAD_HOLD_PWROFF (0x1 << 1) -#define PRCM_VDD_SYS_AVCC_A_PWROFF (0x1 << 2) -#define PRCM_VDD_SYS_CPU0_VDD_PWROFF (0x1 << 3) - -#define PRCM_VDD_GPU_PWROFF (0x1 << 0) - -#define PRCM_VDD_SYS_RESET (0x1 << 0) - -#define PRCM_CPU1_PWR_CLAMP (n) (((n) & 0xff) << 0) -#define PRCM_CPU1_PWR_CLAMP_MASK PRCM_CPU1_PWR_CLAMP(0xff) - -#define PRCM_CPU2_PWR_CLAMP (n) (((n) & 0xff) << 0) -#define PRCM_CPU2_PWR_CLAMP_MASK PRCM_CPU2_PWR_CLAMP(0xff) - -#define PRCM_CPU3_PWR_CLAMP (n) (((n) & 0xff) << 0) -#define PRCM_CPU3_PWR_CLAMP_MASK PRCM_CPU3_PWR_CLAMP(0xff) - -#define PRCM_SEC_SWITCH_APB0_CLK_NONSEC (0x1 << 0) -#define PRCM_SEC_SWITCH_PLL_CFG_NONSEC (0x1 << 1) -#define PRCM_SEC_SWITCH_PWR_GATE_NONSEC (0x1 << 2) - -#ifndef __ASSEMBLY__ -#include <linux/compiler.h> - -struct sunxi_prcm_reg { - u32 cpus_cfg; /* 0x000 */ - u8 res0[0x8]; /* 0x004 */ - u32 apb0_ratio; /* 0x00c */ - u32 cpu0_cfg; /* 0x010 */ - u32 cpu1_cfg; /* 0x014 */ - u32 cpu2_cfg; /* 0x018 */ - u32 cpu3_cfg; /* 0x01c */ - u8 res1[0x8]; /* 0x020 */ - u32 apb0_gate; /* 0x028 */ - u8 res2[0x14]; /* 0x02c */ - u32 pll_ctrl0; /* 0x040 */ - u32 pll_ctrl1; /* 0x044 */ - u8 res3[0x8]; /* 0x048 */ - u32 clk_1wire; /* 0x050 */ - u32 clk_ir; /* 0x054 */ - u8 res4[0x58]; /* 0x058 */ - u32 apb0_reset; /* 0x0b0 */ - u8 res5[0x3c]; /* 0x0b4 */ - u32 clk_outd; /* 0x0f0 */ - u8 res6[0xc]; /* 0x0f4 */ - u32 cpu_pwroff; /* 0x100 */
Quoted 8 lines
arch/arm/include/asm/arch-sunxi/prcm.h
Quoted 8 lines
arch/arm/include/asm/arch-sunxi/prcm.h +0
-8-u8 res7[0xc ];/* 0x104 */ -u32 vdd_sys_pwroff;/* 0x110 */ -u8 res8[0x4 ];/* 0x114 */ -u32 gpu_pwroff;/* 0x118 */ -u8 res9[0x4 ];/* 0x11c */ -u32 vdd_pwr_reset;/* 0x120 */ -u8 res10[0x1c ];/* 0x124 */ -u32 cpu_pwr_clamp[4 ];/* 0x140 but first one is actually unused
*/
Quoted 14 lines
Quoted 14 lines
arch/arm/include/asm/arch-sunxi/prcm.h +1
-13-u8 res11[0x30 ];/* 0x150 */ -u32 dram_pwr;/* 0x180 */ -u8 res12[0xc ];/* 0x184 */ -u32 dram_tst;/* 0x190 */ -u8 res13[0x3c ];/* 0x194 */ -u32 prcm_sec_switch;/* 0x1d0 */ -}; - -void prcm_apb0_enable (u32 flags); -void prcm_apb0_disable (u32 flags); - -#endif /* __ASSEMBLY__ */ -#endif /* _PRCM_H */ +/* prcm regs definition */
Quoted 8 lines
arch/arm/
Quoted 8 lines
arch/arm/include/asm/arch-sunxi/prcm.h +7
-0+#if defined(CONFIG_SUN50I_GEN_H6 ) +#include <asm/arch/prcm_sun50i.h> +#else +#include <asm/arch/prcm_sun6i.h> +#endif + +#endif /* _SUNXI_PRCM_H */ arch/arm/ renamed from arch/arm/include/asm/arch-sunxi/prcm_sun50i.h +0
-0
include/asm/arch-sunxi/prcm_sun50i.h
Quoted 28 lines
Quoted 15 lines
new file mode 100644
index 000000000000..68a78e50ce64arch/arm/include/asm/arch-sunxi/prcm_sun50i.h new file +10
-0@@ -0,0 +1,41 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Sunxi H6 Power Management Unit register definition. +* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +*/ + +#ifndef _SUN50I_PRCM_H +#define _SUN50I_PRCM_H +arch/arm/include/asm/arch-sunxi/prcm_sun50i.h line 20
Quoted 10 lines
arch/arm/include/asm/arch-sunxi/prcm_sun50i.h new file +10
-0+#ifndef __ASSEMBLY__ +#include <linux/compiler.h> + +struct sunxi_prcm_reg { + u32 cpus_cfg; /* 0x000 */ + u8 res0[0x8]; /* 0x004 */ + u32 apbs1_cfg; /* 0x00c */ + u32 apbs2_cfg; /* 0x010 */ + u8 res1[0x118]; /* 0x014 */ + u32 wdg_gate_reset; /* 0x12c */This is the register for
R_TWD, notR_WDOG.
Quoted 3 lines
And out of curiosity, were you intending to include all PRCM registers, or just those present on both H6 and H616? (H6 also has TIMER, PWM and UART.)
I think I went over some BSP sources. Anyway, I'll update this structure to cover both SoCs. Not sure if most of definitions will be ever used, but I'll include them for the sake of completeness.
Quoted 15 lines
Quoted 15 lines
arch/arm/include/asm/arch-sunxi/prcm_sun50i.h new file +14
-0+u8 res2[0x6c ];/* 0x130 */ +u32 twi_gate_reset;/* 0x19c */ +u8 res3[0x1c ];/* 0x1a0 */ +u32 rsb_gate_reset;/* 0x1bc */ +u32 cir_cfg;/* 0x1c0 */ +u8 res4[0x8 ];/* 0x1c4 */ +u32 cir_gate_reset;/* 0x1cc */ +u8 res5[0x10 ];/* 0x1d0 */ +u32 w1_cfg;/* 0x1e0 */ +u8 res6[0x8 ];/* 0x1e4 */ +u32 w1_gate_reset;/* 0x1ec */ +u8 res7[0x1c ];/* 0x1f0 */ +u32 rtc_gate_reset;/* 0x20c */ +};
Quoted 8 lines
arch/arm/
Quoted 8 lines
arch/arm/include/asm/arch-sunxi/prcm_sun50i.h new file +7
-0+check_member (sunxi_prcm_reg, rtc_gate_reset,0x20c ); + +#define PRCM_TWI_GATE (1 << 0) +#define PRCM_TWI_RESET (1 << 16) + +#endif /* __ASSEMBLY__ */ +#endif /* _PRCM_H */ arch/arm/ renamed from arch/arm/include/asm/arch-sunxi/prcm_sun6i.h +0
-0
include/asm/arch-sunxi/prcm_sun6i.h
Quoted 109 lines
Quoted 109 lines
new file mode 100644
index 000000000000..ab664e80bbe8arch/arm/include/asm/arch-sunxi/prcm_sun6i.h new file +104
-0@@ -0,0 +1,247 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Sunxi A31 Power Management Unit register definition. +* +* (C) Copyright 2013 Oliver Schinagl <[email protected]> +* http://linux-sunxi.org +* Allwinner Technology Co., Ltd. <www.allwinnertech.com> +* Berg Xing <[email protected]> +* Tom Cubie <[email protected]> +*/ + +#ifndef _SUN6I_PRCM_H +#define _SUN6I_PRCM_H + +#define __PRCM_CPUS_CFG_PRE (n) (((n) & 0x3) << 4) +#define PRCM_CPUS_CFG_PRE_MASK __PRCM_CPUS_CFG_PRE(0x3) +#define __PRCM_CPUS_CFG_PRE_DIV (n) (((n) >> 1) - 1) +#define PRCM_CPUS_CFG_PRE_DIV (n) \ + __PRCM_CPUS_CFG_PRE(__PRCM_CPUS_CFG_CLK_PRE(n)) +#define __PRCM_CPUS_CFG_POST (n) (((n) & 0x1f) << 8) +#define PRCM_CPUS_CFG_POST_MASK __PRCM_CPUS_CFG_POST(0x1f) +#define __PRCM_CPUS_CFG_POST_DIV (n) ((n) - 1) +#define PRCM_CPUS_CFG_POST_DIV (n) \ + __PRCM_CPUS_CFG_POST_DIV(__PRCM_CPUS_CFG_POST_DIV(n)) +#define __PRCM_CPUS_CFG_CLK_SRC (n) (((n) & 0x3) << 16) +#define PRCM_CPUS_CFG_CLK_SRC_MASK __PRCM_CPUS_CFG_CLK_SRC(0x3) +#define __PRCM_CPUS_CFG_CLK_SRC_LOSC 0x0 +#define __PRCM_CPUS_CFG_CLK_SRC_HOSC 0x1 +#define __PRCM_CPUS_CFG_CLK_SRC_PLL6 0x2 +#define __PRCM_CPUS_CFG_CLK_SRC_PDIV 0x3 +#define PRCM_CPUS_CFG_CLK_SRC_LOSC \ + __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_LOSC) +#define PRCM_CPUS_CFG_CLK_SRC_HOSC \ + __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_HOSC) +#define PRCM_CPUS_CFG_CLK_SRC_PLL6 \ + __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_PLL6) +#define PRCM_CPUS_CFG_CLK_SRC_PDIV \ + __PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_PDIV) + +#define __PRCM_APB0_RATIO (n) (((n) & 0x3) << 0) +#define PRCM_APB0_RATIO_DIV_MASK __PRCM_APB0_RATIO_DIV(0x3) +#define __PRCM_APB0_RATIO_DIV (n) (((n) >> 1) - 1) +#define PRCM_APB0_RATIO_DIV (n) \ + __PRCM_APB0_RATIO(__PRCM_APB0_RATIO_DIV(n)) + +#define PRCM_CPU_CFG_NEON_CLK_EN (0x1 << 0) +#define PRCM_CPU_CFG_CPU_CLK_EN (0x1 << 1) + +#define PRCM_APB0_GATE_PIO (0x1 << 0) +#define PRCM_APB0_GATE_IR (0x1 << 1) +#define PRCM_APB0_GATE_TIMER01 (0x1 << 2) +#define PRCM_APB0_GATE_P2WI (0x1 << 3)/* sun6i */ +#define PRCM_APB0_GATE_RSB (0x1 << 3)/* sun8i */ +#define PRCM_APB0_GATE_UART (0x1 << 4) +#define PRCM_APB0_GATE_1WIRE (0x1 << 5) +#define PRCM_APB0_GATE_I2C (0x1 << 6) + +#define PRCM_APB0_RESET_PIO (0x1 << 0) +#define PRCM_APB0_RESET_IR (0x1 << 1) +#define PRCM_APB0_RESET_TIMER01 (0x1 << 2) +#define PRCM_APB0_RESET_P2WI (0x1 << 3) +#define PRCM_APB0_RESET_UART (0x1 << 4) +#define PRCM_APB0_RESET_1WIRE (0x1 << 5) +#define PRCM_APB0_RESET_I2C (0x1 << 6) + +#define PRCM_PLL_CTRL_PLL_BIAS (0x1 << 0) +#define PRCM_PLL_CTRL_HOSC_GAIN_ENH (0x1 << 1) +#define __PRCM_PLL_CTRL_USB_CLK_SRC (n) (((n) & 0x3) << 4) +#define PRCM_PLL_CTRL_USB_CLK_SRC_MASK \ + __PRCM_PLL_CTRL_USB_CLK_SRC(0x3) +#define __PRCM_PLL_CTRL_USB_CLK_0 0x0 +#define __PRCM_PLL_CTRL_USB_CLK_1 0x1 +#define __PRCM_PLL_CTRL_USB_CLK_2 0x2 +#define __PRCM_PLL_CTRL_USB_CLK_3 0x3 +#define PRCM_PLL_CTRL_USB_CLK_0 \ + __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_0) +#define PRCM_PLL_CTRL_USB_CLK_1 \ + __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_1) +#define PRCM_PLL_CTRL_USB_CLK_2 \ + __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_2) +#define PRCM_PLL_CTRL_USB_CLK_3 \ + __PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_3) +#define __PRCM_PLL_CTRL_INT_PLL_IN_SEL (n) (((n) & 0x3) << 12) +#define PRCM_PLL_CTRL_INT_PLL_IN_SEL_MASK \ + __PRCM_PLL_CTRL_INT_PLL_IN_SEL(0x3) +#define PRCM_PLL_CTRL_INT_PLL_IN_SEL (n) \ + __PRCM_PLL_CTRL_INT_PLL_IN_SEL(n) +#define __PRCM_PLL_CTRL_HOSC_CLK_SEL (n) (((n) & 0x3) << 20) +#define PRCM_PLL_CTRL_HOSC_CLK_SEL_MASK \ + __PRCM_PLL_CTRL_HOSC_CLK_SEL(0x3) +#define __PRCM_PLL_CTRL_HOSC_CLK_0 0x0 +#define __PRCM_PLL_CTRL_HOSC_CLK_1 0x1 +#define __PRCM_PLL_CTRL_HOSC_CLK_2 0x2 +#define __PRCM_PLL_CTRL_HOSC_CLK_3 0x3 +#define PRCM_PLL_CTRL_HOSC_CLK_0 \ + __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_0) +#define PRCM_PLL_CTRL_HOSC_CLK_1 \ + __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_1) +#define PRCM_PLL_CTRL_HOSC_CLK_2 \ + __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_2) +#define PRCM_PLL_CTRL_HOSC_CLK_3 \ + __PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_3) +#define PRCM_PLL_CTRL_PLL_TST_SRC_EXT (0x1 << 24) +#define PRCM_PLL_CTRL_LDO_DIGITAL_EN (0x1 << 0)
Quoted 8 lines
arch/arm/include/asm/arch-sunxi/prcm_sun6i.h
Quoted 8 lines
arch/arm/include/asm/arch-sunxi/prcm_sun6i.h new file +8
-0+#define PRCM_PLL_CTRL_LDO_ANALOG_EN (0x1 << 1) +#define PRCM_PLL_CTRL_EXT_OSC_EN (0x1 << 2) +#define PRCM_PLL_CTRL_CLK_TST_EN (0x1 << 3) +#define PRCM_PLL_CTRL_IN_PWR_HIGH (0x1 << 15)/* 3.3 for hi 2.5 for lo */ +#define __PRCM_PLL_CTRL_VDD_LDO_OUT (n) (((n) & 0x7) << 16) +#define PRCM_PLL_CTRL_LDO_OUT_MASK \ + __PRCM_PLL_CTRL_LDO_OUT(0x7) +/* When using the low voltage 20 mV steps, and high voltage 30 mV steps
*/
Quoted 114 lines
Quoted 114 lines
arch/arm/include/asm/arch-sunxi/prcm_sun6i.h new file +114
-0+#define PRCM_PLL_CTRL_LDO_OUT_L (n) \ + __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) - 1000) / 20) & 0x7) +#define PRCM_PLL_CTRL_LDO_OUT_H (n) \ + __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) - 1160) / 30) & 0x7) +#define PRCM_PLL_CTRL_LDO_OUT_LV (n) \ + __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) & 0x7) * 20) + 1000) +#define PRCM_PLL_CTRL_LDO_OUT_HV (n) \ + __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) & 0x7) * 30) + 1160) +#define PRCM_PLL_CTRL_LDO_KEY (0xa7 << 24) +#define PRCM_PLL_CTRL_LDO_KEY_MASK (0xff << 24) + +#define PRCM_CLK_1WIRE_GATE (0x1 << 31) + +#define __PRCM_CLK_MOD0_M (n) (((n) & 0xf) << 0) +#define PRCM_CLK_MOD0_M_MASK __PRCM_CLK_MOD0_M(0xf) +#define __PRCM_CLK_MOD0_M_X (n) (n - 1) +#define PRCM_CLK_MOD0_M (n) __PRCM_CLK_MOD0_M(__PRCM_CLK_MOD0_M_X(n)) +#define PRCM_CLK_MOD0_OUT_PHASE (n) (((n) & 0x7) << 8) +#define PRCM_CLK_MOD0_OUT_PHASE_MASK (n) PRCM_CLK_MOD0_OUT_PHASE(0x7) +#define _PRCM_CLK_MOD0_N (n) (((n) & 0x3) << 16) +#define PRCM_CLK_MOD0_N_MASK __PRCM_CLK_MOD_N(0x3) +#define __PRCM_CLK_MOD0_N_X (n) (((n) >> 1) - 1) +#define PRCM_CLK_MOD0_N (n) __PRCM_CLK_MOD0_N(__PRCM_CLK_MOD0_N_X(n)) +#define PRCM_CLK_MOD0_SMPL_PHASE (n) (((n) & 0x7) << 20) +#define PRCM_CLK_MOD0_SMPL_PHASE_MASK PRCM_CLK_MOD0_SMPL_PHASE(0x7) +#define PRCM_CLK_MOD0_SRC_SEL (n) (((n) & 0x7) << 24) +#define PRCM_CLK_MOD0_SRC_SEL_MASK PRCM_CLK_MOD0_SRC_SEL(0x7) +#define PRCM_CLK_MOD0_GATE_EN (0x1 << 31) + +#define PRCM_APB0_RESET_PIO (0x1 << 0) +#define PRCM_APB0_RESET_IR (0x1 << 1) +#define PRCM_APB0_RESET_TIMER01 (0x1 << 2) +#define PRCM_APB0_RESET_P2WI (0x1 << 3) +#define PRCM_APB0_RESET_UART (0x1 << 4) +#define PRCM_APB0_RESET_1WIRE (0x1 << 5) +#define PRCM_APB0_RESET_I2C (0x1 << 6) + +#define __PRCM_CLK_OUTD_M (n) (((n) & 0x7) << 8) +#define PRCM_CLK_OUTD_M_MASK __PRCM_CLK_OUTD_M(0x7) +#define __PRCM_CLK_OUTD_M_X () ((n) - 1) +#define PRCM_CLK_OUTD_M (n) __PRCM_CLK_OUTD_M(__PRCM_CLK_OUTD_M_X(n)) +#define __PRCM_CLK_OUTD_N (n) (((n) & 0x7) << 20) +#define PRCM_CLK_OUTD_N_MASK __PRCM_CLK_OUTD_N(0x7) +#define __PRCM_CLK_OUTD_N_X (n) (((n) >> 1) - 1) +#define PRCM_CLK_OUTD_N (n) __PRCM_CLK_OUTD_N(__PRCM_CLK_OUTD_N_X(n) +#define __PRCM_CLK_OUTD_SRC_SEL (n) (((n) & 0x3) << 24) +#define PRCM_CLK_OUTD_SRC_SEL_MASK __PRCM_CLK_OUTD_SRC_SEL(0x3) +#define __PRCM_CLK_OUTD_SRC_LOSC2 0x0 +#define __PRCM_CLK_OUTD_SRC_LOSC 0x1 +#define __PRCM_CLK_OUTD_SRC_HOSC 0x2 +#define __PRCM_CLK_OUTD_SRC_ERR 0x3 +#define PRCM_CLK_OUTD_SRC_LOSC2 \ +#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_LOSC2) +#define PRCM_CLK_OUTD_SRC_LOSC \ +#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_LOSC) +#define PRCM_CLK_OUTD_SRC_HOSC \ +#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_HOSC) +#define PRCM_CLK_OUTD_SRC_ERR \ +#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_ERR) +#define PRCM_CLK_OUTD_EN (0x1 << 31) + +#define PRCM_CPU0_PWROFF (0x1 << 0) +#define PRCM_CPU1_PWROFF (0x1 << 1) +#define PRCM_CPU2_PWROFF (0x1 << 2) +#define PRCM_CPU3_PWROFF (0x1 << 3) +#define PRCM_CPU_ALL_PWROFF (0xf << 0) + +#define PRCM_VDD_SYS_DRAM_CH0_PAD_HOLD_PWROFF (0x1 << 0) +#define PRCM_VDD_SYS_DRAM_CH1_PAD_HOLD_PWROFF (0x1 << 1) +#define PRCM_VDD_SYS_AVCC_A_PWROFF (0x1 << 2) +#define PRCM_VDD_SYS_CPU0_VDD_PWROFF (0x1 << 3) + +#define PRCM_VDD_GPU_PWROFF (0x1 << 0) + +#define PRCM_VDD_SYS_RESET (0x1 << 0) + +#define PRCM_CPU1_PWR_CLAMP (n) (((n) & 0xff) << 0) +#define PRCM_CPU1_PWR_CLAMP_MASK PRCM_CPU1_PWR_CLAMP(0xff) + +#define PRCM_CPU2_PWR_CLAMP (n) (((n) & 0xff) << 0) +#define PRCM_CPU2_PWR_CLAMP_MASK PRCM_CPU2_PWR_CLAMP(0xff) + +#define PRCM_CPU3_PWR_CLAMP (n) (((n) & 0xff) << 0) +#define PRCM_CPU3_PWR_CLAMP_MASK PRCM_CPU3_PWR_CLAMP(0xff) + +#define PRCM_SEC_SWITCH_APB0_CLK_NONSEC (0x1 << 0) +#define PRCM_SEC_SWITCH_PLL_CFG_NONSEC (0x1 << 1) +#define PRCM_SEC_SWITCH_PWR_GATE_NONSEC (0x1 << 2) + +#ifndef __ASSEMBLY__ +#include <linux/compiler.h> + +struct sunxi_prcm_reg { + u32 cpus_cfg; /* 0x000 */ + u8 res0[0x8]; /* 0x004 */ + u32 apb0_ratio; /* 0x00c */ + u32 cpu0_cfg; /* 0x010 */ + u32 cpu1_cfg; /* 0x014 */ + u32 cpu2_cfg; /* 0x018 */ + u32 cpu3_cfg; /* 0x01c */ + u8 res1[0x8]; /* 0x020 */ + u32 apb0_gate; /* 0x028 */ + u8 res2[0x14]; /* 0x02c */ + u32 pll_ctrl0; /* 0x040 */ + u32 pll_ctrl1; /* 0x044 */ + u8 res3[0x8]; /* 0x048 */ + u32 clk_1wire; /* 0x050 */ + u32 clk_ir; /* 0x054 */ + u8 res4[0x58]; /* 0x058 */ + u32 apb0_reset; /* 0x0b0 */ + u8 res5[0x3c]; /* 0x0b4 */ + u32 clk_outd; /* 0x0f0 */ + u8 res6[0xc]; /* 0x0f4 */ + u32 cpu_pwroff; /* 0x100 */
Quoted 8 lines
arch/arm/include/asm/arch-sunxi/prcm_sun6i.h
Quoted 8 lines
arch/arm/include/asm/arch-sunxi/prcm_sun6i.h new file +8
-0+u8 res7[0xc ];/* 0x104 */ +u32 vdd_sys_pwroff;/* 0x110 */ +u8 res8[0x4 ];/* 0x114 */ +u32 gpu_pwroff;/* 0x118 */ +u8 res9[0x4 ];/* 0x11c */ +u32 vdd_pwr_reset;/* 0x120 */ +u8 res10[0x1c ];/* 0x124 */ +u32 cpu_pwr_clamp[4 ];/* 0x140 but first one is actually unused
*/
Quoted 16 lines
Quoted 14 lines
arch/arm/include/asm/arch-sunxi/prcm_sun6i.h new file +13
-0+u8 res11[0x30 ];/* 0x150 */ +u32 dram_pwr;/* 0x180 */ +u8 res12[0xc ];/* 0x184 */ +u32 dram_tst;/* 0x190 */ +u8 res13[0x3c ];/* 0x194 */ +u32 prcm_sec_switch;/* 0x1d0 */ +}; + +void prcm_apb0_enable (u32 flags); +void prcm_apb0_disable (u32 flags); + +#endif /* __ASSEMBLY__ */ +#endif /* _PRCM_H */
PATCH 6/17 sunxi: Add support for I2C on H6 like SoCs
In reply to Jernej SkrabecI2C support, especially R_I2C port, will be needed in future. Upcoming support for H616 will need R_I2C to adjust DRAM voltage.
--- .../include/asm/arch-sunxi/clock_sun50i_h6.h | 1 + arch/arm/mach-sunxi/Kconfig | 2 +- arch/arm/mach-sunxi/clock_sun50i_h6.c | 29 +++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-)
arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h +1 -0
@@ -297,6 +297,7 @@ struct sunxi_ccm_reg {/* Module gate/reset shift*/ #define RESET_SHIFT (16) +#define GATE_SHIFT (0)/* DRAM clock bit field */ #define DRAM_MOD_RESET BIT(30)
arch/arm/mach-sunxi/Kconfig +1 -1
@@ -728,7 +728,7 @@ config I2C3_ENABLE See I2C0_ENABLE help text. endif -if SUNXI_GEN_SUN6I +if SUNXI_GEN_SUN6I || SUN50I_GEN_H6 config R_I2C_ENABLE bool "Enable the PRCM I2C/TWI controller" # This is used for the pmic on H3
arch/arm/mach-sunxi/clock_sun50i_h6.c +29 -0
@@ -2,6 +2,7 @@#include <asm/io.h> #include <asm/arch/cpu.h> #include <asm/arch/clock.h> +#include <asm/arch/prcm.h> #ifdef CONFIG_SPL_BUILD void clock_init_safe (void )
@@ -92,3 +93,31 @@ unsigned int clock_get_pll6(void)/* The register defines PLL6-4X, not plain PLL6 */ return 24000000 /4 * n / div1 / div2; } + +int clock_twi_onoff (int port,int state) +{ +struct sunxi_ccm_reg *const ccm = + (struct sunxi_ccm_reg *)SUNXI_CCM_BASE ; +struct sunxi_prcm_reg *const prcm = + (struct sunxi_prcm_reg *)SUNXI_PRCM_BASE ; +u32 value, *ptr; +int shift; + + value =BIT (GATE_SHIFT ) |BIT (RESET_SHIFT ); + +if (port ==5 ) { + shift =0 ; + ptr = &prcm->twi_gate_reset; + }else { + shift = port; + ptr = &ccm->twi_gate_reset; + } + +/* set the apb clock gate and reset for twi */ +if (state) +setbits_le32 (ptr, value << shift); +else +clrbits_le32 (ptr, value << shift); + +return 0 ; +}
Signature · 1 line
2.30.0
Samuel Holland
maintainerPATCH 6/17 sunxi: Add support for I2C on H6 like SoCs
Quoted 4 lines · Jernej Skrabec
I2C support, especially
R_I2Cport, will be needed in future. Upcoming support for H616 will needR_I2Cto adjust DRAM voltage.Signed-off-by Jernej Skrabec <[email protected]>
PATCH 7/17 sunxi: support loading with SPL > 32KB
In reply to Jernej SkrabecFrom: Andre Przywara <[email protected]>
H616 supports and needs bigger SPL than 32 KiB, mostly due to big DRAM driver and need for PMIC configuration, which pull several drivers which are not needed otherwise.
--- arch/arm/mach-sunxi/board.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm/mach-sunxi/board.c +12 -0
@@ -277,6 +277,14 @@ uint32_t sunxi_get_boot_device(void) }#ifdef CONFIG_SPL_BUILD +static u32 sunxi_get_spl_size (void ) +{ +if (!is_boot0_magic (SPL_ADDR +4 ))/* eGON.BT0 */ +return 32768 ; + +return readl (SPL_ADDR +0x10 ); +} +/* * The eGON SPL image can be located at 8KB or at 128KB into an SD card or * an eMMC device. The boot source has bit 4 set in the latter case.
@@ -286,6 +294,7 @@ uint32_t sunxi_get_boot_device(void)unsigned long spl_mmc_get_uboot_raw_sector (struct mmc *mmc) {unsigned long sector =CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR ; +u32 spl_size =sunxi_get_spl_size ();switch (sunxi_get_boot_source ()) {case SUNXI_BOOTED_FROM_MMC0_HIGH :
@@ -294,6 +303,9 @@ unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc)break ; } +if (spl_size >32768 ) + sector += (spl_size -32768 ) /512 ; +return sector; }
Signature · 1 line
2.30.0
Samuel Holland
maintainerPATCH 7/17 sunxi: support loading with SPL > 32KB
Quoted 17 lines · Jernej Skrabec
From: Andre Przywara <[email protected]>
H616 supports and needs bigger SPL than 32 KiB, mostly due to big DRAM driver and need for PMIC configuration, which pull several drivers which are not needed otherwise.
Signed-off-by Andre Przywara <[email protected]>Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/mach-sunxi/board.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)arch/arm/mach-sunxi/board.c +0
-0
arch/arm/mach-sunxi/board.c uint32_t sunxi_get_boot_device(void) · line 283
Quoted 7 lines
arch/arm/mach-sunxi/board.c +4
-0@@ -277,6 +277,14 @@ uint32_t sunxi_get_boot_device(void) }#ifdef CONFIG_SPL_BUILD +static u32 sunxi_get_spl_size (void ) +{ +if (!is_boot0_magic (SPL_ADDR +4 ))/* eGON.BT0 */ +return 32768 ;
In the context of the suggestion below, this case could return 0.
arch/arm/mach-sunxi/board.c uint32_t sunxi_get_boot_device(void) · line 294
Quoted 9 lines
arch/arm/mach-sunxi/board.c +4
-0+ +return readl (SPL_ADDR +0x10 ); +} +/* * The eGON SPL image can be located at 8KB or at 128KB into an SD card or * an eMMC device. The boot source has bit 4 set in the latter case. @@ -286,6 +294,7 @@ uint32_t sunxi_get_boot_device(void)unsigned long spl_mmc_get_uboot_raw_sector (struct mmc *mmc)
As a side note, the prototype for this function was changed in commit cf0082559698 ("spl: mmc: Fix spl_mmc_get_uboot_raw_sector() implementation"), but nobody noticed since it is not in a header.
arch/arm/mach-sunxi/board.c unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc) · line 308
Quoted 13 lines
arch/arm/mach-sunxi/board.c +4
-0{unsigned long sector =CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR ; +u32 spl_size =sunxi_get_spl_size ();switch (sunxi_get_boot_source ()) {case SUNXI_BOOTED_FROM_MMC0_HIGH :@@ -294,6 +303,9 @@ unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc)break ; } +if (spl_size >32768 ) + sector += (spl_size -32768 ) /512 ; +
What I would suggest doing instead of this is setting SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x40, SYS_MMCSD_RAW_MODE_U_BOOT_DATA_PART_OFFSET=0x10, and then before the switch statement doing:
sector = max(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR,
spl_size / 512);
Not only does this get rid of the magic 32768 constant (which is meaningless on new platforms), but it also works cleanly for eMMC boot partitions (where there's no 0x10 sector offset).
arch/arm/mach-sunxi/board.c unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc) · line 311
Quoted 4 lines
arch/arm/mach-sunxi/board.c +0
-0return sector; }
Cheers,
Samuel
PATCH 7/17 sunxi: support loading with SPL > 32KB
Dne ponedeljek, 04. januar 2021 ob 03:02:03 CET je Samuel Holland napisal(a):
Quoted 27 lines · Jernej Skrabec
Quoted 17 lines
From: Andre Przywara <[email protected]>
H616 supports and needs bigger SPL than 32 KiB, mostly due to big DRAM driver and need for PMIC configuration, which pull several drivers which are not needed otherwise.
Signed-off-by Andre Przywara <[email protected]>Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/mach-sunxi/board.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)arch/arm/mach-sunxi/board.c +0
-0arch/arm/mach-sunxi/board.c uint32_t sunxi_get_boot_device(void) · line 283
Quoted 7 lines
arch/arm/mach-sunxi/board.c +4
-0@@ -277,6 +277,14 @@ uint32_t sunxi_get_boot_device(void) }#ifdef CONFIG_SPL_BUILD +static u32 sunxi_get_spl_size (void ) +{ +if (!is_boot0_magic (SPL_ADDR +4 ))/* eGON.BT0 */ +return 32768 ;In the context of the suggestion below, this case could return 0.
Quoted 6 lines
arch/arm/mach-sunxi/board.c uint32_t sunxi_get_boot_device(void)
Quoted 6 lines
arch/arm/mach-sunxi/board.c +4
-0+ +return readl (SPL_ADDR +0x10 ); +} +/* * The eGON SPL image can be located at 8KB or at 128KB into an SD card
or
Quoted 8 lines
arch/arm/mach-sunxi/board.c uint32_t sunxi_get_boot_device(void) · line 294
Quoted 3 lines
arch/arm/mach-sunxi/board.c +0
-0* an eMMC device. The boot source has bit 4 set in the latter case. @@ -286,6 +294,7 @@ uint32_t sunxi_get_boot_device(void)unsigned long spl_mmc_get_uboot_raw_sector (struct mmc *mmc)As a side note, the prototype for this function was changed in commit
cf0082559698("spl: mmc: Fixspl_mmc_get_uboot_raw_sector()implementation"), but nobody noticed since it is not in a header.
Quoted 7 lines
arch/arm/mach-sunxi/board.c unsigned long spl_mmc_get_uboot_raw_sector(struct mmc
Quoted 7 lines
arch/arm/mach-sunxi/board.c +1
-0{unsigned long sector =CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR ; +u32 spl_size =sunxi_get_spl_size ();switch (sunxi_get_boot_source ()) {case SUNXI_BOOTED_FROM_MMC0_HIGH :@@ -294,6 +303,9 @@ unsigned long spl_mmc_get_uboot_raw_sector(struct mmc
*mmc)
Quoted 12 lines
arch/arm/mach-sunxi/board.c unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc) · line 308
Quoted 6 lines
arch/arm/mach-sunxi/board.c +3
-0break ; } +if (spl_size >32768 ) + sector += (spl_size -32768 ) /512 ; +What I would suggest doing instead of this is setting SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x40, SYS_MMCSD_RAW_MODE_U_BOOT_DATA_PART_OFFSET=0x10, and then before the switch statement doing:
Quoted 6 lines
sector = max(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR,
spl_size/ 512);Not only does this get rid of the magic 32768 constant (which is meaningless on new platforms), but it also works cleanly for eMMC boot partitions (where there's no
0x10sector offset).
Thanks for the suggestion, this is indeed much cleaner.
Best regards,
Jernej
Quoted 9 lines
arch/arm/mach-sunxi/board.c unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc) · line 311
Quoted 5 lines
arch/arm/mach-sunxi/board.c +0
-0return sector; }Cheers,
Samuel
PATCH 8/17 sunxi: introduce support for H616 clocks
In reply to Jernej SkrabecH616 has mostly the same clocks as H6 with some small differences. Just reuse H6 clocks for H616 and handle differences with macros.
--- .../include/asm/arch-sunxi/clock_sun50i_h6.h | 18 +++++++++++++++++- arch/arm/mach-sunxi/clock_sun50i_h6.c | 10 +++++++++- 2 files changed, 26 insertions(+), 2 deletions(-)
arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h +17 -1
@@ -230,6 +230,7 @@ struct sunxi_ccm_reg {#define CCM_PLL1_CTRL_EN BIT(31)#define CCM_PLL1_LOCK_EN BIT(29)#define CCM_PLL1_LOCK BIT(28) +#define CCM_PLL1_OUT_EN BIT(27)#define CCM_PLL1_CLOCK_TIME_2 (2 << 24)#define CCM_PLL1_CTRL_P (p) ((p) << 16)#define CCM_PLL1_CTRL_N (n) ((n) << 8)
@@ -238,6 +239,7 @@ struct sunxi_ccm_reg {#define CCM_PLL5_CTRL_EN BIT(31)#define CCM_PLL5_LOCK_EN BIT(29)#define CCM_PLL5_LOCK BIT(28) +#define CCM_PLL5_OUT_EN BIT(27)#define CCM_PLL5_CTRL_N (n) ((n) << 8)#define CCM_PLL5_CTRL_DIV1 (div1) ((div1) << 0)#define CCM_PLL5_CTRL_DIV2 (div0) ((div0) << 1)
@@ -252,7 +254,6 @@ struct sunxi_ccm_reg {#define CCM_PLL6_CTRL_DIV1_MASK (0x1 << CCM_PLL6_CTRL_DIV1_SHIFT)#define CCM_PLL6_CTRL_DIV2_SHIFT 1#define CCM_PLL6_CTRL_DIV2_MASK (0x1 << CCM_PLL6_CTRL_DIV2_SHIFT) -#define CCM_PLL6_DEFAULT 0xa0006300/* cpu_axi bit field*/ #define CCM_CPU_AXI_MUX_MASK (0x3 << 24)
@@ -262,6 +263,9 @@ struct sunxi_ccm_reg {#define CCM_CPU_AXI_AXI_MASK 0x3#define CCM_CPU_AXI_DEFAULT_FACTORS 0x301 +#ifdef CONFIG_MACH_SUN50I_H6 +#define CCM_PLL6_DEFAULT 0xa0006300 +/* psi_ahb1_ahb2 bit field */ #define CCM_PSI_AHB1_AHB2_DEFAULT 0x03000102
@@ -270,6 +274,18 @@ struct sunxi_ccm_reg {/* apb1 bit field */ #define CCM_APB1_DEFAULT 0x03000102 +#elif CONFIG_MACH_SUN50I_H616 +#define CCM_PLL6_DEFAULT 0xa8003100 + +/* psi_ahb1_ahb2 bit field */ +#define CCM_PSI_AHB1_AHB2_DEFAULT 0x03000002 + +/* ahb3 bit field */ +#define CCM_AHB3_DEFAULT 0x03000002 + +/* apb1 bit field */ +#define CCM_APB1_DEFAULT 0x03000102 +#endif /* apb2 bit field */ #define APB2_CLK_SRC_OSC24M (0x0 << 24)
arch/arm/mach-sunxi/clock_sun50i_h6.c +9 -1
@@ -68,6 +68,9 @@ void clock_set_pll1(unsigned int clk)/* clk = 24*n/p, p is ignored if clock is >288MHz */ writel(CCM_PLL1_CTRL_EN | CCM_PLL1_LOCK_EN | CCM_PLL1_CLOCK_TIME_2 | +#ifdef CONFIG_MACH_SUN50I_H616 +CCM_PLL1_OUT_EN | +#endif CCM_PLL1_CTRL_N(clk / 24000000), &ccm->pll1_cfg);while (!(readl (&ccm->pll1_cfg) &CCM_PLL1_LOCK )) {}
@@ -83,6 +86,11 @@ unsigned int clock_get_pll6(void) {struct sunxi_ccm_reg *const ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE ; +#ifdef CONFIG_MACH_SUN50I_H6 +int m =4 ; +#else +int m =2 ; +#endif uint32_t rval =readl (&ccm->pll6_cfg);int n = ((rval &CCM_PLL6_CTRL_N_MASK ) >>CCM_PLL6_CTRL_N_SHIFT );
@@ -91,7 +99,7 @@ unsigned int clock_get_pll6(void)int div2 = ((rval &CCM_PLL6_CTRL_DIV2_MASK ) >>CCM_PLL6_CTRL_DIV2_SHIFT ) +1 ;/* The register defines PLL6-4X, not plain PLL6 */ -return 24000000 /4 * n / div1 / div2; +return 24000000 / m * n / div1 / div2; }int clock_twi_onoff (int port,int state)
Signature · 1 line
2.30.0
Samuel Holland
maintainerPATCH 8/17 sunxi: introduce support for H616 clocks
Quoted 81 lines · Jernej Skrabec
H616 has mostly the same clocks as H6 with some small differences. Just reuse H6 clocks for H616 and handle differences with macros.
Signed-off-by Jernej Skrabec <[email protected]>--- .../include/asm/arch-sunxi/clock_sun50i_h6.h | 18 +++++++++++++++++- arch/arm/mach-sunxi/clock_sun50i_h6.c | 10 +++++++++- 2 files changed, 26 insertions(+), 2 deletions(-)arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h +17
-1@@ -230,6 +230,7 @@ struct sunxi_ccm_reg {#define CCM_PLL1_CTRL_EN BIT(31)#define CCM_PLL1_LOCK_EN BIT(29)#define CCM_PLL1_LOCK BIT(28) +#define CCM_PLL1_OUT_EN BIT(27)#define CCM_PLL1_CLOCK_TIME_2 (2 << 24)#define CCM_PLL1_CTRL_P (p) ((p) << 16)#define CCM_PLL1_CTRL_N (n) ((n) << 8)@@ -238,6 +239,7 @@ struct sunxi_ccm_reg {#define CCM_PLL5_CTRL_EN BIT(31)#define CCM_PLL5_LOCK_EN BIT(29)#define CCM_PLL5_LOCK BIT(28) +#define CCM_PLL5_OUT_EN BIT(27)#define CCM_PLL5_CTRL_N (n) ((n) << 8)#define CCM_PLL5_CTRL_DIV1 (div1) ((div1) << 0)#define CCM_PLL5_CTRL_DIV2 (div0) ((div0) << 1)@@ -252,7 +254,6 @@ struct sunxi_ccm_reg {#define CCM_PLL6_CTRL_DIV1_MASK (0x1 << CCM_PLL6_CTRL_DIV1_SHIFT)#define CCM_PLL6_CTRL_DIV2_SHIFT 1#define CCM_PLL6_CTRL_DIV2_MASK (0x1 << CCM_PLL6_CTRL_DIV2_SHIFT) -#define CCM_PLL6_DEFAULT 0xa0006300/* cpu_axi bit field*/ #define CCM_CPU_AXI_MUX_MASK (0x3 << 24)@@ -262,6 +263,9 @@ struct sunxi_ccm_reg {#define CCM_CPU_AXI_AXI_MASK 0x3#define CCM_CPU_AXI_DEFAULT_FACTORS 0x301 +#ifdef CONFIG_MACH_SUN50I_H6 +#define CCM_PLL6_DEFAULT 0xa0006300 +/* psi_ahb1_ahb2 bit field */ #define CCM_PSI_AHB1_AHB2_DEFAULT 0x03000102@@ -270,6 +274,18 @@ struct sunxi_ccm_reg {/* apb1 bit field */ #define CCM_APB1_DEFAULT 0x03000102 +#elif CONFIG_MACH_SUN50I_H616 +#define CCM_PLL6_DEFAULT 0xa8003100 + +/* psi_ahb1_ahb2 bit field */ +#define CCM_PSI_AHB1_AHB2_DEFAULT 0x03000002 + +/* ahb3 bit field */ +#define CCM_AHB3_DEFAULT 0x03000002 + +/* apb1 bit field */ +#define CCM_APB1_DEFAULT 0x03000102 +#endif /* apb2 bit field */ #define APB2_CLK_SRC_OSC24M (0x0 << 24)arch/arm/mach-sunxi/clock_sun50i_h6.c +3
-0@@ -68,6 +68,9 @@ void clock_set_pll1(unsigned int clk)/* clk = 24*n/p, p is ignored if clock is >288MHz */ writel(CCM_PLL1_CTRL_EN | CCM_PLL1_LOCK_EN | CCM_PLL1_CLOCK_TIME_2 | +#ifdef CONFIG_MACH_SUN50I_H616 +CCM_PLL1_OUT_EN | +#endif CCM_PLL1_CTRL_N(clk / 24000000), &ccm->pll1_cfg);while (!(readl (&ccm->pll1_cfg) &CCM_PLL1_LOCK )) {}
arch/arm/mach-sunxi/clock_sun50i_h6.c unsigned int clock_get_pll6(void) · line 93
Quoted 8 lines
arch/arm/mach-sunxi/clock_sun50i_h6.c +5
-0@@ -83,6 +86,11 @@ unsigned int clock_get_pll6(void) {struct sunxi_ccm_reg *const ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE ; +#ifdef CONFIG_MACH_SUN50I_H6 +int m =4 ; +#else +int m =2 ; +#endif
This looks like a good place for an IS_ENABLED ternary.
arch/arm/mach-sunxi/clock_sun50i_h6.c unsigned int clock_get_pll6(void) · line 101
Quoted 6 lines
arch/arm/mach-sunxi/clock_sun50i_h6.c +0
-0uint32_t rval =readl (&ccm->pll6_cfg);int n = ((rval &CCM_PLL6_CTRL_N_MASK ) >>CCM_PLL6_CTRL_N_SHIFT );@@ -91,7 +99,7 @@ unsigned int clock_get_pll6(void)int div2 = ((rval &CCM_PLL6_CTRL_DIV2_MASK ) >>CCM_PLL6_CTRL_DIV2_SHIFT ) +1 ;/* The register defines PLL6-4X, not plain PLL6 */
Now it is PLL6-2X or PLL6-4X.
With those adjustments:
Quoted 6 lines
arch/arm/mach-sunxi/clock_sun50i_h6.c +1
-1-return 24000000 /4 * n / div1 / div2; +return 24000000 / m * n / div1 / div2; }int clock_twi_onoff (int port,int state)
PATCH 9/17 sunxi: add support for H616 uart0
In reply to Jernej SkrabecThis port is used for debug terminal on all known H616 boards.
--- arch/arm/include/asm/arch-sunxi/gpio.h | 1 + arch/arm/mach-sunxi/board.c | 4 ++++ 2 files changed, 5 insertions(+)
arch/arm/include/asm/arch-sunxi/gpio.h +1 -0
@@ -206,6 +206,7 @@ enum sunxi_gpio_number {#define SUN6I_GPH_UART0 2#define SUN9I_GPH_UART0 2#define SUN50I_H6_GPH_UART0 2 +#define SUN50I_H616_GPH_UART0 2#define SUNXI_GPI_SDC3 2#define SUN7I_GPI_TWI3 3
arch/arm/mach-sunxi/board.c +4 -0
@@ -116,6 +116,10 @@ static int gpio_init(void)sunxi_gpio_set_cfgpin (SUNXI_GPH (0 ),SUN50I_H6_GPH_UART0 );sunxi_gpio_set_cfgpin (SUNXI_GPH (1 ),SUN50I_H6_GPH_UART0 );sunxi_gpio_set_pull (SUNXI_GPH (1 ),SUNXI_GPIO_PULL_UP ); +#elif CONFIG_CONS_INDEX ==1 && defined(CONFIG_MACH_SUN50I_H616 ) +sunxi_gpio_set_cfgpin (SUNXI_GPH (0 ),SUN50I_H616_GPH_UART0 ); +sunxi_gpio_set_cfgpin (SUNXI_GPH (1 ),SUN50I_H616_GPH_UART0 ); +sunxi_gpio_set_pull (SUNXI_GPH (1 ),SUNXI_GPIO_PULL_UP );#elif CONFIG_CONS_INDEX ==1 && defined(CONFIG_MACH_SUN8I_A83T )sunxi_gpio_set_cfgpin (SUNXI_GPB (9 ),SUN8I_A83T_GPB_UART0 );sunxi_gpio_set_cfgpin (SUNXI_GPB (10 ),SUN8I_A83T_GPB_UART0 );
Signature · 1 line
2.30.0
Samuel Holland
maintainerPATCH 9/17 sunxi: add support for H616 uart0
Quoted 3 lines · Jernej Skrabec
This port is used for debug terminal on all known H616 boards.
Signed-off-by Jernej Skrabec <[email protected]>
PATCH 10/17 sunxi: add support for R_I2C on H616
In reply to Jernej SkrabecThis port is needed for communication with PMIC. SPL uses it to set DRAM voltage on H616 boards.
--- arch/arm/include/asm/arch-sunxi/gpio.h | 1 + board/sunxi/board.c | 4 ++++ 2 files changed, 5 insertions(+)
arch/arm/include/asm/arch-sunxi/gpio.h +1 -0
@@ -220,6 +220,7 @@ enum sunxi_gpio_number {#define SUN8I_A23_GPL_R_TWI 3#define SUN8I_GPL_R_UART 2#define SUN50I_GPL_R_TWI 2 +#define SUN50I_H616_GPL_R_TWI 3#define SUN9I_GPN_R_RSB 3
board/sunxi/board.c +4 -0
@@ -196,6 +196,10 @@ void i2c_init_board(void)clock_twi_onoff (5 ,1 );sunxi_gpio_set_cfgpin (SUNXI_GPL (8 ),SUN50I_GPL_R_TWI );sunxi_gpio_set_cfgpin (SUNXI_GPL (9 ),SUN50I_GPL_R_TWI ); +#elif CONFIG_MACH_SUN50I_H616 +clock_twi_onoff (5 ,1 ); +sunxi_gpio_set_cfgpin (SUNXI_GPL (0 ),SUN50I_H616_GPL_R_TWI ); +sunxi_gpio_set_cfgpin (SUNXI_GPL (1 ),SUN50I_H616_GPL_R_TWI );#else clock_twi_onoff (5 ,1 );sunxi_gpio_set_cfgpin (SUNXI_GPL (0 ),SUN8I_H3_GPL_R_TWI );
Signature · 1 line
2.30.0
Samuel Holland
maintainerPATCH 10/17 sunxi: add support for R_I2C on H616
Quoted 14 lines · Jernej Skrabec
This port is needed for communication with PMIC. SPL uses it to set DRAM voltage on H616 boards.
Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/include/asm/arch-sunxi/gpio.h | 1 + board/sunxi/board.c | 4 ++++ 2 files changed, 5 insertions(+)arch/arm/include/asm/arch-sunxi/gpio.h +0
-0
arch/arm/include/asm/arch-sunxi/gpio.h enum sunxi_gpio_number { · line 223
Quoted 4 lines
arch/arm/include/asm/arch-sunxi/gpio.h +1
-0@@ -220,6 +220,7 @@ enum sunxi_gpio_number {#define SUN8I_A23_GPL_R_TWI 3#define SUN8I_GPL_R_UART 2#define SUN50I_GPL_R_TWI 2 +#define SUN50I_H616_GPL_R_TWI 3
The fact that I2C is at function 3 makes me suspicious that there is RSB at function 2. Have you checked if that is the case?
Either way:
Quoted 18 lines
arch/arm/include/asm/arch-sunxi/gpio.h +0
-0#define SUN9I_GPN_R_RSB 3board/sunxi/board.c +4
-0@@ -196,6 +196,10 @@ void i2c_init_board(void)clock_twi_onoff (5 ,1 );sunxi_gpio_set_cfgpin (SUNXI_GPL (8 ),SUN50I_GPL_R_TWI );sunxi_gpio_set_cfgpin (SUNXI_GPL (9 ),SUN50I_GPL_R_TWI ); +#elif CONFIG_MACH_SUN50I_H616 +clock_twi_onoff (5 ,1 ); +sunxi_gpio_set_cfgpin (SUNXI_GPL (0 ),SUN50I_H616_GPL_R_TWI ); +sunxi_gpio_set_cfgpin (SUNXI_GPL (1 ),SUN50I_H616_GPL_R_TWI );#else clock_twi_onoff (5 ,1 );sunxi_gpio_set_cfgpin (SUNXI_GPL (0 ),SUN8I_H3_GPL_R_TWI );
PATCH 10/17 sunxi: add support for R_I2C on H616
Dne ponedeljek, 04. januar 2021 ob 03:33:12 CET je Samuel Holland napisal(a):
Quoted 18 lines · Jernej Skrabec
Quoted 17 lines
This port is needed for communication with PMIC. SPL uses it to set DRAM voltage on H616 boards.
Signed-off-by Jernej Skrabec <[email protected]>---
arch/arm/include/asm/arch-sunxi/gpio.h | 1 + board/sunxi/board.c | 4 ++++ 2 files changed, 5 insertions(+)(quoted diff) +0
-0
b/arch/arm/include/asm/arch-sunxi/gpio.hindexcdb7dbd5b8e5..de77bf638e21100644arch/arm/include/asm/arch-sunxi/gpio.h +0
-0@@ -220,6 +220,7 @@ enum sunxi_gpio_number {
Quoted 8 lines
arch/arm/include/asm/arch-sunxi/gpio.h enum sunxi_gpio_number {
Quoted 5 lines
arch/arm/include/asm/arch-sunxi/gpio.h +1
-0#define SUN8I_A23_GPL_R_TWI 3#define SUN8I_GPL_R_UART 2#define SUN50I_GPL_R_TWI 2 +#define SUN50I_H616_GPL_R_TWI 3The fact that I2C is at function 3 makes me suspicious that there is RSB at function 2. Have you checked if that is the case?
BSP Linux pinctrl has function 2 s_rsb0, so yes, that should be the case. However, it doesn't have RSB DT node anywhere. Datasheet mentions RSB only in CCU diagram, so no details anywhere. I didn't test it.
Best regards,
Jernej
Quoted 26 lines
Either way:
Reviewed-by Samuel Holland <[email protected]>Quoted 21 lines
arch/arm/include/asm/arch-sunxi/gpio.h +0
-0#define SUN9I_GPN_R_RSB 3board/sunxi/board.c +4
-0@@ -196,6 +196,10 @@ void i2c_init_board(void)clock_twi_onoff (5 ,1 );sunxi_gpio_set_cfgpin (SUNXI_GPL (8 ),SUN50I_GPL_R_TWI );sunxi_gpio_set_cfgpin (SUNXI_GPL (9 ),SUN50I_GPL_R_TWI ); +#elif CONFIG_MACH_SUN50I_H616 +clock_twi_onoff (5 ,1 ); +sunxi_gpio_set_cfgpin (SUNXI_GPL (0 ),SUN50I_H616_GPL_R_TWI ); +sunxi_gpio_set_cfgpin (SUNXI_GPL (1 ),SUN50I_H616_GPL_R_TWI );#else
board/sunxi/board.c +0
-0clock_twi_onoff (5 ,1 );sunxi_gpio_set_cfgpin (SUNXI_GPL (0 ),SUN8I_H3_GPL_R_TWI );
PATCH 11/17 sunxi: Add H616 DRAM support
In reply to Jernej SkrabecAllwinner H616 supports many types of DRAM. Most notably it supports LPDDR4. However, all commercially available boards at this time use only DDR3, so this commit adds only DDR3 support.
Controller and MBUS are very similar to H6 but PHY is completely unknown.
--- arch/arm/include/asm/arch-sunxi/dram.h | 2 + .../include/asm/arch-sunxi/dram_sun50i_h616.h | 159 +++ arch/arm/mach-sunxi/Kconfig | 43 + arch/arm/mach-sunxi/Makefile | 2 + arch/arm/mach-sunxi/dram_sun50i_h616.c | 1023 +++++++++++++++++ arch/arm/mach-sunxi/dram_timings/Makefile | 2 + .../mach-sunxi/dram_timings/h616_ddr3_1333.c | 94 ++ 7 files changed, 1325 insertions(+) create mode 100644 arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h create mode 100644 arch/arm/mach-sunxi/dram_sun50i_h616.c create mode 100644 arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c
arch/arm/include/asm/arch-sunxi/dram.h +2 -0
@@ -29,6 +29,8 @@#include <asm/arch/dram_sun9i.h> #elif defined(CONFIG_MACH_SUN50I_H6 )#include <asm/arch/dram_sun50i_h6.h> +#elif defined(CONFIG_MACH_SUN50I_H616 ) +#include <asm/arch/dram_sun50i_h616.h> #else #include <asm/arch/dram_sun4i.h> #endif
arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h new file +159 -0
159 lines not on this page · raw message
arch/arm/mach-sunxi/Kconfig +43 -0
67 lines not on this page · raw message
arch/arm/mach-sunxi/Makefile +2 -0
@@ -40,4 +40,6 @@ obj-$(CONFIG_SUNXI_DRAM_DW) += dram_sunxi_dw.o obj-$(CONFIG_SUNXI_DRAM_DW) += dram_timings/ obj-$(CONFIG_DRAM_SUN50I_H6) += dram_sun50i_h6.o obj-$(CONFIG_DRAM_SUN50I_H6) += dram_timings/ +obj-$(CONFIG_DRAM_SUN50I_H616) += dram_sun50i_h616.o +obj-$(CONFIG_DRAM_SUN50I_H616) += dram_timings/ endif
arch/arm/mach-sunxi/dram_sun50i_h616.c new file +1023 -0
1,023 lines not on this page · raw message
arch/arm/mach-sunxi/dram_timings/Makefile +2 -0
@@ -3,3 +3,5 @@ obj-$(CONFIG_SUNXI_DRAM_LPDDR3_STOCK) += lpddr3_stock.o obj-$(CONFIG_SUNXI_DRAM_DDR2_V3S) += ddr2_v3s.o obj-$(CONFIG_SUNXI_DRAM_H6_LPDDR3) += h6_lpddr3.o obj-$(CONFIG_SUNXI_DRAM_H6_DDR3_1333) += h6_ddr3_1333.o +# currently only DDR3 is supported on H616 +obj-$(CONFIG_MACH_SUN50I_H616) += h616_ddr3_1333.o
arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c new file +94 -0
94 lines not on this page · raw message
Signature · 1 line
2.30.0
Samuel Holland
maintainerPATCH 11/17 sunxi: Add H616 DRAM support
Quoted 94 lines · Jernej Skrabec
Allwinner H616 supports many types of DRAM. Most notably it supports LPDDR4. However, all commercially available boards at this time use only DDR3, so this commit adds only DDR3 support.
Controller and MBUS are very similar to H6 but PHY is completely unknown.
Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/include/asm/arch-sunxi/dram.h | 2 + .../include/asm/arch-sunxi/dram_sun50i_h616.h | 159 +++ arch/arm/mach-sunxi/Kconfig | 43 + arch/arm/mach-sunxi/Makefile | 2 + arch/arm/mach-sunxi/dram_sun50i_h616.c | 1023 +++++++++++++++++ arch/arm/mach-sunxi/dram_timings/Makefile | 2 + .../mach-sunxi/dram_timings/h616_ddr3_1333.c | 94 ++ 7 files changed, 1325 insertions(+) create mode 100644 arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h create mode 100644 arch/arm/mach-sunxi/dram_sun50i_h616.c create mode 100644 arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.carch/arm/include/asm/arch-sunxi/dram.h +2
-0@@ -29,6 +29,8 @@#include <asm/arch/dram_sun9i.h> #elif defined(CONFIG_MACH_SUN50I_H6 )#include <asm/arch/dram_sun50i_h6.h> +#elif defined(CONFIG_MACH_SUN50I_H616 ) +#include <asm/arch/dram_sun50i_h616.h> #else #include <asm/arch/dram_sun4i.h> #endif arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h new file +54
-0@@ -0,0 +1,159 @@ +/* +* H616 dram controller register and constant defines +* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +* +* Based on H6 one, which is: +* (C) Copyright 2017 Icenowy Zheng <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _SUNXI_DRAM_SUN50I_H616_H +#define _SUNXI_DRAM_SUN50I_H616_H + +#include <stdbool.h> +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + +enum sunxi_dram_type { +SUNXI_DRAM_TYPE_DDR3 =3 , +SUNXI_DRAM_TYPE_DDR4 , +SUNXI_DRAM_TYPE_LPDDR3 =7 , +SUNXI_DRAM_TYPE_LPDDR4 +}; + +/* MBUS part is largely the same as in H6, except for one special register */ +struct sunxi_mctl_com_reg { +u32 cr;/* 0x000 control register */ +u8 reserved_0x004[4 ];/* 0x004 */ +u32 unk_0x008;/* 0x008 */ +u32 tmr;/* 0x00c timer register */ +u8 reserved_0x010[4 ];/* 0x010 */ +u32 unk_0x014;/* 0x014 */ +u8 reserved_0x018[8 ];/* 0x018 */ +u32 maer0;/* 0x020 master enable register 0 */ +u32 maer1;/* 0x024 master enable register 1 */ +u32 maer2;/* 0x028 master enable register 2 */ +u8 reserved_0x02c[468 ];/* 0x02c */ +u32 bwcr;/* 0x200 bandwidth control register */ +u8 reserved_0x204[12 ];/* 0x204 */ +/* +* The last master configured by BSP libdram is at 0x49x, so the +* size of this struct array is set to 41 (0x29) now. +*/ +struct { +u32 cfg0;/* 0x0 */ +u32 cfg1;/* 0x4 */ +u8 reserved_0x8[8 ];/* 0x8 */ + } master[41 ];/* 0x210 + index * 0x10 */ +u8 reserved_0x4a0[96 ];/* 0x4a0 */ +u32 unk_0x500;/* 0x500 */ +}; +check_member (sunxi_mctl_com_reg, unk_0x500,0x500 );
arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h line 64
Quoted 10 lines
arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h new file +10
-0+ +/* +* Controller registers seems to be the same or at least very similar +* to those in H6. +*/ +struct sunxi_mctl_ctl_reg { +u32 mstr;/* 0x000 */ +u32 statr;/* 0x004 unused */ +u32 mstr1;/* 0x008 unused */ +u32 unk_0x00c;/* 0x00c */
This is clken (and the same on H6). It is obvious when looking at the standby power-down sequence.
Quoted 107 lines
arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h new file +95
-0+u32 mrctrl0;/* 0x010 unused */ +u32 mrctrl1;/* 0x014 unused */ +u32 mrstatr;/* 0x018 unused */ +u32 mrctrl2;/* 0x01c unused */ +u32 derateen;/* 0x020 unused */ +u32 derateint;/* 0x024 unused */ +u8 reserved_0x028[8 ];/* 0x028 */ +u32 pwrctl;/* 0x030 unused */ +u32 pwrtmg;/* 0x034 unused */ +u32 hwlpctl;/* 0x038 unused */ +u8 reserved_0x03c[20 ];/* 0x03c */ +u32 rfshctl0;/* 0x050 unused */ +u32 rfshctl1;/* 0x054 unused */ +u8 reserved_0x058[8 ];/* 0x05c */ +u32 rfshctl3;/* 0x060 */ +u32 rfshtmg;/* 0x064 */ +u8 reserved_0x068[104 ];/* 0x068 */ +u32 init[8 ];/* 0x0d0 */ +u32 dimmctl;/* 0x0f0 unused */ +u32 rankctl;/* 0x0f4 */ +u8 reserved_0x0f8[8 ];/* 0x0f8 */ +u32 dramtmg[17 ];/* 0x100 */ +u8 reserved_0x144[60 ];/* 0x144 */ +u32 zqctl[3 ];/* 0x180 */ +u32 zqstat;/* 0x18c unused */ +u32 dfitmg0;/* 0x190 */ +u32 dfitmg1;/* 0x194 */ +u32 dfilpcfg[2 ];/* 0x198 unused */ +u32 dfiupd[3 ];/* 0x1a0 */ +u32 reserved_0x1ac;/* 0x1ac */ +u32 dfimisc;/* 0x1b0 */ +u32 dfitmg2;/* 0x1b4 unused */ +u32 dfitmg3;/* 0x1b8 unused */ +u32 dfistat;/* 0x1bc */ +u32 dbictl;/* 0x1c0 */ +u8 reserved_0x1c4[60 ];/* 0x1c4 */ +u32 addrmap[12 ];/* 0x200 */ +u8 reserved_0x230[16 ];/* 0x230 */ +u32 odtcfg;/* 0x240 */ +u32 odtmap;/* 0x244 */ +u8 reserved_0x248[8 ];/* 0x248 */ +u32 sched[2 ];/* 0x250 */ +u8 reserved_0x258[180 ];/* 0x258 */ +u32 dbgcmd;/* 0x30c unused */ +u32 dbgstat;/* 0x310 unused */ +u8 reserved_0x314[12 ];/* 0x314 */ +u32 swctl;/* 0x320 */ +u32 swstat;/* 0x324 */ +u8 reserved_0x328[7768 ];/* 0x328 */ +u32 unk_0x2180;/* 0x2180 */ +u8 reserved_0x2184[188 ];/* 0x2184 */ +u32 unk_0x2240;/* 0x2240 */ +u8 reserved_0x2244[3900 ];/* 0x2244 */ +u32 unk_0x3180;/* 0x3180 */ +u8 reserved_0x3184[188 ];/* 0x3184 */ +u32 unk_0x3240;/* 0x3240 */ +u8 reserved_0x3244[3900 ];/* 0x3244 */ +u32 unk_0x4180;/* 0x4180 */ +u8 reserved_0x4184[188 ];/* 0x4184 */ + u32 unk_0x4240; /* 0x4240 */ +}; +check_member (sunxi_mctl_ctl_reg, swstat,0x324 ); +check_member (sunxi_mctl_ctl_reg, unk_0x4240,0x4240 ); + +#define MSTR_DEVICETYPE_DDR3 BIT(0) +#define MSTR_DEVICETYPE_LPDDR2 BIT(2) +#define MSTR_DEVICETYPE_LPDDR3 BIT(3) +#define MSTR_DEVICETYPE_DDR4 BIT(4) +#define MSTR_DEVICETYPE_MASK GENMASK(5, 0) +#define MSTR_2TMODE BIT(10) +#define MSTR_BUSWIDTH_FULL (0 << 12) +#define MSTR_BUSWIDTH_HALF (1 << 12) +#define MSTR_ACTIVE_RANKS (x) (((x == 2) ? 3 : 1) << 24) +#define MSTR_BURST_LENGTH (x) (((x) >> 1) << 16) + +struct dram_para { +u32 clk; +enum sunxi_dram_type type; +u8 cols; +u8 rows; +u8 ranks; +u8 bus_full_width; +}; + + +static inline int ns_to_t (int nanoseconds) +{ +const unsigned int ctrl_freq =CONFIG_DRAM_CLK /2 ; + +return DIV_ROUND_UP (ctrl_freq * nanoseconds,1000 ); +} + +void mctl_set_timing_params (struct dram_para *para); + +#endif /* _SUNXI_DRAM_SUN50I_H616_H */ arch/arm/mach-sunxi/Kconfig +4
-0@@ -48,6 +48,46 @@ config DRAM_SUN50I_H6 Select this dram controller driver for some sun50i platforms, like H6. +config DRAM_SUN50I_H616 + bool + help + Select this dram controller driver for some sun50i platforms,
arch/arm/mach-sunxi/Kconfig config DRAM_SUN50I_H6 · line 64
Quoted 10 lines
arch/arm/mach-sunxi/Kconfig +10
-0+ like H616. + +if DRAM_SUN50I_H616 +config DRAM_SUN50I_H616_WRITE_LEVELING + bool "H616 DRAM write leveling" + ---help--- + Select this when DRAM on your H616 board needs write leveling. + +config DRAM_SUN50I_H616_READ_CALIBRATION + bool"H616 DRAM read calibration"
Missing a space here.
Quoted 67 lines
arch/arm/mach-sunxi/Kconfig +29
-0+ ---help--- + Select this when DRAM on your H616 board needs read calibration. + +config DRAM_SUN50I_H616_READ_TRAINING + bool "H616 DRAM read training" + ---help--- + Select this when DRAM on your H616 board needs read training. + +config DRAM_SUN50I_H616_WRITE_TRAINING + bool "H616 DRAM write training" + ---help--- + Select this when DRAM on your H616 board needs write training. + +config DRAM_SUN50I_H616_BIT_DELAY_COMPENSATION + bool "H616 DRAM bit delay compensation" + ---help--- + Select this when DRAM on your H616 board needs bit delay + compensation. + +config DRAM_SUN50I_H616_UNKNOWN_FEATURE + bool "H616 DRAM unknown feature" + ---help--- + Select this when DRAM on your H616 board needs this unknown + feature. +endif + config SUN6I_P2WI bool "Allwinner sun6i internal P2WI controller" help@@ -423,6 +463,7 @@ config DRAM_CLK MACH_SUN8I_V3S default 672 if MACH_SUN50I default 744 if MACH_SUN50I_H6 + default 720 if MACH_SUN50I_H616 ---help--- Set the dram clock speed, valid range 240 - 480 (prior to sun9i), must be a multiple of 24. For the sun9i (A80), the tested values@@ -439,6 +480,7 @@ endif config DRAM_ZQ int "sunxi dram zq value" + depends on !MACH_SUN50I_H616 default 123 if MACH_SUN4I || MACH_SUN5I || MACH_SUN6I || \ MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_A83T default 127 if MACH_SUN7I@@ -456,6 +498,7 @@ config DRAM_ODT_EN default y if MACH_SUN8I_R40 default y if MACH_SUN50I default y if MACH_SUN50I_H6 + default y if MACH_SUN50I_H616 ---help--- Select this to enable dram odt (on die termination).arch/arm/mach-sunxi/Makefile +2
-0@@ -40,4 +40,6 @@ obj-$(CONFIG_SUNXI_DRAM_DW) += dram_sunxi_dw.o obj-$(CONFIG_SUNXI_DRAM_DW) += dram_timings/ obj-$(CONFIG_DRAM_SUN50I_H6) += dram_sun50i_h6.o obj-$(CONFIG_DRAM_SUN50I_H6) += dram_timings/ +obj-$(CONFIG_DRAM_SUN50I_H616) += dram_sun50i_h616.o +obj-$(CONFIG_DRAM_SUN50I_H616) += dram_timings/ endifarch/arm/mach-sunxi/dram_sun50i_h616.c new file +0
-0
PATCH 11/17 sunxi: Add H616 DRAM support
Dne ponedeljek, 04. januar 2021 ob 03:39:52 CET je Samuel Holland napisal(a):
Quoted 106 lines · Jernej Skrabec
Quoted 105 lines
Allwinner H616 supports many types of DRAM. Most notably it supports LPDDR4. However, all commercially available boards at this time use only DDR3, so this commit adds only DDR3 support.
Controller and MBUS are very similar to H6 but PHY is completely unknown.
Signed-off-by Jernej Skrabec <[email protected]>---
arch/arm/include/asm/arch-sunxi/dram.h | 2 + .../include/asm/arch-sunxi/dram_sun50i_h616.h | 159 +++ arch/arm/mach-sunxi/Kconfig | 43 + arch/arm/mach-sunxi/Makefile | 2 + arch/arm/mach-sunxi/dram_sun50i_h616.c | 1023 +++++++++++++++++ arch/arm/mach-sunxi/dram_timings/Makefile | 2 + .../mach-sunxi/dram_timings/h616_ddr3_1333.c | 94 ++ 7 files changed, 1325 insertions(+) create mode 100644 arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h create mode 100644 arch/arm/mach-sunxi/dram_sun50i_h616.c create mode 100644 arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c(quoted diff) +0
-0
b/arch/arm/include/asm/arch-sunxi/dram.hindex8002b7efdc19..c3b3e1f512b2100644arch/arm/include/asm/arch-sunxi/dram.h +2
-0@@ -29,6 +29,8 @@#include <asm/arch/dram_sun9i.h> #elif defined(CONFIG_MACH_SUN50I_H6 )#include <asm/arch/dram_sun50i_h6.h> +#elif defined(CONFIG_MACH_SUN50I_H616 ) +#include <asm/arch/dram_sun50i_h616.h> #else
#include <asm/arch/dram_sun4i.h>
#endif(quoted diff) +0
-0
b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.hnew file mode 100644 index 000000000000..5d105afd6110arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h new file +27
-0@@ -0,0 +1,159 @@ +/* +* H616 dram controller register and constant defines +* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +* +* Based on H6 one, which is: +* (C) Copyright 2017 Icenowy Zheng <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _SUNXI_DRAM_SUN50I_H616_H +#define _SUNXI_DRAM_SUN50I_H616_H + +#include <stdbool.h> +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + +enum sunxi_dram_type { +SUNXI_DRAM_TYPE_DDR3 =3 , +SUNXI_DRAM_TYPE_DDR4 , +SUNXI_DRAM_TYPE_LPDDR3 =7 , +SUNXI_DRAM_TYPE_LPDDR4 +}; + +/* MBUS part is largely the same as in H6, except for one special register */ +struct
sunxi_mctl_com_reg{arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h new file +31
-0+u32 cr;/* 0x000 control register */ +u8 reserved_0x004[4 ];/* 0x004 */ +u32 unk_0x008;/* 0x008 */ +u32 tmr;/* 0x00c timer register */ +u8 reserved_0x010[4 ];/* 0x010 */ +u32 unk_0x014;/* 0x014 */ +u8 reserved_0x018[8 ];/* 0x018 */ +u32 maer0;/* 0x020 master enable register 0 */ +u32 maer1;/* 0x024 master enable register 1 */ +u32 maer2;/* 0x028 master enable register 2 */ +u8 reserved_0x02c[468 ];/* 0x02c */ +u32 bwcr;/* 0x200 bandwidth control register */ +u8 reserved_0x204[12 ];/* 0x204 */ +/* +* The last master configured by BSP libdram is at 0x49x, so the +* size of this struct array is set to 41 (0x29) now. +*/ +struct { +u32 cfg0;/* 0x0 */ +u32 cfg1;/* 0x4 */ +u8 reserved_0x8[8 ];/* 0x8 */ + } master[41 ];/* 0x210 + index * 0x10 */ +u8 reserved_0x4a0[96 ];/* 0x4a0 */ +u32 unk_0x500;/* 0x500 */ +}; +check_member (sunxi_mctl_com_reg, unk_0x500,0x500 ); + +/* +* Controller registers seems to be the same or at least very similar +* to those in H6. +*/
Quoted 8 lines
arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h line 64
Quoted 5 lines
arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h new file +5
-0+struct sunxi_mctl_ctl_reg { +u32 mstr;/* 0x000 */ +u32 statr;/* 0x004 unused */ +u32 mstr1;/* 0x008 unused */ +u32 unk_0x00c;/* 0x00c */ This is clken (and the same on H6). It is obvious when looking at the standby power-down sequence.
Where is that sequence? I mostly consulted H6 and Zynq docs where this register is not explained. I'll update it in next revision.
Best regards,
Jernej
Quoted 171 lines
Quoted 109 lines
arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h new file +95
-0+u32 mrctrl0;/* 0x010 unused */ +u32 mrctrl1;/* 0x014 unused */ +u32 mrstatr;/* 0x018 unused */ +u32 mrctrl2;/* 0x01c unused */ +u32 derateen;/* 0x020 unused */ +u32 derateint;/* 0x024 unused */ +u8 reserved_0x028[8 ];/* 0x028 */ +u32 pwrctl;/* 0x030 unused */ +u32 pwrtmg;/* 0x034 unused */ +u32 hwlpctl;/* 0x038 unused */ +u8 reserved_0x03c[20 ];/* 0x03c */ +u32 rfshctl0;/* 0x050 unused */ +u32 rfshctl1;/* 0x054 unused */ +u8 reserved_0x058[8 ];/* 0x05c */ +u32 rfshctl3;/* 0x060 */ +u32 rfshtmg;/* 0x064 */ +u8 reserved_0x068[104 ];/* 0x068 */ +u32 init[8 ];/* 0x0d0 */ +u32 dimmctl;/* 0x0f0 unused */ +u32 rankctl;/* 0x0f4 */ +u8 reserved_0x0f8[8 ];/* 0x0f8 */ +u32 dramtmg[17 ];/* 0x100 */ +u8 reserved_0x144[60 ];/* 0x144 */ +u32 zqctl[3 ];/* 0x180 */ +u32 zqstat;/* 0x18c unused */ +u32 dfitmg0;/* 0x190 */ +u32 dfitmg1;/* 0x194 */ +u32 dfilpcfg[2 ];/* 0x198 unused */ +u32 dfiupd[3 ];/* 0x1a0 */ +u32 reserved_0x1ac;/* 0x1ac */ +u32 dfimisc;/* 0x1b0 */ +u32 dfitmg2;/* 0x1b4 unused */ +u32 dfitmg3;/* 0x1b8 unused */ +u32 dfistat;/* 0x1bc */ +u32 dbictl;/* 0x1c0 */ +u8 reserved_0x1c4[60 ];/* 0x1c4 */ +u32 addrmap[12 ];/* 0x200 */ +u8 reserved_0x230[16 ];/* 0x230 */ +u32 odtcfg;/* 0x240 */ +u32 odtmap;/* 0x244 */ +u8 reserved_0x248[8 ];/* 0x248 */ +u32 sched[2 ];/* 0x250 */ +u8 reserved_0x258[180 ];/* 0x258 */ +u32 dbgcmd;/* 0x30c unused */ +u32 dbgstat;/* 0x310 unused */ +u8 reserved_0x314[12 ];/* 0x314 */ +u32 swctl;/* 0x320 */ +u32 swstat;/* 0x324 */ +u8 reserved_0x328[7768 ];/* 0x328 */ +u32 unk_0x2180;/* 0x2180 */ +u8 reserved_0x2184[188 ];/* 0x2184 */ +u32 unk_0x2240;/* 0x2240 */ +u8 reserved_0x2244[3900 ];/* 0x2244 */ +u32 unk_0x3180;/* 0x3180 */ +u8 reserved_0x3184[188 ];/* 0x3184 */ +u32 unk_0x3240;/* 0x3240 */ +u8 reserved_0x3244[3900 ];/* 0x3244 */ +u32 unk_0x4180;/* 0x4180 */ +u8 reserved_0x4184[188 ];/* 0x4184 */ + u32 unk_0x4240; /* 0x4240 */ +}; +check_member (sunxi_mctl_ctl_reg, swstat,0x324 ); +check_member (sunxi_mctl_ctl_reg, unk_0x4240,0x4240 ); + +#define MSTR_DEVICETYPE_DDR3 BIT(0) +#define MSTR_DEVICETYPE_LPDDR2 BIT(2) +#define MSTR_DEVICETYPE_LPDDR3 BIT(3) +#define MSTR_DEVICETYPE_DDR4 BIT(4) +#define MSTR_DEVICETYPE_MASK GENMASK(5, 0) +#define MSTR_2TMODE BIT(10) +#define MSTR_BUSWIDTH_FULL (0 << 12) +#define MSTR_BUSWIDTH_HALF (1 << 12) +#define MSTR_ACTIVE_RANKS (x) (((x == 2) ? 3 : 1) << 24) +#define MSTR_BURST_LENGTH (x) (((x) >> 1) << 16) + +struct dram_para { +u32 clk; +enum sunxi_dram_type type; +u8 cols; +u8 rows; +u8 ranks; +u8 bus_full_width; +}; + + +static inline int ns_to_t (int nanoseconds) +{ +const unsigned int ctrl_freq =CONFIG_DRAM_CLK /2 ; + +return DIV_ROUND_UP (ctrl_freq * nanoseconds,1000 ); +} + +void mctl_set_timing_params (struct dram_para *para); + +#endif /* _SUNXI_DRAM_SUN50I_H616_H */ arch/arm/mach-sunxi/Kconfig +4
-0@@ -48,6 +48,46 @@ config DRAM_SUN50I_H6 Select this dram controller driver for some sun50i platforms, like H6. +config DRAM_SUN50I_H616 + bool + help + Select this dram controller driver for some sun50i platforms,arch/arm/mach-sunxi/Kconfig config DRAM_SUN50I_H6 · line 65
Quoted 10 lines
arch/arm/mach-sunxi/Kconfig +10
-0+ like H616. + +if DRAM_SUN50I_H616 +config DRAM_SUN50I_H616_WRITE_LEVELING + bool "H616 DRAM write leveling" + ---help--- + Select this when DRAM on your H616 board needs write leveling. + +config DRAM_SUN50I_H616_READ_CALIBRATION + bool"H616 DRAM read calibration"Missing a space here.
Quoted 49 lines
arch/arm/mach-sunxi/Kconfig +26
-0+ ---help--- + Select this when DRAM on your H616 board needs read calibration. + +config DRAM_SUN50I_H616_READ_TRAINING + bool "H616 DRAM read training" + ---help--- + Select this when DRAM on your H616 board needs read training. + +config DRAM_SUN50I_H616_WRITE_TRAINING + bool "H616 DRAM write training" + ---help--- + Select this when DRAM on your H616 board needs write training. + +config DRAM_SUN50I_H616_BIT_DELAY_COMPENSATION + bool "H616 DRAM bit delay compensation" + ---help--- + Select this when DRAM on your H616 board needs bit delay + compensation. + +config DRAM_SUN50I_H616_UNKNOWN_FEATURE + bool "H616 DRAM unknown feature" + ---help--- + Select this when DRAM on your H616 board needs this unknown + feature. +endif + config SUN6I_P2WIarch/arm/mach-sunxi/Kconfig +1
-0bool "Allwinner sun6i internal P2WI controller" help@@ -423,6 +463,7 @@ config DRAM_CLK MACH_SUN8I_V3S default 672 if MACH_SUN50I default 744 if MACH_SUN50I_H6 + default 720 if MACH_SUN50I_H616arch/arm/mach-sunxi/Kconfig +0
-0---help--- Set the dram clock speed, valid range 240 - 480 (prior to sun9i), must be a multiple of 24. For the sun9i (A80), the tested values@@ -439,6 +480,7 @@ endif config DRAM_ZQ
Quoted 7 lines
arch/arm/mach-sunxi/Kconfig
Quoted 7 lines
arch/arm/mach-sunxi/Kconfig +1
-0int "sunxi dram zq value" + depends on !MACH_SUN50I_H616arch/arm/mach-sunxi/Kconfig +0
-0default 123 if MACH_SUN4I || MACH_SUN5I || MACH_SUN6I || \ MACH_SUN8I_A23 || MACH_SUN8I_A33 ||
MACH_SUN8I_A83T
Quoted 32 lines
Quoted 32 lines
arch/arm/mach-sunxi/Kconfig +1
-0default 127 if MACH_SUN7I@@ -456,6 +498,7 @@ config DRAM_ODT_EN default y if MACH_SUN8I_R40 default y if MACH_SUN50I default y if MACH_SUN50I_H6 + default y if MACH_SUN50I_H616arch/arm/mach-sunxi/Kconfig +0
-0---help--- Select this to enable dram odt (on die termination).arch/arm/mach-sunxi/Makefile +2
-0@@ -40,4 +40,6 @@ obj-$(CONFIG_SUNXI_DRAM_DW) += dram_sunxi_dw.o obj-$(CONFIG_SUNXI_DRAM_DW) += dram_timings/ obj-$(CONFIG_DRAM_SUN50I_H6) += dram_sun50i_h6.o obj-$(CONFIG_DRAM_SUN50I_H6) += dram_timings/ +obj-$(CONFIG_DRAM_SUN50I_H616) += dram_sun50i_h616.o +obj-$(CONFIG_DRAM_SUN50I_H616) += dram_timings/ endif(quoted diff) +0
-0
b/arch/arm/mach-sunxi/dram_sun50i_h616.cnew file mode 100644 index 000000000000..0c86f54b8a73[...]
Samuel Holland
maintainerPATCH 11/17 sunxi: Add H616 DRAM support
Quoted 116 lines · Jernej ?krabec
Dne ponedeljek, 04. januar 2021 ob 03:39:52 CET je Samuel Holland napisal(a):
Quoted 106 lines · Jernej Skrabec
Quoted 105 lines
Allwinner H616 supports many types of DRAM. Most notably it supports LPDDR4. However, all commercially available boards at this time use only DDR3, so this commit adds only DDR3 support.
Controller and MBUS are very similar to H6 but PHY is completely unknown.
Signed-off-by Jernej Skrabec <[email protected]>---
arch/arm/include/asm/arch-sunxi/dram.h | 2 + .../include/asm/arch-sunxi/dram_sun50i_h616.h | 159 +++ arch/arm/mach-sunxi/Kconfig | 43 + arch/arm/mach-sunxi/Makefile | 2 + arch/arm/mach-sunxi/dram_sun50i_h616.c | 1023 +++++++++++++++++ arch/arm/mach-sunxi/dram_timings/Makefile | 2 + .../mach-sunxi/dram_timings/h616_ddr3_1333.c | 94 ++ 7 files changed, 1325 insertions(+) create mode 100644 arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h create mode 100644 arch/arm/mach-sunxi/dram_sun50i_h616.c create mode 100644 arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c(quoted diff) +0
-0
b/arch/arm/include/asm/arch-sunxi/dram.hindex8002b7efdc19..c3b3e1f512b2100644arch/arm/include/asm/arch-sunxi/dram.h +2
-0@@ -29,6 +29,8 @@#include <asm/arch/dram_sun9i.h> #elif defined(CONFIG_MACH_SUN50I_H6 )#include <asm/arch/dram_sun50i_h6.h> +#elif defined(CONFIG_MACH_SUN50I_H616 ) +#include <asm/arch/dram_sun50i_h616.h> #else
#include <asm/arch/dram_sun4i.h>
#endif(quoted diff) +0
-0
b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.hnew file mode 100644 index 000000000000..5d105afd6110arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h new file +27
-0@@ -0,0 +1,159 @@ +/* +* H616 dram controller register and constant defines +* +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +* +* Based on H6 one, which is: +* (C) Copyright 2017 Icenowy Zheng <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _SUNXI_DRAM_SUN50I_H616_H +#define _SUNXI_DRAM_SUN50I_H616_H + +#include <stdbool.h> +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + +enum sunxi_dram_type { +SUNXI_DRAM_TYPE_DDR3 =3 , +SUNXI_DRAM_TYPE_DDR4 , +SUNXI_DRAM_TYPE_LPDDR3 =7 , +SUNXI_DRAM_TYPE_LPDDR4 +}; + +/* MBUS part is largely the same as in H6, except for one special register */ +struct
sunxi_mctl_com_reg{arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h new file +31
-0+u32 cr;/* 0x000 control register */ +u8 reserved_0x004[4 ];/* 0x004 */ +u32 unk_0x008;/* 0x008 */ +u32 tmr;/* 0x00c timer register */ +u8 reserved_0x010[4 ];/* 0x010 */ +u32 unk_0x014;/* 0x014 */ +u8 reserved_0x018[8 ];/* 0x018 */ +u32 maer0;/* 0x020 master enable register 0 */ +u32 maer1;/* 0x024 master enable register 1 */ +u32 maer2;/* 0x028 master enable register 2 */ +u8 reserved_0x02c[468 ];/* 0x02c */ +u32 bwcr;/* 0x200 bandwidth control register */ +u8 reserved_0x204[12 ];/* 0x204 */ +/* +* The last master configured by BSP libdram is at 0x49x, so the +* size of this struct array is set to 41 (0x29) now. +*/ +struct { +u32 cfg0;/* 0x0 */ +u32 cfg1;/* 0x4 */ +u8 reserved_0x8[8 ];/* 0x8 */ + } master[41 ];/* 0x210 + index * 0x10 */ +u8 reserved_0x4a0[96 ];/* 0x4a0 */ +u32 unk_0x500;/* 0x500 */ +}; +check_member (sunxi_mctl_com_reg, unk_0x500,0x500 ); + +/* +* Controller registers seems to be the same or at least very similar +* to those in H6. +*/ Quoted 8 lines
arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h line 64
Quoted 5 lines
arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h new file +5
-0+struct sunxi_mctl_ctl_reg { +u32 mstr;/* 0x000 */ +u32 statr;/* 0x004 unused */ +u32 mstr1;/* 0x008 unused */ +u32 unk_0x00c;/* 0x00c */ This is clken (and the same on H6). It is obvious when looking at the standby power-down sequence.
Quoted 2 lines
Where is that sequence? I mostly consulted H6 and Zynq docs where this register is not explained. I'll update it in next revision.
This is from the H6 ARISC firmware, which has a similar structure to earlier generations with known registers.
Cheers,
Samuel
Quoted 214 lines
Best regards,
JernejQuoted 171 lines
Quoted 109 lines
arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h new file +95
-0+u32 mrctrl0;/* 0x010 unused */ +u32 mrctrl1;/* 0x014 unused */ +u32 mrstatr;/* 0x018 unused */ +u32 mrctrl2;/* 0x01c unused */ +u32 derateen;/* 0x020 unused */ +u32 derateint;/* 0x024 unused */ +u8 reserved_0x028[8 ];/* 0x028 */ +u32 pwrctl;/* 0x030 unused */ +u32 pwrtmg;/* 0x034 unused */ +u32 hwlpctl;/* 0x038 unused */ +u8 reserved_0x03c[20 ];/* 0x03c */ +u32 rfshctl0;/* 0x050 unused */ +u32 rfshctl1;/* 0x054 unused */ +u8 reserved_0x058[8 ];/* 0x05c */ +u32 rfshctl3;/* 0x060 */ +u32 rfshtmg;/* 0x064 */ +u8 reserved_0x068[104 ];/* 0x068 */ +u32 init[8 ];/* 0x0d0 */ +u32 dimmctl;/* 0x0f0 unused */ +u32 rankctl;/* 0x0f4 */ +u8 reserved_0x0f8[8 ];/* 0x0f8 */ +u32 dramtmg[17 ];/* 0x100 */ +u8 reserved_0x144[60 ];/* 0x144 */ +u32 zqctl[3 ];/* 0x180 */ +u32 zqstat;/* 0x18c unused */ +u32 dfitmg0;/* 0x190 */ +u32 dfitmg1;/* 0x194 */ +u32 dfilpcfg[2 ];/* 0x198 unused */ +u32 dfiupd[3 ];/* 0x1a0 */ +u32 reserved_0x1ac;/* 0x1ac */ +u32 dfimisc;/* 0x1b0 */ +u32 dfitmg2;/* 0x1b4 unused */ +u32 dfitmg3;/* 0x1b8 unused */ +u32 dfistat;/* 0x1bc */ +u32 dbictl;/* 0x1c0 */ +u8 reserved_0x1c4[60 ];/* 0x1c4 */ +u32 addrmap[12 ];/* 0x200 */ +u8 reserved_0x230[16 ];/* 0x230 */ +u32 odtcfg;/* 0x240 */ +u32 odtmap;/* 0x244 */ +u8 reserved_0x248[8 ];/* 0x248 */ +u32 sched[2 ];/* 0x250 */ +u8 reserved_0x258[180 ];/* 0x258 */ +u32 dbgcmd;/* 0x30c unused */ +u32 dbgstat;/* 0x310 unused */ +u8 reserved_0x314[12 ];/* 0x314 */ +u32 swctl;/* 0x320 */ +u32 swstat;/* 0x324 */ +u8 reserved_0x328[7768 ];/* 0x328 */ +u32 unk_0x2180;/* 0x2180 */ +u8 reserved_0x2184[188 ];/* 0x2184 */ +u32 unk_0x2240;/* 0x2240 */ +u8 reserved_0x2244[3900 ];/* 0x2244 */ +u32 unk_0x3180;/* 0x3180 */ +u8 reserved_0x3184[188 ];/* 0x3184 */ +u32 unk_0x3240;/* 0x3240 */ +u8 reserved_0x3244[3900 ];/* 0x3244 */ +u32 unk_0x4180;/* 0x4180 */ +u8 reserved_0x4184[188 ];/* 0x4184 */ + u32 unk_0x4240; /* 0x4240 */ +}; +check_member (sunxi_mctl_ctl_reg, swstat,0x324 ); +check_member (sunxi_mctl_ctl_reg, unk_0x4240,0x4240 ); + +#define MSTR_DEVICETYPE_DDR3 BIT(0) +#define MSTR_DEVICETYPE_LPDDR2 BIT(2) +#define MSTR_DEVICETYPE_LPDDR3 BIT(3) +#define MSTR_DEVICETYPE_DDR4 BIT(4) +#define MSTR_DEVICETYPE_MASK GENMASK(5, 0) +#define MSTR_2TMODE BIT(10) +#define MSTR_BUSWIDTH_FULL (0 << 12) +#define MSTR_BUSWIDTH_HALF (1 << 12) +#define MSTR_ACTIVE_RANKS (x) (((x == 2) ? 3 : 1) << 24) +#define MSTR_BURST_LENGTH (x) (((x) >> 1) << 16) + +struct dram_para { +u32 clk; +enum sunxi_dram_type type; +u8 cols; +u8 rows; +u8 ranks; +u8 bus_full_width; +}; + + +static inline int ns_to_t (int nanoseconds) +{ +const unsigned int ctrl_freq =CONFIG_DRAM_CLK /2 ; + +return DIV_ROUND_UP (ctrl_freq * nanoseconds,1000 ); +} + +void mctl_set_timing_params (struct dram_para *para); + +#endif /* _SUNXI_DRAM_SUN50I_H616_H */ arch/arm/mach-sunxi/Kconfig +4
-0@@ -48,6 +48,46 @@ config DRAM_SUN50I_H6 Select this dram controller driver for some sun50i platforms, like H6. +config DRAM_SUN50I_H616 + bool + help + Select this dram controller driver for some sun50i platforms,arch/arm/mach-sunxi/Kconfig config DRAM_SUN50I_H6 · line 65
Quoted 10 lines
arch/arm/mach-sunxi/Kconfig +10
-0+ like H616. + +if DRAM_SUN50I_H616 +config DRAM_SUN50I_H616_WRITE_LEVELING + bool "H616 DRAM write leveling" + ---help--- + Select this when DRAM on your H616 board needs write leveling. + +config DRAM_SUN50I_H616_READ_CALIBRATION + bool"H616 DRAM read calibration"Missing a space here.
Quoted 49 lines
arch/arm/mach-sunxi/Kconfig +26
-0+ ---help--- + Select this when DRAM on your H616 board needs read calibration. + +config DRAM_SUN50I_H616_READ_TRAINING + bool "H616 DRAM read training" + ---help--- + Select this when DRAM on your H616 board needs read training. + +config DRAM_SUN50I_H616_WRITE_TRAINING + bool "H616 DRAM write training" + ---help--- + Select this when DRAM on your H616 board needs write training. + +config DRAM_SUN50I_H616_BIT_DELAY_COMPENSATION + bool "H616 DRAM bit delay compensation" + ---help--- + Select this when DRAM on your H616 board needs bit delay + compensation. + +config DRAM_SUN50I_H616_UNKNOWN_FEATURE + bool "H616 DRAM unknown feature" + ---help--- + Select this when DRAM on your H616 board needs this unknown + feature. +endif + config SUN6I_P2WIarch/arm/mach-sunxi/Kconfig +1
-0bool "Allwinner sun6i internal P2WI controller" help@@ -423,6 +463,7 @@ config DRAM_CLK MACH_SUN8I_V3S default 672 if MACH_SUN50I default 744 if MACH_SUN50I_H6 + default 720 if MACH_SUN50I_H616arch/arm/mach-sunxi/Kconfig +0
-0---help--- Set the dram clock speed, valid range 240 - 480 (prior to sun9i), must be a multiple of 24. For the sun9i (A80), the tested values@@ -439,6 +480,7 @@ endif config DRAM_ZQQuoted 7 lines
arch/arm/mach-sunxi/Kconfig
Quoted 7 lines
arch/arm/mach-sunxi/Kconfig +1
-0int "sunxi dram zq value" + depends on !MACH_SUN50I_H616arch/arm/mach-sunxi/Kconfig +0
-0default 123 if MACH_SUN4I || MACH_SUN5I || MACH_SUN6I || \ MACH_SUN8I_A23 || MACH_SUN8I_A33 ||
MACH_SUN8I_A83TQuoted 32 lines
Quoted 32 lines
arch/arm/mach-sunxi/Kconfig +1
-0default 127 if MACH_SUN7I@@ -456,6 +498,7 @@ config DRAM_ODT_EN default y if MACH_SUN8I_R40 default y if MACH_SUN50I default y if MACH_SUN50I_H6 + default y if MACH_SUN50I_H616arch/arm/mach-sunxi/Kconfig +0
-0---help--- Select this to enable dram odt (on die termination).arch/arm/mach-sunxi/Makefile +2
-0@@ -40,4 +40,6 @@ obj-$(CONFIG_SUNXI_DRAM_DW) += dram_sunxi_dw.o obj-$(CONFIG_SUNXI_DRAM_DW) += dram_timings/ obj-$(CONFIG_DRAM_SUN50I_H6) += dram_sun50i_h6.o obj-$(CONFIG_DRAM_SUN50I_H6) += dram_timings/ +obj-$(CONFIG_DRAM_SUN50I_H616) += dram_sun50i_h616.o +obj-$(CONFIG_DRAM_SUN50I_H616) += dram_timings/ endif(quoted diff) +0
-0
b/arch/arm/mach-sunxi/dram_sun50i_h616.cnew file mode 100644 index 000000000000..0c86f54b8a73[...]
PATCH 12/17 sunxi: Add support for H616 SoC
In reply to Jernej SkrabecH616 is very similar to H6 so most of the infrastructure can be reused. However, two big differences are that it doesn't have functional SRAM A2 which is usually used for TF-A and it doesn't have ARISC co-processor. It also needs bigger SPL size - 48 KiB.
--- arch/arm/dts/sunxi-u-boot.dtsi | 9 +++++++++ arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h | 7 +++++++ arch/arm/mach-sunxi/Kconfig | 11 ++++++++++- arch/arm/mach-sunxi/cpu_info.c | 2 ++ drivers/power/Kconfig | 1 + include/configs/sunxi-common.h | 10 ++++++++++ 6 files changed, 39 insertions(+), 1 deletion(-)
arch/arm/dts/sunxi-u-boot.dtsi +9 -0
@@ -3,6 +3,9 @@ #ifdef CONFIG_MACH_SUN50I_H6 #define BL31_ADDR 0x104000 #define SCP_ADDR 0x114000 +#elif defined(CONFIG_MACH_SUN50I_H616) +#define BL31_ADDR 0x40004000 +#define SCP_ADDR 0x028000 #else #define BL31_ADDR 0x44000 #define SCP_ADDR 0x50000
@@ -61,6 +64,7 @@ }; }; +#ifndef CONFIG_MACH_SUN50I_H616 scp { description = "SCP firmware"; type = "firmware";
@@ -73,6 +77,7 @@ missing-msg = "scp-sunxi"; }; }; +#endif @fdt-SEQ { description = "NAME";
@@ -87,7 +92,11 @@ @config-SEQ { description = "NAME"; firmware = "atf"; +#ifdef CONFIG_MACH_SUN50I_H616 + loadables = "uboot"; +#else loadables = "scp", "uboot"; +#endif fdt = "fdt-SEQ"; }; };
arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h +7 -0
@@ -28,13 +28,20 @@#define SUNXI_GIC400_BASE 0x03020000#define SUNXI_IOMMU_BASE 0x030F0000 +#ifdef CONFIG_MACH_SUN50I_H6 #define SUNXI_DRAM_COM_BASE 0x04002000#define SUNXI_DRAM_CTL0_BASE 0x04003000#define SUNXI_DRAM_PHY0_BASE 0x04005000 +#endif #define SUNXI_NFC_BASE 0x04011000#define SUNXI_MMC0_BASE 0x04020000#define SUNXI_MMC1_BASE 0x04021000#define SUNXI_MMC2_BASE 0x04022000 +#ifdef CONFIG_MACH_SUN50I_H616 +#define SUNXI_DRAM_COM_BASE 0x047FA000 +#define SUNXI_DRAM_CTL0_BASE 0x047FB000 +#define SUNXI_DRAM_PHY0_BASE 0x04800000 +#endif #define SUNXI_UART0_BASE 0x05000000#define SUNXI_UART1_BASE 0x05000400
arch/arm/mach-sunxi/Kconfig +10 -1
@@ -190,9 +190,10 @@ config MACH_SUNXI_H3_H5 select SUPPORT_SPL # TODO: try out A80's 8GiB DRAM space +# TODO: H616 supports 4 GiB DRAM space config SUNXI_DRAM_MAX_SIZE hex - default 0xC0000000 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN50I_H6 + default 0xC0000000 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN50I_H6 || MACH_SUN50I_H616 default 0x80000000 choice
@@ -354,6 +355,12 @@ config MACH_SUN50I_H6 select PHY_SUN4I_USB select DRAM_SUN50I_H6 +config MACH_SUN50I_H616 + bool "sun50i (Allwinner H616)" + select ARM64 + select DRAM_SUN50I_H616 + select SUN50I_GEN_H6 + endchoice # The sun8i SoCs share a lot, this helps to avoid a lot of "if A23 || A33"
@@ -589,6 +596,7 @@ config SYS_CLK_FREQ default 816000000 if MACH_SUN50I || MACH_SUN50I_H5 default 1008000000 if MACH_SUN8I default 1008000000 if MACH_SUN9I + default 1008000000 if MACH_SUN50I_H616 config SYS_CONFIG_NAME default "sun4i" if MACH_SUN4I
@@ -599,6 +607,7 @@ config SYS_CONFIG_NAME default "sun9i" if MACH_SUN9I default "sun50i" if MACH_SUN50I default "sun50i" if MACH_SUN50I_H6 + default "sun50i" if MACH_SUN50I_H616 config SYS_BOARD default "sunxi"
arch/arm/mach-sunxi/cpu_info.c +2 -0
@@ -99,6 +99,8 @@ int print_cpuinfo(void)puts ("CPU: Allwinner H5 (SUN50I)\n" );#elif definedCONFIG_MACH_SUN50I_H6 puts ("CPU: Allwinner H6 (SUN50I)\n" ); +#elif definedCONFIG_MACH_SUN50I_H616 +puts ("CPU: Allwinner H616 (SUN50I)\n" );#else #warning Please update cpu_info.c with correct CPU informationputs ("CPU: SUNXI Family\n" );
drivers/power/Kconfig +1 -0
@@ -13,6 +13,7 @@ choice depends on ARCH_SUNXI default AXP209_POWER if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I default AXP221_POWER if MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_R40 + default AXP305_POWER if MACH_SUN50I_H616 default AXP818_POWER if MACH_SUN8I_A83T default SUNXI_NO_PMIC if MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_V3S
include/configs/sunxi-common.h +10 -0
@@ -178,9 +178,14 @@#define LOW_LEVEL_SRAM_STACK 0x00018000#endif /* !CONFIG_ARM64 */ #elif CONFIG_SUNXI_SRAM_ADDRESS == 0x20000 +#ifdef CONFIG_MACH_SUN50I_H616 +#define CONFIG_SPL_MAX_SIZE 0xbfa0/* 48 KiB */ +#define LOW_LEVEL_SRAM_STACK 0x58000 +#else #define CONFIG_SPL_MAX_SIZE 0x7fa0/* 32 KiB */ /* end of SRAM A2 on H6 for now */ #define LOW_LEVEL_SRAM_STACK 0x00118000 +#endif #else #define CONFIG_SPL_MAX_SIZE 0x5fa0/* 24KB on sun4i/sun7i */ #define LOW_LEVEL_SRAM_STACK 0x00008000/* End of sram */
@@ -188,7 +193,12 @@#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK +/* H616 supports 48 KiB SPL */ +#ifdef CONFIG_MACH_SUN50I_H616 +#define CONFIG_SPL_PAD_TO 49152/* decimal for 'dd' */ +#else #define CONFIG_SPL_PAD_TO 32768/* decimal for 'dd' */ +#endif /* I2C */
Signature · 1 line
2.30.0
Samuel Holland
maintainerPATCH 12/17 sunxi: Add support for H616 SoC
Quoted 20 lines · Jernej Skrabec
H616 is very similar to H6 so most of the infrastructure can be reused. However, two big differences are that it doesn't have functional SRAM A2 which is usually used for TF-A and it doesn't have ARISC co-processor. It also needs bigger SPL size - 48 KiB.
Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/dts/sunxi-u-boot.dtsi | 9 +++++++++ arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h | 7 +++++++ arch/arm/mach-sunxi/Kconfig | 11 ++++++++++- arch/arm/mach-sunxi/cpu_info.c | 2 ++ drivers/power/Kconfig | 1 + include/configs/sunxi-common.h | 10 ++++++++++ 6 files changed, 39 insertions(+), 1 deletion(-)arch/arm/dts/sunxi-u-boot.dtsi +0
-0
arch/arm/dts/sunxi-u-boot.dtsi line 8
Quoted 6 lines
arch/arm/dts/sunxi-u-boot.dtsi +3
-0@@ -3,6 +3,9 @@ #ifdef CONFIG_MACH_SUN50I_H6 #define BL31_ADDR 0x104000 #define SCP_ADDR 0x114000 +#elif defined(CONFIG_MACH_SUN50I_H616) +#define BL31_ADDR 0x40004000 +#define SCP_ADDR 0x028000
There should be no SCP_ADDR if there is no SCP firmware.
Quoted 146 lines
arch/arm/dts/sunxi-u-boot.dtsi +6
-0#else #define BL31_ADDR 0x44000 #define SCP_ADDR 0x50000@@ -61,6 +64,7 @@ }; }; +#ifndef CONFIG_MACH_SUN50I_H616 scp { description = "SCP firmware"; type = "firmware";@@ -73,6 +77,7 @@ missing-msg = "scp-sunxi"; }; }; +#endif @fdt-SEQ { description = "NAME";@@ -87,7 +92,11 @@ @config-SEQ { description = "NAME"; firmware = "atf"; +#ifdef CONFIG_MACH_SUN50I_H616 + loadables = "uboot"; +#else loadables = "scp", "uboot"; +#endif fdt = "fdt-SEQ"; }; };arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h +7
-0@@ -28,13 +28,20 @@#define SUNXI_GIC400_BASE 0x03020000#define SUNXI_IOMMU_BASE 0x030F0000 +#ifdef CONFIG_MACH_SUN50I_H6 #define SUNXI_DRAM_COM_BASE 0x04002000#define SUNXI_DRAM_CTL0_BASE 0x04003000#define SUNXI_DRAM_PHY0_BASE 0x04005000 +#endif #define SUNXI_NFC_BASE 0x04011000#define SUNXI_MMC0_BASE 0x04020000#define SUNXI_MMC1_BASE 0x04021000#define SUNXI_MMC2_BASE 0x04022000 +#ifdef CONFIG_MACH_SUN50I_H616 +#define SUNXI_DRAM_COM_BASE 0x047FA000 +#define SUNXI_DRAM_CTL0_BASE 0x047FB000 +#define SUNXI_DRAM_PHY0_BASE 0x04800000 +#endif #define SUNXI_UART0_BASE 0x05000000#define SUNXI_UART1_BASE 0x05000400arch/arm/mach-sunxi/Kconfig +10
-1@@ -190,9 +190,10 @@ config MACH_SUNXI_H3_H5 select SUPPORT_SPL # TODO: try out A80's 8GiB DRAM space +# TODO: H616 supports 4 GiB DRAM space config SUNXI_DRAM_MAX_SIZE hex - default 0xC0000000 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN50I_H6 + default 0xC0000000 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN50I_H6 || MACH_SUN50I_H616 default 0x80000000 choice@@ -354,6 +355,12 @@ config MACH_SUN50I_H6 select PHY_SUN4I_USB select DRAM_SUN50I_H6 +config MACH_SUN50I_H616 + bool "sun50i (Allwinner H616)" + select ARM64 + select DRAM_SUN50I_H616 + select SUN50I_GEN_H6 + endchoice # The sun8i SoCs share a lot, this helps to avoid a lot of "if A23 || A33"@@ -589,6 +596,7 @@ config SYS_CLK_FREQ default 816000000 if MACH_SUN50I || MACH_SUN50I_H5 default 1008000000 if MACH_SUN8I default 1008000000 if MACH_SUN9I + default 1008000000 if MACH_SUN50I_H616 config SYS_CONFIG_NAME default "sun4i" if MACH_SUN4I@@ -599,6 +607,7 @@ config SYS_CONFIG_NAME default "sun9i" if MACH_SUN9I default "sun50i" if MACH_SUN50I default "sun50i" if MACH_SUN50I_H6 + default "sun50i" if MACH_SUN50I_H616 config SYS_BOARD default "sunxi"arch/arm/mach-sunxi/cpu_info.c +2
-0@@ -99,6 +99,8 @@ int print_cpuinfo(void)puts ("CPU: Allwinner H5 (SUN50I)\n" );#elif definedCONFIG_MACH_SUN50I_H6 puts ("CPU: Allwinner H6 (SUN50I)\n" ); +#elif definedCONFIG_MACH_SUN50I_H616 +puts ("CPU: Allwinner H616 (SUN50I)\n" );#else #warning Please update cpu_info.c with correct CPU informationputs ("CPU: SUNXI Family\n" );drivers/power/Kconfig +1
-0@@ -13,6 +13,7 @@ choice depends on ARCH_SUNXI default AXP209_POWER if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I default AXP221_POWER if MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_R40 + default AXP305_POWER if MACH_SUN50I_H616 default AXP818_POWER if MACH_SUN8I_A83T default SUNXI_NO_PMIC if MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_V3Sinclude/configs/sunxi-common.h +5
-0@@ -178,9 +178,14 @@#define LOW_LEVEL_SRAM_STACK 0x00018000#endif /* !CONFIG_ARM64 */ #elif CONFIG_SUNXI_SRAM_ADDRESS == 0x20000 +#ifdef CONFIG_MACH_SUN50I_H616 +#define CONFIG_SPL_MAX_SIZE 0xbfa0/* 48 KiB */ +#define LOW_LEVEL_SRAM_STACK 0x58000 +#else #define CONFIG_SPL_MAX_SIZE 0x7fa0/* 32 KiB */ /* end of SRAM A2 on H6 for now */ #define LOW_LEVEL_SRAM_STACK 0x00118000 +#endif #else #define CONFIG_SPL_MAX_SIZE 0x5fa0/* 24KB on sun4i/sun7i */ #define LOW_LEVEL_SRAM_STACK 0x00008000/* End of sram */
include/configs/sunxi-common.h line 198
Quoted 6 lines
include/configs/sunxi-common.h +3
-0@@ -188,7 +193,12 @@#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK +/* H616 supports 48 KiB SPL */ +#ifdef CONFIG_MACH_SUN50I_H616 +#define CONFIG_SPL_PAD_TO 49152/* decimal for 'dd' */
H616 supports much larger SPLs than 48 KiB, and CONFIG_SPL_PAD_TO enforces both a minimum and maximum size. So please leave CONFIG_SPL_PAD_TO undefined on the new platform (or for all SUN50I_GEN_H6, where the SPL size restriction was removed).
include/configs/sunxi-common.h line 204
Quoted 7 lines
include/configs/sunxi-common.h +2
-0+#else #define CONFIG_SPL_PAD_TO 32768/* decimal for 'dd' */ +#endif /* I2C */
Cheers,
Samuel
PATCH 12/17 sunxi: Add support for H616 SoC
Dne ponedeljek, 04. januar 2021 ob 03:47:06 CET je Samuel Holland napisal(a):
Quoted 27 lines · Jernej Skrabec
Quoted 26 lines
H616 is very similar to H6 so most of the infrastructure can be reused. However, two big differences are that it doesn't have functional SRAM A2 which is usually used for TF-A and it doesn't have ARISC co-processor. It also needs bigger SPL size - 48 KiB.
Signed-off-by Jernej Skrabec <[email protected]>---
arch/arm/dts/sunxi-u-boot.dtsi | 9 +++++++++ arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h | 7 +++++++ arch/arm/mach-sunxi/Kconfig | 11 ++++++++++- arch/arm/mach-sunxi/cpu_info.c | 2 ++ drivers/power/Kconfig | 1 + include/configs/sunxi-common.h | 10 ++++++++++ 6 files changed, 39 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/arch/arm/dts/sunxi-u-boot.dtsiindexc77cf7cacf0c..7e8644f390a8100644arch/arm/dts/sunxi-u-boot.dtsi +0
-0@@ -3,6 +3,9 @@ #ifdef CONFIG_MACH_SUN50I_H6 #define BL31_ADDR 0x104000 #define SCP_ADDR 0x114000
Quoted 5 lines
arch/arm/dts/sunxi-u-boot.dtsi line 8
Quoted 3 lines
arch/arm/dts/sunxi-u-boot.dtsi +3
-0+#elif defined(CONFIG_MACH_SUN50I_H616) +#define BL31_ADDR 0x40004000 +#define SCP_ADDR 0x028000There should be no
SCP_ADDRif there is no SCP firmware.
Nice catch!
Quoted 9 lines
Quoted 9 lines
arch/arm/dts/sunxi-u-boot.dtsi +0
-0#else#define
BL31_ADDR0x44000
#defineSCP_ADDR0x50000arch/arm/dts/sunxi-u-boot.dtsi +0
-0@@ -61,6 +64,7 @@ };
Quoted 7 lines
arch/arm/dts/sunxi-u-boot.dtsi
Quoted 7 lines
arch/arm/dts/sunxi-u-boot.dtsi +1
-0}; +#ifndef CONFIG_MACH_SUN50I_H616arch/arm/dts/sunxi-u-boot.dtsi +0
-0scp { description = "SCP
firmware";
Quoted 5 lines
arch/arm/dts/sunxi-u-boot.dtsi line 78
Quoted 5 lines
arch/arm/dts/sunxi-u-boot.dtsi +0
-0type = "firmware";@@ -73,6 +77,7 @@ missing-msg
= "scp-sunxi";
Quoted 15 lines
Quoted 15 lines
arch/arm/dts/sunxi-u-boot.dtsi +1
-0}; }; +#endifarch/arm/dts/sunxi-u-boot.dtsi +0
-0@fdt-SEQ { description = "NAME";@@ -87,7 +92,11 @@ @config-SEQ {
Quoted 8 lines
arch/arm/dts/sunxi-u-boot.dtsi
Quoted 8 lines
arch/arm/dts/sunxi-u-boot.dtsi +3
-0description = "NAME"; firmware = "atf"; +#ifdef CONFIG_MACH_SUN50I_H616 + loadables = "uboot"; +#else loadables = "scp",
"uboot";
Quoted 51 lines
Quoted 51 lines
arch/arm/dts/sunxi-u-boot.dtsi +1
-0+#endif fdt = "fdt-SEQ"; }; };(quoted diff) +0
-0
b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.hindex6392cb07b472..d9cf8ae04288100644arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h +7
-0@@ -28,13 +28,20 @@#define SUNXI_GIC400_BASE 0x03020000#define SUNXI_IOMMU_BASE 0x030F0000 +#ifdef CONFIG_MACH_SUN50I_H6 #define SUNXI_DRAM_COM_BASE 0x04002000#define SUNXI_DRAM_CTL0_BASE 0x04003000#define SUNXI_DRAM_PHY0_BASE 0x04005000 +#endif #define SUNXI_NFC_BASE 0x04011000#define SUNXI_MMC0_BASE 0x04020000#define SUNXI_MMC1_BASE 0x04021000#define SUNXI_MMC2_BASE 0x04022000 +#ifdef CONFIG_MACH_SUN50I_H616 +#define SUNXI_DRAM_COM_BASE 0x047FA000 +#define SUNXI_DRAM_CTL0_BASE 0x047FB000 +#define SUNXI_DRAM_PHY0_BASE 0x04800000 +#endif #define SUNXI_UART0_BASE 0x05000000#define SUNXI_UART1_BASE 0x05000400arch/arm/mach-sunxi/Kconfig +0
-0@@ -190,9 +190,10 @@ config MACH_SUNXI_H3_H5 select SUPPORT_SPL # TODO: try out A80's 8GiB DRAM space
Quoted 7 lines
arch/arm/mach-sunxi/Kconfig config MACH_SUNXI_H3_H5
Quoted 7 lines
arch/arm/mach-sunxi/Kconfig +1
-1+# TODO: H616 supports 4 GiB DRAM space config SUNXI_DRAM_MAX_SIZE hex - default 0xC0000000 if MACH_SUN50I || MACH_SUN50I_H5 ||
MACH_SUN50I_H6
Quoted 1 line
arch/arm/mach-sunxi/Kconfig
Quoted 1 line
arch/arm/mach-sunxi/Kconfig +1
-0+ default 0xC0000000 if MACH_SUN50I || MACH_SUN50I_H5 ||
MACH_SUN50I_H6 ||
Quoted 72 lines
Quoted 72 lines
MACH_SUN50I_H616>arch/arm/mach-sunxi/Kconfig +6
-0default 0x80000000 choice@@ -354,6 +355,12 @@ config MACH_SUN50I_H6 select PHY_SUN4I_USB select DRAM_SUN50I_H6 +config MACH_SUN50I_H616 + bool "sun50i (Allwinner H616)" + select ARM64 + select DRAM_SUN50I_H616 + select SUN50I_GEN_H6 + endchoice# The sun8i SoCs share a lot, this helps to avoid a lot of "if A23 || A33"
arch/arm/mach-sunxi/Kconfig +1
-0@@ -589,6 +596,7 @@ config SYS_CLK_FREQ default 816000000 if MACH_SUN50I || MACH_SUN50I_H5 default 1008000000 if MACH_SUN8I default 1008000000 if MACH_SUN9I + default 1008000000 if MACH_SUN50I_H616config
SYS_CONFIG_NAMEarch/arm/mach-sunxi/Kconfig +1
-0default "sun4i" if MACH_SUN4I@@ -599,6 +607,7 @@ config SYS_CONFIG_NAME default "sun9i" if MACH_SUN9I default "sun50i" if MACH_SUN50I default "sun50i" if MACH_SUN50I_H6 + default "sun50i" if MACH_SUN50I_H616config
SYS_BOARDarch/arm/mach-sunxi/Kconfig +0
-0default "sunxi"(quoted diff) +0
-0
b/arch/arm/mach-sunxi/cpu_info.cindex875e5a1a8a8e..ba33ef24300c100644arch/arm/mach-sunxi/cpu_info.c +2
-0@@ -99,6 +99,8 @@ int print_cpuinfo(void)puts ("CPU: Allwinner H5 (SUN50I)\n" );#elif definedCONFIG_MACH_SUN50I_H6 puts ("CPU: Allwinner H6 (SUN50I)\n" ); +#elif definedCONFIG_MACH_SUN50I_H616 +puts ("CPU: Allwinner H616 (SUN50I)\n" );#else #warning Please update cpu_info.c with correct CPU informationputs ("CPU: SUNXI Family\n" );drivers/power/Kconfig +0
-0@@ -13,6 +13,7 @@ choice
Quoted 3 lines
drivers/power/Kconfig choice
Quoted 3 lines
drivers/power/Kconfig +0
-0depends on ARCH_SUNXI default AXP209_POWER if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I default AXP221_POWER if MACH_SUN6I || MACH_SUN8I_A23 ||
MACH_SUN8I_A33
Quoted 13 lines
Quoted 13 lines
drivers/power/Kconfig +1
-0|| MACH_SUN8I_R40> + default AXP305_POWER if MACH_SUN50I_H616drivers/power/Kconfig +0
-0default AXP818_POWER if MACH_SUN8I_A83T default SUNXI_NO_PMIC if MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_V3S(quoted diff) +0
-0
b/include/configs/sunxi-common.hindex203cb10fbabc..6e8f547214d6100644include/configs/sunxi-common.h +0
-0@@ -178,9 +178,14 @@
Quoted 6 lines
include/configs/sunxi-common.h
Quoted 6 lines
include/configs/sunxi-common.h +2
-0#define LOW_LEVEL_SRAM_STACK 0x00018000#endif /* !CONFIG_ARM64 */ #elif CONFIG_SUNXI_SRAM_ADDRESS == 0x20000 +#ifdef CONFIG_MACH_SUN50I_H616 +#define CONFIG_SPL_MAX_SIZE 0xbfa0/* 48 KiB
*/
Quoted 4 lines
include/configs/sunxi-common.h
Quoted 4 lines
include/configs/sunxi-common.h +2
-0+#define LOW_LEVEL_SRAM_STACK 0x58000 +#else #define CONFIG_SPL_MAX_SIZE 0x7fa0/* 32 KiB
*/
Quoted 7 lines
include/configs/sunxi-common.h
Quoted 7 lines
include/configs/sunxi-common.h +1
-0/* end of SRAM A2 on H6 for now */ #define LOW_LEVEL_SRAM_STACK 0x00118000 +#endif #else #define CONFIG_SPL_MAX_SIZE 0x5fa0/* 24KB on
sun4i/sun7i */
Quoted 9 lines
include/configs/sunxi-common.h line 198
Quoted 9 lines
#define
LOW_LEVEL_SRAM_STACK0x00008000/* End of sram */include/configs/sunxi-common.h +3
-0@@ -188,7 +193,12 @@#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK +/* H616 supports 48 KiB SPL */ +#ifdef CONFIG_MACH_SUN50I_H616 +#define CONFIG_SPL_PAD_TO 49152/* decimal
for 'dd' */
Quoted 5 lines
H616 supports much larger SPLs than 48 KiB, and
CONFIG_SPL_PAD_TOenforces both a minimum and maximum size. So please leaveCONFIG_SPL_PAD_TOundefined on the new platform (or for allSUN50I_GEN_H6, where the SPL size restriction was removed).
I thought padding is required for proper build. I'll test that.
Best regards,
Jernej
Quoted 4 lines
include/configs/sunxi-common.h
Quoted 4 lines
include/configs/sunxi-common.h +1
-0+#else #define CONFIG_SPL_PAD_TO 32768/* decimal
for 'dd' */
Quoted 7 lines
include/configs/sunxi-common.h line 204
Quoted 4 lines
include/configs/sunxi-common.h +1
-0+#endif /* I2C */ Cheers,
Samuel
PATCH 13/17 net: sun8i-emac: Determine pinmux based on SoC, not EMAC type
In reply to Jernej SkrabecFrom: Andre Przywara <[email protected]>
--- drivers/net/sun8i_emac.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/net/sun8i_emac.c +20 -8
@@ -85,7 +85,9 @@/* IO mux settings */ #define SUN8I_IOMUX_H3 2 -#define SUN8I_IOMUX_R40 5 +#define SUN8I_IOMUX_R40 5 +#define SUN8I_IOMUX_H6 5 +#define SUN8I_IOMUX_H616 2#define SUN8I_IOMUX 4/* H3/A64 EMAC Register's offset */
@@ -519,10 +521,10 @@ static int sun8i_emac_eth_start(struct udevice *dev)static int parse_phy_pins (struct udevice *dev) { -struct emac_eth_dev *priv =dev_get_priv (dev);int offset;const char *pin_name;int drive, pull =SUN4I_PINCTRL_NO_PULL , i; +u32 iomux; offset =fdtdec_lookup_phandle (gd->fdt_blob,dev_of_offset (dev),"pinctrl-0" );
@@ -549,6 +551,21 @@ static int parse_phy_pins(struct udevice *dev)else if (fdt_get_property (gd->fdt_blob, offset,"bias-pull-down" ,NULL )) pull =SUN4I_PINCTRL_PULL_DOWN ; +/* +* The GPIO pinmux value is an integration choice, so depends on the +* SoC, not the EMAC variant. +*/ +if (IS_ENABLED (CONFIG_MACH_SUN8I_H3 )) + iomux =SUN8I_IOMUX_H3 ; +else if (IS_ENABLED (CONFIG_MACH_SUN8I_R40 )) + iomux =SUN8I_IOMUX_R40 ; +else if (IS_ENABLED (CONFIG_MACH_SUN50I_H6 )) + iomux =SUN8I_IOMUX_H6 ; +else if (IS_ENABLED (CONFIG_MACH_SUN50I_H616 )) + iomux =SUN8I_IOMUX_H616 ; +else + iomux =SUN8I_IOMUX ; +for (i =0 ; ; i++) {int pin;
@@ -561,12 +578,7 @@ static int parse_phy_pins(struct udevice *dev)if (pin <0 )continue ; -if (priv->variant ==H3_EMAC ) -sunxi_gpio_set_cfgpin (pin,SUN8I_IOMUX_H3 ); -else if (priv->variant ==R40_GMAC || priv->variant ==H6_EMAC ) -sunxi_gpio_set_cfgpin (pin,SUN8I_IOMUX_R40 ); -else -sunxi_gpio_set_cfgpin (pin,SUN8I_IOMUX ); +sunxi_gpio_set_cfgpin (pin, iomux);if (drive != ~0 )sunxi_gpio_set_drv (pin, drive);
Signature · 1 line
2.30.0
PATCH 14/17 arm: sunxi: add initial H616 DTSI and headers
In reply to Jernej SkrabecThis commit introduces H616 DTSI file and dt-bindings headers needed for device tree files.
Files are taken from initial Linux H616 support submission with minor change - emac0 fallback has H6 compatible instead of A64, otherwise network doesn't work. H616 DTSI is not merged upstream yet.
--- arch/arm/dts/sun50i-h616.dtsi | 716 ++++++++++++++++++++ include/dt-bindings/clock/sun50i-h616-ccu.h | 115 ++++ include/dt-bindings/reset/sun50i-h616-ccu.h | 70 ++ 3 files changed, 901 insertions(+) create mode 100644 arch/arm/dts/sun50i-h616.dtsi create mode 100644 include/dt-bindings/clock/sun50i-h616-ccu.h create mode 100644 include/dt-bindings/reset/sun50i-h616-ccu.h
arch/arm/dts/sun50i-h616.dtsi new file +716 -0
@@ -0,0 +1,716 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// Copyright (C) 2020 Arm Ltd. +// based on the H6 dtsi, which is: +// Copyright (C) 2017 Icenowy Zheng <[email protected]> + +#include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/clock/sun50i-h616-ccu.h> +#include <dt-bindings/clock/sun50i-h6-r-ccu.h> +#include <dt-bindings/reset/sun50i-h616-ccu.h> +#include <dt-bindings/reset/sun50i-h6-r-ccu.h> + +/ { + interrupt-parent = <&gic>; + #address-cells = <2>; + #size-cells = <2>; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu0: cpu at 0 { + compatible = "arm,cortex-a53"; + device_type = "cpu"; + reg = <0>; + enable-method = "psci"; + clocks = <&ccu CLK_CPUX>; + }; + + cpu1: cpu at 1 { + compatible = "arm,cortex-a53"; + device_type = "cpu"; + reg = <1>; + enable-method = "psci"; + clocks = <&ccu CLK_CPUX>; + }; + + cpu2: cpu at 2 { + compatible = "arm,cortex-a53"; + device_type = "cpu"; + reg = <2>; + enable-method = "psci"; + clocks = <&ccu CLK_CPUX>; + }; + + cpu3: cpu at 3 { + compatible = "arm,cortex-a53"; + device_type = "cpu"; + reg = <3>; + enable-method = "psci"; + clocks = <&ccu CLK_CPUX>; + }; + }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* 512KiB reserved for ARM Trusted Firmware (BL31) */ + secmon_reserved: secmon at 40000000 { + reg = <0x0 0x40000000 0x0 0x80000>; + no-map; + }; + }; + + osc24M: osc24M_clk { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "osc24M"; + }; + + pmu { + compatible = "arm,cortex-a53-pmu"; + interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>; + interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; + }; + + psci { + compatible = "arm,psci-0.2"; + method = "smc"; + }; + + timer { + compatible = "arm,armv8-timer"; + arm,no-tick-in-suspend; + interrupts = <GIC_PPI 13 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>, + <GIC_PPI 14 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>, + <GIC_PPI 11 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>, + <GIC_PPI 10 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x0 0x0 0x40000000>; + + syscon: syscon at 3000000 { + compatible = "allwinner,sun50i-h616-system-control"; + reg = <0x03000000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram_c: sram at 28000 { + compatible = "mmio-sram"; + reg = <0x00028000 0x30000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x00028000 0x30000>; + }; + }; + + ccu: clock at 3001000 { + compatible = "allwinner,sun50i-h616-ccu"; + reg = <0x03001000 0x1000>; + clocks = <&osc24M>, <&rtc 0>, <&rtc 2>; + clock-names = "hosc", "losc", "iosc"; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + watchdog: watchdog at 30090a0 { + compatible = "allwinner,sun50i-h616-wdt", + "allwinner,sun6i-a31-wdt"; + reg = <0x030090a0 0x20>; + interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&osc24M>; + status = "disabled"; + }; + + pio: pinctrl at 300b000 { + compatible = "allwinner,sun50i-h616-pinctrl"; + reg = <0x0300b000 0x400>; + interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_APB1>, <&osc24M>, <&rtc 0>; + clock-names = "apb", "hosc", "losc"; + gpio-controller; + #gpio-cells = <3>; + interrupt-controller; + #interrupt-cells = <3>; + + ext_rgmii_pins: rgmii-pins { + pins = "PI0", "PI1", "PI2", "PI3", "PI4", + "PI5", "PI7", "PI8", "PI9", "PI10", + "PI11", "PI12", "PI13", "PI14", "PI15", + "PI16"; + function = "emac0"; + drive-strength = <40>; + }; + + i2c0_pins: i2c0-pins { + pins = "PI6", "PI7"; + function = "i2c0"; + }; + + i2c3_ph_pins: i2c3-ph-pins { + pins = "PH4", "PH5"; + function = "i2c3"; + }; + + ir_rx_pin: ir_rx_pin { + pins = "PH10"; + function = "ir_rx"; + }; + + mmc0_pins: mmc0-pins { + pins = "PF0", "PF1", "PF2", "PF3", + "PF4", "PF5"; + function = "mmc0"; + drive-strength = <30>; + bias-pull-up; + }; + + mmc1_pins: mmc1-pins { + pins = "PG0", "PG1", "PG2", "PG3", + "PG4", "PG5"; + function = "mmc1"; + drive-strength = <30>; + bias-pull-up; + }; + + mmc2_pins: mmc2-pins { + pins = "PC0", "PC1", "PC5", "PC6", + "PC8", "PC9", "PC10", "PC11", + "PC13", "PC14", "PC15", "PC16"; + function = "mmc2"; + drive-strength = <30>; + bias-pull-up; + }; + + spi0_pins: spi0-pins { + pins = "PC0", "PC2", "PC3", "PC4"; + function = "spi0"; + }; + + spi1_pins: spi1-pins { + pins = "PH6", "PH7", "PH8"; + function = "spi1"; + }; + + spi1_cs_pin: spi1-cs-pin { + pins = "PH5"; + function = "spi1"; + }; + + uart0_ph_pins: uart0-ph-pins { + pins = "PH0", "PH1"; + function = "uart0"; + }; + + uart1_pins: uart1-pins { + pins = "PG6", "PG7"; + function = "uart1"; + }; + + uart1_rts_cts_pins: uart1-rts-cts-pins { + pins = "PG8", "PG9"; + function = "uart1"; + }; + }; + + gic: interrupt-controller at 3021000 { + compatible = "arm,gic-400"; + reg = <0x03021000 0x1000>, + <0x03022000 0x2000>, + <0x03024000 0x2000>, + <0x03026000 0x2000>; + interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; + interrupt-controller; + #interrupt-cells = <3>; + }; + + mmc0: mmc at 4020000 { + compatible = "allwinner,sun50i-h616-mmc", + "allwinner,sun50i-a100-mmc"; + reg = <0x04020000 0x1000>; + clocks = <&ccu CLK_BUS_MMC0>, <&ccu CLK_MMC0>; + clock-names = "ahb", "mmc"; + resets = <&ccu RST_BUS_MMC0>; + reset-names = "ahb"; + interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + mmc1: mmc at 4021000 { + compatible = "allwinner,sun50i-h616-mmc", + "allwinner,sun50i-a100-mmc"; + reg = <0x04021000 0x1000>; + clocks = <&ccu CLK_BUS_MMC1>, <&ccu CLK_MMC1>; + clock-names = "ahb", "mmc"; + resets = <&ccu RST_BUS_MMC1>; + reset-names = "ahb"; + interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + mmc2: mmc at 4022000 { + compatible = "allwinner,sun50i-h616-emmc", + "allwinner,sun50i-a100-emmc"; + reg = <0x04022000 0x1000>; + clocks = <&ccu CLK_BUS_MMC2>, <&ccu CLK_MMC2>; + clock-names = "ahb", "mmc"; + resets = <&ccu RST_BUS_MMC2>; + reset-names = "ahb"; + interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + uart0: serial at 5000000 { + compatible = "snps,dw-apb-uart"; + reg = <0x05000000 0x400>; + interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART0>; + resets = <&ccu RST_BUS_UART0>; + status = "disabled"; + }; + + uart1: serial at 5000400 { + compatible = "snps,dw-apb-uart"; + reg = <0x05000400 0x400>; + interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART1>; + resets = <&ccu RST_BUS_UART1>; + status = "disabled"; + }; + + uart2: serial at 5000800 { + compatible = "snps,dw-apb-uart"; + reg = <0x05000800 0x400>; + interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART2>; + resets = <&ccu RST_BUS_UART2>; + status = "disabled"; + }; + + uart3: serial at 5000c00 { + compatible = "snps,dw-apb-uart"; + reg = <0x05000c00 0x400>; + interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART3>; + resets = <&ccu RST_BUS_UART3>; + status = "disabled"; + }; + + uart4: serial at 5001000 { + compatible = "snps,dw-apb-uart"; + reg = <0x05001000 0x400>; + interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART4>; + resets = <&ccu RST_BUS_UART4>; + status = "disabled"; + }; + + uart5: serial at 5001400 { + compatible = "snps,dw-apb-uart"; + reg = <0x05001400 0x400>; + interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART5>; + resets = <&ccu RST_BUS_UART5>; + status = "disabled"; + }; + + i2c0: i2c at 5002000 { + compatible = "allwinner,sun50i-h616-i2c", + "allwinner,sun6i-a31-i2c"; + reg = <0x05002000 0x400>; + interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_I2C0>; + resets = <&ccu RST_BUS_I2C0>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + i2c1: i2c at 5002400 { + compatible = "allwinner,sun50i-h616-i2c", + "allwinner,sun6i-a31-i2c"; + reg = <0x05002400 0x400>; + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_I2C1>; + resets = <&ccu RST_BUS_I2C1>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + i2c2: i2c at 5002800 { + compatible = "allwinner,sun50i-h616-i2c", + "allwinner,sun6i-a31-i2c"; + reg = <0x05002800 0x400>; + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_I2C2>; + resets = <&ccu RST_BUS_I2C2>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + i2c3: i2c at 5002c00 { + compatible = "allwinner,sun50i-h616-i2c", + "allwinner,sun6i-a31-i2c"; + reg = <0x05002c00 0x400>; + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_I2C3>; + resets = <&ccu RST_BUS_I2C3>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + i2c4: i2c at 5003000 { + compatible = "allwinner,sun50i-h616-i2c", + "allwinner,sun6i-a31-i2c"; + reg = <0x05003000 0x400>; + interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_I2C4>; + resets = <&ccu RST_BUS_I2C4>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + spi0: spi at 5010000 { + compatible = "allwinner,sun50i-h616-spi", + "allwinner,sun8i-h3-spi"; + reg = <0x05010000 0x1000>; + interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_SPI0>, <&ccu CLK_SPI0>; + clock-names = "ahb", "mod"; + resets = <&ccu RST_BUS_SPI0>; + pinctrl-names = "default"; + pinctrl-0 = <&spi0_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + spi1: spi at 5011000 { + compatible = "allwinner,sun50i-h616-spi", + "allwinner,sun8i-h3-spi"; + reg = <0x05011000 0x1000>; + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_SPI1>, <&ccu CLK_SPI1>; + clock-names = "ahb", "mod"; + resets = <&ccu RST_BUS_SPI1>; + pinctrl-names = "default"; + pinctrl-0 = <&spi1_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + emac0: ethernet at 5020000 { + compatible = "allwinner,sun50i-h616-emac", + "allwinner,sun50i-h6-emac", + "allwinner,sun50i-a64-emac"; + syscon = <&syscon>; + reg = <0x05020000 0x10000>; + interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "macirq"; + resets = <&ccu RST_BUS_EMAC0>; + reset-names = "stmmaceth"; + clocks = <&ccu CLK_BUS_EMAC0>; + clock-names = "stmmaceth"; + status = "disabled"; + + mdio0: mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + + emac1: ethernet at 5030000 { + compatible = "allwinner,sun50i-h616-emac"; + syscon = <&syscon 1>; + reg = <0x05030000 0x10000>; + interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "macirq"; + resets = <&ccu RST_BUS_EMAC1>; + reset-names = "stmmaceth"; + clocks = <&ccu CLK_BUS_EMAC1>; + clock-names = "stmmaceth"; + status = "disabled"; + + mdio1: mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + + usbotg: usb at 5100000 { + compatible = "allwinner,sun50i-h616-musb", + "allwinner,sun8i-h3-musb"; + reg = <0x05100000 0x0400>; + clocks = <&ccu CLK_BUS_OTG>; + resets = <&ccu RST_BUS_OTG>; + interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "mc"; + phys = <&usbphy 0>; + phy-names = "usb"; + extcon = <&usbphy 0>; + status = "disabled"; + }; + + usbphy: phy at 5100400 { + compatible = "allwinner,sun50i-h616-usb-phy"; + reg = <0x05100400 0x24>, + <0x05101800 0x14>, + <0x05200800 0x14>, + <0x05310800 0x14>, + <0x05311800 0x14>; + reg-names = "phy_ctrl", + "pmu0", + "pmu1", + "pmu2", + "pmu3"; + clocks = <&ccu CLK_USB_PHY0>, + <&ccu CLK_USB_PHY1>, + <&ccu CLK_USB_PHY2>, + <&ccu CLK_USB_PHY3>; + clock-names = "usb0_phy", + "usb1_phy", + "usb2_phy", + "usb3_phy"; + resets = <&ccu RST_USB_PHY0>, + <&ccu RST_USB_PHY1>, + <&ccu RST_USB_PHY2>, + <&ccu RST_USB_PHY3>; + reset-names = "usb0_reset", + "usb1_reset", + "usb2_reset", + "usb3_reset"; + status = "disabled"; + #phy-cells = <1>; + }; + + ehci0: usb at 5101000 { + compatible = "allwinner,sun50i-h616-ehci", + "generic-ehci"; + reg = <0x05101000 0x100>; + interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI0>, + <&ccu CLK_BUS_EHCI0>, + <&ccu CLK_USB_OHCI0>; + resets = <&ccu RST_BUS_OHCI0>, + <&ccu RST_BUS_EHCI0>; + phys = <&usbphy 0>; + phy-names = "usb"; + status = "disabled"; + }; + + ohci0: usb at 5101400 { + compatible = "allwinner,sun50i-h616-ohci", + "generic-ohci"; + reg = <0x05101400 0x100>; + interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI0>, + <&ccu CLK_USB_OHCI0>; + resets = <&ccu RST_BUS_OHCI0>; + phys = <&usbphy 0>; + phy-names = "usb"; + status = "disabled"; + }; + + ehci1: usb at 5200000 { + compatible = "allwinner,sun50i-h616-ehci", + "generic-ehci"; + reg = <0x05200000 0x100>; + interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI1>, + <&ccu CLK_BUS_EHCI1>, + <&ccu CLK_USB_OHCI1>; + resets = <&ccu RST_BUS_OHCI1>, + <&ccu RST_BUS_EHCI1>; + phys = <&usbphy 1>; + phy-names = "usb"; + status = "disabled"; + }; + + ohci1: usb at 5200400 { + compatible = "allwinner,sun50i-h616-ohci", + "generic-ohci"; + reg = <0x05200400 0x100>; + interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI1>, + <&ccu CLK_USB_OHCI1>; + resets = <&ccu RST_BUS_OHCI1>; + phys = <&usbphy 1>; + phy-names = "usb"; + status = "disabled"; + }; + + ehci2: usb at 5310000 { + compatible = "allwinner,sun50i-h616-ehci", + "generic-ehci"; + reg = <0x05310000 0x100>; + interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI2>, + <&ccu CLK_BUS_EHCI2>, + <&ccu CLK_USB_OHCI2>; + resets = <&ccu RST_BUS_OHCI2>, + <&ccu RST_BUS_EHCI2>; + phys = <&usbphy 2>; + phy-names = "usb"; + status = "disabled"; + }; + + ohci2: usb at 5310400 { + compatible = "allwinner,sun50i-h616-ohci", + "generic-ohci"; + reg = <0x05310400 0x100>; + interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI2>, + <&ccu CLK_USB_OHCI2>; + resets = <&ccu RST_BUS_OHCI2>; + phys = <&usbphy 2>; + phy-names = "usb"; + status = "disabled"; + }; + + ehci3: usb at 5311000 { + compatible = "allwinner,sun50i-h616-ehci", + "generic-ehci"; + reg = <0x05311000 0x100>; + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI3>, + <&ccu CLK_BUS_EHCI3>, + <&ccu CLK_USB_OHCI3>; + resets = <&ccu RST_BUS_OHCI3>, + <&ccu RST_BUS_EHCI3>; + phys = <&usbphy 3>; + phy-names = "usb"; + status = "disabled"; + }; + + ohci3: usb at 5311400 { + compatible = "allwinner,sun50i-h616-ohci", + "generic-ohci"; + reg = <0x05311400 0x100>; + interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI3>, + <&ccu CLK_USB_OHCI3>; + resets = <&ccu RST_BUS_OHCI3>; + phys = <&usbphy 3>; + phy-names = "usb"; + status = "disabled"; + }; + + rtc: rtc at 7000000 { + compatible = "allwinner,sun50i-h616-rtc", + "allwinner,sun50i-h6-rtc"; + reg = <0x07000000 0x400>; + interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>; + clock-output-names = "osc32k", "osc32k-out", "iosc"; + #clock-cells = <1>; + }; + + r_ccu: clock at 7010000 { + compatible = "allwinner,sun50i-h616-r-ccu"; + reg = <0x07010000 0x400>; + clocks = <&osc24M>, <&rtc 0>, <&rtc 2>, + <&ccu CLK_PLL_PERIPH0>; + clock-names = "hosc", "losc", "iosc", "pll-periph"; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + r_pio: pinctrl at 7022000 { + compatible = "allwinner,sun50i-h616-r-pinctrl"; + reg = <0x07022000 0x400>; + interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&r_ccu CLK_R_APB1>, <&osc24M>, <&rtc 0>; + clock-names = "apb", "hosc", "losc"; + gpio-controller; + #gpio-cells = <3>; + interrupt-controller; + #interrupt-cells = <3>; + + r_i2c_pins: r-i2c-pins { + pins = "PL0", "PL1"; + function = "s_i2c"; + }; + }; + + ir: ir at 7040000 { + compatible = "allwinner,sun50i-h616-ir", + "allwinner,sun6i-a31-ir"; + reg = <0x07040000 0x400>; + interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&r_ccu CLK_R_APB1_IR>, + <&r_ccu CLK_IR>; + clock-names = "apb", "ir"; + resets = <&r_ccu RST_R_APB1_IR>; + pinctrl-names = "default"; + pinctrl-0 = <&ir_rx_pin>; + status = "disabled"; + }; + + r_i2c: i2c at 7081400 { + compatible = "allwinner,sun50i-h616-i2c", + "allwinner,sun6i-a31-i2c"; + reg = <0x07081400 0x400>; + interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&r_ccu CLK_R_APB2_I2C>; + resets = <&r_ccu RST_R_APB2_I2C>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + }; +};
include/dt-bindings/clock/sun50i-h616-ccu.h new file +115 -0
115 lines not on this page · raw message
include/dt-bindings/reset/sun50i-h616-ccu.h new file +70 -0
70 lines not on this page · raw message
Signature · 1 line
2.30.0
PATCH 15/17 sunxi: gpio: introduce compatible for H616
In reply to Jernej SkrabecH616 pinctrl is no different configuration wise than others, so just add compatible for it.
--- drivers/gpio/sunxi_gpio.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpio/sunxi_gpio.c +1 -0
@@ -356,6 +356,7 @@ static const struct udevice_id sunxi_gpio_ids[] = {ID ("allwinner,sun9i-a80-pinctrl" , a_all),ID ("allwinner,sun50i-a64-pinctrl" , a_all),ID ("allwinner,sun50i-h6-pinctrl" , a_all), +ID ("allwinner,sun50i-h616-pinctrl" , a_all),ID ("allwinner,sun6i-a31-r-pinctrl" , l_2),ID ("allwinner,sun8i-a23-r-pinctrl" , l_1), ID("allwinner,sun8i-a83t-r-pinctrl", l_1),
Signature · 1 line
2.30.0
PATCH 15/17 sunxi: gpio: introduce compatible for H616
Quoted 4 lines · Jernej Skrabec
H616 pinctrl is no different configuration wise than others, so just add compatible for it.
Signed-off-by Jernej Skrabec <[email protected]>
Cheers,
Andre
Quoted 17 lines
--- drivers/gpio/sunxi_gpio.c | 1 + 1 file changed, 1 insertion(+)drivers/gpio/sunxi_gpio.c +1
-0@@ -356,6 +356,7 @@ static const struct udevice_id sunxi_gpio_ids[] = {ID ("allwinner,sun9i-a80-pinctrl" , a_all),ID ("allwinner,sun50i-a64-pinctrl" , a_all),ID ("allwinner,sun50i-h6-pinctrl" , a_all), +ID ("allwinner,sun50i-h616-pinctrl" , a_all),ID ("allwinner,sun6i-a31-r-pinctrl" , l_2),ID ("allwinner,sun8i-a23-r-pinctrl" , l_1), ID("allwinner,sun8i-a83t-r-pinctrl", l_1),
PATCH 16/17 clk: sunxi: Add support for H616 clocks
In reply to Jernej SkrabecThis commit introduces DM H616 clock driver.
--- drivers/clk/sunxi/Kconfig | 7 ++ drivers/clk/sunxi/Makefile | 1 + drivers/clk/sunxi/clk_h616.c | 120 +++++++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+) create mode 100644 drivers/clk/sunxi/clk_h616.c
drivers/clk/sunxi/Kconfig +7 -0
@@ -79,6 +79,13 @@ config CLK_SUN50I_H6 This enables common clock driver support for platforms based on Allwinner H6 SoC. +config CLK_SUN50I_H616 + bool "Clock driver for Allwinner H616" + default MACH_SUN50I_H616 + help + This enables common clock driver support for platforms based + on Allwinner H616 SoC. + config CLK_SUN50I_A64 bool "Clock driver for Allwinner A64" default MACH_SUN50I
drivers/clk/sunxi/Makefile +1 -0
@@ -16,4 +16,5 @@ obj-$(CONFIG_CLK_SUN8I_V3S) += clk_v3s.o obj-$(CONFIG_CLK_SUN9I_A80) += clk_a80.o obj-$(CONFIG_CLK_SUN8I_H3) += clk_h3.o obj-$(CONFIG_CLK_SUN50I_H6) += clk_h6.o +obj-$(CONFIG_CLK_SUN50I_H616) += clk_h616.o obj-$(CONFIG_CLK_SUN50I_A64) += clk_a64.o
drivers/clk/sunxi/clk_h616.c new file +120 -0
120 lines not on this page · raw message
Signature · 1 line
2.30.0
PATCH 16/17 clk: sunxi: Add support for H616 clocks
Quoted 3 lines · Jernej Skrabec
This commit introduces DM H616 clock driver.
Signed-off-by Jernej Skrabec <[email protected]>
Compared against the manual.
Cheers,
Andre
Quoted 162 lines
--- drivers/clk/sunxi/Kconfig | 7 ++ drivers/clk/sunxi/Makefile | 1 + drivers/clk/sunxi/clk_h616.c | 120 +++++++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+) create mode 100644 drivers/clk/sunxi/clk_h616.cdrivers/clk/sunxi/Kconfig +7
-0@@ -79,6 +79,13 @@ config CLK_SUN50I_H6 This enables common clock driver support for platforms based on Allwinner H6 SoC. +config CLK_SUN50I_H616 + bool "Clock driver for Allwinner H616" + default MACH_SUN50I_H616 + help + This enables common clock driver support for platforms based + on Allwinner H616 SoC. + config CLK_SUN50I_A64 bool "Clock driver for Allwinner A64" default MACH_SUN50Idrivers/clk/sunxi/Makefile +1
-0@@ -16,4 +16,5 @@ obj-$(CONFIG_CLK_SUN8I_V3S) += clk_v3s.o obj-$(CONFIG_CLK_SUN9I_A80) += clk_a80.o obj-$(CONFIG_CLK_SUN8I_H3) += clk_h3.o obj-$(CONFIG_CLK_SUN50I_H6) += clk_h6.o +obj-$(CONFIG_CLK_SUN50I_H616) += clk_h616.o obj-$(CONFIG_CLK_SUN50I_A64) += clk_a64.odrivers/clk/sunxi/clk_h616.c new file +120
-0@@ -0,0 +1,120 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* +* Copyright (C) 2021 Jernej Skrabec <[email protected]> +*/ + +#include <common.h> +#include <clk-uclass.h> +#include <dm.h> +#include <errno.h> +#include <asm/arch/ccu.h> +#include <dt-bindings/clock/sun50i-h616-ccu.h> +#include <dt-bindings/reset/sun50i-h616-ccu.h> +#include <linux/bitops.h> + +static struct ccu_clk_gate h616_gates[] = { + [CLK_BUS_MMC0 ] =GATE (0x84c ,BIT (0 )), + [CLK_BUS_MMC1 ] =GATE (0x84c ,BIT (1 )), + [CLK_BUS_MMC2 ] =GATE (0x84c ,BIT (2 )), + + [CLK_BUS_UART0 ] =GATE (0x90c ,BIT (0 )), + [CLK_BUS_UART1 ] =GATE (0x90c ,BIT (1 )), + [CLK_BUS_UART2 ] =GATE (0x90c ,BIT (2 )), + [CLK_BUS_UART3 ] =GATE (0x90c ,BIT (3 )), + [CLK_BUS_UART4 ] =GATE (0x90c ,BIT (4 )), + [CLK_BUS_UART5 ] =GATE (0x90c ,BIT (5 )), + + [CLK_SPI0 ] =GATE (0x940 ,BIT (31 )), + [CLK_SPI1 ] =GATE (0x944 ,BIT (31 )), + + [CLK_BUS_SPI0 ] =GATE (0x96c ,BIT (0 )), + [CLK_BUS_SPI1 ] =GATE (0x96c ,BIT (1 )), + + [CLK_BUS_EMAC0 ] =GATE (0x97c ,BIT (0 )), + [CLK_BUS_EMAC1 ] =GATE (0x97c ,BIT (1 )), + + [CLK_USB_PHY0 ] =GATE (0xa70 ,BIT (29 )), + [CLK_USB_OHCI0 ] =GATE (0xa70 ,BIT (31 )), + + [CLK_USB_PHY1 ] =GATE (0xa74 ,BIT (29 )), + [CLK_USB_OHCI1 ] =GATE (0xa74 ,BIT (31 )), + + [CLK_USB_PHY2 ] =GATE (0xa78 ,BIT (29 )), + [CLK_USB_OHCI2 ] =GATE (0xa78 ,BIT (31 )), + + [CLK_USB_PHY3 ] =GATE (0xa7c ,BIT (29 )), + [CLK_USB_OHCI3 ] =GATE (0xa7c ,BIT (31 )), + + [CLK_BUS_OHCI0 ] =GATE (0xa8c ,BIT (0 )), + [CLK_BUS_OHCI1 ] =GATE (0xa8c ,BIT (1 )), + [CLK_BUS_OHCI2 ] =GATE (0xa8c ,BIT (2 )), + [CLK_BUS_OHCI3 ] =GATE (0xa8c ,BIT (3 )), + [CLK_BUS_EHCI0 ] =GATE (0xa8c ,BIT (4 )), + [CLK_BUS_EHCI1 ] =GATE (0xa8c ,BIT (5 )), + [CLK_BUS_EHCI2 ] =GATE (0xa8c ,BIT (6 )), + [CLK_BUS_EHCI3 ] =GATE (0xa8c ,BIT (7 )), + [CLK_BUS_OTG ] =GATE (0xa8c ,BIT (8 )), +}; + +static struct ccu_reset h616_resets[] = { + [RST_BUS_MMC0 ] =RESET (0x84c ,BIT (16 )), + [RST_BUS_MMC1 ] =RESET (0x84c ,BIT (17 )), + [RST_BUS_MMC2 ] =RESET (0x84c ,BIT (18 )), + + [RST_BUS_UART0 ] =RESET (0x90c ,BIT (16 )), + [RST_BUS_UART1 ] =RESET (0x90c ,BIT (17 )), + [RST_BUS_UART2 ] =RESET (0x90c ,BIT (18 )), + [RST_BUS_UART3 ] =RESET (0x90c ,BIT (19 )), + [RST_BUS_UART4 ] =RESET (0x90c ,BIT (20 )), + [RST_BUS_UART5 ] =RESET (0x90c ,BIT (21 )), + + [RST_BUS_SPI0 ] =RESET (0x96c ,BIT (16 )), + [RST_BUS_SPI1 ] =RESET (0x96c ,BIT (17 )), + + [RST_BUS_EMAC0 ] =RESET (0x97c ,BIT (16 )), + [RST_BUS_EMAC1 ] =RESET (0x97c ,BIT (17 )), + + [RST_USB_PHY0 ] =RESET (0xa70 ,BIT (30 )), + + [RST_USB_PHY1 ] =RESET (0xa74 ,BIT (30 )), + + [RST_USB_PHY2 ] =RESET (0xa78 ,BIT (30 )), + + [RST_USB_PHY3 ] =RESET (0xa7c ,BIT (30 )), + + [RST_BUS_OHCI0 ] =RESET (0xa8c ,BIT (16 )), + [RST_BUS_OHCI1 ] =RESET (0xa8c ,BIT (17 )), + [RST_BUS_OHCI2 ] =RESET (0xa8c ,BIT (18 )), + [RST_BUS_OHCI3 ] =RESET (0xa8c ,BIT (19 )), + [RST_BUS_EHCI0 ] =RESET (0xa8c ,BIT (20 )), + [RST_BUS_EHCI1 ] =RESET (0xa8c ,BIT (21 )), + [RST_BUS_EHCI2 ] =RESET (0xa8c ,BIT (22 )), + [RST_BUS_EHCI3 ] =RESET (0xa8c ,BIT (23 )), + [RST_BUS_OTG ] =RESET (0xa8c ,BIT (24 )), +}; + +static const struct ccu_desc h616_ccu_desc = { + .gates = h616_gates, + .resets = h616_resets, +}; + +static int h616_clk_bind (struct udevice *dev) +{ +return sunxi_reset_bind (dev,ARRAY_SIZE (h616_resets)); +} + +static const struct udevice_id h616_ccu_ids[] = { + { .compatible ="allwinner,sun50i-h616-ccu" , + .data = (ulong)&h616_ccu_desc }, + { } +}; + +U_BOOT_DRIVER (clk_sun50i_h616) = { + .name ="sun50i_h616_ccu" , + .id =UCLASS_CLK , + .of_match = h616_ccu_ids, + .priv_auto_alloc_size =sizeof (struct ccu_priv ), + .ops = &sunxi_clk_ops, + .probe = sunxi_clk_probe, + .bind = h616_clk_bind, +};
PATCH 17/17 sunxi: Add support for OrangePi Zero2
In reply to Jernej SkrabecOrangePi Zero2 is SBC based on Allwinner H616 with 1 GiB of RAM, SD card support, gigabit ethernet, micro HDMI, WIFI, Bluetooth and 1 USB 2.0 port. It also has two GPIO headers which allows further peripherals to be used.
Device Tree file is taken from initial OrangePi Zero2 Linux submission and it's not yet merged.
--- arch/arm/dts/Makefile | 2 + arch/arm/dts/sun50i-h616-orangepi-zero2.dts | 240 ++++++++++++++++++++ board/sunxi/MAINTAINERS | 5 + configs/orangepi_zero2_defconfig | 15 ++ 4 files changed, 262 insertions(+) create mode 100644 arch/arm/dts/sun50i-h616-orangepi-zero2.dts create mode 100644 configs/orangepi_zero2_defconfig
arch/arm/dts/Makefile +2 -0
@@ -608,6 +608,8 @@ dtb-$(CONFIG_MACH_SUN50I_H6) += \ sun50i-h6-orangepi-lite2.dtb \ sun50i-h6-orangepi-one-plus.dtb \ sun50i-h6-pine-h64.dtb +dtb-$(CONFIG_MACH_SUN50I_H616) += \ + sun50i-h616-orangepi-zero2.dtb dtb-$(CONFIG_MACH_SUN50I) += \ sun50i-a64-amarula-relic.dtb \ sun50i-a64-bananapi-m64.dtb \
arch/arm/dts/sun50i-h616-orangepi-zero2.dts new file +240 -0
240 lines not on this page · raw message
board/sunxi/MAINTAINERS +5 -0
@@ -420,6 +420,11 @@ M: Diego Rondini <[email protected]> S: Maintained F: configs/orangepi_zero_plus2_h3_defconfig +ORANGEPI ZERO 2 BOARD +M: Jernej Skrabec <[email protected]> +S: Maintained +F: configs/orangepi_zero2_defconfig + ORANGEPI PC 2 BOARD M: Andre Przywara <[email protected]> S: Maintained
configs/orangepi_zero2_defconfig new file +15 -0
@@ -0,0 +1,15 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_SPL=y +CONFIG_DRAM_SUN50I_H616_WRITE_LEVELING=y +CONFIG_DRAM_SUN50I_H616_READ_CALIBRATION=y +CONFIG_DRAM_SUN50I_H616_READ_TRAINING=y +CONFIG_DRAM_SUN50I_H616_WRITE_TRAINING=y +CONFIG_MACH_SUN50I_H616=y +CONFIG_MMC0_CD_PIN="PF6" +CONFIG_R_I2C_ENABLE=y +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h616-orangepi-zero2" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL_I2C_SUPPORT=y +CONFIG_PHY_REALTEK=y +CONFIG_SUN8I_EMAC=y
Signature · 1 line
2.30.0