sunxi: Allwinner T113s support
Subsystems (15)
cover sunxi: Allwinner T113s support
Hi,
this is finally the series adding support for the new SoC series that covers the Allwinner D1 siblings R528 and T113s. They all share the same die, although the D1 and D1s use RISC-V cores, which requires more plumbing, to use the sunxi code across two architectures. Getting the R528 support in should help a bit in sorting out what's new peripheral code and what is architecture dependent. IIUC, Samuel has that running, although with some hacks, the number of which this series tries to reduce.
The most interesting part of this is the pincontroller rework, this tackles two issues:
- For the first time in the history of mainline Allwinner support the pincontroller changed the register layout. The code here tries to abstract the differences away, so both variants can share the code peacefully.
- For the above mentioned reason, the pincontroller code is quite old, and is mostly spread out across arch/arm, in a pre-DM style, even though we have real DM support in U-Boot proper. We need the non-DM version for the (ARM-only?) legacy SPL, so can't get rid of that completely. This series also tries to modernise that code, and moves it into board/sunxi/, where it can be more easily shared with RISC-V.
The main feature is then of course the T113s support, of which the new pinctroller is only one part. Apart from the new pincontroller and the usual new SoC bits (like clock and pinmux support), this includes the DRAM controller code.
With the basics in, we add support for the MangoPi MQ-R board, which uses the T113s and seems to be a popular board. This should also serve as a blueprint for supporting similar boards. The DTs are copied from the kernel (as usual).
There are some bits missing, prominently PSCI support. There are good patches out there, I just didn't manage to test and review them yet, but hopefully they can follow directly in the wake of this series.
This series is based on top of current sunxi/master, which covers the first part of the 2023.10 pull request.
Compared to the RFC post from December(!), there were numerous changes, inspired by comments from the community reviewers, many thanks to all of them!
A branch is available at:
https://source.denx.de/u-boot/custodians/u-boot-sunxi.git t113s
Please have a look, review and test.
Cheers,
Andre
Andre Przywara (18):
net: sunxi_emac: chase DT nodes to find PHY regulator
sunxi: remove CONFIG_MACPWR
pinctrl: sunxi: add GPIO in/out wrappers
pinctrl: sunxi: remove struct sunxi_gpio
pinctrl: sunxi: move pinctrl code and remove GPIO_EXTRA_HEADER
pinctrl: sunxi: move PIO_BASE into sunxi_gpio.h
pinctrl: sunxi: add new D1 pinctrl support
sunxi: introduce NCAT2 generation model
pinctrl: sunxi: add Allwinner D1 pinctrl description
sunxi: clock: D1/R528: Enable PLL LDO during PLL1 setup
sunxi: clock: support D1/R528 PLL6 clock
sunxi: clock: h6: prepare for PRCM less SoCs
Kconfig: sunxi: prepare for using drivers/ram/sunxi
sunxi: add R528/T113-s3/D1(s) DRAM initialisation code
sunxi: add Allwinner R528/T113 SoC support
sunxi: refactor serial base addresses to avoid asm/arch/cpu.h
ARM: dts: sunxi: add Allwinner T113-s SoC .dtsi
sunxi: add MangoPi MQ-R board support
Samuel Holland (2):
clk: sunxi: Add support for the D1 CCU
riscv: dts: allwinner: Add the D1/D1s SoC devicetree
arch/arm/Kconfig | 1 - arch/arm/cpu/armv7/sunxi/sram.c | 1 + arch/arm/cpu/armv8/fel_utils.S | 1 + arch/arm/dts/Makefile | 2 + .../arm/dts/sun8i-t113s-mangopi-mq-r-t113.dts | 35 + arch/arm/dts/sun8i-t113s.dtsi | 59 + arch/arm/dts/sunxi-d1s-t113-mangopi-mq-r.dtsi | 126 ++ arch/arm/dts/sunxi-u-boot.dtsi | 7 + arch/arm/include/asm/arch-sunxi/boot0.h | 2 + arch/arm/include/asm/arch-sunxi/clock.h | 3 +- .../include/asm/arch-sunxi/clock_sun50i_h6.h | 12 +- arch/arm/include/asm/arch-sunxi/cpu.h | 2 + arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 17 - .../include/asm/arch-sunxi/cpu_sun50i_h6.h | 7 - arch/arm/include/asm/arch-sunxi/cpu_sun9i.h | 9 - .../include/asm/arch-sunxi/cpu_sunxi_ncat2.h | 39 + arch/arm/include/asm/arch-sunxi/mmc.h | 2 +- arch/arm/include/asm/arch-sunxi/prcm.h | 2 +- arch/arm/include/asm/arch-sunxi/serial.h | 32 + arch/arm/include/asm/arch-sunxi/timer.h | 2 +- arch/arm/mach-sunxi/Kconfig | 36 +- arch/arm/mach-sunxi/Makefile | 2 +- arch/arm/mach-sunxi/board.c | 31 +- arch/arm/mach-sunxi/clock_sun50i_h6.c | 60 +- arch/arm/mach-sunxi/cpu_info.c | 2 + arch/arm/mach-sunxi/dram_suniv.c | 2 +- arch/arm/mach-sunxi/gtbus_sun9i.c | 1 + arch/arm/mach-sunxi/pinmux.c | 78 - arch/arm/mach-sunxi/spl_spi_sunxi.c | 1 + arch/arm/mach-sunxi/timer.c | 1 + arch/riscv/dts/sun20i-common-regulators.dtsi | 28 + arch/riscv/dts/sun20i-d1.dtsi | 66 + arch/riscv/dts/sun20i-d1s.dtsi | 76 + arch/riscv/dts/sunxi-d1-t113.dtsi | 15 + arch/riscv/dts/sunxi-d1s-t113.dtsi | 846 ++++++++++ board/sunxi/Makefile | 1 + board/sunxi/board.c | 13 +- board/sunxi/chip.c | 2 +- board/sunxi/pinctrl.c | 115 ++ common/spl/Kconfig | 3 +- configs/Bananapi_M2_Ultra_defconfig | 1 - configs/Bananapi_defconfig | 1 - configs/Bananapro_defconfig | 1 - configs/Lamobo_R1_defconfig | 1 - configs/Mele_A1000_defconfig | 1 - configs/Orangepi_defconfig | 1 - configs/Orangepi_mini_defconfig | 1 - configs/bananapi_m1_plus_defconfig | 1 - configs/bananapi_m2_plus_h3_defconfig | 1 - configs/bananapi_m2_plus_h5_defconfig | 1 - configs/i12-tvbox_defconfig | 1 - configs/jesurun_q5_defconfig | 1 - configs/mangopi_mq_r_defconfig | 15 + configs/mixtile_loftq_defconfig | 1 - configs/nanopi_m1_plus_defconfig | 1 - configs/nanopi_neo_plus2_defconfig | 1 - configs/nanopi_r1s_h5_defconfig | 1 - configs/orangepi_pc2_defconfig | 1 - configs/orangepi_plus2e_defconfig | 1 - configs/orangepi_plus_defconfig | 1 - configs/orangepi_win_defconfig | 1 - configs/pine_h64_defconfig | 1 - configs/zeropi_defconfig | 1 - drivers/Makefile | 1 + drivers/clk/sunxi/Kconfig | 7 + drivers/clk/sunxi/Makefile | 1 + drivers/clk/sunxi/clk_d1.c | 84 + drivers/clk/sunxi/clk_sunxi.c | 5 + drivers/gpio/axp_gpio.c | 1 + drivers/gpio/sunxi_gpio.c | 50 +- drivers/i2c/mvtwsi.c | 3 +- drivers/i2c/sun6i_p2wi.c | 2 +- drivers/i2c/sun8i_rsb.c | 2 +- drivers/mmc/sunxi_mmc.c | 12 +- drivers/net/sun8i_emac.c | 9 +- drivers/net/sunxi_emac.c | 39 + drivers/pinctrl/sunxi/Kconfig | 5 + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 43 +- drivers/ram/Kconfig | 3 +- drivers/ram/Makefile | 3 + drivers/ram/sunxi/Kconfig | 72 + drivers/ram/sunxi/Makefile | 4 + drivers/ram/sunxi/dram_sun20i_d1.c | 1432 +++++++++++++++++ drivers/ram/sunxi/dram_sun20i_d1.h | 73 + drivers/video/hitachi_tx18d42vm_lcd.c | 1 + drivers/video/ssd2828.c | 1 - drivers/video/sunxi/sunxi_display.c | 1 + drivers/video/sunxi/sunxi_lcd.c | 1 + include/configs/sunxi-common.h | 2 +- include/dt-bindings/clock/sun20i-d1-ccu.h | 158 ++ include/dt-bindings/clock/sun20i-d1-r-ccu.h | 19 + include/dt-bindings/reset/sun20i-d1-ccu.h | 79 + include/dt-bindings/reset/sun20i-d1-r-ccu.h | 16 + .../arch-sunxi/gpio.h => include/sunxi_gpio.h | 104 +- 94 files changed, 3723 insertions(+), 287 deletions(-) create mode 100644 arch/arm/dts/sun8i-t113s-mangopi-mq-r-t113.dts create mode 100644 arch/arm/dts/sun8i-t113s.dtsi create mode 100644 arch/arm/dts/sunxi-d1s-t113-mangopi-mq-r.dtsi create mode 100644 arch/arm/include/asm/arch-sunxi/cpu_sunxi_ncat2.h create mode 100644 arch/arm/include/asm/arch-sunxi/serial.h delete mode 100644 arch/arm/mach-sunxi/pinmux.c create mode 100644 arch/riscv/dts/sun20i-common-regulators.dtsi create mode 100644 arch/riscv/dts/sun20i-d1.dtsi create mode 100644 arch/riscv/dts/sun20i-d1s.dtsi create mode 100644 arch/riscv/dts/sunxi-d1-t113.dtsi create mode 100644 arch/riscv/dts/sunxi-d1s-t113.dtsi create mode 100644 board/sunxi/pinctrl.c create mode 100644 configs/mangopi_mq_r_defconfig create mode 100644 drivers/clk/sunxi/clk_d1.c create mode 100644 drivers/ram/sunxi/Kconfig create mode 100644 drivers/ram/sunxi/Makefile create mode 100644 drivers/ram/sunxi/dram_sun20i_d1.c create mode 100644 drivers/ram/sunxi/dram_sun20i_d1.h create mode 100644 include/dt-bindings/clock/sun20i-d1-ccu.h create mode 100644 include/dt-bindings/clock/sun20i-d1-r-ccu.h create mode 100644 include/dt-bindings/reset/sun20i-d1-ccu.h create mode 100644 include/dt-bindings/reset/sun20i-d1-r-ccu.h rename arch/arm/include/asm/arch-sunxi/gpio.h => include/sunxi_gpio.h (73%)
Signature · 1 line
2.35.8
PATCH 1/20 net: sunxi_emac: chase DT nodes to find PHY regulator
At the moment the sun4i EMAC driver relies on hardcoded CONFIG_MACPWR Kconfig symbols to enable potential PHY regulators. As we want to get rid of those, we need to find the regulator by chasing up the DT.
The sun4i-emac binding puts the PHY regulator into the MDIO node, which is the parent of the PHY device. U-Boot does not have (and does not need) an MDIO driver, so we need to chase down the regulator through the EMAC node: we follow the "phy-handle" property to find the PHY node, then go up to its parent, where we find the "phy-supply" link to the regulator. Let U-Boot find the associated regulator device, and put that into the private device struct, so we can find and enable the regulator at probe time, later.
--- drivers/net/sunxi_emac.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
drivers/net/sunxi_emac.c +39 -0
@@ -17,6 +17,7 @@#include <net.h> #include <asm/io.h> #include <asm/arch/clock.h> +#include <power/regulator.h> /* EMAC register */ struct emac_regs {
@@ -165,6 +166,7 @@ struct emac_eth_dev {struct phy_device *phydev;int link_printed;uchar rx_buf[EMAC_RX_BUFSIZE ]; +struct udevice *phy_reg; };struct emac_rxhdr {
@@ -572,6 +574,9 @@ static int sunxi_emac_eth_probe(struct udevice *dev)if (ret)return ret; +if (priv->phy_reg) +regulator_set_enable (priv->phy_reg, true); +return sunxi_emac_init_phy (priv, dev); }
@@ -585,9 +590,43 @@ static const struct eth_ops sunxi_emac_eth_ops = {static int sunxi_emac_eth_of_to_plat (struct udevice *dev) {struct eth_pdata *pdata =dev_get_plat (dev); +struct emac_eth_dev *priv =dev_get_priv (dev); +struct ofnode_phandle_args args; +ofnode mdio_node; +int ret; pdata->iobase =dev_read_addr (dev); +/* The PHY regulator is in the MDIO node, not the EMAC or PHY node. */ + ret =dev_read_phandle_with_args (dev,"phy-handle" ,NULL ,0 ,0 , &args); +if (ret) { +dev_err (dev,"failed to get PHY node\n" ); +return ret; + } + +/* +* U-Boot does not have (and does not need) a device driver for the +* MDIO device, so just "pass through" that DT node to get to the +* regulator phandle. +* The PHY regulator is optional, though: ignore if we cannot find +* a phy-supply property. +*/ + mdio_node =ofnode_get_parent (args.node); + ret=ofnode_parse_phandle_with_args (mdio_node,"phy-supply" ,NULL ,0 ,0 , + &args); +if (ret && ret != -ENOENT ) { +dev_err (dev,"failed to get PHY supply node\n" ); +return ret; + } +if (!ret) { + ret =uclass_get_device_by_ofnode (UCLASS_REGULATOR , args.node, + &priv->phy_reg); +if (ret) { +dev_err (dev,"failed to get PHY regulator node\n" ); +return ret; + } + } +return 0 ; }
Signature · 1 line
2.35.8
Re: [PATCH 01/20] net: sunxi_emac: chase DT nodes to find PHY regulator
Hi Andre,
Looks good to me! My target doesn't have PHY on a regulator, so no test result for this one.
Quoted 13 lines · Andre Przywara
At the moment the sun4i EMAC driver relies on hardcoded
CONFIG_MACPWRKconfigsymbols to enable potential PHY regulators. As we want to get rid of those, we need to find the regulator by chasing up the DT.The sun4i-emac binding puts the PHY regulator into the MDIO node, which is the parent of the PHY device. U-Boot does not have (and does not need) an MDIO driver, so we need to chase down the regulator through the EMAC node: we follow the "phy-handle" property to find the PHY node, then go up to its parent, where we find the "phy-supply" link to the regulator. Let U-Boot find the associated regulator device, and put that into the private device struct, so we can find and enable the regulator at probe time, later.
Quoted 1 line
Signed-off-by Andre Przywara <[email protected]>
Thanks,
Sam
PATCH 2/20 sunxi: remove CONFIG_MACPWR
In reply to Andre PrzywaraThe CONFIG_MACPWR Kconfig symbol is used to point to a GPIO that enables the power for the Ethernet "MAC" (mostly PHY, really).
In the DT this is described with the phy-supply property in the MAC DT node, pointing to a (GPIO controlled) regulator. Since we need Ethernet only in U-Boot proper, and use a DM driver there, we should use the DT instead of hardcoding this.
Add code to the sun8i_emac and sunxi_emac drivers to check the DT for that regulator and enable it, at probe time. Then drop the current code from board.c, which was doing that job before.
This allows us to remove the MACPWR Kconfig definition and the respective values from the defconfigs.
--- arch/arm/mach-sunxi/Kconfig | 7 ------- board/sunxi/board.c | 12 +----------- configs/Bananapi_M2_Ultra_defconfig | 1 - configs/Bananapi_defconfig | 1 - configs/Bananapro_defconfig | 1 - configs/Lamobo_R1_defconfig | 1 - configs/Mele_A1000_defconfig | 1 - configs/Orangepi_defconfig | 1 - configs/Orangepi_mini_defconfig | 1 - configs/bananapi_m1_plus_defconfig | 1 - configs/bananapi_m2_plus_h3_defconfig | 1 - configs/bananapi_m2_plus_h5_defconfig | 1 - configs/i12-tvbox_defconfig | 1 - configs/jesurun_q5_defconfig | 1 - configs/mixtile_loftq_defconfig | 1 - configs/nanopi_m1_plus_defconfig | 1 - configs/nanopi_neo_plus2_defconfig | 1 - configs/nanopi_r1s_h5_defconfig | 1 - configs/orangepi_pc2_defconfig | 1 - configs/orangepi_plus2e_defconfig | 1 - configs/orangepi_plus_defconfig | 1 - configs/orangepi_win_defconfig | 1 - configs/pine_h64_defconfig | 1 - configs/zeropi_defconfig | 1 - drivers/net/sun8i_emac.c | 9 +++++++-- 25 files changed, 8 insertions(+), 42 deletions(-)
arch/arm/mach-sunxi/Kconfig +0 -7
@@ -695,13 +695,6 @@ config OLD_SUNXI_KERNEL_COMPAT Set this to enable various workarounds for old kernels, this results in sub-optimal settings for newer kernels, only enable if needed. -config MACPWR - string "MAC power pin" - default "" - help - Set the pin used to power the MAC. This takes a string in the format - understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H. - config MMC1_PINS_PH bool "Pins for mmc1 are on Port H" depends on MACH_SUN4I || MACH_SUN7I || MACH_SUN8I_R40
board/sunxi/board.c +1 -11
@@ -187,7 +187,7 @@ enum env_location env_get_location(enum env_operation op, int prio)/* add board specific code here */ int board_init (void ) { -__maybe_unused int id_pfr1, ret, macpwr_pin; +__maybe_unused int id_pfr1, ret; gd->bd->bi_boot_params = (PHYS_SDRAM_0 +0x100 );
@@ -224,15 +224,6 @@ int board_init(void)if (ret)return ret; -/* strcmp() would look better, but doesn't get optimised away. */ -if (CONFIG_MACPWR [0 ]) { - macpwr_pin =sunxi_name_to_gpio (CONFIG_MACPWR ); -if (macpwr_pin >=0 ) { -gpio_request (macpwr_pin,"macpwr" ); -gpio_direction_output (macpwr_pin,1 ); - } - } -#if CONFIG_IS_ENABLED (DM_I2C )/* * Temporary workaround for enabling I2C clocks until proper sunxi DM
@@ -240,7 +231,6 @@ int board_init(void)*/ i2c_init_board ();#endif -eth_init_board ();return 0 ;
configs/Bananapi_M2_Ultra_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-r40-bananapi-m2-ultra" CONFIG_SPL=y CONFIG_MACH_SUN8I_R40=y CONFIG_DRAM_CLK=576 -CONFIG_MACPWR="PA17" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB1_VBUS_PIN="PH23" CONFIG_USB2_VBUS_PIN="PH23"
configs/Bananapi_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=432 -CONFIG_MACPWR="PH23" CONFIG_VIDEO_COMPOSITE=y CONFIG_GMAC_TX_DELAY=3 CONFIG_AHCI=y
configs/Bananapro_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapro" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=432 -CONFIG_MACPWR="PH23" CONFIG_USB1_VBUS_PIN="PH0" CONFIG_USB2_VBUS_PIN="PH1" CONFIG_VIDEO_COMPOSITE=y
configs/Lamobo_R1_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=432 -CONFIG_MACPWR="PH23" CONFIG_GMAC_TX_DELAY=4 CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/Mele_A1000_defconfig +0 -1
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000" CONFIG_SPL=y CONFIG_MACH_SUN4I=y -CONFIG_MACPWR="PH15" CONFIG_VIDEO_VGA=y CONFIG_VIDEO_COMPOSITE=y CONFIG_AHCI=y
configs/Orangepi_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=432 -CONFIG_MACPWR="PH23" CONFIG_USB1_VBUS_PIN="PH26" CONFIG_USB2_VBUS_PIN="PH22" CONFIG_VIDEO_VGA=y
configs/Orangepi_mini_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi-mini" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=432 -CONFIG_MACPWR="PH23" CONFIG_MMC_SUNXI_SLOT_EXTRA=3 CONFIG_USB1_VBUS_PIN="PH26" CONFIG_USB2_VBUS_PIN="PH22"
configs/bananapi_m1_plus_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi-m1-plus" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=432 -CONFIG_MACPWR="PH23" CONFIG_VIDEO_COMPOSITE=y CONFIG_GMAC_TX_DELAY=3 CONFIG_AHCI=y
configs/bananapi_m2_plus_h3_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-bananapi-m2-plus" CONFIG_SPL=y CONFIG_MACH_SUN8I_H3=y CONFIG_DRAM_CLK=672 -CONFIG_MACPWR="PD6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SUN8I_EMAC=y
configs/bananapi_m2_plus_h5_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-bananapi-m2-plus" CONFIG_SPL=y CONFIG_MACH_SUN50I_H5=y CONFIG_DRAM_CLK=672 -CONFIG_MACPWR="PD6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SUN8I_EMAC=y
configs/i12-tvbox_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-i12-tvbox" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 -CONFIG_MACPWR="PH21" CONFIG_VIDEO_COMPOSITE=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y
configs/jesurun_q5_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-jesurun-q5" CONFIG_SPL=y CONFIG_MACH_SUN4I=y CONFIG_DRAM_CLK=312 -CONFIG_MACPWR="PH19" CONFIG_USB0_VBUS_PIN="PB9" CONFIG_VIDEO_COMPOSITE=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/mixtile_loftq_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mixtile-loftq" CONFIG_SPL=y CONFIG_MACH_SUN6I=y CONFIG_DRAM_ZQ=251 -CONFIG_MACPWR="PA21" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB1_VBUS_PIN="PH24" CONFIG_USB2_VBUS_PIN=""
configs/nanopi_m1_plus_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-m1-plus" CONFIG_SPL=y CONFIG_MACH_SUN8I_H3=y CONFIG_DRAM_CLK=408 -CONFIG_MACPWR="PD6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SUN8I_EMAC=y
configs/nanopi_neo_plus2_defconfig +0 -1
@@ -6,7 +6,6 @@ CONFIG_MACH_SUN50I_H5=y CONFIG_DRAM_CLK=408 CONFIG_DRAM_ZQ=3881977 # CONFIG_DRAM_ODT_EN is not set -CONFIG_MACPWR="PD6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SUN8I_EMAC=y
configs/nanopi_r1s_h5_defconfig +0 -1
@@ -6,7 +6,6 @@ CONFIG_MACH_SUN50I_H5=y CONFIG_DRAM_CLK=672 CONFIG_DRAM_ZQ=3881977 # CONFIG_DRAM_ODT_EN is not set -CONFIG_MACPWR="PD6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SUN8I_EMAC=y
configs/orangepi_pc2_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN50I_H5=y CONFIG_DRAM_CLK=672 CONFIG_DRAM_ZQ=3881977 -CONFIG_MACPWR="PD6" CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y
configs/orangepi_plus2e_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-plus2e" CONFIG_SPL=y CONFIG_MACH_SUN8I_H3=y CONFIG_DRAM_CLK=672 -CONFIG_MACPWR="PD6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y
configs/orangepi_plus_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-plus" CONFIG_SPL=y CONFIG_MACH_SUN8I_H3=y CONFIG_DRAM_CLK=672 -CONFIG_MACPWR="PD6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB1_VBUS_PIN="PG13" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/orangepi_win_defconfig +0 -1
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-orangepi-win" CONFIG_SPL=y CONFIG_MACH_SUN50I=y -CONFIG_MACPWR="PD14" CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPI_FLASH_WINBOND=y
configs/pine_h64_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-pine-h64" CONFIG_SPL=y CONFIG_MACH_SUN50I_H6=y CONFIG_SUNXI_DRAM_H6_LPDDR3=y -CONFIG_MACPWR="PC16" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB3_VBUS_PIN="PL5" CONFIG_SPL_SPI_SUNXI=y
configs/zeropi_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-zeropi" CONFIG_SPL=y CONFIG_MACH_SUN8I_H3=y CONFIG_DRAM_CLK=408 -CONFIG_MACPWR="PD6" # CONFIG_VIDEO_DE2 is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_CONSOLE_MUX=y
drivers/net/sun8i_emac.c +7 -2
@@ -29,6 +29,7 @@#include <net.h> #include <reset.h> #include <wait_bit.h> +#include <power/regulator.h> #define MDIO_CMD_MII_BUSY BIT(0)#define MDIO_CMD_MII_WRITE BIT(1)
@@ -167,9 +168,8 @@ struct emac_eth_dev {struct clk ephy_clk;struct reset_ctl tx_rst;struct reset_ctl ephy_rst; -#if CONFIG_IS_ENABLED (DM_GPIO )struct gpio_desc reset_gpio; -#endif +struct udevice *phy_reg; };
@@ -720,6 +720,9 @@ static int sun8i_emac_eth_probe(struct udevice *dev)sun8i_emac_set_syscon (sun8i_pdata, priv); +if (priv->phy_reg) +regulator_set_enable (priv->phy_reg, true); +sun8i_mdio_init (dev->name, dev); priv->bus =miiphy_get_dev_by_name (dev->name);
@@ -829,6 +832,8 @@ static int sun8i_emac_eth_of_to_plat(struct udevice *dev) priv->sysctl_reg = (void *)syscon_base + priv->variant->syscon_offset; +device_get_supply_regulator (dev,"phy-supply" , &priv->phy_reg); + pdata->phy_interface =-1 ; priv->phyaddr =-1 ; priv->use_internal_phy = false;
Signature · 1 line
2.35.8
Re: [PATCH 02/20] sunxi: remove CONFIG_MACPWR
Hi Andre,
Series looks good so far! I'm trying to move my testing build over to it now; I will report back when I've been running on it for a little bit.
Quoted 15 lines · Andre Przywara
board/sunxi/board.c +1
-1@@ -187,7 +187,7 @@ enum env_location env_get_location(enum env_operation op, int prio)/* add board specific code here */ int board_init (void ) { -__maybe_unused int id_pfr1, ret, macpwr_pin; +__maybe_unused int id_pfr1, ret; gd->bd->bi_boot_params = (PHYS_SDRAM_0 +0x100 );@@ -224,15 +224,6 @@ int board_init(void)if (ret)
board/sunxi/board.c int board_init(void) · line 234
Quoted 10 lines
board/sunxi/board.c +0
-8return ret; -/* strcmp() would look better, but doesn't get optimised away. */ -if (CONFIG_MACPWR [0 ]) { - macpwr_pin =sunxi_name_to_gpio (CONFIG_MACPWR ); -if (macpwr_pin >=0 ) { -gpio_request (macpwr_pin,"macpwr" ); -gpio_direction_output (macpwr_pin,1 ); - } - }
This version of your series does not include the CONFIG_SATAPWR removal (is that intentional or did you miss it?) so these hunks do not apply against master. I was able to cherry-pick the rc series version of the CONFIG_SATAPWR removal and everything applied fine. Just thought you should know!
Cheers,
Sam
Re: [PATCH 02/20] sunxi: remove CONFIG_MACPWR
Hi Sam,
Quoted 3 lines · Sam Edwards
Hi Andre,
Series looks good so far! I'm trying to move my testing build over to it now; I will report back when I've been running on it for a little bit.
Cool, thanks!
Quoted 19 lines · Andre Przywara
Quoted 17 lines
board/sunxi/board.c +1
-3@@ -187,7 +187,7 @@ enum env_location env_get_location(enum env_operation op, int prio) /* add board specific code here */ int board_init(void) { - __maybe_unused int id_pfr1, ret, macpwr_pin; + __maybe_unused int id_pfr1, ret; gd->bd->bi_boot_params = (PHYS_SDRAM_0 + 0x100);@@ -224,15 +224,6 @@ int board_init(void) if (ret) return ret; - /* strcmp() would look better, but doesn't get optimised away. */ - if (CONFIG_MACPWR[0]) {
Quoted 8 lines
board/sunxi/board.c int board_init(void) · line 234
Quoted 6 lines
board/sunxi/board.c +0
-6- macpwr_pin = sunxi_name_to_gpio(CONFIG_MACPWR); - if (macpwr_pin >= 0) { - gpio_request(macpwr_pin, "macpwr"); - gpio_direction_output(macpwr_pin, 1); - } - }This version of your series does not include the
CONFIG_SATAPWRremoval (is that intentional or did you miss it?) so these hunks do not apply against master. I was able to cherry-pick the rc series version of theCONFIG_SATAPWRremoval and everything applied fine. Just thought you should know!
Ah, thanks for the heads up! It's actually the first patch, but I apparently had an off-by-one on the git format-patch command line. The gitlab repo has the patch:
https://source.denx.de/u-boot/custodians/u-boot-sunxi/-/commits/t113s/
I will send it separately later today.
Cheers,
Andre
Re: [PATCH 02/20] sunxi: remove CONFIG_MACPWR
In reply to Andre PrzywaraHi Andre,
Ditto my response to the previous patch.
Quoted 7 lines · Andre Przywara
The
CONFIG_MACPWRKconfigsymbol is used to point to a GPIO that enables the power for the Ethernet "MAC" (mostly PHY, really).
In the DT this is described with the phy-supply property in the MAC DT node, pointing to a (GPIO controlled) regulator. Since we need Ethernet only in U-Boot proper, and use a DM driver there, we should use the DT instead of hardcoding this.
Quoted 7 lines
Add code to the
sun8i_emacandsunxi_emacdrivers to check the DT for that regulator and enable it, at probe time. Then drop the current code fromboard.c, which was doing that job before.
This allows us to remove the MACPWRKconfigdefinition and the respective values from the defconfigs.Signed-off-by Andre Przywara <[email protected]>
Thanks,
Sam
PATCH 3/20 pinctrl: sunxi: add GPIO in/out wrappers
In reply to Andre PrzywaraSo far we were open-coding the pincontroller's GPIO output/input access in each function using that.
Provide functions that wrap that nicely, and follow the existing pattern (set/get_{bank,}), so users don't need to know about the internals, and we can abstract the new D1 pinctrl more easily.
--- arch/arm/include/asm/arch-sunxi/gpio.h | 4 +++ arch/arm/mach-sunxi/pinmux.c | 28 +++++++++++++++ drivers/gpio/sunxi_gpio.c | 49 +++++--------------------- 3 files changed, 40 insertions(+), 41 deletions(-)
arch/arm/include/asm/arch-sunxi/gpio.h +4 -0
@@ -221,6 +221,10 @@ void sunxi_gpio_set_cfgbank(struct sunxi_gpio *pio, int bank_offset, u32 val);void sunxi_gpio_set_cfgpin (u32 pin,u32 val);int sunxi_gpio_get_cfgbank (struct sunxi_gpio *pio,int bank_offset);int sunxi_gpio_get_cfgpin (u32 pin); +void sunxi_gpio_set_output_bank (struct sunxi_gpio *pio,int pin,bool set); +void sunxi_gpio_set_output (u32 pin,bool set); +int sunxi_gpio_get_output_bank (struct sunxi_gpio *pio,int pin); +int sunxi_gpio_get_output (u32 pin);void sunxi_gpio_set_drv (u32 pin,u32 val);void sunxi_gpio_set_drv_bank (struct sunxi_gpio *pio,u32 bank_offset,u32 val);void sunxi_gpio_set_pull (u32 pin,u32 val);
arch/arm/mach-sunxi/pinmux.c +28 -0
@@ -45,6 +45,34 @@ int sunxi_gpio_get_cfgpin(u32 pin)return sunxi_gpio_get_cfgbank (pio, pin); } +void sunxi_gpio_set_output_bank (struct sunxi_gpio *pio,int pin,bool set) +{ +u32 mask =1U <<GPIO_NUM (pin); + +clrsetbits_le32 (&pio->dat, set ?0 : mask, set ? mask :0 ); +} + +void sunxi_gpio_set_output (u32 pin,bool set) +{ +u32 bank =GPIO_BANK (pin); +struct sunxi_gpio *pio =BANK_TO_GPIO (bank); + +sunxi_gpio_set_output_bank (pio, pin, set); +} + +int sunxi_gpio_get_output_bank (struct sunxi_gpio *pio,int pin) +{ +return !!(readl (&pio->dat) & (1U <<GPIO_NUM (pin))); +} + +int sunxi_gpio_get_output (u32 pin) +{ +u32 bank =GPIO_BANK (pin); +struct sunxi_gpio *pio =BANK_TO_GPIO (bank); + +return sunxi_gpio_get_output_bank (pio, pin); +} +void sunxi_gpio_set_drv (u32 pin,u32 val) {u32 bank =GPIO_BANK (pin);
drivers/gpio/sunxi_gpio.c +8 -41
83 lines not on this page · raw message
Signature · 1 line
2.35.8
Re: [PATCH 03/20] pinctrl: sunxi: add GPIO in/out wrappers
Quoted 8 lines · Andre Przywara
So far we were open-coding the pincontroller's GPIO output/input access in each function using that.
Provide functions that wrap that nicely, and follow the existing pattern (set/get_{bank,}), so users don't need to know about the internals, and we can abstract the new D1 pinctrl more easily.
Signed-off-by Andre Przywara <[email protected]>
Thanks,
Sam
PATCH 4/20 pinctrl: sunxi: remove struct sunxi_gpio
In reply to Andre PrzywaraSo far every Allwinner SoC used the same basic pincontroller/GPIO register frame, and just differed by the number of implemented banks and pins, plus some special functionality from time to time. However the D1 and successors use a slightly different pinctrl register layout. Use that opportunity to drop "struct sunxi_gpio", that described that MMIO frame in a C struct. That approach is somewhat frowned upon in the Linux world and rarely used there, though still popular with U-Boot.
Switching from a C struct to a "base address plus offset" approach allows to switch between the two models more dynamically, without reverting to preprocessor macros and #ifdef's.
Model the pinctrl MMIO register frame in the usual "base address + offset" way, and replace a hard-to-parse CPP macro with a more readable static function.
All the users get converted over. There are no functional changes at this point, it just prepares the stages for the D1 and friends.
--- arch/arm/include/asm/arch-sunxi/gpio.h | 67 +++++++++++--------------- arch/arm/mach-sunxi/pinmux.c | 66 +++++++++++++------------ drivers/pinctrl/sunxi/pinctrl-sunxi.c | 14 +++--- 3 files changed, 71 insertions(+), 76 deletions(-)
arch/arm/include/asm/arch-sunxi/gpio.h +28 -39
@@ -28,13 +28,6 @@#define SUNXI_GPIO_H 7#define SUNXI_GPIO_I 8 -/* -* This defines the number of GPIO banks for the _main_ GPIO controller. -* You should fix up the padding in struct sunxi_gpio_reg below if you -* change this. -*/ -#define SUNXI_GPIO_BANKS 9 -/* * sun6i/sun8i and later SoCs have an additional GPIO controller (R_PIO) * at a different register offset.
@@ -52,46 +45,42 @@#define SUNXI_GPIO_M 12#define SUNXI_GPIO_N 13 -struct sunxi_gpio { -u32 cfg[4 ]; -u32 dat; -u32 drv[2 ]; -u32 pull[2 ]; -}; - -/* gpio interrupt control */ -struct sunxi_gpio_int { -u32 cfg[3 ]; -u32 ctl; -u32 sta; -u32 deb;/* interrupt debounce */ -}; - -struct sunxi_gpio_reg { -struct sunxi_gpio gpio_bank[SUNXI_GPIO_BANKS ]; -u8 res[0xbc ]; -struct sunxi_gpio_int gpio_int; -}; -#define SUN50I_H6_GPIO_POW_MOD_SEL 0x340#define SUN50I_H6_GPIO_POW_MOD_VAL 0x348 -#define BANK_TO_GPIO (bank) (((bank) < SUNXI_GPIO_L) ? \ - &((struct sunxi_gpio_reg *)SUNXI_PIO_BASE)->gpio_bank[bank] : \ - &((struct sunxi_gpio_reg *)SUNXI_R_PIO_BASE)->gpio_bank[(bank) - SUNXI_GPIO_L]) -#define GPIO_BANK (pin) ((pin) >> 5)#define GPIO_NUM (pin) ((pin) & 0x1f) +#define GPIO_CFG_REG_OFFSET 0x00#define GPIO_CFG_INDEX (pin) (((pin) & 0x1f) >> 3)#define GPIO_CFG_OFFSET (pin) ((((pin) & 0x1f) & 0x7) << 2) +#define GPIO_DAT_REG_OFFSET 0x10 + +#define GPIO_DRV_REG_OFFSET 0x14#define GPIO_DRV_INDEX (pin) (((pin) & 0x1f) >> 4)#define GPIO_DRV_OFFSET (pin) ((((pin) & 0x1f) & 0xf) << 1) +#define GPIO_PULL_REG_OFFSET 0x1c#define GPIO_PULL_INDEX (pin) (((pin) & 0x1f) >> 4)#define GPIO_PULL_OFFSET (pin) ((((pin) & 0x1f) & 0xf) << 1) +#define SUNXI_PINCTRL_BANK_SIZE 0x24 + +static inline void *BANK_TO_GPIO (int bank) +{ +void *pio_base; + +if (bank <SUNXI_GPIO_L ) { + pio_base = (void *)(uintptr_t )SUNXI_PIO_BASE ; + }else { + pio_base = (void *)(uintptr_t )SUNXI_R_PIO_BASE ; + bank -=SUNXI_GPIO_L ; + } + +return pio_base + bank *SUNXI_PINCTRL_BANK_SIZE ; +} +/* GPIO bank sizes */ #define SUNXI_GPIOS_PER_BANK 32
@@ -213,22 +202,22 @@ enum sunxi_gpio_number {#define SUNXI_GPIO_AXP0_GPIO_COUNT 6struct sunxi_gpio_plat { -struct sunxi_gpio *regs; +void *regs;char bank_name[3 ]; }; -void sunxi_gpio_set_cfgbank (struct sunxi_gpio *pio,int bank_offset,u32 val); +void sunxi_gpio_set_cfgbank (void *bank_base,int pin_offset,u32 val);void sunxi_gpio_set_cfgpin (u32 pin,u32 val); -int sunxi_gpio_get_cfgbank (struct sunxi_gpio *pio,int bank_offset); +int sunxi_gpio_get_cfgbank (void *bank_base,int pin_offset);int sunxi_gpio_get_cfgpin (u32 pin); -void sunxi_gpio_set_output_bank (struct sunxi_gpio *pio,int pin,bool set); +void sunxi_gpio_set_output_bank (void *bank_base,int pin,bool set);void sunxi_gpio_set_output (u32 pin,bool set); -int sunxi_gpio_get_output_bank (struct sunxi_gpio *pio,int pin); +int sunxi_gpio_get_output_bank (void *bank_base,int pin);int sunxi_gpio_get_output (u32 pin);void sunxi_gpio_set_drv (u32 pin,u32 val); -void sunxi_gpio_set_drv_bank (struct sunxi_gpio *pio,u32 bank_offset,u32 val); +void sunxi_gpio_set_drv_bank (void *bank_base,u32 pin_offset,u32 val);void sunxi_gpio_set_pull (u32 pin,u32 val); -void sunxi_gpio_set_pull_bank (struct sunxi_gpio *pio,int bank_offset,u32 val); +void sunxi_gpio_set_pull_bank (void *bank_base,int pin_offset,u32 val);int sunxi_name_to_gpio (const char *name);#if !definedCONFIG_SPL_BUILD && definedCONFIG_AXP_GPIO
arch/arm/mach-sunxi/pinmux.c +36 -30
131 lines not on this page · raw message
drivers/pinctrl/sunxi/pinctrl-sunxi.c +7 -7
@@ -35,7 +35,7 @@ struct sunxi_pinctrl_desc { };struct sunxi_pinctrl_plat { -struct sunxi_gpio __iomem *base; +void __iomem *base; };static int sunxi_pinctrl_get_pins_count (struct udevice *dev)
@@ -86,8 +86,8 @@ static int sunxi_pinctrl_pinmux_set(struct udevice *dev, uint pin_selector,sunxi_pinctrl_get_function_name (dev, func_selector), desc->functions[func_selector].mux); -sunxi_gpio_set_cfgbank (plat->base + bank, pin, - desc->functions[func_selector].mux); +sunxi_gpio_set_cfgbank (plat->base + bank *SUNXI_PINCTRL_BANK_SIZE , + pin, desc->functions[func_selector].mux);return 0 ; }
@@ -102,7 +102,7 @@ static const struct pinconf_param sunxi_pinctrl_pinconf_params[] = {static int sunxi_pinctrl_pinconf_set_pull (struct sunxi_pinctrl_plat *plat,uint bank,uint pin,uint bias) { -struct sunxi_gpio *regs = &plat->base[bank]; +void *regs = plat->base + bank *SUNXI_PINCTRL_BANK_SIZE ;sunxi_gpio_set_pull_bank (regs, pin, bias);
@@ -112,7 +112,7 @@ static int sunxi_pinctrl_pinconf_set_pull(struct sunxi_pinctrl_plat *plat,static int sunxi_pinctrl_pinconf_set_drive (struct sunxi_pinctrl_plat *plat,uint bank,uint pin,uint drive) { -struct sunxi_gpio *regs = &plat->base[bank]; +void *regs = plat->base + bank *SUNXI_PINCTRL_BANK_SIZE ;if (drive <10 || drive >40 )return -EINVAL ;
@@ -148,7 +148,7 @@ static int sunxi_pinctrl_get_pin_muxing(struct udevice *dev, uint pin_selector,struct sunxi_pinctrl_plat *plat =dev_get_plat (dev);int bank = pin_selector /SUNXI_GPIOS_PER_BANK ;int pin = pin_selector %SUNXI_GPIOS_PER_BANK ; -int mux =sunxi_gpio_get_cfgbank (plat->base + bank, pin); +int mux =sunxi_gpio_get_cfgbank (plat->base + bank *SUNXI_PINCTRL_BANK_SIZE , pin);switch (mux) {case SUNXI_GPIO_INPUT :
@@ -206,7 +206,7 @@ static int sunxi_pinctrl_bind(struct udevice *dev)if (!gpio_plat)return -ENOMEM ; - gpio_plat->regs = plat->base + i; + gpio_plat->regs = plat->base + i *SUNXI_PINCTRL_BANK_SIZE ; gpio_plat->bank_name[0 ] ='P' ; gpio_plat->bank_name[1 ] ='A' + desc->first_bank + i; gpio_plat->bank_name[2 ] ='\0' ;
Signature · 1 line
2.35.8
PATCH 5/20 pinctrl: sunxi: move pinctrl code and remove GPIO_EXTRA_HEADER
In reply to Andre PrzywaraU-Boot's generic GPIO_EXTRA_HEADER is a convenience symbol to allow code to more easily include platform specific GPIO headers. This should not be needed in a DM world anymore, since the generic GPIO framework handles that nicely.
For Allwinner boards we still need to deal with non-DM GPIO in the SPL, but this should become the exception, not the rule.
Make this more obvious by removing the definition of GPIO_EXTRA_HEADER, and just force every legacy user of platform specific GPIO to include the new sunxi_gpio.h header explicitly. Everyone doing so should feel ashamed and should find a way to avoid it from now on.
This also moves and renames the existing sunxi-specific low level pinctrl routines from arch/arm/mach-sunxi into board/sunxi, and the gpio.h header to the generic include/ directory, so the common code can be shared outside of arch/arm.
--- arch/arm/Kconfig | 1 - arch/arm/mach-sunxi/Makefile | 1 - arch/arm/mach-sunxi/board.c | 1 + arch/arm/mach-sunxi/dram_suniv.c | 2 +- arch/arm/mach-sunxi/spl_spi_sunxi.c | 1 + board/sunxi/Makefile | 1 + board/sunxi/board.c | 1 + board/sunxi/chip.c | 2 +- arch/arm/mach-sunxi/pinmux.c => board/sunxi/pinctrl.c | 5 ++++- drivers/gpio/axp_gpio.c | 1 + drivers/gpio/sunxi_gpio.c | 1 + drivers/i2c/sun6i_p2wi.c | 2 +- drivers/i2c/sun8i_rsb.c | 2 +- drivers/mmc/sunxi_mmc.c | 1 + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 1 + drivers/video/hitachi_tx18d42vm_lcd.c | 1 + drivers/video/ssd2828.c | 1 - drivers/video/sunxi/sunxi_display.c | 1 + drivers/video/sunxi/sunxi_lcd.c | 1 + .../include/asm/arch-sunxi/gpio.h => include/sunxi_gpio.h | 0 20 files changed, 19 insertions(+), 8 deletions(-) rename arch/arm/mach-sunxi/pinmux.c => board/sunxi/pinctrl.c (94%) rename arch/arm/include/asm/arch-sunxi/gpio.h => include/sunxi_gpio.h (100%)
arch/arm/Kconfig +0 -1
@@ -1134,7 +1134,6 @@ config ARCH_SUNXI select DM_MMC if MMC select DM_SCSI if SCSI select DM_SERIAL - select GPIO_EXTRA_HEADER select OF_BOARD_SETUP select OF_CONTROL select OF_SEPARATE
arch/arm/mach-sunxi/Makefile +0 -1
@@ -10,7 +10,6 @@ obj-y += board.o obj-y += clock.o obj-y += cpu_info.o obj-y += dram_helpers.o -obj-y += pinmux.o obj-$(CONFIG_SUN6I_PRCM) += prcm.o obj-$(CONFIG_AXP_PMIC_BUS) += pmic_bus.o obj-$(CONFIG_MACH_SUNIV) += clock_sun6i.o
arch/arm/mach-sunxi/board.c +1 -0
@@ -17,6 +17,7 @@#include <i2c.h> #include <serial.h> #include <spl.h> +#include <sunxi_gpio.h> #include <asm/cache.h> #include <asm/gpio.h> #include <asm/io.h>
arch/arm/mach-sunxi/dram_suniv.c +1 -1
@@ -13,10 +13,10 @@#include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/dram.h> -#include <asm/arch/gpio.h> #include <linux/bitops.h> #include <linux/delay.h> #include <hang.h> +#include <sunxi_gpio.h> #define SDR_T_CAS (0x2)#define SDR_T_RAS (0x8)
arch/arm/mach-sunxi/spl_spi_sunxi.c +1 -0
@@ -13,6 +13,7 @@#include <linux/bitops.h> #include <linux/delay.h> #include <linux/libfdt.h> +#include <sunxi_gpio.h> #ifdef CONFIG_SPL_OS_BOOT #error CONFIG_SPL_OS_BOOT is not supported yet
board/sunxi/Makefile +1 -0
@@ -7,6 +7,7 @@ # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, [email protected]. obj-y += board.o +obj-y += pinctrl.o obj-$(CONFIG_SUN7I_GMAC) += gmac.o obj-$(CONFIG_MACH_SUN4I) += dram_sun4i_auto.o obj-$(CONFIG_MACH_SUN5I) += dram_sun5i_auto.o
board/sunxi/board.c +1 -0
@@ -38,6 +38,7 @@#include <asm/armv7.h> #endif #include <asm/gpio.h> +#include <sunxi_gpio.h> #include <asm/io.h> #include <u-boot/crc.h> #include <env_internal.h>
board/sunxi/chip.c +1 -1
@@ -12,7 +12,7 @@#include <w1-eeprom.h> #include <dm/device-internal.h> -#include <asm/arch/gpio.h> +#include <sunxi_gpio.h> #include <extension_board.h>
board/sunxi/pinctrl.c renamed from arch/arm/mach-sunxi/pinmux.c +4 -1
@@ -3,11 +3,14 @@* (C) Copyright 2007-2011 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> * Tom Cubie <[email protected]> +* +* Low level GPIO/pin controller access functions, to be shared by non-DM +* SPL code and the DM pinctrl/GPIO drivers. */ #include <common.h> #include <asm/io.h> -#include <asm/arch/gpio.h> +#include <sunxi_gpio.h> void sunxi_gpio_set_cfgbank (void *bank_base,int pin_offset,u32 val) {
drivers/gpio/axp_gpio.c +1 -0
@@ -14,6 +14,7 @@#include <dm/lists.h> #include <dm/root.h> #include <errno.h> +#include <sunxi_gpio.h> static int axp_gpio_set_value (struct udevice *dev,unsigned pin,int val);
drivers/gpio/sunxi_gpio.c +1 -0
@@ -17,6 +17,7 @@#include <asm/io.h> #include <asm/gpio.h> #include <dt-bindings/gpio/gpio.h> +#include <sunxi_gpio.h> #if !CONFIG_IS_ENABLED (DM_GPIO )int gpio_request (unsigned gpio,const char *label)
drivers/i2c/sun6i_p2wi.c +1 -1
@@ -20,10 +20,10 @@#include <errno.h> #include <i2c.h> #include <reset.h> +#include <sunxi_gpio.h> #include <time.h> #include <asm/io.h> #include <asm/arch/cpu.h> -#include <asm/arch/gpio.h> #include <asm/arch/p2wi.h> #include <asm/arch/prcm.h> #include <asm/arch/sys_proto.h>
drivers/i2c/sun8i_rsb.c +1 -1
@@ -14,10 +14,10 @@#include <dm.h> #include <errno.h> #include <i2c.h> +#include <sunxi_gpio.h> #include <reset.h> #include <time.h> #include <asm/arch/cpu.h> -#include <asm/arch/gpio.h> #include <asm/arch/prcm.h> #include <asm/arch/rsb.h>
drivers/mmc/sunxi_mmc.c +1 -0
@@ -27,6 +27,7 @@#include <asm/arch/cpu.h> #include <asm/arch/mmc.h> #include <linux/delay.h> +#include <sunxi_gpio.h> #ifndef CCM_MMC_CTRL_MODE_SEL_NEW #define CCM_MMC_CTRL_MODE_SEL_NEW 0
drivers/pinctrl/sunxi/pinctrl-sunxi.c +1 -0
@@ -7,6 +7,7 @@#include <dm/pinctrl.h> #include <errno.h> #include <malloc.h> +#include <sunxi_gpio.h> #include <asm/gpio.h>
drivers/video/hitachi_tx18d42vm_lcd.c +1 -0
@@ -10,6 +10,7 @@#include <linux/delay.h> #include <asm/gpio.h> +#include <sunxi_gpio.h> #include <errno.h> /*
drivers/video/ssd2828.c +0 -1
@@ -12,7 +12,6 @@#include <common.h> #include <malloc.h> #include <mipi_display.h> -#include <asm/arch/gpio.h> #include <asm/gpio.h> #include <linux/delay.h>
drivers/video/sunxi/sunxi_display.c +1 -0
@@ -31,6 +31,7 @@#include <malloc.h> #include <video.h> #include <dm/uclass-internal.h> +#include <sunxi_gpio.h> #include "../videomodes.h" #include "../anx9804.h" #include "../hitachi_tx18d42vm_lcd.h"
drivers/video/sunxi/sunxi_lcd.c +1 -0
@@ -17,6 +17,7 @@#include <asm/arch/lcdc.h> #include <asm/global_data.h> #include <asm/gpio.h> +#include <sunxi_gpio.h> struct sunxi_lcd_priv {struct display_timing timing;
include/sunxi_gpio.h renamed from arch/arm/include/asm/arch-sunxi/gpio.h +0 -0
Signature · 1 line
2.35.8
PATCH 6/20 pinctrl: sunxi: move PIO_BASE into sunxi_gpio.h
In reply to Andre PrzywaraOn the Allwinner platform we were describing a quite comprehensive memory map in a per-SoC header unser arch/arm.
In the old days that was used by every driver, but nowadays it should only be needed by SPL drivers (not using the DT). Many addresses in there were never used, and some are not needed anymore.
To avoid a dependency on CPU specific headers in an arch specific directory, move the definition of the pinctroller MMIO base address into the sunxi_gpio.h header, because the SPL routines for GPIO should be the only one needing this address.
This is a first step towards getting rid of cpu_sun[x]i.h completely, and allows to remove the inclusion of that file from the sunxi_gpio.h header.
--- arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 2 -- arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h | 2 -- arch/arm/include/asm/arch-sunxi/cpu_sun9i.h | 2 -- include/sunxi_gpio.h | 12 +++++++++++- 4 files changed, 11 insertions(+), 7 deletions(-)
arch/arm/include/asm/arch-sunxi/cpu_sun4i.h +0 -2
@@ -91,7 +91,6 @@#define SUNXI_CCM_BASE 0x01c20000#define SUNXI_INTC_BASE 0x01c20400 -#define SUNXI_PIO_BASE 0x01c20800#define SUNXI_TIMER_BASE 0x01c20c00#ifndef CONFIG_SUNXI_GEN_SUN6I #define SUNXI_PWM_BASE 0x01c20e00
@@ -210,7 +209,6 @@ defined(CONFIG_MACH_SUN50I)#define SUNXI_R_TWI_BASE 0x01f02400#define SUNXI_R_UART_BASE 0x01f02800 -#define SUNXI_R_PIO_BASE 0x01f02c00#define SUN6I_P2WI_BASE 0x01f03400#define SUNXI_RSB_BASE 0x01f03400
arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h +0 -2
@@ -22,7 +22,6 @@#define SUNXI_SIDC_BASE 0x03006000#define SUNXI_SID_BASE 0x03006200#define SUNXI_TIMER_BASE 0x03009000 -#define SUNXI_PIO_BASE 0x0300B000#define SUNXI_PSI_BASE 0x0300C000#define SUNXI_GIC400_BASE 0x03020000
@@ -68,7 +67,6 @@#define SUNXI_R_CPUCFG_BASE 0x07000400#define SUNXI_PRCM_BASE 0x07010000#define SUNXI_R_WDOG_BASE 0x07020400 -#define SUNXI_R_PIO_BASE 0x07022000#define SUNXI_R_UART_BASE 0x07080000#define SUNXI_R_TWI_BASE 0x07081400
arch/arm/include/asm/arch-sunxi/cpu_sun9i.h +0 -2
@@ -81,7 +81,6 @@/* APB0 Module */ #define SUNXI_CCM_BASE (REGS_APB0_BASE + 0x0000)#define SUNXI_CCMMODULE_BASE (REGS_APB0_BASE + 0x0400) -#define SUNXI_PIO_BASE (REGS_APB0_BASE + 0x0800)#define SUNXI_TIMER_BASE (REGS_APB0_BASE + 0x0C00)#define SUNXI_PWM_BASE (REGS_APB0_BASE + 0x1400)#define SUNXI_LRADC_BASE (REGS_APB0_BASE + 0x1800)
@@ -102,7 +101,6 @@/* RCPUS Module */ #define SUNXI_PRCM_BASE (REGS_RCPUS_BASE + 0x1400)#define SUNXI_R_UART_BASE (REGS_RCPUS_BASE + 0x2800) -#define SUNXI_R_PIO_BASE (REGS_RCPUS_BASE + 0x2c00)#define SUNXI_RSB_BASE (REGS_RCPUS_BASE + 0x3400)/* Misc. */
include/sunxi_gpio.h +11 -1
@@ -9,7 +9,17 @@#define _SUNXI_GPIO_H#include <linux/types.h> -#include <asm/arch/cpu.h> + +#if defined(CONFIG_MACH_SUN9I ) +#define SUNXI_PIO_BASE 0x06000800 +#define SUNXI_R_PIO_BASE 0x08002c00 +#elif defined(CONFIG_SUN50I_GEN_H6 ) +#define SUNXI_PIO_BASE 0x0300b000 +#define SUNXI_R_PIO_BASE 0x07022000 +#else +#define SUNXI_PIO_BASE 0x01c20800 +#define SUNXI_R_PIO_BASE 0x01f02c00 +#endif /* * sunxi has 9 banks of gpio, they are:
Signature · 1 line
2.35.8
PATCH 7/20 pinctrl: sunxi: add new D1 pinctrl support
In reply to Andre PrzywaraFor the first time since at least the Allwinner A10 SoCs, the D1 (and related cores) use a new pincontroller MMIO register layout, so we cannot use our hardcoded, fixed offsets anymore.
Ideally this would all be handled by devicetree and DM drivers, but for the DT-less SPL we still need the legacy interfaces.
Add a new Kconfig symbol to differenciate between the two generations of pincontrollers, and just use that to just switch some basic symbols. The rest is already abstracted enough, so works out of the box.
--- arch/arm/mach-sunxi/Kconfig | 6 ++++++ include/sunxi_gpio.h | 26 +++++++++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-)
arch/arm/mach-sunxi/Kconfig +6 -0
@@ -158,6 +158,12 @@ config SUNXI_RVBAR_ALTERNATIVE config SUNXI_A64_TIMER_ERRATUM bool +config SUNXI_NEW_PINCTRL + bool + ---help--- + The Allwinner D1 and other new SoCs use a different register map + for the GPIO block, which we need to know about in the SPL. + # Note only one of these may be selected at a time! But hidden choices are # not supported by Kconfig config SUNXI_GEN_SUN4I
include/sunxi_gpio.h +21 -5
@@ -68,15 +68,32 @@#define GPIO_DAT_REG_OFFSET 0x10#define GPIO_DRV_REG_OFFSET 0x14 -#define GPIO_DRV_INDEX (pin) (((pin) & 0x1f) >> 4) -#define GPIO_DRV_OFFSET (pin) ((((pin) & 0x1f) & 0xf) << 1) + +/* Newer SoCs use a slightly different register layout */ +#ifdef CONFIG_SUNXI_NEW_PINCTRL +/* pin drive strength: 4 bits per pin */ +#define GPIO_DRV_INDEX (pin) ((pin) / 8) +#define GPIO_DRV_OFFSET (pin) (((pin) % 8) * 4) + +#define GPIO_PULL_REG_OFFSET 0x24 + +#define SUNXI_PINCTRL_BANK_SIZE 0x30 +#define SUNXI_GPIO_DISABLE 0xf + +#else /* older generation pin controllers */ +/* pin drive strength: 2 bits per pin */ +#define GPIO_DRV_INDEX (pin) ((pin) / 16) +#define GPIO_DRV_OFFSET (pin) (((pin) % 16) * 2)#define GPIO_PULL_REG_OFFSET 0x1c + +#define SUNXI_PINCTRL_BANK_SIZE 0x24 +#define SUNXI_GPIO_DISABLE 0x7 +#endif +#define GPIO_PULL_INDEX (pin) (((pin) & 0x1f) >> 4)#define GPIO_PULL_OFFSET (pin) ((((pin) & 0x1f) & 0xf) << 1) -#define SUNXI_PINCTRL_BANK_SIZE 0x24 -static inline void *BANK_TO_GPIO (int bank) {void *pio_base;
@@ -132,7 +149,6 @@ enum sunxi_gpio_number {/* GPIO pin function config */ #define SUNXI_GPIO_INPUT 0#define SUNXI_GPIO_OUTPUT 1 -#define SUNXI_GPIO_DISABLE 7#define SUN8I_H3_GPA_UART0 2#define SUN8I_H3_GPA_UART2 2
Signature · 1 line
2.35.8
Re: [PATCH 07/20] pinctrl: sunxi: add new D1 pinctrl support
Quoted 11 lines · Andre Przywara
For the first time since at least the Allwinner A10 SoCs, the D1 (and related cores) use a new pincontroller MMIO register layout, so we cannot use our hardcoded, fixed offsets anymore.
Ideally this would all be handled by devicetree and DM drivers, but for the DT-less SPL we still need the legacy interfaces.Add a new
Kconfigsymbol to differenciate between the two generations of pincontrollers, and just use that to just switch some basic symbols. The rest is already abstracted enough, so works out of the box.Signed-off-by Andre Przywara <[email protected]>
Thanks,
Sam
PATCH 8/20 sunxi: introduce NCAT2 generation model
In reply to Andre PrzywaraAllwinner seems to typically stick to a common MMIO memory map for several SoCs, but from time to time does some breaking changes, which also introduce new generations of some peripherals. The last time this happened with the H6, which apart from re-organising the base addresses also changed the clock controller significantly. We added a CONFIG_SUN50I_GEN_H6 symbol back then to mark SoCs sharing those traits.
Now the Allwinner D1 changes the memory map again, and also extends the pincontroller, among other peripherals.
To mark this generation of SoCs, add a CONFIG_SUNXI_GEN_NCAT2 symbol, this name is reportedly used in the Allwinner BSP code, and prevents us from inventing our own name.
Add this new symbol to some guards that were already checking for the H6 generation, since many features are shared between the two (like the renovated clock controller).
This paves the way to introduce a first user of this generation.
--- arch/arm/include/asm/arch-sunxi/clock.h | 2 +- arch/arm/include/asm/arch-sunxi/cpu.h | 2 + .../include/asm/arch-sunxi/cpu_sunxi_ncat2.h | 43 +++++++++++++++++++ arch/arm/include/asm/arch-sunxi/mmc.h | 2 +- arch/arm/include/asm/arch-sunxi/prcm.h | 2 +- arch/arm/include/asm/arch-sunxi/timer.h | 2 +- arch/arm/mach-sunxi/Kconfig | 12 +++++- arch/arm/mach-sunxi/Makefile | 1 + arch/arm/mach-sunxi/board.c | 22 ++++++---- common/spl/Kconfig | 2 +- drivers/i2c/mvtwsi.c | 3 +- drivers/mmc/sunxi_mmc.c | 10 +++-- include/sunxi_gpio.h | 3 ++ 13 files changed, 87 insertions(+), 19 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/cpu_sunxi_ncat2.h
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_SUN50I_GEN_H6 ) +#elif defined(CONFIG_SUN50I_GEN_H6 ) || defined(CONFIG_SUNXI_GEN_NCAT2 )#include <asm/arch/clock_sun50i_h6.h> #elif defined(CONFIG_MACH_SUN6I ) || defined(CONFIG_MACH_SUN8I ) || \ defined(CONFIG_MACH_SUN50I ) || defined(CONFIG_MACH_SUNIV )
arch/arm/include/asm/arch-sunxi/cpu.h +2 -0
@@ -10,6 +10,8 @@#include <asm/arch/cpu_sun9i.h> #elif defined(CONFIG_SUN50I_GEN_H6 )#include <asm/arch/cpu_sun50i_h6.h> +#elif defined(CONFIG_SUNXI_GEN_NCAT2 ) +#include <asm/arch/cpu_sunxi_ncat2.h> #else #include <asm/arch/cpu_sun4i.h> #endif
arch/arm/include/asm/arch-sunxi/cpu_sunxi_ncat2.h new file +43 -0
43 lines not on this page · raw message
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_SUN50I_GEN_H6 ) +#if defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 ) || defined(CONFIG_SUNXI_GEN_NCAT2 )u32 res3[17 ];u32 samp_dl;u32 res4[46 ];
arch/arm/include/asm/arch-sunxi/prcm.h +1 -1
@@ -9,7 +9,7 @@#define _SUNXI_PRCM_H/* prcm regs definition */ -#if defined(CONFIG_SUN50I_GEN_H6 ) +#if defined(CONFIG_SUN50I_GEN_H6 ) || defined(CONFIG_SUNXI_GEN_NCAT2 )#include <asm/arch/prcm_sun50i.h> #else #include <asm/arch/prcm_sun6i.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_SUN50I_GEN_H6 ) +#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 ) || defined(CONFIG_SUNXI_GEN_NCAT2 )u8 res3[16 ];struct sunxi_wdog wdog[5 ];/* We have 5 watchdogs */ #endif
arch/arm/mach-sunxi/Kconfig +11 -1
@@ -121,7 +121,7 @@ config AXP_PMIC_BUS config SUNXI_SRAM_ADDRESS hex default 0x10000 if MACH_SUN9I || MACH_SUN50I || MACH_SUN50I_H5 - default 0x20000 if SUN50I_GEN_H6 + default 0x20000 if SUN50I_GEN_H6 || SUNXI_GEN_NCAT2 default 0x0 ---help--- Older Allwinner SoCs have their mask boot ROM mapped just below 4GB,
@@ -189,6 +189,14 @@ config SUN50I_GEN_H6 Select this for sunxi SoCs which have H6 like peripherals, clocks and memory map. +config SUNXI_GEN_NCAT2 + bool + select MMC_SUNXI_HAS_NEW_MODE + select SUPPORT_SPL + ---help--- + Select this for sunxi SoCs which have D1 like peripherals, clocks + and memory map. + config SUNXI_DRAM_DW bool ---help---
@@ -810,6 +818,7 @@ config VIDEO_SUNXI depends on !MACH_SUN9I depends on !MACH_SUN50I depends on !SUN50I_GEN_H6 + depends on !SUNXI_GEN_NCAT2 select VIDEO select DISPLAY imply VIDEO_DT_SIMPLEFB
@@ -1023,6 +1032,7 @@ config SPL_STACK_R_ADDR default 0x2fe00000 if MACH_SUN9I default 0x4fe00000 if MACH_SUN50I default 0x4fe00000 if SUN50I_GEN_H6 + default 0x4fe00000 if SUNXI_GEN_NCAT2 config SPL_SPI_SUNXI bool "Support for SPI Flash on Allwinner SoCs in SPL"
arch/arm/mach-sunxi/Makefile +1 -0
@@ -25,6 +25,7 @@ obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o obj-$(CONFIG_SUN50I_GEN_H6) += clock_sun50i_h6.o +obj-$(CONFIG_SUNXI_GEN_NCAT2) += clock_sun50i_h6.o ifndef CONFIG_ARM64 obj-y += timer.o endif
arch/arm/mach-sunxi/board.c +14 -8
@@ -176,13 +176,19 @@ static int gpio_init(void)#error Unsupported console port number. Please fix pin mux settings in board.c#endif -#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 ); - val =readl (SUNXI_R_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_VAL ); -writel (val,SUNXI_R_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_SEL ); -#endif +/* +* Update PIO power bias configuration by copying the hardware +* detected value. +*/ +if (IS_ENABLED (CONFIG_SUN50I_GEN_H6 ) || +IS_ENABLED (CONFIG_SUN50I_GEN_NCAT2 )) { + val =readl (SUNXI_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_VAL ); +writel (val,SUNXI_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_SEL ); + } +if (IS_ENABLED (CONFIG_SUN50I_GEN_H6 )) { + val =readl (SUNXI_R_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_VAL ); +writel (val,SUNXI_R_PIO_BASE +SUN50I_H6_GPIO_POW_MOD_SEL ); + }return 0 ; }
@@ -481,7 +487,7 @@ void reset_cpu(void)/* sun5i sometimes gets stuck without this */ writel (WDT_MODE_RESET_EN |WDT_MODE_EN , &wdog->mode); } -#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 ) +#elif defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 ) || defined(CONFIG_SUNXI_GEN_NCAT2 )#if defined(CONFIG_MACH_SUN50I_H6 )/* WDOG is broken for some H6 rev. use the R_WDOG instead */ static const struct sunxi_wdog *wdog =
common/spl/Kconfig +1 -1
@@ -265,7 +265,7 @@ config SPL_TEXT_BASE default 0x402F0400 if AM33XX default 0x40301350 if OMAP54XX default 0x10060 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN9I - default 0x20060 if SUN50I_GEN_H6 + default 0x20060 if SUN50I_GEN_H6 || SUNXI_GEN_NCAT2 default 0x00060 if ARCH_SUNXI default 0xfffc0000 if ARCH_ZYNQMP default 0x0
drivers/i2c/mvtwsi.c +2 -1
@@ -124,7 +124,8 @@ enum mvtwsi_ctrl_register_fields {* on other platforms, it is a normal r/w bit, which is cleared by writing 0. */ -#if defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 ) +#if defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 ) || \ + defined(CONFIG_SUNXI_GEN_NCAT2 )#define MVTWSI_CONTROL_CLEAR_IFLG 0x00000008#else #define MVTWSI_CONTROL_CLEAR_IFLG 0x00000000
drivers/mmc/sunxi_mmc.c +6 -4
@@ -57,6 +57,7 @@ static bool sunxi_mmc_can_calibrate(void)return IS_ENABLED (CONFIG_MACH_SUN50I ) ||IS_ENABLED (CONFIG_MACH_SUN50I_H5 ) ||IS_ENABLED (CONFIG_SUN50I_GEN_H6 ) || +IS_ENABLED (CONFIG_SUNXI_GEN_NCAT2 ) ||IS_ENABLED (CONFIG_MACH_SUN8I_R40 ); }
@@ -191,7 +192,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_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 ) +#if defined(CONFIG_SUNXI_GEN_SUN6I ) || defined(CONFIG_SUN50I_GEN_H6 ) || defined(CONFIG_SUNXI_GEN_NCAT2 )/* 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 +531,8 @@ struct mmc *sunxi_mmc_init(int sdc_no) cfg->host_caps =MMC_MODE_4BIT ;if ((IS_ENABLED (CONFIG_MACH_SUN50I ) ||IS_ENABLED (CONFIG_MACH_SUN8I ) || -IS_ENABLED (CONFIG_SUN50I_GEN_H6 )) && (sdc_no ==2 )) +IS_ENABLED (CONFIG_SUN50I_GEN_H6 ) || +IS_ENABLED (CONFIG_SUNXI_GEN_NCAT2 )) && (sdc_no ==2 )) cfg->host_caps =MMC_MODE_8BIT ; cfg->host_caps |= MMC_MODE_HS_52MHz |MMC_MODE_HS ;
@@ -544,7 +546,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_SUN50I_GEN_H6 ) +#if !defined(CONFIG_SUN50I_GEN_H6 ) && !defined(CONFIG_SUNXI_GEN_NCAT2 )setbits_le32 (&ccm->ahb_gate0,1 <<AHB_GATE_OFFSET_MMC (sdc_no));#ifdef CONFIG_SUNXI_GEN_SUN6I
@@ -619,7 +621,7 @@ static unsigned get_mclk_offset(void)if (IS_ENABLED (CONFIG_MACH_SUN9I_A80 ))return 0x410 ; -if (IS_ENABLED (CONFIG_SUN50I_GEN_H6 )) +if (IS_ENABLED (CONFIG_SUN50I_GEN_H6 ) ||IS_ENABLED (CONFIG_SUNXI_GEN_NCAT2 ))return 0x830 ;return 0x88 ;
include/sunxi_gpio.h +3 -0
@@ -16,6 +16,9 @@#elif defined(CONFIG_SUN50I_GEN_H6 )#define SUNXI_PIO_BASE 0x0300b000#define SUNXI_R_PIO_BASE 0x07022000 +#elif defined(CONFIG_SUNXI_GEN_NCAT2 ) +#define SUNXI_PIO_BASE 0x02000000 +#define SUNXI_R_PIO_BASE 0#else #define SUNXI_PIO_BASE 0x01c20800#define SUNXI_R_PIO_BASE 0x01f02c00
Signature · 1 line
2.35.8
Re: [PATCH 08/20] sunxi: introduce NCAT2 generation model
Quoted 13 lines · Andre Przywara
Allwinner seems to typically stick to a common MMIO memory map for several SoCs, but from time to time does some breaking changes, which also introduce new generations of some peripherals. The last time this happened with the H6, which apart from re-organising the base addresses also changed the clock controller significantly. We added a
CONFIG_SUN50I_GEN_H6symbol back then to mark SoCs sharing those traits.Now the Allwinner D1 changes the memory map again, and also extends the pincontroller, among other peripherals.
To mark this generation of SoCs, add aCONFIG_SUNXI_GEN_NCAT2symbol, this name is reportedly used in the Allwinner BSP code, and prevents us from inventing our own name.
Quoted 7 lines
Add this new symbol to some guards that were already checking for the H6 generation, since many features are shared between the two (like the renovated clock controller).
This paves the way to introduce a first user of this generation.
Signed-off-by Andre Przywara <[email protected]>
Thanks,
Sam
sunxi: introduce NCAT2 generation model
In reply to Andre PrzywaraWhen NCAT2 generation model's introduced for t113, the modification in drivers/mmc/sunxi_mmc.c
Quoted 1 line
+
IS_ENABLED(CONFIG_SUNXI_GEN_NCAT2)) && (sdc_no== 2))
in struct mmc *sunxi_mmc_init(int sdc_no) seems to have some negative side effects, meaning enabling 8-bit mode for MMC2. Paticularly, IS_ENABLED(CONFIG_SUNXI_GEN_NCAT2)
should not be used for D1/T113
since there is not support for 8-bit mode for MMC2 yet. Therefore, the solution would be to drop this particular change entirely.
Re: sunxi: introduce NCAT2 generation model
On Wed, 27 Sep 2023 12:42:52 +0300
Okhunjon Sobirjonov <[email protected]> wrote:
Hi,
Quoted 5 lines
When NCAT2 generation model's introduced for t113, the modification in
drivers/mmc/sunxi_mmc.cQuoted 1 line
+
IS_ENABLED(CONFIG_SUNXI_GEN_NCAT2)) && (sdc_no== 2))in struct mmc *sunxi_mmc_init(int
sdc_no) seems to have some negative side effects, meaning enabling 8-bit mode for MMC2.
"Some negative side effects" sounds cute, but it actually breaks it ;-)
Quoted 5 lines
Paticularly,
IS_ENABLED(CONFIG_SUNXI_GEN_NCAT2)should not be used for D1/T113
since there is not support for 8-bit mode for MMC2 yet. Therefore, the solution would be to drop this particular change entirely.
So yeah, that line is just plain wrong, it seems like all the NCAT SoCs we have seen (D1/T113/R329) do no support 8-bit eMMC.
So thanks for the heads up, I will remove that line from v2.
Quoted 1 line
Signed-off-by Okhunjon Sobirjonov <[email protected]>
S-o-b:'s are only needed for actual patch submissions, not for comments on the list.
Cheers,
Andre
PATCH 9/20 pinctrl: sunxi: add Allwinner D1 pinctrl description
In reply to Andre PrzywaraApart from using the new pinctrl MMIO register layout, the Allwinner D1 and related SoCs still need to usual set of mux values hardcoded in U-Boot's pinctrl driver.
Add the values we need so far to this list, so that DM based drivers will just work without further ado.
--- drivers/pinctrl/sunxi/Kconfig | 4 ++++ drivers/pinctrl/sunxi/pinctrl-sunxi.c | 28 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+)
drivers/pinctrl/sunxi/Kconfig +4 -0
@@ -124,4 +124,8 @@ config PINCTRL_SUN50I_H616_R default MACH_SUN50I_H616 select PINCTRL_SUNXI +config PINCTRL_SUN20I_D1 + bool "Support for the Allwinner D1/R528 PIO" + select PINCTRL_SUNXI + endif
drivers/pinctrl/sunxi/pinctrl-sunxi.c +28 -0
@@ -748,6 +748,28 @@ static const struct sunxi_pinctrl_desc __maybe_unused sun50i_h616_r_pinctrl_desc .num_banks = 1, }; +static const struct sunxi_pinctrl_function sun20i_d1_pinctrl_functions[] = { + {"emac" ,8 },/* PE0-PE15 */ + {"gpio_in" ,0 }, + {"gpio_out" ,1 }, + {"mmc0" ,2 },/* PF0-PF5 */ + {"mmc2" ,3 },/* PC1-PC7 */ + {"spi0" ,2 },/* PC2-PC7 */ +#if IS_ENABLED(CONFIG_UART0_PORT_F) + {"uart0" ,3 },/* PF2-PF4 */ +#else + {"uart0" ,6 },/* PB2-PB3 */ +#endif + {"uart3" ,7 },/* PB6-PB9 */ +}; + +static const struct sunxi_pinctrl_desc __maybe_unused sun20i_d1_pinctrl_desc = { + .functions = sun20i_d1_pinctrl_functions, + .num_functions =ARRAY_SIZE (sun20i_d1_pinctrl_functions), + .first_bank =SUNXI_GPIO_A , + .num_banks =7 , +}; + static const struct udevice_id sunxi_pinctrl_ids[] = { #ifdef CONFIG_PINCTRL_SUNIV_F1C100S {
@@ -904,6 +926,12 @@ static const struct udevice_id sunxi_pinctrl_ids[] = { .compatible = "allwinner,sun50i-h616-r-pinctrl", .data = (ulong)&sun50i_h616_r_pinctrl_desc, }, +#endif +#ifdef CONFIG_PINCTRL_SUN20I_D1 + { + .compatible = "allwinner,sun20i-d1-pinctrl", + .data = (ulong)&sun20i_d1_pinctrl_desc, + }, #endif {} };
Signature · 1 line
2.35.8
Re: [PATCH 09/20] pinctrl: sunxi: add Allwinner D1 pinctrl description
Quoted 7 lines · Andre Przywara
drivers/pinctrl/sunxi/pinctrl-sunxi.c +0
-0@@ -748,6 +748,28 @@ static const struct sunxi_pinctrl_desc __maybe_unused sun50i_h616_r_pinctrl_desc .num_banks = 1, };
drivers/pinctrl/sunxi/pinctrl-sunxi.c static const struct sunxi_pinctrl_desc __maybe_unused sun50i_h616_r_pinctrl_desc · line 759
Quoted 10 lines
drivers/pinctrl/sunxi/pinctrl-sunxi.c +9
-0+static const struct sunxi_pinctrl_function sun20i_d1_pinctrl_functions[] = { + {"emac" ,8 },/* PE0-PE15 */ + {"gpio_in" ,0 }, + {"gpio_out" ,1 }, + {"mmc0" ,2 },/* PF0-PF5 */ + {"mmc2" ,3 },/* PC1-PC7 */ + {"spi0" ,2 },/* PC2-PC7 */ +#if IS_ENABLED(CONFIG_UART0_PORT_F) + { "uart0", 3 }, /* PF2-PF4 */
/* PF2, PF4 */ ?
drivers/pinctrl/sunxi/pinctrl-sunxi.c static const struct sunxi_pinctrl_desc __maybe_unused sun50i_h616_r_pinctrl_desc · line 761
Quoted 2 lines
drivers/pinctrl/sunxi/pinctrl-sunxi.c +2
-0+#else + { "uart0", 6 }, /* PB2-PB3 */
/* PB0-PB1 */ ?
drivers/pinctrl/sunxi/pinctrl-sunxi.c static const struct sunxi_pinctrl_desc __maybe_unused sun50i_h616_r_pinctrl_desc · line 763
Quoted 2 lines
drivers/pinctrl/sunxi/pinctrl-sunxi.c +2
-0+#endif + { "uart3", 7 }, /* PB6-PB9 */
/* PB6-PB7 */ ?
drivers/pinctrl/sunxi/pinctrl-sunxi.c static const struct sunxi_pinctrl_desc __maybe_unused sun50i_h616_r_pinctrl_desc · line 764
Quoted 1 line
drivers/pinctrl/sunxi/pinctrl-sunxi.c +1
-0+};
Cheers,
Sam
PATCH 10/20 clk: sunxi: Add support for the D1 CCU
In reply to Andre PrzywaraFrom: Samuel Holland <[email protected]>
Since the D1 CCU binding is defined, we can add support for its gates/resets, following the pattern of the existing drivers.
--- drivers/clk/sunxi/Kconfig | 6 + drivers/clk/sunxi/Makefile | 1 + drivers/clk/sunxi/clk_d1.c | 84 ++++++++++++ drivers/clk/sunxi/clk_sunxi.c | 5 + include/dt-bindings/clock/sun20i-d1-ccu.h | 158 ++++++++++++++++++++++ include/dt-bindings/reset/sun20i-d1-ccu.h | 79 +++++++++++ 6 files changed, 333 insertions(+) create mode 100644 drivers/clk/sunxi/clk_d1.c create mode 100644 include/dt-bindings/clock/sun20i-d1-ccu.h create mode 100644 include/dt-bindings/reset/sun20i-d1-ccu.h
drivers/clk/sunxi/Kconfig +6 -0
@@ -87,6 +87,12 @@ config CLK_SUN8I_H3 This enables common clock driver support for platforms based on Allwinner H3/H5 SoC. +config CLK_SUN20I_D1 + bool "Clock driver for Allwinner D1" + help + This enables common clock driver support for platforms based + on Allwinner D1 SoC. + config CLK_SUN50I_H6 bool "Clock driver for Allwinner H6" default MACH_SUN50I_H6
drivers/clk/sunxi/Makefile +1 -0
@@ -19,6 +19,7 @@ obj-$(CONFIG_CLK_SUN8I_R40) += clk_r40.o 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_SUN20I_D1) += clk_d1.o obj-$(CONFIG_CLK_SUN50I_H6) += clk_h6.o obj-$(CONFIG_CLK_SUN50I_H6_R) += clk_h6_r.o obj-$(CONFIG_CLK_SUN50I_H616) += clk_h616.o
drivers/clk/sunxi/clk_d1.c new file +84 -0
84 lines not on this page · raw message
drivers/clk/sunxi/clk_sunxi.c +5 -0
@@ -118,6 +118,7 @@ extern const struct ccu_desc a64_ccu_desc;extern const struct ccu_desc a80_ccu_desc;extern const struct ccu_desc a80_mmc_clk_desc;extern const struct ccu_desc a83t_ccu_desc; +extern const struct ccu_desc d1_ccu_desc;extern const struct ccu_desc f1c100s_ccu_desc;extern const struct ccu_desc h3_ccu_desc;extern const struct ccu_desc h6_ccu_desc;
@@ -214,6 +215,10 @@ static const struct udevice_id sunxi_clk_ids[] = {#ifdef CONFIG_CLK_SUNIV_F1C100S { .compatible = "allwinner,suniv-f1c100s-ccu", .data = (ulong)&f1c100s_ccu_desc }, +#endif +#ifdef CONFIG_CLK_SUN20I_D1 + { .compatible = "allwinner,sun20i-d1-ccu", + .data = (ulong)&d1_ccu_desc },#endif { } };
include/dt-bindings/clock/sun20i-d1-ccu.h new file +158 -0
158 lines not on this page · raw message
include/dt-bindings/reset/sun20i-d1-ccu.h new file +79 -0
79 lines not on this page · raw message
Signature · 1 line
2.35.8
PATCH 11/20 sunxi: clock: D1/R528: Enable PLL LDO during PLL1 setup
In reply to Andre PrzywaraThe D1/R528/T113s SoCs introduce a new "LDO enable" bit in the CPUX_PLL. Just enable that when we program that PLL.
--- arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h | 1 + arch/arm/mach-sunxi/clock_sun50i_h6.c | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-)
arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h +1 -0
@@ -228,6 +228,7 @@ struct sunxi_ccm_reg {/* pll1 bit field */ #define CCM_PLL1_CTRL_EN BIT(31) +#define CCM_PLL1_LDO_EN BIT(30)#define CCM_PLL1_LOCK_EN BIT(29)#define CCM_PLL1_LOCK BIT(28)#define CCM_PLL1_OUT_EN BIT(27)
arch/arm/mach-sunxi/clock_sun50i_h6.c +7 -5
@@ -86,11 +86,13 @@ void clock_set_pll1(unsigned int clk)writel (val, &ccm->cpu_axi_cfg);/* 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); + val =CCM_PLL1_CTRL_EN |CCM_PLL1_LOCK_EN |CCM_PLL1_CLOCK_TIME_2 ; + val |=CCM_PLL1_CTRL_N (clk /24000000 ); +if (IS_ENABLED (CONFIG_MACH_SUN50I_H616 )) + val |=CCM_PLL1_OUT_EN ; +if (IS_ENABLED (CONFIG_SUNXI_GEN_NCAT2 )) + val |=CCM_PLL1_OUT_EN |CCM_PLL1_LDO_EN ; +writel (val, &ccm->pll1_cfg);while (!(readl (&ccm->pll1_cfg) &CCM_PLL1_LOCK )) {}/* Switch CPU to PLL1 */
Signature · 1 line
2.35.8
PATCH 12/20 sunxi: clock: support D1/R528 PLL6 clock
In reply to Andre PrzywaraThe PLL_PERIPH0 clock changed a bit in the D1/R528/T113s SoCs: there is new P0 divider at bits [18:16], and the M divider is 1.
Add code to support this version of "PLL6".
--- .../include/asm/arch-sunxi/clock_sun50i_h6.h | 2 ++ arch/arm/mach-sunxi/clock_sun50i_h6.c | 24 +++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-)
arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h +2 -0
@@ -249,6 +249,8 @@ struct sunxi_ccm_reg {#define CCM_PLL6_CTRL_EN BIT(31)#define CCM_PLL6_LOCK_EN BIT(29)#define CCM_PLL6_LOCK BIT(28) +#define CCM_PLL6_CTRL_P0_SHIFT 16 +#define CCM_PLL6_CTRL_P0_MASK (0x7 << CCM_PLL6_CTRL_P0_SHIFT)#define CCM_PLL6_CTRL_N_SHIFT 8#define CCM_PLL6_CTRL_N_MASK (0xff << CCM_PLL6_CTRL_N_SHIFT)#define CCM_PLL6_CTRL_DIV1_SHIFT 0
arch/arm/mach-sunxi/clock_sun50i_h6.c +17 -7
@@ -107,16 +107,26 @@ unsigned int clock_get_pll6(void) {struct sunxi_ccm_reg *const ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE ; -int m =IS_ENABLED (CONFIG_MACH_SUN50I_H6 ) ?4 :2 ; -uint32_t rval =readl (&ccm->pll6_cfg);int n = ((rval &CCM_PLL6_CTRL_N_MASK ) >>CCM_PLL6_CTRL_N_SHIFT ) +1 ; -int div1 = ((rval &CCM_PLL6_CTRL_DIV1_MASK ) >> -CCM_PLL6_CTRL_DIV1_SHIFT ) +1 ;int div2 = ((rval &CCM_PLL6_CTRL_DIV2_MASK ) >> -CCM_PLL6_CTRL_DIV2_SHIFT ) +1 ; -/* The register defines PLL6-2X or PLL6-4X, not plain PLL6 */ -return 24000000 / m * n / div1 / div2; +CCM_PLL6_CTRL_DIV2_SHIFT ) +1 ; +int div1, m; + +if (IS_ENABLED (CONFIG_SUNXI_GEN_NCAT2 )) { + div1 = ((rval &CCM_PLL6_CTRL_P0_MASK ) >> +CCM_PLL6_CTRL_P0_SHIFT ) +1 ; + m =1 ; + }else { + div1 = ((rval &CCM_PLL6_CTRL_DIV1_MASK ) >> +CCM_PLL6_CTRL_DIV1_SHIFT ) +1 ; +if (IS_ENABLED (CONFIG_MACH_SUN50I_H6 )) + m =4 ; +else + m =2 ; + } + +return 24000000U * n / m / div1 / div2; }int clock_twi_onoff (int port,int state)
Signature · 1 line
2.35.8
PATCH 13/20 sunxi: clock: h6: prepare for PRCM less SoCs
In reply to Andre PrzywaraThe Allwinner D1/R528/T113 SoCs have a very minimal separate "management" power plane, with almost no device attached to it (so no r_i2c or r_uart). This means we don't need to flip any clock gates in the PRCM block, which in fact those SoCs do not have.
Prepare the code for those SoCs by making the PRCM block optional in the H6 SPL clock code, which we otherwise share to this new family of SoCs. If the memory map (cpu.h) does not define the PRCM address, we simply skip any attempt to program gates there.
--- arch/arm/mach-sunxi/clock_sun50i_h6.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
arch/arm/mach-sunxi/clock_sun50i_h6.c +19 -3
@@ -4,14 +4,20 @@#include <asm/arch/clock.h> #include <asm/arch/prcm.h> +#ifndef SUNXI_PRCM_BASE +#define SUNXI_PRCM_BASE 0 +#endif +#ifdef CONFIG_SPL_BUILD -void clock_init_safe (void ) + +static void clock_init_safe_prcm (void ) { -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 ; +if (!prcm) +return ; +if (IS_ENABLED (CONFIG_MACH_SUN50I_H616 )) {/* this seems to enable PLLs on H616 */ setbits_le32 (&prcm->sys_pwroff_gating,0x10 );
@@ -27,6 +33,14 @@ void clock_init_safe(void)/* set PLL VDD LDO output to 1.14 V */ setbits_le32 (&prcm->pll_ldo_cfg,0x60000 ); } +} + +void clock_init_safe (void ) +{ +struct sunxi_ccm_reg *const ccm = + (struct sunxi_ccm_reg *)SUNXI_CCM_BASE ; + +clock_init_safe_prcm ();clock_set_pll1 (408000000 );
@@ -141,6 +155,8 @@ int clock_twi_onoff(int port, int state) value =BIT (GATE_SHIFT ) |BIT (RESET_SHIFT );if (port ==5 ) { +if (!prcm) +return -ENODEV ; shift =0 ; ptr = &prcm->twi_gate_reset; }else {
Signature · 1 line
2.35.8
PATCH 14/20 Kconfig: sunxi: prepare for using drivers/ram/sunxi
In reply to Andre PrzywaraAt the moment all Allwinner DRAM initialisation routines are stored in arch/arm/mach-sunxi, even though those "drivers" are just a giant collection of writel's, without any architectural dependency.
The R528/T113-s SoC (with ARM cores) and the D1/D1s Soc (with RISC-V cores) share the same die, so should share the same DRAM init routines as well.
To prepare for this, add a new sunxi directory inside drivers/ram, and add some stub entries to prepare for the addition of the share DRAM code for those SoCs.
The RISC-V D1(s) SoCs will probably use SPL_DM, so make this entry depend on that already.
--- drivers/ram/Kconfig | 3 ++- drivers/ram/sunxi/Kconfig | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 drivers/ram/sunxi/Kconfig
drivers/ram/Kconfig +2 -1
@@ -109,8 +109,9 @@ config IMXRT_SDRAM source "drivers/ram/aspeed/Kconfig" source "drivers/ram/cadence/Kconfig" +source "drivers/ram/octeon/Kconfig" source "drivers/ram/rockchip/Kconfig" source "drivers/ram/sifive/Kconfig" source "drivers/ram/stm32mp1/Kconfig" -source "drivers/ram/octeon/Kconfig" source "drivers/ram/starfive/Kconfig" +source "drivers/ram/sunxi/Kconfig"
drivers/ram/sunxi/Kconfig new file +13 -0
@@ -0,0 +1,13 @@ +config DRAM_SUN20I_D1 + bool "DM DRAM driver support for Allwinner D1" + depends on RAM && ARCH_SUNXI + default y + help + This enables support for DRAM drivers using the driver model + for Allwinner SoCs. + +config DRAM_SUN8I_R528 + bool "DRAM driver support for Allwinner R528/T113s" + default y if MACH_SUN8I_R528 + help + Select this DRAM controller driver for the R528/T113s SoCs.
Signature · 1 line
2.35.8
PATCH 15/20 sunxi: add R528/T113-s3/D1(s) DRAM initialisation code
In reply to Andre PrzywaraThe Allwinner R528/T113-s/D1/D1s SoCs all share the same die, so use the same DRAM initialisation code.
Make use of prior art here and lift some code from awboot[1], which carried init code based on earlier decompilation efforts, but with a GPL2 license tag.
This code has been heavily reworked and cleaned up, to match previous DRAM routines for other SoCs, and also to be closer to U-Boot's coding style and support routines.
The actual DRAM chip timing parameters are included in the main file, since they cover all DRAM types, and are protected by a new Kconfig CONFIG_SUNXI_DRAM_TYPE symbol, which allows the compiler to pick only the relevant settings, at build time.
The relevant DRAM chips/board specific configuration parameters are delivered via Kconfig, so this code here should work for all supported SoCs and DRAM chips combinations.
--- drivers/Makefile | 1 + drivers/ram/Makefile | 3 + drivers/ram/sunxi/Kconfig | 59 ++ drivers/ram/sunxi/Makefile | 4 + drivers/ram/sunxi/dram_sun20i_d1.c | 1432 ++++++++++++++++++++++++++++ drivers/ram/sunxi/dram_sun20i_d1.h | 73 ++ 6 files changed, 1572 insertions(+) create mode 100644 drivers/ram/sunxi/Makefile create mode 100644 drivers/ram/sunxi/dram_sun20i_d1.c create mode 100644 drivers/ram/sunxi/dram_sun20i_d1.h
drivers/Makefile +1 -0
@@ -54,6 +54,7 @@ obj-$(CONFIG_$(SPL_)ALTERA_SDRAM) += ddr/altera/ obj-$(CONFIG_ARCH_IMX8M) += ddr/imx/imx8m/ obj-$(CONFIG_IMX8ULP_DRAM) += ddr/imx/imx8ulp/ obj-$(CONFIG_ARCH_IMX9) += ddr/imx/imx9/ +obj-$(CONFIG_DRAM_SUN8I_R528) += ram/ obj-$(CONFIG_SPL_DM_RESET) += reset/ obj-$(CONFIG_SPL_MUSB_NEW) += usb/musb-new/ obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/
drivers/ram/Makefile +3 -0
@@ -23,6 +23,9 @@ obj-$(CONFIG_RAM_SIFIVE) += sifive/ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_STARFIVE_DDR) += starfive/ endif + +obj-$(CONFIG_DRAM_SUN8I_R528) += sunxi/ + obj-$(CONFIG_ARCH_OCTEON) += octeon/ obj-$(CONFIG_ARCH_RMOBILE) += renesas/
drivers/ram/sunxi/Kconfig +59 -0
62 lines not on this page · raw message
drivers/ram/sunxi/Makefile new file +4 -0
@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ + +obj-$(CONFIG_DRAM_SUN20I_D1) += dram_sun20i_d1.o +obj-$(CONFIG_DRAM_SUN8I_R528) += dram_sun20i_d1.o
drivers/ram/sunxi/dram_sun20i_d1.c new file +1432 -0
1,432 lines not on this page · raw message
drivers/ram/sunxi/dram_sun20i_d1.h new file +73 -0
73 lines not on this page · raw message
Signature · 1 line
2.35.8
Re: [PATCH 15/20] sunxi: add R528/T113-s3/D1(s) DRAM initialisation code
I've had countless successful boots of a T113-s3 using this DRAM controller code, so:
Quoted 1 line · Andre Przywara
Signed-off-by Andre Przywara <[email protected]>
PATCH 16/20 sunxi: add Allwinner R528/T113 SoC support
In reply to Andre PrzywaraThis adds the remaining code bits to teach U-Boot about Allwinner's newest SoC generation. This was introduced with the RISC-V based Allwinner D1 SoC, which actually shares a die with the ARM cores versions called R528 (BGA, without DRAM) and T113s (QFP, with embedded DRAM).
This adds the new Kconfig stanza, using the two newly introduced symbols for the new SoC generation and pincontroller. It also adds the new symbols to the relavent code places, to set all the hardcoded bits directly.
--- arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h | 9 +++++++-- arch/arm/mach-sunxi/Kconfig | 11 +++++++++++ arch/arm/mach-sunxi/board.c | 8 ++++++++ arch/arm/mach-sunxi/clock_sun50i_h6.c | 2 ++ arch/arm/mach-sunxi/cpu_info.c | 2 ++ common/spl/Kconfig | 1 + drivers/clk/sunxi/Kconfig | 1 + drivers/mmc/sunxi_mmc.c | 1 + drivers/pinctrl/sunxi/Kconfig | 1 + 9 files changed, 34 insertions(+), 2 deletions(-)
arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h +7 -2
@@ -266,7 +266,7 @@ struct sunxi_ccm_reg {#define CCM_CPU_AXI_AXI_MASK 0x3#define CCM_CPU_AXI_DEFAULT_FACTORS 0x301 -#ifdef CONFIG_MACH_SUN50I_H6 +#ifdef CONFIG_MACH_SUN50I_H6 /* H6 */ #define CCM_PLL6_DEFAULT 0xa0006300/* psi_ahb1_ahb2 bit field */
@@ -277,7 +277,7 @@ struct sunxi_ccm_reg {/* apb1 bit field */ #define CCM_APB1_DEFAULT 0x03000102 -#elif CONFIG_MACH_SUN50I_H616 +#elif CONFIG_MACH_SUN50I_H616 /* H616 */ #define CCM_PLL6_DEFAULT 0xa8003100/* psi_ahb1_ahb2 bit field */
@@ -288,6 +288,11 @@ struct sunxi_ccm_reg {/* apb1 bit field */ #define CCM_APB1_DEFAULT 0x03000102 +#elif CONFIG_MACH_SUN8I_R528 /* R528 */ +#define CCM_PLL6_DEFAULT 0xe8216300 +#define CCM_PSI_AHB1_AHB2_DEFAULT 0x03000002 +//#define CCM_AHB3_DEFAULT 0x03000002 +#define CCM_APB1_DEFAULT 0x03000102#endif /* apb2 bit field */
arch/arm/mach-sunxi/Kconfig +11 -0
@@ -352,6 +352,15 @@ config MACH_SUN8I_R40 select SUNXI_DRAM_DW_32BIT imply SPL_SYS_I2C_LEGACY +config MACH_SUN8I_R528 + bool "sun8i (Allwinner R528)" + select CPU_V7A + select SUNXI_GEN_NCAT2 + select SUNXI_NEW_PINCTRL + select MMC_SUNXI_HAS_NEW_MODE + select SUPPORT_SPL + select DRAM_SUN8I_R528 + config MACH_SUN8I_V3S bool "sun8i (Allwinner V3/V3s/S3/S3L)" select CPU_V7A
@@ -662,6 +671,7 @@ config SYS_CLK_FREQ default 1008000000 if MACH_SUN9I default 888000000 if MACH_SUN50I_H6 default 1008000000 if MACH_SUN50I_H616 + default 1008000000 if MACH_SUN8I_R528 config SYS_CONFIG_NAME default "suniv" if MACH_SUNIV
@@ -670,6 +680,7 @@ config SYS_CONFIG_NAME default "sun6i" if MACH_SUN6I default "sun7i" if MACH_SUN7I default "sun8i" if MACH_SUN8I + default "sun8i" if MACH_SUN8I_R528 default "sun9i" if MACH_SUN9I default "sun50i" if MACH_SUN50I default "sun50i" if MACH_SUN50I_H6
arch/arm/mach-sunxi/board.c +8 -0
@@ -147,6 +147,10 @@ static int gpio_init(void)sunxi_gpio_set_cfgpin (SUNXI_GPH (12 ),SUN9I_GPH_UART0 );sunxi_gpio_set_cfgpin (SUNXI_GPH (13 ),SUN9I_GPH_UART0 );sunxi_gpio_set_pull (SUNXI_GPH (13 ),SUNXI_GPIO_PULL_UP ); +#elif CONFIG_CONS_INDEX ==1 && defined(CONFIG_MACH_SUN8I_R528 ) +sunxi_gpio_set_cfgpin (SUNXI_GPE (2 ),6 ); +sunxi_gpio_set_cfgpin (SUNXI_GPE (3 ),6 ); +sunxi_gpio_set_pull (SUNXI_GPE (3 ),SUNXI_GPIO_PULL_UP );#elif CONFIG_CONS_INDEX ==2 && defined(CONFIG_MACH_SUNIV )sunxi_gpio_set_cfgpin (SUNXI_GPA (2 ),SUNIV_GPE_UART0 );sunxi_gpio_set_cfgpin (SUNXI_GPA (3 ),SUNIV_GPE_UART0 );
@@ -163,6 +167,10 @@ static int gpio_init(void)sunxi_gpio_set_cfgpin (SUNXI_GPB (0 ),SUN8I_GPB_UART2 );sunxi_gpio_set_cfgpin (SUNXI_GPB (1 ),SUN8I_GPB_UART2 );sunxi_gpio_set_pull (SUNXI_GPB (1 ),SUNXI_GPIO_PULL_UP ); +#elif CONFIG_CONS_INDEX ==4 && defined(CONFIG_MACH_SUN8I_R528 ) +sunxi_gpio_set_cfgpin (SUNXI_GPB (6 ),7 ); +sunxi_gpio_set_cfgpin (SUNXI_GPB (7 ),7 ); +sunxi_gpio_set_pull (SUNXI_GPB (7 ),SUNXI_GPIO_PULL_UP );#elif CONFIG_CONS_INDEX ==5 && defined(CONFIG_MACH_SUN8I )sunxi_gpio_set_cfgpin (SUNXI_GPL (2 ),SUN8I_GPL_R_UART );sunxi_gpio_set_cfgpin (SUNXI_GPL (3 ),SUN8I_GPL_R_UART );
arch/arm/mach-sunxi/clock_sun50i_h6.c +2 -0
@@ -52,7 +52,9 @@ void clock_init_safe(void) CCM_CPU_AXI_DEFAULT_FACTORS);writel (CCM_PSI_AHB1_AHB2_DEFAULT , &ccm->psi_ahb1_ahb2_cfg); +#ifdef CCM_AHB3_DEFAULT writel (CCM_AHB3_DEFAULT , &ccm->ahb3_cfg); +#endif writel (CCM_APB1_DEFAULT , &ccm->apb1_cfg);/*
arch/arm/mach-sunxi/cpu_info.c +2 -0
@@ -93,6 +93,8 @@ int print_cpuinfo(void)printf ("CPU: Allwinner R40 (SUN8I %04x)\n" ,sunxi_get_sram_id ());#elif definedCONFIG_MACH_SUN8I_V3S printf ("CPU: Allwinner V3s (SUN8I %04x)\n" ,sunxi_get_sram_id ()); +#elif definedCONFIG_MACH_SUN8I_R528 +puts ("CPU: Allwinner R528 (SUN8I)\n" );#elif definedCONFIG_MACH_SUN9I puts ("CPU: Allwinner A80 (SUN9I)\n" );#elif definedCONFIG_MACH_SUN50I
common/spl/Kconfig +1 -0
@@ -357,6 +357,7 @@ config SPL_STACK default 0x91ffb8 if ARCH_MX6 && !MX6_OCRAM_256KB default 0x118000 if MACH_SUN50I_H6 default 0x58000 if MACH_SUN50I_H616 + default 0x40000 if MACH_SUN8I_R528 default 0x54000 if MACH_SUN50I || MACH_SUN50I_H5 default 0x18000 if MACH_SUN9I default 0x8000 if ARCH_SUNXI
drivers/clk/sunxi/Kconfig +1 -0
@@ -89,6 +89,7 @@ config CLK_SUN8I_H3 config CLK_SUN20I_D1 bool "Clock driver for Allwinner D1" + default MACH_SUN8I_R528 help This enables common clock driver support for platforms based on Allwinner D1 SoC.
drivers/mmc/sunxi_mmc.c +1 -0
@@ -708,6 +708,7 @@ static const struct udevice_id sunxi_mmc_ids[] = { { .compatible = "allwinner,sun50i-h6-emmc" }, { .compatible = "allwinner,sun50i-a100-mmc" }, { .compatible = "allwinner,sun50i-a100-emmc" }, + { .compatible = "allwinner,sun20i-d1-mmc" }, {/* sentinel */ } };
drivers/pinctrl/sunxi/Kconfig +1 -0
@@ -126,6 +126,7 @@ config PINCTRL_SUN50I_H616_R config PINCTRL_SUN20I_D1 bool "Support for the Allwinner D1/R528 PIO" + default MACH_SUN8I_R528 select PINCTRL_SUNXI endif
Signature · 1 line
2.35.8
Re: [PATCH 16/20] sunxi: add Allwinner R528/T113 SoC support
пт, 21 июл. 2023 г. в 16:47, Andre Przywara <[email protected]>:
Quoted 6 lines
This adds the remaining code bits to teach U-Boot about Allwinner's newest SoC generation. This was introduced with the RISC-V based Allwinner D1 SoC, which actually shares a die with the ARM cores versions called R528 (BGA, without DRAM) and T113s (QFP, with embedded DRAM).
Quoted 6 lines
This adds the new
Kconfigstanza, using the two newly introduced symbols for the new SoC generation and pincontroller. It also adds the new symbols to the relavent code places, to set all the hardcoded bits directly.Signed-off-by Andre Przywara <[email protected]>---
Hi, Andre!
I just tested this series on my T113s board. Everything works good. Thanks for your work!
PATCH 17/20 sunxi: refactor serial base addresses to avoid asm/arch/cpu.h
In reply to Andre PrzywaraAt the moment we have each SoC's memory map defined in its own cpu.h, which is included in include/configs/sunxi_common.h. This will be a problem with the introduction of Allwinner RISC-V support.
Remove the inclusion of that header file from the common config header, instead move the required serial base addresses (for the SPL) into a separate header file. Then include the original cpu.h file only where we really need it, which is only under arch/arm now.
This disentangles the architecture specific header files from the generic code.
--- arch/arm/cpu/armv7/sunxi/sram.c | 1 + arch/arm/cpu/armv8/fel_utils.S | 1 + arch/arm/include/asm/arch-sunxi/boot0.h | 2 ++ arch/arm/include/asm/arch-sunxi/clock.h | 1 + arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 15 --------- .../include/asm/arch-sunxi/cpu_sun50i_h6.h | 5 --- arch/arm/include/asm/arch-sunxi/cpu_sun9i.h | 7 ---- .../include/asm/arch-sunxi/cpu_sunxi_ncat2.h | 4 --- arch/arm/include/asm/arch-sunxi/serial.h | 32 +++++++++++++++++++ arch/arm/mach-sunxi/gtbus_sun9i.c | 1 + arch/arm/mach-sunxi/timer.c | 1 + include/configs/sunxi-common.h | 2 +- 12 files changed, 40 insertions(+), 32 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/serial.h
arch/arm/cpu/armv7/sunxi/sram.c +1 -0
@@ -12,6 +12,7 @@#include <common.h> #include <init.h> #include <asm/io.h> +#include <asm/arch/cpu.h> void sunxi_sram_init (void ) {
arch/arm/cpu/armv8/fel_utils.S +1 -0
@@ -10,6 +10,7 @@ #include <config.h> #include <asm/system.h> #include <linux/linkage.h> +#include <asm/arch/cpu.h> /* * We don't overwrite save_boot_params() here, to save the FEL state upon
arch/arm/include/asm/arch-sunxi/boot0.h +2 -0
@@ -3,6 +3,8 @@* Configuration settings for the Allwinner A64 (sun50i) CPU */ +#include <asm/arch/cpu.h> +#if defined(CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER ) && !defined(CONFIG_SPL_BUILD )/* reserve space for BOOT0 header information */ b reset
arch/arm/include/asm/arch-sunxi/clock.h +1 -0
@@ -9,6 +9,7 @@#define _SUNXI_CLOCK_H#include <linux/types.h> +#include <asm/arch/cpu.h> #define CLK_GATE_OPEN 0x1#define CLK_GATE_CLOSE 0x0
arch/arm/include/asm/arch-sunxi/cpu_sun4i.h +0 -15
@@ -128,20 +128,6 @@ defined(CONFIG_MACH_SUN50I)#define SUNXI_CPUCFG_BASE 0x01c25c00#endif -#ifdef CONFIG_MACH_SUNIV -#define SUNXI_UART0_BASE 0x01c25000 -#define SUNXI_UART1_BASE 0x01c25400 -#define SUNXI_UART2_BASE 0x01c25800 -#else -#define SUNXI_UART0_BASE 0x01c28000 -#define SUNXI_UART1_BASE 0x01c28400 -#define SUNXI_UART2_BASE 0x01c28800 -#endif -#define SUNXI_UART3_BASE 0x01c28c00 -#define SUNXI_UART4_BASE 0x01c29000 -#define SUNXI_UART5_BASE 0x01c29400 -#define SUNXI_UART6_BASE 0x01c29800 -#define SUNXI_UART7_BASE 0x01c29c00#define SUNXI_PS2_0_BASE 0x01c2a000#define SUNXI_PS2_1_BASE 0x01c2a400
@@ -208,7 +194,6 @@ defined(CONFIG_MACH_SUN50I)#endif #define SUNXI_R_TWI_BASE 0x01f02400 -#define SUNXI_R_UART_BASE 0x01f02800#define SUN6I_P2WI_BASE 0x01f03400#define SUNXI_RSB_BASE 0x01f03400
arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h +0 -5
@@ -42,10 +42,6 @@#define SUNXI_DRAM_PHY0_BASE 0x04800000#endif -#define SUNXI_UART0_BASE 0x05000000 -#define SUNXI_UART1_BASE 0x05000400 -#define SUNXI_UART2_BASE 0x05000800 -#define SUNXI_UART3_BASE 0x05000C00#define SUNXI_TWI0_BASE 0x05002000#define SUNXI_TWI1_BASE 0x05002400#define SUNXI_TWI2_BASE 0x05002800
@@ -67,7 +63,6 @@#define SUNXI_R_CPUCFG_BASE 0x07000400#define SUNXI_PRCM_BASE 0x07010000#define SUNXI_R_WDOG_BASE 0x07020400 -#define SUNXI_R_UART_BASE 0x07080000#define SUNXI_R_TWI_BASE 0x07081400#ifndef __ASSEMBLY__
arch/arm/include/asm/arch-sunxi/cpu_sun9i.h +0 -7
@@ -86,12 +86,6 @@#define SUNXI_LRADC_BASE (REGS_APB0_BASE + 0x1800)/* APB1 Module */ -#define SUNXI_UART0_BASE (REGS_APB1_BASE + 0x0000) -#define SUNXI_UART1_BASE (REGS_APB1_BASE + 0x0400) -#define SUNXI_UART2_BASE (REGS_APB1_BASE + 0x0800) -#define SUNXI_UART3_BASE (REGS_APB1_BASE + 0x0C00) -#define SUNXI_UART4_BASE (REGS_APB1_BASE + 0x1000) -#define SUNXI_UART5_BASE (REGS_APB1_BASE + 0x1400)#define SUNXI_TWI0_BASE (REGS_APB1_BASE + 0x2800)#define SUNXI_TWI1_BASE (REGS_APB1_BASE + 0x2C00)#define SUNXI_TWI2_BASE (REGS_APB1_BASE + 0x3000)
@@ -100,7 +94,6 @@/* RCPUS Module */ #define SUNXI_PRCM_BASE (REGS_RCPUS_BASE + 0x1400) -#define SUNXI_R_UART_BASE (REGS_RCPUS_BASE + 0x2800)#define SUNXI_RSB_BASE (REGS_RCPUS_BASE + 0x3400)/* Misc. */
arch/arm/include/asm/arch-sunxi/cpu_sunxi_ncat2.h +0 -4
@@ -10,10 +10,6 @@#define SUNXI_CCM_BASE 0x02001000#define SUNXI_TIMER_BASE 0x02050000 -#define SUNXI_UART0_BASE 0x02500000 -#define SUNXI_UART1_BASE 0x02500400 -#define SUNXI_UART2_BASE 0x02500800 -#define SUNXI_UART3_BASE 0x02500C00#define SUNXI_TWI0_BASE 0x02502000#define SUNXI_TWI1_BASE 0x02502400#define SUNXI_TWI2_BASE 0x02502800
arch/arm/include/asm/arch-sunxi/serial.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* hardcoded UART base addresses for early SPL use +* +* Copyright (c) 2022 Arm Ltd. +*/ + +#ifndef SUNXI_SERIAL_MEMMAP_H +#define SUNXI_SERIAL_MEMMAP_H + +#if defined(CONFIG_MACH_SUN9I ) +#define SUNXI_UART0_BASE 0x07000000 +#define SUNXI_R_UART_BASE 0x08002800 +#elif defined(CONFIG_SUN50I_GEN_H6 ) +#define SUNXI_UART0_BASE 0x05000000 +#define SUNXI_R_UART_BASE 0x07080000 +#elif defined(CONFIG_MACH_SUNIV ) +#define SUNXI_UART0_BASE 0x01c25000 +#define SUNXI_R_UART_BASE 0 +#elif defined(CONFIG_SUNXI_GEN_NCAT2 ) +#define SUNXI_UART0_BASE 0x02500000 +#define SUNXI_R_UART_BASE 0 // 0x07080000 (?> +#else +#define SUNXI_UART0_BASE 0x01c28000 +#define SUNXI_R_UART_BASE 0x01f02800 +#endif + +#define SUNXI_UART1_BASE (SUNXI_UART0_BASE + 0x400) +#define SUNXI_UART2_BASE (SUNXI_UART0_BASE + 0x800) +#define SUNXI_UART3_BASE (SUNXI_UART0_BASE + 0xc00) + +#endif /* SUNXI_SERIAL_MEMMAP_H */
arch/arm/mach-sunxi/gtbus_sun9i.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <asm/io.h> +#include <asm/arch/cpu.h> #include <asm/arch/gtbus_sun9i.h> #include <asm/arch/sys_proto.h>
arch/arm/mach-sunxi/timer.c +1 -0
@@ -10,6 +10,7 @@#include <time.h> #include <asm/global_data.h> #include <asm/io.h> +#include <asm/arch/cpu.h> #include <asm/arch/timer.h> #include <linux/delay.h>
include/configs/sunxi-common.h +1 -1
@@ -12,7 +12,6 @@#ifndef _SUNXI_COMMON_CONFIG_H#define _SUNXI_COMMON_CONFIG_H -#include <asm/arch/cpu.h> #include <linux/stringify.h> /* Serial & console */
@@ -24,6 +23,7 @@#define CFG_SYS_NS16550_CLK 24000000#endif #if !CONFIG_IS_ENABLED (DM_SERIAL ) +#include <asm/arch/serial.h> # define CFG_SYS_NS16550_COM1 SUNXI_UART0_BASE# define CFG_SYS_NS16550_COM2 SUNXI_UART1_BASE# define CFG_SYS_NS16550_COM3 SUNXI_UART2_BASE
Signature · 1 line
2.35.8
PATCH 18/20 riscv: dts: allwinner: Add the D1/D1s SoC devicetree
In reply to Andre PrzywaraFrom: Samuel Holland <[email protected]>
D1 (aka D1-H), D1s (aka F133), R528, and T113 are a family of SoCs based on a single die, or at a pair of dies derived from the same design.
D1 and D1s contain a single T-HEAD Xuantie C906 CPU, whereas R528 and T113 contain a pair of Cortex-A7's. D1 and R528 are the full version of the chip with a BGA package, whereas D1s and T113 are low-pin-count QFP variants.
Because the original design supported both ARM and RISC-V CPUs, some peripherals are duplicated. In addition, all variants except D1s contain a HiFi 4 DSP with its own set of peripherals.
The devicetrees are organized to minimize duplication:
- Common perhiperals are described in sunxi-d1s-t113.dtsi
- DSP-related peripherals are described in sunxi-d1-t113.dtsi
- RISC-V specific hardware is described in sun20i-d1s.dtsi
- Functionality unique to the D1 variant is described in sun20i-d1.dtsi
The SOC_PERIPHERAL_IRQ macro handles the different #interrupt-cells values between the ARM (GIC) and RISC-V (PLIC) versions of the SoC.
--- arch/riscv/dts/sun20i-common-regulators.dtsi | 28 + arch/riscv/dts/sun20i-d1.dtsi | 66 ++ arch/riscv/dts/sun20i-d1s.dtsi | 76 ++ arch/riscv/dts/sunxi-d1-t113.dtsi | 15 + arch/riscv/dts/sunxi-d1s-t113.dtsi | 846 +++++++++++++++++++ include/dt-bindings/clock/sun20i-d1-r-ccu.h | 19 + include/dt-bindings/reset/sun20i-d1-r-ccu.h | 16 + 7 files changed, 1066 insertions(+) create mode 100644 arch/riscv/dts/sun20i-common-regulators.dtsi create mode 100644 arch/riscv/dts/sun20i-d1.dtsi create mode 100644 arch/riscv/dts/sun20i-d1s.dtsi create mode 100644 arch/riscv/dts/sunxi-d1-t113.dtsi create mode 100644 arch/riscv/dts/sunxi-d1s-t113.dtsi create mode 100644 include/dt-bindings/clock/sun20i-d1-r-ccu.h create mode 100644 include/dt-bindings/reset/sun20i-d1-r-ccu.h
arch/riscv/dts/sun20i-common-regulators.dtsi new file +28 -0
@@ -0,0 +1,28 @@ +// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// Copyright (C) 2021-2022 Samuel Holland <[email protected]> + +/ { + reg_vcc: vcc { + compatible = "regulator-fixed"; + regulator-name = "vcc"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + + reg_vcc_3v3: vcc-3v3 { + compatible = "regulator-fixed"; + regulator-name = "vcc-3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <®_vcc>; + }; +}; + +&pio { + vcc-pb-supply = <®_vcc_3v3>; + vcc-pc-supply = <®_vcc_3v3>; + vcc-pd-supply = <®_vcc_3v3>; + vcc-pe-supply = <®_vcc_3v3>; + vcc-pf-supply = <®_vcc_3v3>; + vcc-pg-supply = <®_vcc_3v3>; +};
arch/riscv/dts/sun20i-d1.dtsi new file +66 -0
66 lines not on this page · raw message
arch/riscv/dts/sun20i-d1s.dtsi new file +76 -0
76 lines not on this page · raw message
arch/riscv/dts/sunxi-d1-t113.dtsi new file +15 -0
@@ -0,0 +1,15 @@ +// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// Copyright (C) 2021-2022 Samuel Holland <[email protected]> + +/ { + soc { + dsp_wdt: watchdog@1700400 { + compatible = "allwinner,sun20i-d1-wdt"; + reg = <0x1700400 0x20>; + interrupts = <SOC_PERIPHERAL_IRQ(122) IRQ_TYPE_LEVEL_HIGH>; + clocks = <&dcxo>, <&rtc CLK_OSC32K>; + clock-names = "hosc", "losc"; + status = "reserved"; + }; + }; +};
arch/riscv/dts/sunxi-d1s-t113.dtsi new file +846 -0
846 lines not on this page · raw message
include/dt-bindings/clock/sun20i-d1-r-ccu.h new file +19 -0
@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* +* Copyright (C) 2021 Samuel Holland <[email protected]> +*/ + +#ifndef _DT_BINDINGS_CLK_SUN20I_D1_R_CCU_H_ +#define _DT_BINDINGS_CLK_SUN20I_D1_R_CCU_H_ + +#define CLK_R_AHB 0 + +#define CLK_BUS_R_TIMER 2 +#define CLK_BUS_R_TWD 3 +#define CLK_BUS_R_PPU 4 +#define CLK_R_IR_RX 5 +#define CLK_BUS_R_IR_RX 6 +#define CLK_BUS_R_RTC 7 +#define CLK_BUS_R_CPUCFG 8 + +#endif /* _DT_BINDINGS_CLK_SUN20I_D1_R_CCU_H_ */
include/dt-bindings/reset/sun20i-d1-r-ccu.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* +* Copyright (C) 2021 Samuel Holland <[email protected]> +*/ + +#ifndef _DT_BINDINGS_RST_SUN20I_D1_R_CCU_H_ +#define _DT_BINDINGS_RST_SUN20I_D1_R_CCU_H_ + +#define RST_BUS_R_TIMER 0 +#define RST_BUS_R_TWD 1 +#define RST_BUS_R_PPU 2 +#define RST_BUS_R_IR_RX 3 +#define RST_BUS_R_RTC 4 +#define RST_BUS_R_CPUCFG 5 + +#endif /* _DT_BINDINGS_RST_SUN20I_D1_R_CCU_H_ */
Signature · 1 line
2.35.8
PATCH 19/20 ARM: dts: sunxi: add Allwinner T113-s SoC .dtsi
In reply to Andre PrzywaraThe Allwinner T113-s SoC is apparently using the same (or at least a very similar) die as the D1/D1s, but replaces the single RISC-V core with two Arm Cortex-A7 cores.
Since the D1 core .dtsi already describes all common peripherals, we just need a DT describing the ARM specific peripherals: the CPU cores, the Generic Timer, the GIC and the PMU.
We include the core .dtsi directly from the riscv DT directory.
The ARM core version of the DT specifies the CPUX watchdog as "reserved", which means it won't be recognised by U-Boot. Override this in our generic sunxi-u-boot.dtsi, to let U-Boot pick up this watchdog, so that the generic reset driver will work.
--- arch/arm/dts/sun8i-t113s.dtsi | 59 ++++++++++++++++++++++++++++++++++ arch/arm/dts/sunxi-u-boot.dtsi | 7 ++++ 2 files changed, 66 insertions(+) create mode 100644 arch/arm/dts/sun8i-t113s.dtsi
arch/arm/dts/sun8i-t113s.dtsi new file +59 -0
@@ -0,0 +1,59 @@ +// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// Copyright (C) 2022 Arm Ltd. + +#define SOC_PERIPHERAL_IRQ(nr) GIC_SPI nr + +#include <dt-bindings/interrupt-controller/arm-gic.h> +#include <../../riscv/dts/sunxi-d1s-t113.dtsi> +#include <../../riscv/dts/sunxi-d1-t113.dtsi> + +/ { + interrupt-parent = <&gic>; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu0: cpu@0 { + compatible = "arm,cortex-a7"; + device_type = "cpu"; + reg = <0>; + clocks = <&ccu CLK_CPUX>; + clock-names = "cpu"; + }; + + cpu1: cpu@1 { + compatible = "arm,cortex-a7"; + device_type = "cpu"; + reg = <1>; + clocks = <&ccu CLK_CPUX>; + clock-names = "cpu"; + }; + }; + + gic: interrupt-controller@1c81000 { + 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>; + }; + + timer { + compatible = "arm,armv7-timer"; + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; + }; + + pmu { + compatible = "arm,cortex-a7-pmu"; + interrupts = <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>; + interrupt-affinity = <&cpu0>, <&cpu1>; + }; +};
arch/arm/dts/sunxi-u-boot.dtsi +7 -0
@@ -23,6 +23,13 @@ }; }; +/* Let U-Boot be the firmware layer that controls the watchdog. */ +#ifdef CONFIG_MACH_SUN8I_R528 +&wdt { + status = "okay"; +}; +#endif + &binman { u-boot-sunxi-with-spl { filename = "u-boot-sunxi-with-spl.bin";
Signature · 1 line
2.35.8
Re: [PATCH 19/20] ARM: dts: sunxi: add Allwinner T113-s SoC .dtsi
Quoted 8 lines · Andre Przywara
The Allwinner T113-s SoC is apparently using the same (or at least a very similar) die as the D1/D1s, but replaces the single RISC-V core with two Arm Cortex-A7 cores.
Since the D1 core .dtsi already describes all common peripherals, we just need a DT describing the ARM specific peripherals: the CPU cores, the Generic Timer, the GIC and the PMU.
We include the core .dtsi directly from the riscv DT directory.
Quoted 6 lines
The ARM core version of the DT specifies the CPUX watchdog as "reserved", which means it won't be recognised by U-Boot. Override this in our generic
sunxi-u-boot.dtsi, to let U-Boot pick up this watchdog, so that the generic reset driver will work.Signed-off-by Andre Przywara <[email protected]>
Quoted 8 lines
arch/arm/dts/sunxi-u-boot.dtsi +0
-0@@ -23,6 +23,13 @@ }; };
arch/arm/dts/sunxi-u-boot.dtsi line 35
Quoted 10 lines
arch/arm/dts/sunxi-u-boot.dtsi +7
-0+/* Let U-Boot be the firmware layer that controls the watchdog. */ +#ifdef CONFIG_MACH_SUN8I_R528 +&wdt { + status = "okay"; +}; +#endif + &binman { u-boot-sunxi-with-spl { filename = "u-boot-sunxi-with-spl.bin";
Nice!!
Thanks,
Sam
PATCH 20/20 sunxi: add MangoPi MQ-R board support
In reply to Andre PrzywaraThis copies the T113s specific DTs from the Linux kernel tree (v6.4-rc1), and adds a defconfig to get the board booted.
--- arch/arm/dts/Makefile | 2 + .../arm/dts/sun8i-t113s-mangopi-mq-r-t113.dts | 35 +++++ arch/arm/dts/sunxi-d1s-t113-mangopi-mq-r.dtsi | 126 ++++++++++++++++++ configs/mangopi_mq_r_defconfig | 15 +++ 4 files changed, 178 insertions(+) create mode 100644 arch/arm/dts/sun8i-t113s-mangopi-mq-r-t113.dts create mode 100644 arch/arm/dts/sunxi-d1s-t113-mangopi-mq-r.dtsi create mode 100644 configs/mangopi_mq_r_defconfig
arch/arm/dts/Makefile +2 -0
@@ -722,6 +722,8 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \ sun8i-s3-pinecube.dtb \ sun8i-v3-sl631-imx179.dtb \ sun8i-v3s-licheepi-zero.dtb +dtb-$(CONFIG_MACH_SUN8I_R528) += \ + sun8i-t113s-mangopi-mq-r-t113.dtb dtb-$(CONFIG_MACH_SUN50I_H5) += \ sun50i-h5-bananapi-m2-plus.dtb \ sun50i-h5-emlid-neutis-n5-devboard.dtb \
arch/arm/dts/sun8i-t113s-mangopi-mq-r-t113.dts new file +35 -0
@@ -0,0 +1,35 @@ +// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// Copyright (C) 2022 Arm Ltd. + +#include <dt-bindings/interrupt-controller/irq.h> + +/dts-v1/; + +#include "sun8i-t113s.dtsi" +#include "sunxi-d1s-t113-mangopi-mq-r.dtsi" + +/ { + model = "MangoPi MQ-R-T113"; + compatible = "widora,mangopi-mq-r-t113", "allwinner,sun8i-t113s"; + + aliases { + ethernet0 = &rtl8189ftv; + }; +}; + +&cpu0 { + cpu-supply = <®_vcc_core>; +}; + +&cpu1 { + cpu-supply = <®_vcc_core>; +}; + +&mmc1 { + rtl8189ftv: wifi@1 { + reg = <1>; + interrupt-parent = <&pio>; + interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 = WL_WAKE_AP */ + interrupt-names = "host-wake"; + }; +};
arch/arm/dts/sunxi-d1s-t113-mangopi-mq-r.dtsi new file +126 -0
126 lines not on this page · raw message
configs/mangopi_mq_r_defconfig new file +15 -0
@@ -0,0 +1,15 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_DEFAULT_DEVICE_TREE="sun8i-t113s-mangopi-mq-r-t113" +CONFIG_SPL=y +CONFIG_MACH_SUN8I_R528=y +CONFIG_DRAM_CLK=792 +CONFIG_DRAM_ZQ=8092667 +CONFIG_SUNXI_MINIMUM_DRAM_MB=128 +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_DRAM_SUNXI_ODT_EN=0 +CONFIG_DRAM_SUNXI_TPR0=0x004a2195 +CONFIG_DRAM_SUNXI_TPR11=0x340000 +CONFIG_DRAM_SUNXI_TPR12=0x46 +CONFIG_DRAM_SUNXI_TPR13=0x34000100 +CONFIG_CONS_INDEX=4
Signature · 1 line
2.35.8
PATCH 1/1 sunxi: remove CONFIG_SATAPWR
In reply to Andre PrzywaraThe CONFIG_SATAPWR Kconfig symbol was used to point to a GPIO that enables the power for a SATA harddisk.
In the DT this is described with the target-supply property in the AHCI DT node, pointing to a (GPIO controlled) regulator. Since we need SATA only in U-Boot proper, and use a DM driver for AHCI there, we should use the DT instead of hardcoding this.
Add code to the sunxi AHCI driver to check the DT for that regulator and enable it, at probe time. Then drop the current code from board.c, which was doing that job before.
This allows us to remove the SATAPWR Kconfig definition and the respective values from the defconfigs.
We also select the generic fixed regulator driver, which handles those GPIO controlled regulators.
---
Hi, this patch is actually the first patch in the T113s support series, but was missing from the post. Without it the next patches won't apply cleanly. It's part of the gitlab branch:
https://source.denx.de/u-boot/custodians/u-boot-sunxi/-/commits/t113s/
Cheers,
Andre
arch/arm/Kconfig | 2 ++ arch/arm/mach-sunxi/Kconfig | 8 -------- board/sunxi/board.c | 16 +--------------- configs/A10-OLinuXino-Lime_defconfig | 1 - configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 - configs/A20-OLinuXino-Lime2_defconfig | 1 - configs/A20-OLinuXino-Lime_defconfig | 1 - configs/A20-OLinuXino_MICRO-eMMC_defconfig | 1 - configs/A20-OLinuXino_MICRO_defconfig | 1 - configs/A20-Olimex-SOM-EVB_defconfig | 1 - configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 - configs/A20-Olimex-SOM204-EVB_defconfig | 1 - configs/Cubieboard2_defconfig | 1 - configs/Cubieboard_defconfig | 1 - configs/Cubietruck_defconfig | 1 - configs/Itead_Ibox_A20_defconfig | 1 - configs/Lamobo_R1_defconfig | 1 - configs/Linksprite_pcDuino3_Nano_defconfig | 1 - configs/Linksprite_pcDuino3_defconfig | 1 - configs/Sinovoip_BPI_M3_defconfig | 1 - configs/orangepi_plus_defconfig | 2 +- drivers/ata/ahci_sunxi.c | 9 +++++++++ 22 files changed, 13 insertions(+), 41 deletions(-)
arch/arm/Kconfig +2 -0
@@ -1158,6 +1158,8 @@ config ARCH_SUNXI imply CMD_GPT imply CMD_UBI if MTD_RAW_NAND imply DISTRO_DEFAULTS + imply DM_REGULATOR + imply DM_REGULATOR_FIXED imply FAT_WRITE imply FIT imply OF_LIBFDT_OVERLAY
arch/arm/mach-sunxi/Kconfig +0 -8
@@ -1008,14 +1008,6 @@ config VIDEO_LCD_TL059WV5C0 endchoice -config SATAPWR - string "SATA power pin" - default "" - help - Set the pins used to power the SATA. This takes a string in the - format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of - port H. - config GMAC_TX_DELAY int "GMAC Transmit Clock Delay Chain" default 0
board/sunxi/board.c +1 -15
@@ -187,7 +187,7 @@ enum env_location env_get_location(enum env_operation op, int prio)/* add board specific code here */ int board_init (void ) { -__maybe_unused int id_pfr1, ret, satapwr_pin, macpwr_pin; +__maybe_unused int id_pfr1, ret, macpwr_pin; gd->bd->bi_boot_params = (PHYS_SDRAM_0 +0x100 );
@@ -225,20 +225,6 @@ int board_init(void)return ret;/* strcmp() would look better, but doesn't get optimised away. */ -if (CONFIG_SATAPWR [0 ]) { - satapwr_pin =sunxi_name_to_gpio (CONFIG_SATAPWR ); -if (satapwr_pin >=0 ) { -gpio_request (satapwr_pin,"satapwr" ); -gpio_direction_output (satapwr_pin,1 ); - -/* -* Give the attached SATA device time to power-up -* to avoid link timeouts -*/ -mdelay (500 ); - } - } -if (CONFIG_MACPWR [0 ]) { macpwr_pin =sunxi_name_to_gpio (CONFIG_MACPWR );if (macpwr_pin >=0 ) {
configs/A10-OLinuXino-Lime_defconfig +0 -1
@@ -7,7 +7,6 @@ CONFIG_DRAM_CLK=480 CONFIG_DRAM_EMR1=4 CONFIG_SYS_CLK_FREQ=912000000 CONFIG_I2C1_ENABLE=y -CONFIG_SATAPWR="PC3" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y
configs/A20-OLinuXino-Lime2-eMMC_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB0_VBUS_PIN="PC17" CONFIG_USB0_VBUS_DET="PH5" CONFIG_I2C1_ENABLE=y -CONFIG_SATAPWR="PC3" CONFIG_SPL_SPI_SUNXI=y CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/A20-OLinuXino-Lime2_defconfig +0 -1
@@ -7,7 +7,6 @@ CONFIG_DRAM_CLK=384 CONFIG_USB0_VBUS_PIN="PC17" CONFIG_USB0_VBUS_DET="PH5" CONFIG_I2C1_ENABLE=y -CONFIG_SATAPWR="PC3" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y
configs/A20-OLinuXino-Lime_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 CONFIG_I2C1_ENABLE=y -CONFIG_SATAPWR="PC3" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y
configs/A20-OLinuXino_MICRO-eMMC_defconfig +0 -1
@@ -7,7 +7,6 @@ CONFIG_DRAM_CLK=384 CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_I2C1_ENABLE=y CONFIG_VIDEO_VGA=y -CONFIG_SATAPWR="PB8" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y
configs/A20-OLinuXino_MICRO_defconfig +0 -1
@@ -7,7 +7,6 @@ CONFIG_DRAM_CLK=384 CONFIG_MMC_SUNXI_SLOT_EXTRA=3 CONFIG_I2C1_ENABLE=y CONFIG_VIDEO_VGA=y -CONFIG_SATAPWR="PB8" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y
configs/A20-Olimex-SOM-EVB_defconfig +0 -1
@@ -7,7 +7,6 @@ CONFIG_DRAM_CLK=384 CONFIG_MMC_SUNXI_SLOT_EXTRA=3 CONFIG_USB0_VBUS_PIN="PB9" CONFIG_USB0_VBUS_DET="PH5" -CONFIG_SATAPWR="PC3" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y
configs/A20-Olimex-SOM204-EVB-eMMC_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB0_VBUS_PIN="PC17" CONFIG_USB0_VBUS_DET="PH5" CONFIG_I2C1_ENABLE=y -CONFIG_SATAPWR="PC3" CONFIG_GMAC_TX_DELAY=4 CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/A20-Olimex-SOM204-EVB_defconfig +0 -1
@@ -7,7 +7,6 @@ CONFIG_DRAM_CLK=384 CONFIG_USB0_VBUS_PIN="PC17" CONFIG_USB0_VBUS_DET="PH5" CONFIG_I2C1_ENABLE=y -CONFIG_SATAPWR="PC3" CONFIG_GMAC_TX_DELAY=4 CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/Cubieboard2_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=480 -CONFIG_SATAPWR="PB8" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y
configs/Cubieboard_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard" CONFIG_SPL=y CONFIG_MACH_SUN4I=y CONFIG_DRAM_CLK=480 -CONFIG_SATAPWR="PB8" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y
configs/Cubietruck_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_USB0_VBUS_PIN="PH17" CONFIG_USB0_VBUS_DET="PH22" CONFIG_USB0_ID_DET="PH19" CONFIG_VIDEO_VGA=y -CONFIG_SATAPWR="PH12" CONFIG_GMAC_TX_DELAY=1 CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/Itead_Ibox_A20_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-itead-ibox" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=480 -CONFIG_SATAPWR="PB8" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y
configs/Lamobo_R1_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=432 CONFIG_MACPWR="PH23" -CONFIG_SATAPWR="PB3" CONFIG_GMAC_TX_DELAY=4 CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/Linksprite_pcDuino3_Nano_defconfig +0 -1
@@ -6,7 +6,6 @@ CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=408 CONFIG_DRAM_ZQ=122 CONFIG_USB1_VBUS_PIN="PH11" -CONFIG_SATAPWR="PH2" CONFIG_GMAC_TX_DELAY=3 CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/Linksprite_pcDuino3_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=480 CONFIG_DRAM_ZQ=122 -CONFIG_SATAPWR="PH2" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y
configs/Sinovoip_BPI_M3_defconfig +0 -1
@@ -12,7 +12,6 @@ CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_ID_DET="PH11" CONFIG_USB1_VBUS_PIN="PD24" CONFIG_AXP_GPIO=y -CONFIG_SATAPWR="PD25" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_CONSOLE_MUX=y CONFIG_PHY_REALTEK=y
configs/orangepi_plus_defconfig +1 -1
@@ -7,7 +7,6 @@ CONFIG_DRAM_CLK=672 CONFIG_MACPWR="PD6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB1_VBUS_PIN="PG13" -CONFIG_SATAPWR="PG11" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y
@@ -16,3 +15,4 @@ CONFIG_SUN8I_EMAC=y CONFIG_SY8106A_POWER=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y +CONFIG_USB3_VBUS_PIN="PG11"
drivers/ata/ahci_sunxi.c +9 -0
@@ -7,6 +7,7 @@#include <asm/io.h> #include <asm/gpio.h> #include <linux/delay.h> +#include <power/regulator.h> #define AHCI_PHYCS0R 0x00c0#define AHCI_PHYCS1R 0x00c4
@@ -74,6 +75,7 @@ static int sunxi_ahci_phy_init(u8 *reg_base)static int sunxi_sata_probe (struct udevice *dev) { +struct udevice *reg_dev;ulong base;u8 *reg;int ret;
@@ -89,6 +91,13 @@ static int sunxi_sata_probe(struct udevice *dev)debug ("%s: Failed to init phy (err=%d)\n" , __func__, ret);return ret; } + + ret =device_get_supply_regulator (dev,"target-supply" , ®_dev); +if (ret ==0 ) { +regulator_set_enable (reg_dev, true); +mdelay (500 ); + } + ret =ahci_probe_scsi (dev, base);if (ret) {debug ("%s: Failed to probe (err=%d)\n" , __func__, ret);
Signature · 1 line
2.35.8
Re: [PATCH] sunxi: remove CONFIG_SATAPWR
Quoted 91 lines · Andre Przywara
arch/arm/Kconfig +2
-0@@ -1158,6 +1158,8 @@ config ARCH_SUNXI imply CMD_GPT imply CMD_UBI if MTD_RAW_NAND imply DISTRO_DEFAULTS + imply DM_REGULATOR + imply DM_REGULATOR_FIXED imply FAT_WRITE imply FIT imply OF_LIBFDT_OVERLAYarch/arm/mach-sunxi/Kconfig +0
-8@@ -1008,14 +1008,6 @@ config VIDEO_LCD_TL059WV5C0 endchoice -config SATAPWR - string "SATA power pin" - default "" - help - Set the pins used to power the SATA. This takes a string in the - format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of - port H. - config GMAC_TX_DELAY int "GMAC Transmit Clock Delay Chain" default 0board/sunxi/board.c +1
-15@@ -187,7 +187,7 @@ enum env_location env_get_location(enum env_operation op, int prio)/* add board specific code here */ int board_init (void ) { -__maybe_unused int id_pfr1, ret, satapwr_pin, macpwr_pin; +__maybe_unused int id_pfr1, ret, macpwr_pin; gd->bd->bi_boot_params = (PHYS_SDRAM_0 +0x100 );@@ -225,20 +225,6 @@ int board_init(void)return ret;/* strcmp() would look better, but doesn't get optimised away. */ -if (CONFIG_SATAPWR [0 ]) { - satapwr_pin =sunxi_name_to_gpio (CONFIG_SATAPWR ); -if (satapwr_pin >=0 ) { -gpio_request (satapwr_pin,"satapwr" ); -gpio_direction_output (satapwr_pin,1 ); - -/* -* Give the attached SATA device time to power-up -* to avoid link timeouts -*/ -mdelay (500 ); - } - } -if (CONFIG_MACPWR [0 ]) { macpwr_pin =sunxi_name_to_gpio (CONFIG_MACPWR );if (macpwr_pin >=0 ) {drivers/ata/ahci_sunxi.c +2
-0@@ -7,6 +7,7 @@#include <asm/io.h> #include <asm/gpio.h> #include <linux/delay.h> +#include <power/regulator.h> #define AHCI_PHYCS0R 0x00c0#define AHCI_PHYCS1R 0x00c4@@ -74,6 +75,7 @@ static int sunxi_ahci_phy_init(u8 *reg_base)static int sunxi_sata_probe (struct udevice *dev) { +struct udevice *reg_dev;ulong base;u8 *reg;int ret;@@ -89,6 +91,13 @@ static int sunxi_sata_probe(struct udevice *dev)debug ("%s: Failed to init phy (err=%d)\n" , __func__, ret);return ret; }
drivers/ata/ahci_sunxi.c static int sunxi_sata_probe(struct udevice *dev) · line 103
Quoted 10 lines
drivers/ata/ahci_sunxi.c +7
-0+ + ret =device_get_supply_regulator (dev,"target-supply" , ®_dev); +if (ret ==0 ) { +regulator_set_enable (reg_dev, true); +mdelay (500 ); + } + ret =ahci_probe_scsi (dev, base);if (ret) {debug ("%s: Failed to probe (err=%d)\n" , __func__, ret);
Love these sorts of clean-ups. I don't have a sunxi with SATA so I can't test it, but I've been running my target on this patch in some form or another for several weeks, and the code looks good, so:
PATCH 1/1 sunxi: R528: add SMHC2 pin pull ups support
In reply to Andre PrzywaraAdded support for on-chip EMMC(SMHC2) pin pull ups for sunxi R528 board. Otherwise, "No pinmux setup defined for MMC2" appears. Moreover, adding CONFIG_MMC_SUNXI_SLOT_EXTRA=2 to defconfig might be needed in order to inform SPL code that another MMC instance on top of the default 0 for booting should be considered.
--- board/sunxi/board.c | 7 +++++++ 1 file changed, 7 insertions(+)
board/sunxi/board.c +7 -0
@@ -482,6 +482,13 @@ static void mmc_pinmux_setup(int sdc)sunxi_gpio_set_pull (pin,SUNXI_GPIO_PULL_UP ); sunxi_gpio_set_drv(pin, 2); } +#elif defined(CONFIG_MACH_SUN8I_R528) +/* SDC2: PC2-PC7 */ +for (pin =SUNXI_GPC (2 ); pin <=SUNXI_GPC (7 ); pin++) { +sunxi_gpio_set_cfgpin (pin,SUNXI_GPC_SDC2 ); +sunxi_gpio_set_pull (pin,SUNXI_GPIO_PULL_UP ); +sunxi_gpio_set_drv (pin,2 ); + }#else puts ("ERROR: No pinmux setup defined for MMC2!\n" );#endif
Signature · 1 line
2.34.1
Re: [PATCH] sunxi: R528: add SMHC2 pin pull ups support
On Sun, 24 Sep 2023 13:21:16 +0300
Okhunjon Sobirjonov <[email protected]> wrote:
Hi Okhunjon,
thanks for sending this!
Quoted 6 lines
Added support for on-chip EMMC(SMHC2) pin pull ups for sunxi R528 board. Otherwise, "No pinmux setup defined for MMC2" appears. Moreover, adding
CONFIG_MMC_SUNXI_SLOT_EXTRA=2to defconfig might be needed in order to inform SPL code that another MMC instance on top of the default 0 for booting should be considered.
The patch itself looks alright, but sunxi_mmc_init() in drivers/mmc/sunxi_mmc.c seems to enable 8-bit mode for MMC2. Can you double check this?
Quoted 1 line
Signed-off-by Okhunjon Sobirjonov <[email protected]>
I will integrate this patch into v2 of the T113s support series.
Cheers,
Andre
Quoted 22 lines
--- board/sunxi/board.c | 7 +++++++ 1 file changed, 7 insertions(+)board/sunxi/board.c +7
-0@@ -482,6 +482,13 @@ static void mmc_pinmux_setup(int sdc)sunxi_gpio_set_pull (pin,SUNXI_GPIO_PULL_UP ); sunxi_gpio_set_drv(pin, 2); } +#elif defined(CONFIG_MACH_SUN8I_R528) +/* SDC2: PC2-PC7 */ +for (pin =SUNXI_GPC (2 ); pin <=SUNXI_GPC (7 ); pin++) { +sunxi_gpio_set_cfgpin (pin,SUNXI_GPC_SDC2 ); +sunxi_gpio_set_pull (pin,SUNXI_GPIO_PULL_UP ); +sunxi_gpio_set_drv (pin,2 ); + }#else puts ("ERROR: No pinmux setup defined for MMC2!\n" );#endif
PATCH 1/1 sunxi: R528: add SMHC2 pin pull ups support
In reply to Andre PrzywaraAdded support for on-chip EMMC(SMHC2) pin pull ups for sunxi R528 board. Otherwise, "No pinmux setup defined for MMC2" appears. Moreover, adding CONFIG_MMC_SUNXI_SLOT_EXTRA=2 to defconfig might be needed in order to inform SPL code that another MMC instance on top of the default 0 for booting should be considered.
--- board/sunxi/board.c | 7 +++++++ 1 file changed, 7 insertions(+)
board/sunxi/board.c +7 -0
@@ -482,6 +482,13 @@ static void mmc_pinmux_setup(int sdc)sunxi_gpio_set_pull (pin,SUNXI_GPIO_PULL_UP ); sunxi_gpio_set_drv(pin, 2); } +#elif defined(CONFIG_MACH_SUN8I_R528) +/* SDC2: PC2-PC7 */ +for (pin =SUNXI_GPC (2 ); pin <=SUNXI_GPC (7 ); pin++) { +sunxi_gpio_set_cfgpin (pin,SUNXI_GPC_SDC2 ); +sunxi_gpio_set_pull (pin,SUNXI_GPIO_PULL_UP ); +sunxi_gpio_set_drv (pin,2 ); + }#else puts ("ERROR: No pinmux setup defined for MMC2!\n" );#endif
Signature · 1 line
2.34.1