| Message ID | 20240408181429.3676856-1-jonas@kwiboo.se |
|---|---|
| Headers | show |
| Series | rockchip: rk3308: Sync DT with linux v6.8 and update defconfigs | expand |
On Mon, Apr 08, 2024 at 06:13:57PM +0000, Jonas Karlman wrote: > This series adds support for new clocks used in linux v6.8 device trees, > enables use of FIT signature check for checksum validation and fixes > loading FIT from SD-card when loading FIT from eMMC fails. > > It should be possible to move RK3308 boards to use OF_UPSTREAM in a > future series after this has been applied. > > I have runtime tested this series on a Radxa ROCK Pi S v1.3 having a > RK3308B SoC. Following was tested and now working after this: SD-card, > eMMC (SD NAND), Ethernet, USB host and USB gadget (RockUSB and UMS). > > Changes in v2: > - Add clocks and resets props to otp node > - Add bootph-some-ram to emmc and sdmmc pinctrl nodes > - Sort bootph-all prop after compatible and reg props > - Fix rk3308-evb debug uart > - New patch to move cru and grf include files to arch-rockchip Sorry if I missed the answer in v1, but why aren't we switching to OF_UPSTREAM here, which is also on v6.8 currently? Thanks.
Hi Tom, On 2024-04-08 21:38, Tom Rini wrote: > On Mon, Apr 08, 2024 at 06:13:57PM +0000, Jonas Karlman wrote: >> This series adds support for new clocks used in linux v6.8 device trees, >> enables use of FIT signature check for checksum validation and fixes >> loading FIT from SD-card when loading FIT from eMMC fails. >> >> It should be possible to move RK3308 boards to use OF_UPSTREAM in a >> future series after this has been applied. >> >> I have runtime tested this series on a Radxa ROCK Pi S v1.3 having a >> RK3308B SoC. Following was tested and now working after this: SD-card, >> eMMC (SD NAND), Ethernet, USB host and USB gadget (RockUSB and UMS). >> >> Changes in v2: >> - Add clocks and resets props to otp node >> - Add bootph-some-ram to emmc and sdmmc pinctrl nodes >> - Sort bootph-all prop after compatible and reg props >> - Fix rk3308-evb debug uart >> - New patch to move cru and grf include files to arch-rockchip > > Sorry if I missed the answer in v1, but why aren't we switching to > OF_UPSTREAM here, which is also on v6.8 currently? Thanks. > I would like to keep the switch to OF_UPSTREAM in a separate series because of reviewability, some of the device tree files has not been updated since v5.5-rc1, also I would like to have the option of cherry-picking these patches to e.g. a 2024.04 branch. What is the expected update cadence on OF_UPSTREAM, will there be an update to v6.9 before v2024.07 or will U-Boot be one version behind linux at release time? Regards, Jonas
On Mon, Apr 08, 2024 at 09:55:59PM +0200, Jonas Karlman wrote: > Hi Tom, > > On 2024-04-08 21:38, Tom Rini wrote: > > On Mon, Apr 08, 2024 at 06:13:57PM +0000, Jonas Karlman wrote: > >> This series adds support for new clocks used in linux v6.8 device trees, > >> enables use of FIT signature check for checksum validation and fixes > >> loading FIT from SD-card when loading FIT from eMMC fails. > >> > >> It should be possible to move RK3308 boards to use OF_UPSTREAM in a > >> future series after this has been applied. > >> > >> I have runtime tested this series on a Radxa ROCK Pi S v1.3 having a > >> RK3308B SoC. Following was tested and now working after this: SD-card, > >> eMMC (SD NAND), Ethernet, USB host and USB gadget (RockUSB and UMS). > >> > >> Changes in v2: > >> - Add clocks and resets props to otp node > >> - Add bootph-some-ram to emmc and sdmmc pinctrl nodes > >> - Sort bootph-all prop after compatible and reg props > >> - Fix rk3308-evb debug uart > >> - New patch to move cru and grf include files to arch-rockchip > > > > Sorry if I missed the answer in v1, but why aren't we switching to > > OF_UPSTREAM here, which is also on v6.8 currently? Thanks. > > > > I would like to keep the switch to OF_UPSTREAM in a separate series > because of reviewability, some of the device tree files has not been > updated since v5.5-rc1, also I would like to have the option of > cherry-picking these patches to e.g. a 2024.04 branch. > > What is the expected update cadence on OF_UPSTREAM, will there be an > update to v6.9 before v2024.07 or will U-Boot be one version behind > linux at release time? If v6.9 comes out before I open the next branch, yes, it will be in v2024.07 otherwise no. I have to double check my emails before repeating if it's rc2 or rc3 I'm trying to regularly do that with, and then update doc/develop/release_cycle.rst to list it clearly.
This series adds support for new clocks used in linux v6.8 device trees, enables use of FIT signature check for checksum validation and fixes loading FIT from SD-card when loading FIT from eMMC fails. It should be possible to move RK3308 boards to use OF_UPSTREAM in a future series after this has been applied. I have runtime tested this series on a Radxa ROCK Pi S v1.3 having a RK3308B SoC. Following was tested and now working after this: SD-card, eMMC (SD NAND), Ethernet, USB host and USB gadget (RockUSB and UMS). Changes in v2: - Add clocks and resets props to otp node - Add bootph-some-ram to emmc and sdmmc pinctrl nodes - Sort bootph-all prop after compatible and reg props - Fix rk3308-evb debug uart - New patch to move cru and grf include files to arch-rockchip Finley Xiao (1): clk: rockchip: rk3308: Add support for SCLK_RTC32K clock Jonas Karlman (13): board: rockchip: rk3308: Add device tree files and myself to MAINTAINERS rockchip: rk3308: Sort imply statements alphabetically rockchip: rk3308: Enable ARMv8 crypto and FIT checksum validation rockchip: rk3308: Generate ethaddr based on cpu id rockchip: rk3308: Enable random generator rockchip: rk3308: Fix loading FIT from SD-card when booting from eMMC clk: rockchip: rk3308: Add dummy support for USB480M clock phy: rockchip-inno-usb2: Add support for RK3308 rockchip: rk3308: Sync device tree from linux v6.8 rockchip: rk3308-evb: Update defconfig rockchip: rk3308-roc-cc: Update defconfig rockchip: rk3308-rock-pi-s: Update defconfig rockchip: rk3308: Move cru and grf include files to arch-rockchip arch/arm/dts/rk3308-evb-u-boot.dtsi | 11 +- arch/arm/dts/rk3308-evb.dts | 104 +- arch/arm/dts/rk3308-roc-cc-u-boot.dtsi | 30 +- arch/arm/dts/rk3308-roc-cc.dts | 83 +- arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi | 45 +- arch/arm/dts/rk3308-rock-pi-s.dts | 100 +- arch/arm/dts/rk3308-u-boot.dtsi | 120 +- arch/arm/dts/rk3308.dtsi | 1205 +++++++++-------- .../cru_rk3308.h | 14 + .../grf_rk3308.h | 0 arch/arm/mach-rockchip/Kconfig | 19 +- arch/arm/mach-rockchip/rk3308/Kconfig | 3 - arch/arm/mach-rockchip/rk3308/clk_rk3308.c | 2 +- arch/arm/mach-rockchip/rk3308/rk3308.c | 2 +- board/firefly/firefly-rk3308/MAINTAINERS | 1 + board/firefly/firefly-rk3308/roc_cc_rk3308.c | 2 +- board/rockchip/evb_rk3308/MAINTAINERS | 5 +- configs/evb-rk3308_defconfig | 40 +- configs/roc-cc-rk3308_defconfig | 40 +- configs/rock-pi-s-rk3308_defconfig | 35 +- drivers/clk/rockchip/clk_rk3308.c | 101 +- drivers/net/gmac_rockchip.c | 4 +- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 20 + drivers/ram/rockchip/sdram_rk3308.c | 2 +- 24 files changed, 1177 insertions(+), 811 deletions(-) rename arch/arm/include/asm/{arch-rk3308 => arch-rockchip}/cru_rk3308.h (95%) rename arch/arm/include/asm/{arch-rk3308 => arch-rockchip}/grf_rk3308.h (100%)