revive Theobroma-Systems puma board
v2 cover revive Theobroma-Systems puma board
From: Heiko Stuebner <[email protected]>
This revives the puma boards and makes them boot again with mainline uboot.
Main points may be going back to the general fit script and cleaning up the devicetree situation that got completely broken by the recent sync from mainline linux.
changes in v2:
- patch subject fixes (Kever)
- make usb work again
- remove usb regulator special handling
Heiko Stuebner (8):
arm64: dts: rk3399-puma: fix gpio levels for gmac reset pin
arm64: dts: rk3399-puma: fix gpio levels for vcc5v0-host regulator
rockchip: puma: fix indentation for -u-boot.dtsi
rockchip: puma: fix indentation of misc_init_r
rockchip: puma: reorganize devicetrees to actually work and match
upstream
rockchip: puma: remove separate fit generator
rockchip: puma: drop special handling of usb host regulator
rockchip: puma: enable new usb config options
arch/arm/dts/Makefile | 4 +- arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi | 4 - arch/arm/dts/rk3399-puma-ddr1333.dts | 8 - arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi | 4 - arch/arm/dts/rk3399-puma-ddr1600.dts | 9 - arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi | 4 - arch/arm/dts/rk3399-puma-ddr1866.dts | 8 - arch/arm/dts/rk3399-puma-haikou.dts | 272 ++++++++++++++++++ arch/arm/dts/rk3399-puma-u-boot.dtsi | 43 +-- arch/arm/dts/rk3399-puma.dtsi | 4 +- board/theobroma-systems/puma_rk3399/Kconfig | 15 + .../puma_rk3399/fit_spl_atf.sh | 94 ------ .../puma_rk3399/puma-rk3399.c | 93 +----- configs/puma-rk3399_defconfig | 8 +- 14 files changed, 336 insertions(+), 234 deletions(-) delete mode 100644 arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi delete mode 100644 arch/arm/dts/rk3399-puma-ddr1333.dts delete mode 100644 arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi delete mode 100644 arch/arm/dts/rk3399-puma-ddr1600.dts delete mode 100644 arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi delete mode 100644 arch/arm/dts/rk3399-puma-ddr1866.dts create mode 100644 arch/arm/dts/rk3399-puma-haikou.dts delete mode 100755 board/theobroma-systems/puma_rk3399/fit_spl_atf.sh
Signature · 1 line
2.25.1
PATCH v2 1/8 arm64: dts: rk3399-puma: fix gpio levels for gmac reset pin
From: Heiko Stuebner <[email protected]>
The gmac reset has opposite values for the gpio declaration and the separate reset-active, bring this in line to make u-boot also find the ethernet-phy.
This mimics the upstream Linux commit found on
https://lore.kernel.org/r/20200603132836.362519-1-heiko at sntech.de
--- arch/arm/dts/rk3399-puma.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/rk3399-puma.dtsi +1 -1
@@ -157,7 +157,7 @@ phy-mode = "rgmii"; pinctrl-names = "default"; pinctrl-0 = <&rgmii_pins>; - snps,reset-gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; + snps,reset-gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_LOW>; snps,reset-active-low; snps,reset-delays-us = <0 10000 50000>; tx_delay = <0x10>;
Signature · 1 line
2.25.1
PATCH v2 1/8 arm64: dts: rk3399-puma: fix gpio levels for gmac reset pin
Quoted 11 lines · Heiko Stuebner
From: Heiko Stuebner <[email protected]>
The gmac reset has opposite values for the gpio declaration and the separate reset-active, bring this in line to make u-boot also find the ethernet-phy.
This mimics the upstream Linux commit found on
https://lore.kernel.org/r/20200603132836.362519-1-heiko at sntech.deSigned-off-by Heiko Stuebner <[email protected]>Reviewed-by Philipp Tomsich <[email protected]>
Thanks,
- Kever
Quoted 17 lines
--- arch/arm/dts/rk3399-puma.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/dts/rk3399-puma.dtsi +1
-1@@ -157,7 +157,7 @@ phy-mode = "rgmii"; pinctrl-names = "default"; pinctrl-0 = <&rgmii_pins>; - snps,reset-gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; + snps,reset-gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_LOW>; snps,reset-active-low; snps,reset-delays-us = <0 10000 50000>; tx_delay = <0x10>;
PATCH v2 2/8 arm64: dts: rk3399-puma: fix gpio levels for vcc5v0-host regulator
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
The regulator enable-gpio uses opposite values for the declaration vs. the enable_active_low property, breaking the regulator enablement.
Make the usbhost-supply work again by bringing them in sync again.
This mimics the upstream Linux change found on:
http://lore.kernel.org/r/20200604091239.424318-1-heiko at sntech.de
--- arch/arm/dts/rk3399-puma.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/rk3399-puma.dtsi +1 -1
@@ -101,7 +101,7 @@ vcc5v0_host: vcc5v0-host-regulator { compatible = "regulator-fixed"; - gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_HIGH>; + gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>; enable-active-low; pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_host_en>;
Signature · 1 line
2.25.1
PATCH v2 2/8 arm64: dts: rk3399-puma: fix gpio levels for vcc5v0-host regulator
Quoted 11 lines · Heiko Stuebner
From: Heiko Stuebner <[email protected]>
The regulator enable-gpio uses opposite values for the declaration vs. the
enable_active_lowproperty, breaking the regulator enablement.Make the usbhost-supply work again by bringing them in sync again.
This mimics the upstream Linux change found on:
http://lore.kernel.org/r/20200604091239.424318-1-heiko at sntech.deSigned-off-by Heiko Stuebner <[email protected]>
Thanks,
- Kever
Quoted 17 lines
--- arch/arm/dts/rk3399-puma.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/dts/rk3399-puma.dtsi +1
-1@@ -101,7 +101,7 @@ vcc5v0_host: vcc5v0-host-regulator { compatible = "regulator-fixed"; - gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_HIGH>; + gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>; enable-active-low; pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_host_en>;
PATCH v2 3/8 rockchip: puma: fix indentation for -u-boot.dtsi
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
Tabs not spaces, so transform it to the common styling.
--- arch/arm/dts/rk3399-puma-u-boot.dtsi | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-)
arch/arm/dts/rk3399-puma-u-boot.dtsi +15 -15
@@ -2,24 +2,24 @@ #include "rk3399-u-boot.dtsi" / { - config { - u-boot,spl-payload-offset = <0x40000>; /* @ 256KB */ - u-boot,mmc-env-offset = <0x4000>; /* @ 16KB */ - u-boot,efi-partition-entries-offset = <0x200000>; /* 2MB */ - u-boot,boot-led = "module_led"; - sysreset-gpio = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>; - }; + config { + u-boot,spl-payload-offset = <0x40000>; /* @ 256KB */ + u-boot,mmc-env-offset = <0x4000>; /* @ 16KB */ + u-boot,efi-partition-entries-offset = <0x200000>; /* 2MB */ + u-boot,boot-led = "module_led"; + sysreset-gpio = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>; + }; - chosen { - stdout-path = "serial0:115200n8"; - u-boot,spl-boot-order = \ + chosen { + stdout-path = "serial0:115200n8"; + u-boot,spl-boot-order = \ "same-as-spl", &norflash, &sdhci, &sdmmc; - }; + }; - aliases { - spi0 = &spi1; - spi1 = &spi5; - }; + aliases { + spi0 = &spi1; + spi1 = &spi5; + }; /* * The Qseven BIOS_DISABLE signal on the RK3399-Q7 keeps the on-module
Signature · 1 line
2.25.1
PATCH v2 3/8 rockchip: puma: fix indentation for -u-boot.dtsi
Quoted 6 lines · Heiko Stuebner
From: Heiko Stuebner <[email protected]>
Tabs not spaces, so transform it to the common styling.
Signed-off-by Heiko Stuebner <[email protected]>Reviewed-by Philipp Tomsich <[email protected]>
Thanks,
- Kever
Quoted 48 lines
--- arch/arm/dts/rk3399-puma-u-boot.dtsi | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-)arch/arm/dts/rk3399-puma-u-boot.dtsi +15
-15@@ -2,24 +2,24 @@ #include "rk3399-u-boot.dtsi" / { - config { - u-boot,spl-payload-offset = <0x40000>; /* @ 256KB */ - u-boot,mmc-env-offset = <0x4000>; /* @ 16KB */ - u-boot,efi-partition-entries-offset = <0x200000>; /* 2MB */ - u-boot,boot-led = "module_led"; - sysreset-gpio = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>; - }; + config { + u-boot,spl-payload-offset = <0x40000>; /* @ 256KB */ + u-boot,mmc-env-offset = <0x4000>; /* @ 16KB */ + u-boot,efi-partition-entries-offset = <0x200000>; /* 2MB */ + u-boot,boot-led = "module_led"; + sysreset-gpio = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>; + }; - chosen { - stdout-path = "serial0:115200n8"; - u-boot,spl-boot-order = \ + chosen { + stdout-path = "serial0:115200n8"; + u-boot,spl-boot-order = \ "same-as-spl", &norflash, &sdhci, &sdmmc; - }; + }; - aliases { - spi0 = &spi1; - spi1 = &spi5; - }; + aliases { + spi0 = &spi1; + spi1 = &spi5; + }; /* * The Qseven BIOS_DISABLE signal on the RK3399-Q7 keeps the on-module
PATCH v2 4/8 rockchip: puma: fix indentation of misc_init_r
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
The commit moving puma to the generic cpuid/macaddr helpers used 7 spaces as indentation, so correct that by moving to the required tabs.
--- .../puma_rk3399/puma-rk3399.c | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-)
board/theobroma-systems/puma_rk3399/puma-rk3399.c +16 -16
@@ -114,22 +114,22 @@ static int setup_boottargets(void)int misc_init_r (void ) { -const u32 cpuid_offset =0x7 ; -const u32 cpuid_length =0x10 ; -u8 cpuid[cpuid_length]; -int ret; - - ret =rockchip_cpuid_from_efuse (cpuid_offset, cpuid_length, cpuid); -if (ret) -return ret; - - ret =rockchip_cpuid_set (cpuid, cpuid_length); -if (ret) -return ret; - - ret =rockchip_setup_macaddr (); -if (ret) -return ret; +const u32 cpuid_offset =0x7 ; +const u32 cpuid_length =0x10 ; +u8 cpuid[cpuid_length]; +int ret; + + ret =rockchip_cpuid_from_efuse (cpuid_offset, cpuid_length, cpuid); +if (ret) +return ret; + + ret =rockchip_cpuid_set (cpuid, cpuid_length); +if (ret) +return ret; + + ret =rockchip_setup_macaddr (); +if (ret) +return ret;setup_iodomain ();setup_boottargets ();
Signature · 1 line
2.25.1
PATCH v2 4/8 rockchip: puma: fix indentation of misc_init_r
Quoted 8 lines · Heiko Stuebner
From: Heiko Stuebner <[email protected]>
The commit moving puma to the generic cpuid/macaddr helpers used 7 spaces as indentation, so correct that by moving to the required tabs.
Fixes fa177ff0208b ("board: puma: Use rockchip_* helpers to setup cpuid and macaddr")Signed-off-by Heiko Stuebner <[email protected]>Reviewed-by Philipp Tomsich <[email protected]>
Thanks,
- Kever
Quoted 47 lines
--- .../puma_rk3399/puma-rk3399.c | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-)board/theobroma-systems/puma_rk3399/puma-rk3399.c +16
-16@@ -114,22 +114,22 @@ static int setup_boottargets(void)int misc_init_r (void ) { -const u32 cpuid_offset =0x7 ; -const u32 cpuid_length =0x10 ; -u8 cpuid[cpuid_length]; -int ret; - - ret =rockchip_cpuid_from_efuse (cpuid_offset, cpuid_length, cpuid); -if (ret) -return ret; - - ret =rockchip_cpuid_set (cpuid, cpuid_length); -if (ret) -return ret; - - ret =rockchip_setup_macaddr (); -if (ret) -return ret; +const u32 cpuid_offset =0x7 ; +const u32 cpuid_length =0x10 ; +u8 cpuid[cpuid_length]; +int ret; + + ret =rockchip_cpuid_from_efuse (cpuid_offset, cpuid_length, cpuid); +if (ret) +return ret; + + ret =rockchip_cpuid_set (cpuid, cpuid_length); +if (ret) +return ret; + + ret =rockchip_setup_macaddr (); +if (ret) +return ret;setup_iodomain ();setup_boottargets ();
PATCH v2 5/8 rockchip: puma: reorganize devicetrees to actually work and match upstream
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
So far the puma dts files only just included the main puma dtsi without handling the actual baseboard and rk3399-puma.dtsi was very much detached from the variant in the mainline Linux kernel.
Recent changes resulted in a strange situation with nonworking puma boards.
Commit ab800e5a6f28 ("arm: dts: rockchip: puma: move U-Boot specific bits to u-boot.dtsi") moved the sdram include from rk3399-puma-ddrX.dts to new files rk3399-puma-ddrx-u-boot.dtsi which were never included anywhere though.
Commit 167efc2c7a46 ("arm64: dts: rk3399: Sync v5.7-rc1 from Linux") replaced the rk3399-puma.dtsi nearly completely, but in the kernel it definitly depends on a baseboard dts to actually enable peripherals like sd-slot, uarts, etc.
So to untagle this and bring the whole thing more in line with mainline Linux, bring the rk3399-puma-haikou.dts over as well, drop the separate DDR-option devicetrees and instead replace them with a puma Kconfig option to select and include the needed DDR variant.
--- arch/arm/dts/Makefile | 4 +- arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi | 4 - arch/arm/dts/rk3399-puma-ddr1333.dts | 8 - arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi | 4 - arch/arm/dts/rk3399-puma-ddr1600.dts | 9 - arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi | 4 - arch/arm/dts/rk3399-puma-ddr1866.dts | 8 - arch/arm/dts/rk3399-puma-haikou.dts | 272 +++++++++++++++++++ arch/arm/dts/rk3399-puma-u-boot.dtsi | 11 + board/theobroma-systems/puma_rk3399/Kconfig | 15 + configs/puma-rk3399_defconfig | 2 +- 11 files changed, 300 insertions(+), 41 deletions(-) delete mode 100644 arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi delete mode 100644 arch/arm/dts/rk3399-puma-ddr1333.dts delete mode 100644 arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi delete mode 100644 arch/arm/dts/rk3399-puma-ddr1600.dts delete mode 100644 arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi delete mode 100644 arch/arm/dts/rk3399-puma-ddr1866.dts create mode 100644 arch/arm/dts/rk3399-puma-haikou.dts
arch/arm/dts/Makefile +1 -3
@@ -130,9 +130,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ rk3399-nanopi-neo4.dtb \ rk3399-orangepi.dtb \ rk3399-pinebook-pro.dtb \ - rk3399-puma-ddr1333.dtb \ - rk3399-puma-ddr1600.dtb \ - rk3399-puma-ddr1866.dtb \ + rk3399-puma-haikou.dtb \ rk3399-roc-pc.dtb \ rk3399-roc-pc-mezzanine.dtb \ rk3399-rock-pi-4.dtb \
arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi deleted +0 -4
@@ -1,4 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -#include "rk3399-puma-u-boot.dtsi" -#include "rk3399-sdram-ddr3-1333.dtsi"
arch/arm/dts/rk3399-puma-ddr1333.dts deleted +0 -8
@@ -1,8 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 -/* - * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH - */ - -/dts-v1/; - -#include "rk3399-puma.dtsi"
arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi deleted +0 -4
@@ -1,4 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -#include "rk3399-puma-u-boot.dtsi" -#include "rk3399-sdram-ddr3-1600.dtsi"
arch/arm/dts/rk3399-puma-ddr1600.dts deleted +0 -9
@@ -1,9 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 -/* - * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH - */ - -/dts-v1/; - -#include "rk3399-puma.dtsi" -#include "rk3399-u-boot.dtsi"
arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi deleted +0 -4
@@ -1,4 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -#include "rk3399-puma-u-boot.dtsi" -#include "rk3399-sdram-ddr3-1866.dtsi"
arch/arm/dts/rk3399-puma-ddr1866.dts deleted +0 -8
@@ -1,8 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 -/* - * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH - */ - -/dts-v1/; - -#include "rk3399-puma.dtsi"
arch/arm/dts/rk3399-puma-haikou.dts new file +272 -0
272 lines not on this page · raw message
arch/arm/dts/rk3399-puma-u-boot.dtsi +11 -0
@@ -1,6 +1,17 @@ // SPDX-License-Identifier: GPL-2.0+ #include "rk3399-u-boot.dtsi" + +#ifdef CONFIG_TARGET_PUMA_RK3399_RAM_DDR3_1333 +#include "rk3399-sdram-ddr3-1333.dtsi" +#endif +#ifdef CONFIG_TARGET_PUMA_RK3399_RAM_DDR3_1600 +#include "rk3399-sdram-ddr3-1600.dtsi" +#endif +#ifdef CONFIG_TARGET_PUMA_RK3399_RAM_DDR3_1866 +#include "rk3399-sdram-ddr3-1866.dtsi" +#endif + / { config { u-boot,spl-payload-offset = <0x40000>; /* @ 256KB */
board/theobroma-systems/puma_rk3399/Kconfig +15 -0
@@ -18,4 +18,19 @@ config ENV_SIZE config ENV_OFFSET default 0x3fc000 if ENV_IS_IN_SPI_FLASH +choice + prompt "Theobroma Systems RK3399-Q7 DDR Option" + default TARGET_PUMA_RK3399_RAM_DDR3_1333 + +config TARGET_PUMA_RK3399_RAM_DDR3_1333 + bool "DDR3-1333MHz" + +config TARGET_PUMA_RK3399_RAM_DDR3_1600 + bool "DDR3-1600MHz" + +config TARGET_PUMA_RK3399_RAM_DDR3_1866 + bool "DDR3-1866MHz" + +endchoice + endif
configs/puma-rk3399_defconfig +1 -1
@@ -39,7 +39,7 @@ CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIVE=y -CONFIG_DEFAULT_DEVICE_TREE="rk3399-puma-ddr1600" +CONFIG_DEFAULT_DEVICE_TREE="rk3399-puma-haikou" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
Signature · 1 line
2.25.1
PATCH v2 5/8 rockchip: puma: reorganize devicetrees to actually work and match upstream
Hi Heiko,
arch/arm/dts/rk3399-puma-haikou.dts line 8
Quoted 12 lines · Heiko Stuebner
index 0000000000..f23ec02783
arch/arm/dts/rk3399-puma-haikou.dts new file +8
-0@@ -0,0 +1,272 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH + */ + +/dts-v1/; +#include "rk3399-puma.dtsi" +#include "rk3399-puma-u-boot.dtsi"
There will be a "rk3399-puma-haikou-u-boot.dtsi " auto detect and include in the dts,
so "rk3399-puma-u-boot.dtsi " should be rename or included to? "rk3399-puma-haikou-u-boot.dtsi ".
After this update, the "rk3399-puma-haikou.dts" can sync from kernel without any modify.
Thanks,
- Kever
PATCH v2 6/8 rockchip: puma: remove separate fit generator
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
The introduction of the puma-specific generator was mainly a way to split the pmu firmware from the ATF binary and not having to distribute that 4GB (sparse) image that was created before moving to the bl31.elf as base.
Looking at the publically available repository for that separate pmu firmware
https://git.theobroma-systems.com/rk3399-cortex-m0.git/
there is also no activity for 3 years and apart from some build customizations no other changes were done.
And even then, if changes need to be made, this can very well also happen in the atf context itself, so there is no real need to diverge from the established build procedure and we can just go back to using the main make_fit_atf.py script.
--- .../puma_rk3399/fit_spl_atf.sh | 94 ------------------- configs/puma-rk3399_defconfig | 1 - 2 files changed, 95 deletions(-) delete mode 100755 board/theobroma-systems/puma_rk3399/fit_spl_atf.sh
board/theobroma-systems/puma_rk3399/fit_spl_atf.sh deleted +0 -94
@@ -1,94 +0,0 @@ -#!/bin/sh -# -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2019 Jagan Teki <[email protected]> -# -# Based on the board/sunxi/mksunxi_fit_atf.sh -# -# Script to generate FIT image source for 64-bit puma boards with -# U-Boot proper, ATF, PMU firmware and devicetree. -# -# usage: $0 <dt_name> [<dt_name> [<dt_name] ...] - -[ -z "$BL31" ] && BL31="bl31.bin" - -if [ ! -f $BL31 ]; then - echo "WARNING: BL31 file $BL31 NOT found, resulting binary is non-functional" >&2 - echo "Please read Building section in doc/README.rockchip" >&2 - BL31=/dev/null -fi - -[ -z "$PMUM0" ] && PMUM0="rk3399m0.bin" - -if [ ! -f $PMUM0 ]; then - echo "WARNING: PMUM0 file $PMUM0 NOT found, resulting binary is non-functional" >&2 - echo "Please read Building section in doc/README.rockchip" >&2 - PMUM0=/dev/null -fi - -cat << __HEADER_EOF -/* SPDX-License-Identifier: GPL-2.0+ OR X11 */ -/* - * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH - * - * Minimal dts for a SPL FIT image payload. - */ - -/dts-v1/; - -/ { - description = "FIT image with U-Boot proper, ATF bl31, M0 Firmware, DTB"; - #address-cells = <1>; - - images { - uboot { - description = "U-Boot (64-bit)"; - data = /incbin/("u-boot-nodtb.bin"); - type = "standalone"; - arch = "arm64"; - compression = "none"; - load = <0x4a000000>; - }; - atf { - description = "ARM Trusted Firmware"; - data = /incbin/("$BL31"); - type = "firmware"; - arch = "arm64"; - os = "arm-trusted-firmware"; - compression = "none"; - load = <0x1000>; - entry = <0x1000>; - }; - pmu { - description = "Cortex-M0 firmware"; - data = /incbin/("$PMUM0"); - type = "pmu-firmware"; - compression = "none"; - load = <0x180000>; - }; - fdt { - description = "RK3399-Q7 (Puma) flat device-tree"; - data = /incbin/("$1"); - type = "flat_dt"; - compression = "none"; - }; -__HEADER_EOF - -cat << __CONF_HEADER_EOF - }; - - configurations { - default = "conf"; - conf { - description = "Theobroma Systems RK3399-Q7 (Puma) SoM"; - firmware = "atf"; - loadables = "uboot", "pmu"; - fdt = "fdt"; - }; -__CONF_HEADER_EOF - -cat << __ITS_EOF - }; -}; -__ITS_EOF
configs/puma-rk3399_defconfig +0 -1
@@ -14,7 +14,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_TEXT_BASE=0xff8c2000 CONFIG_DEBUG_UART=y -CONFIG_SPL_FIT_GENERATOR="board/theobroma-systems/puma_rk3399/fit_spl_atf.sh" CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb" CONFIG_MISC_INIT_R=y CONFIG_DISPLAY_BOARDINFO_LATE=y
Signature · 1 line
2.25.1
PATCH v2 6/8 rockchip: puma: remove separate fit generator
Quoted 13 lines · Heiko Stuebner
From: Heiko Stuebner <[email protected]>
The introduction of the puma-specific generator was mainly a way to split the pmu firmware from the ATF binary and not having to distribute that 4GB (sparse) image that was created before moving to the bl31.elf as base.
Looking at the publically available repository for that separate pmu firmware
https://git.theobroma-systems.com/rk3399-cortex-m0.git/there is also no activity for 3 years and apart from some build customizations no other changes were done.
Quoted 7 lines
And even then, if changes need to be made, this can very well also happen in the atf context itself, so there is no real need to diverge from the established build procedure and we can just go back to using the main
make_fit_atf.pyscript.Signed-off-by Heiko Stuebner <[email protected]>Reviewed-by Philipp Tomsich <[email protected]>
Thanks,
- Kever
Quoted 118 lines
--- .../puma_rk3399/fit_spl_atf.sh | 94 ------------------- configs/puma-rk3399_defconfig | 1 - 2 files changed, 95 deletions(-)delete mode 100755
board/theobroma-systems/puma_rk3399/fit_spl_atf.shboard/theobroma-systems/puma_rk3399/fit_spl_atf.sh deleted +0
-94@@ -1,94 +0,0 @@ -#!/bin/sh -# -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2019 Jagan Teki <[email protected]> -# -# Based on the board/sunxi/mksunxi_fit_atf.sh -# -# Script to generate FIT image source for 64-bit puma boards with -# U-Boot proper, ATF, PMU firmware and devicetree. -# -# usage: $0 <dt_name> [<dt_name> [<dt_name] ...] - -[ -z "$BL31" ] && BL31="bl31.bin" - -if [ ! -f $BL31 ]; then - echo "WARNING: BL31 file $BL31 NOT found, resulting binary is non-functional" >&2 - echo "Please read Building section in doc/README.rockchip" >&2 - BL31=/dev/null -fi - -[ -z "$PMUM0" ] && PMUM0="rk3399m0.bin" - -if [ ! -f $PMUM0 ]; then - echo "WARNING: PMUM0 file $PMUM0 NOT found, resulting binary is non-functional" >&2 - echo "Please read Building section in doc/README.rockchip" >&2 - PMUM0=/dev/null -fi - -cat << __HEADER_EOF -/* SPDX-License-Identifier: GPL-2.0+ OR X11 */ -/* - * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH - * - * Minimal dts for a SPL FIT image payload. - */ - -/dts-v1/; - -/ { - description = "FIT image with U-Boot proper, ATF bl31, M0 Firmware, DTB"; - #address-cells = <1>; - - images { - uboot { - description = "U-Boot (64-bit)"; - data = /incbin/("u-boot-nodtb.bin"); - type = "standalone"; - arch = "arm64"; - compression = "none"; - load = <0x4a000000>; - }; - atf { - description = "ARM Trusted Firmware"; - data = /incbin/("$BL31"); - type = "firmware"; - arch = "arm64"; - os = "arm-trusted-firmware"; - compression = "none"; - load = <0x1000>; - entry = <0x1000>; - }; - pmu { - description = "Cortex-M0 firmware"; - data = /incbin/("$PMUM0"); - type = "pmu-firmware"; - compression = "none"; - load = <0x180000>; - }; - fdt { - description = "RK3399-Q7 (Puma) flat device-tree"; - data = /incbin/("$1"); - type = "flat_dt"; - compression = "none"; - }; -__HEADER_EOF - -cat << __CONF_HEADER_EOF - }; - - configurations { - default = "conf"; - conf { - description = "Theobroma Systems RK3399-Q7 (Puma) SoM"; - firmware = "atf"; - loadables = "uboot", "pmu"; - fdt = "fdt"; - }; -__CONF_HEADER_EOF - -cat << __ITS_EOF - }; -}; -__ITS_EOFconfigs/puma-rk3399_defconfig +0
-1@@ -14,7 +14,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_TEXT_BASE=0xff8c2000 CONFIG_DEBUG_UART=y -CONFIG_SPL_FIT_GENERATOR="board/theobroma-systems/puma_rk3399/fit_spl_atf.sh" CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb" CONFIG_MISC_INIT_R=y CONFIG_DISPLAY_BOARDINFO_LATE=y
PATCH v2 7/8 rockchip: puma: drop special handling of usb host regulator
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
With the current usb stack in u-boot, all host ports on puma work flawlessly without any additional special handling, so drop that usb hub hacking from the puma board.
Tested with mass-storage and usb-ethernet on both usb3 and usb2 ports.
--- .../puma_rk3399/puma-rk3399.c | 67 ------------------- 1 file changed, 67 deletions(-)
board/theobroma-systems/puma_rk3399/puma-rk3399.c +0 -67
@@ -152,70 +152,3 @@ void get_board_serial(struct tag_serialnr *serialnr) serialnr->low = (u32)(serial & 0xffffffff); }#endif - -/** -* Switch power at an external regulator (for our root hub). -* -* @param ctrl pointer to the xHCI controller -* @param port port number as in the control message (one-based) -* @param enable boolean indicating whether to enable or disable power -* @return returns 0 on success, an error-code on failure -*/ -static int board_usb_port_power_set (struct udevice *dev,int port, -bool enable) -{ -#if CONFIG_IS_ENABLED (OF_CONTROL ) &&CONFIG_IS_ENABLED (DM_REGULATOR ) -/* We start counting ports at 0, while USB counts from 1. */ -int index = port -1 ; -const char *regname =NULL ; -struct udevice *regulator; -const char *prop ="tsd,usb-port-power" ; -int ret; - -debug ("%s: ctrl '%s' port %d enable %s\n" , __func__, -dev_read_name (dev), port, enable ?"true" :"false" ); - - ret =dev_read_string_index (dev, prop, index, ®name); -if (ret <0 ) { -debug ("%s: ctrl '%s' port %d: no entry in '%s'\n" , - __func__,dev_read_name (dev), port, prop); -return ret; - } - - ret =regulator_get_by_platname (regname, ®ulator); -if (ret) { -debug ("%s: ctrl '%s' port %d: could not get regulator '%s'\n" , - __func__,dev_read_name (dev), port, regname); -return ret; - } - -regulator_set_enable (regulator, enable); -return 0 ; -#else -return -ENOTSUPP ; -#endif -} - -void usb_hub_reset_devices (struct usb_hub_device *hub,int port) -{ -struct udevice *dev = hub->pusb_dev->dev; -struct udevice *ctrl; - -/* We are only interested in our root-hubs */ -if (usb_hub_is_root_hub (dev) == false) -return ; - - ctrl =usb_get_bus (dev); -if (!ctrl) { -debug ("%s: could not retrieve ctrl for hub\n" , __func__); -return ; - } - -/* -* To work around an incompatibility between the single-threaded -* USB stack in U-Boot and (a strange low-power mode of) the USB -* hub we have on-module, we need to delay powering on the hub -* until the first time the port is probed. -*/ -board_usb_port_power_set (ctrl, port, true); -}
Signature · 1 line
2.25.1
PATCH v2 7/8 rockchip: puma: drop special handling of usb host regulator
Quoted 9 lines · Heiko Stuebner
From: Heiko Stuebner <[email protected]>
With the current usb stack in u-boot, all host ports on puma work flawlessly without any additional special handling, so drop that usb hub hacking from the puma board.
Tested with mass-storage and usb-ethernet on both usb3 and usb2 ports.
Signed-off-by Heiko Stuebner <[email protected]>
Thanks,
- Kever
Quoted 79 lines
--- .../puma_rk3399/puma-rk3399.c | 67 ------------------- 1 file changed, 67 deletions(-)board/theobroma-systems/puma_rk3399/puma-rk3399.c +0
-67@@ -152,70 +152,3 @@ void get_board_serial(struct tag_serialnr *serialnr) serialnr->low = (u32)(serial & 0xffffffff); }#endif - -/** -* Switch power at an external regulator (for our root hub). -* -* @param ctrl pointer to the xHCI controller -* @param port port number as in the control message (one-based) -* @param enable boolean indicating whether to enable or disable power -* @return returns 0 on success, an error-code on failure -*/ -static int board_usb_port_power_set (struct udevice *dev,int port, -bool enable) -{ -#if CONFIG_IS_ENABLED (OF_CONTROL ) &&CONFIG_IS_ENABLED (DM_REGULATOR ) -/* We start counting ports at 0, while USB counts from 1. */ -int index = port -1 ; -const char *regname =NULL ; -struct udevice *regulator; -const char *prop ="tsd,usb-port-power" ; -int ret; - -debug ("%s: ctrl '%s' port %d enable %s\n" , __func__, -dev_read_name (dev), port, enable ?"true" :"false" ); - - ret =dev_read_string_index (dev, prop, index, ®name); -if (ret <0 ) { -debug ("%s: ctrl '%s' port %d: no entry in '%s'\n" , - __func__,dev_read_name (dev), port, prop); -return ret; - } - - ret =regulator_get_by_platname (regname, ®ulator); -if (ret) { -debug ("%s: ctrl '%s' port %d: could not get regulator '%s'\n" , - __func__,dev_read_name (dev), port, regname); -return ret; - } - -regulator_set_enable (regulator, enable); -return 0 ; -#else -return -ENOTSUPP ; -#endif -} - -void usb_hub_reset_devices (struct usb_hub_device *hub,int port) -{ -struct udevice *dev = hub->pusb_dev->dev; -struct udevice *ctrl; - -/* We are only interested in our root-hubs */ -if (usb_hub_is_root_hub (dev) == false) -return ; - - ctrl =usb_get_bus (dev); -if (!ctrl) { -debug ("%s: could not retrieve ctrl for hub\n" , __func__); -return ; - } - -/* -* To work around an incompatibility between the single-threaded -* USB stack in U-Boot and (a strange low-power mode of) the USB -* hub we have on-module, we need to delay powering on the hub -* until the first time the port is probed. -*/ -board_usb_port_power_set (ctrl, port, true); -}
PATCH v2 8/8 rockchip: puma: enable new usb config options
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
With recently added changes we get support for usb3 including handling of the phys (type-c and inno-usb2), so enable the necessary config options on puma.
--- configs/puma-rk3399_defconfig | 5 +++++ 1 file changed, 5 insertions(+)
configs/puma-rk3399_defconfig +5 -0
@@ -59,6 +59,8 @@ CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_DM_PMIC_FAN53555=y CONFIG_PMIC_RK8XX=y CONFIG_SPL_DM_REGULATOR=y
@@ -67,6 +69,7 @@ CONFIG_SPL_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y +CONFIG_DM_RESET=y CONFIG_DM_RTC=y CONFIG_RTC_ISL1208=y CONFIG_DEBUG_UART_SHIFT=2
@@ -77,6 +80,8 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y
Signature · 1 line
2.25.1
PATCH v2 8/8 rockchip: puma: enable new usb config options
Quoted 11 lines · Heiko Stuebner
From: Heiko Stuebner <[email protected]>
With recently added changes we get support for usb3 including handling of the phys (type-c and inno-usb2), so enable the necessary config options on puma.
Signed-off-by Heiko Stuebner <[email protected]>
PATCH v2 8/8 rockchip: puma: enable new usb config options
In reply to Heiko StuebnerQuoted 7 lines · Heiko Stuebner
From: Heiko Stuebner <[email protected]>
With recently added changes we get support for usb3 including handling of the phys (type-c and inno-usb2), so enable the necessary config options on puma.
Signed-off-by Heiko Stuebner <[email protected]>
Thanks,
- Kever
Quoted 34 lines
--- configs/puma-rk3399_defconfig | 5 +++++ 1 file changed, 5 insertions(+)configs/puma-rk3399_defconfig +5
-0@@ -59,6 +59,8 @@ CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_DM_PMIC_FAN53555=y CONFIG_PMIC_RK8XX=y CONFIG_SPL_DM_REGULATOR=y@@ -67,6 +69,7 @@ CONFIG_SPL_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y +CONFIG_DM_RESET=y CONFIG_DM_RTC=y CONFIG_RTC_ISL1208=y CONFIG_DEBUG_UART_SHIFT=2@@ -77,6 +80,8 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y