| Message ID | 20240504194346.2462489-4-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: Migrate RK3308, RK3328, RK356x and RK3588 to OF_UPSTREAM | expand |
On 2024/5/5 03:42, Jonas Karlman wrote: > All RK3328 boards has now been synced to Linux kernel v6.8 DTs and can > migrate to use OF_UPSTREAM. > > Migrate all RK3328 boards to use OF_UPSTREAM. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/Makefile | 11 ----------- > arch/arm/mach-rockchip/Kconfig | 1 + > configs/evb-rk3328_defconfig | 2 +- > configs/nanopi-r2c-plus-rk3328_defconfig | 2 +- > configs/nanopi-r2c-rk3328_defconfig | 2 +- > configs/nanopi-r2s-rk3328_defconfig | 2 +- > configs/orangepi-r1-plus-lts-rk3328_defconfig | 2 +- > configs/orangepi-r1-plus-rk3328_defconfig | 2 +- > configs/roc-cc-rk3328_defconfig | 2 +- > configs/rock-pi-e-rk3328_defconfig | 2 +- > configs/rock64-rk3328_defconfig | 2 +- > 11 files changed, 10 insertions(+), 20 deletions(-) > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index 319ec23a4fee..b7ada58695be 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -92,17 +92,6 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \ > rk3288-veyron-speedy.dtb \ > rk3288-vyasa.dtb > > -dtb-$(CONFIG_ROCKCHIP_RK3328) += \ > - rk3328-evb.dtb \ > - rk3328-nanopi-r2c.dtb \ > - rk3328-nanopi-r2c-plus.dtb \ > - rk3328-nanopi-r2s.dtb \ > - rk3328-orangepi-r1-plus.dtb \ > - rk3328-orangepi-r1-plus-lts.dtb \ > - rk3328-roc-cc.dtb \ > - rk3328-rock64.dtb \ > - rk3328-rock-pi-e.dtb > - > dtb-$(CONFIG_ROCKCHIP_RK3368) += \ > rk3368-lion-haikou.dtb \ > rk3368-sheep.dtb \ > diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig > index f1caf4f3738b..a492b0885c03 100644 > --- a/arch/arm/mach-rockchip/Kconfig > +++ b/arch/arm/mach-rockchip/Kconfig > @@ -197,6 +197,7 @@ config ROCKCHIP_RK3328 > imply MISC > imply MISC_INIT_R > imply OF_LIVE > + imply OF_UPSTREAM > imply PRE_CONSOLE_BUFFER > imply ROCKCHIP_COMMON_BOARD > imply ROCKCHIP_EFUSE > diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig > index 53ad6777ec50..bfb85223437d 100644 > --- a/configs/evb-rk3328_defconfig > +++ b/configs/evb-rk3328_defconfig > @@ -5,7 +5,7 @@ CONFIG_ARCH_ROCKCHIP=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_ENV_OFFSET=0x3F8000 > -CONFIG_DEFAULT_DEVICE_TREE="rk3328-evb" > +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-evb" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3328=y > CONFIG_DEBUG_UART_BASE=0xFF130000 > diff --git a/configs/nanopi-r2c-plus-rk3328_defconfig b/configs/nanopi-r2c-plus-rk3328_defconfig > index beef682a582e..f311a0a80ba7 100644 > --- a/configs/nanopi-r2c-plus-rk3328_defconfig > +++ b/configs/nanopi-r2c-plus-rk3328_defconfig > @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_ENV_OFFSET=0x3F8000 > -CONFIG_DEFAULT_DEVICE_TREE="rk3328-nanopi-r2c-plus" > +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-nanopi-r2c-plus" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3328=y > CONFIG_DEBUG_UART_BASE=0xFF130000 > diff --git a/configs/nanopi-r2c-rk3328_defconfig b/configs/nanopi-r2c-rk3328_defconfig > index 8960c1afaba5..533dc1029f73 100644 > --- a/configs/nanopi-r2c-rk3328_defconfig > +++ b/configs/nanopi-r2c-rk3328_defconfig > @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_ENV_OFFSET=0x3F8000 > -CONFIG_DEFAULT_DEVICE_TREE="rk3328-nanopi-r2c" > +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-nanopi-r2c" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3328=y > CONFIG_DEBUG_UART_BASE=0xFF130000 > diff --git a/configs/nanopi-r2s-rk3328_defconfig b/configs/nanopi-r2s-rk3328_defconfig > index 96e67e248d32..2591a9cc8ab2 100644 > --- a/configs/nanopi-r2s-rk3328_defconfig > +++ b/configs/nanopi-r2s-rk3328_defconfig > @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_ENV_OFFSET=0x3F8000 > -CONFIG_DEFAULT_DEVICE_TREE="rk3328-nanopi-r2s" > +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-nanopi-r2s" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3328=y > CONFIG_DEBUG_UART_BASE=0xFF130000 > diff --git a/configs/orangepi-r1-plus-lts-rk3328_defconfig b/configs/orangepi-r1-plus-lts-rk3328_defconfig > index 5fbbd5fc6558..14cdbd813c81 100644 > --- a/configs/orangepi-r1-plus-lts-rk3328_defconfig > +++ b/configs/orangepi-r1-plus-lts-rk3328_defconfig > @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_ENV_OFFSET=0x3F8000 > -CONFIG_DEFAULT_DEVICE_TREE="rk3328-orangepi-r1-plus-lts" > +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-orangepi-r1-plus-lts" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3328=y > CONFIG_ROCKCHIP_SPI_IMAGE=y > diff --git a/configs/orangepi-r1-plus-rk3328_defconfig b/configs/orangepi-r1-plus-rk3328_defconfig > index c5afe5ea6e5c..7fe58e7a1467 100644 > --- a/configs/orangepi-r1-plus-rk3328_defconfig > +++ b/configs/orangepi-r1-plus-rk3328_defconfig > @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_ENV_OFFSET=0x3F8000 > -CONFIG_DEFAULT_DEVICE_TREE="rk3328-orangepi-r1-plus" > +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-orangepi-r1-plus" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3328=y > CONFIG_ROCKCHIP_SPI_IMAGE=y > diff --git a/configs/roc-cc-rk3328_defconfig b/configs/roc-cc-rk3328_defconfig > index 1dbd39e6b5e7..91b9422e26fb 100644 > --- a/configs/roc-cc-rk3328_defconfig > +++ b/configs/roc-cc-rk3328_defconfig > @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_ENV_OFFSET=0x3F8000 > -CONFIG_DEFAULT_DEVICE_TREE="rk3328-roc-cc" > +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-roc-cc" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3328=y > CONFIG_DEBUG_UART_BASE=0xFF130000 > diff --git a/configs/rock-pi-e-rk3328_defconfig b/configs/rock-pi-e-rk3328_defconfig > index 23029255bca2..5cc54af3ca56 100644 > --- a/configs/rock-pi-e-rk3328_defconfig > +++ b/configs/rock-pi-e-rk3328_defconfig > @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_ENV_OFFSET=0x3F8000 > -CONFIG_DEFAULT_DEVICE_TREE="rk3328-rock-pi-e" > +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-rock-pi-e" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3328=y > CONFIG_DEBUG_UART_BASE=0xFF130000 > diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig > index b0be1d1d7633..9d77dfb7098a 100644 > --- a/configs/rock64-rk3328_defconfig > +++ b/configs/rock64-rk3328_defconfig > @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_ENV_OFFSET=0x3F8000 > -CONFIG_DEFAULT_DEVICE_TREE="rk3328-rock64" > +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-rock64" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3328=y > CONFIG_ROCKCHIP_SPI_IMAGE=y
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 319ec23a4fee..b7ada58695be 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -92,17 +92,6 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \ rk3288-veyron-speedy.dtb \ rk3288-vyasa.dtb -dtb-$(CONFIG_ROCKCHIP_RK3328) += \ - rk3328-evb.dtb \ - rk3328-nanopi-r2c.dtb \ - rk3328-nanopi-r2c-plus.dtb \ - rk3328-nanopi-r2s.dtb \ - rk3328-orangepi-r1-plus.dtb \ - rk3328-orangepi-r1-plus-lts.dtb \ - rk3328-roc-cc.dtb \ - rk3328-rock64.dtb \ - rk3328-rock-pi-e.dtb - dtb-$(CONFIG_ROCKCHIP_RK3368) += \ rk3368-lion-haikou.dtb \ rk3368-sheep.dtb \ diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index f1caf4f3738b..a492b0885c03 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -197,6 +197,7 @@ config ROCKCHIP_RK3328 imply MISC imply MISC_INIT_R imply OF_LIVE + imply OF_UPSTREAM imply PRE_CONSOLE_BUFFER imply ROCKCHIP_COMMON_BOARD imply ROCKCHIP_EFUSE diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig index 53ad6777ec50..bfb85223437d 100644 --- a/configs/evb-rk3328_defconfig +++ b/configs/evb-rk3328_defconfig @@ -5,7 +5,7 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3328-evb" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-evb" CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3328=y CONFIG_DEBUG_UART_BASE=0xFF130000 diff --git a/configs/nanopi-r2c-plus-rk3328_defconfig b/configs/nanopi-r2c-plus-rk3328_defconfig index beef682a582e..f311a0a80ba7 100644 --- a/configs/nanopi-r2c-plus-rk3328_defconfig +++ b/configs/nanopi-r2c-plus-rk3328_defconfig @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3328-nanopi-r2c-plus" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-nanopi-r2c-plus" CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3328=y CONFIG_DEBUG_UART_BASE=0xFF130000 diff --git a/configs/nanopi-r2c-rk3328_defconfig b/configs/nanopi-r2c-rk3328_defconfig index 8960c1afaba5..533dc1029f73 100644 --- a/configs/nanopi-r2c-rk3328_defconfig +++ b/configs/nanopi-r2c-rk3328_defconfig @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3328-nanopi-r2c" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-nanopi-r2c" CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3328=y CONFIG_DEBUG_UART_BASE=0xFF130000 diff --git a/configs/nanopi-r2s-rk3328_defconfig b/configs/nanopi-r2s-rk3328_defconfig index 96e67e248d32..2591a9cc8ab2 100644 --- a/configs/nanopi-r2s-rk3328_defconfig +++ b/configs/nanopi-r2s-rk3328_defconfig @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3328-nanopi-r2s" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-nanopi-r2s" CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3328=y CONFIG_DEBUG_UART_BASE=0xFF130000 diff --git a/configs/orangepi-r1-plus-lts-rk3328_defconfig b/configs/orangepi-r1-plus-lts-rk3328_defconfig index 5fbbd5fc6558..14cdbd813c81 100644 --- a/configs/orangepi-r1-plus-lts-rk3328_defconfig +++ b/configs/orangepi-r1-plus-lts-rk3328_defconfig @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3328-orangepi-r1-plus-lts" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-orangepi-r1-plus-lts" CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3328=y CONFIG_ROCKCHIP_SPI_IMAGE=y diff --git a/configs/orangepi-r1-plus-rk3328_defconfig b/configs/orangepi-r1-plus-rk3328_defconfig index c5afe5ea6e5c..7fe58e7a1467 100644 --- a/configs/orangepi-r1-plus-rk3328_defconfig +++ b/configs/orangepi-r1-plus-rk3328_defconfig @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3328-orangepi-r1-plus" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-orangepi-r1-plus" CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3328=y CONFIG_ROCKCHIP_SPI_IMAGE=y diff --git a/configs/roc-cc-rk3328_defconfig b/configs/roc-cc-rk3328_defconfig index 1dbd39e6b5e7..91b9422e26fb 100644 --- a/configs/roc-cc-rk3328_defconfig +++ b/configs/roc-cc-rk3328_defconfig @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3328-roc-cc" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-roc-cc" CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3328=y CONFIG_DEBUG_UART_BASE=0xFF130000 diff --git a/configs/rock-pi-e-rk3328_defconfig b/configs/rock-pi-e-rk3328_defconfig index 23029255bca2..5cc54af3ca56 100644 --- a/configs/rock-pi-e-rk3328_defconfig +++ b/configs/rock-pi-e-rk3328_defconfig @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3328-rock-pi-e" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-rock-pi-e" CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3328=y CONFIG_DEBUG_UART_BASE=0xFF130000 diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig index b0be1d1d7633..9d77dfb7098a 100644 --- a/configs/rock64-rk3328_defconfig +++ b/configs/rock64-rk3328_defconfig @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3328-rock64" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-rock64" CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3328=y CONFIG_ROCKCHIP_SPI_IMAGE=y
All RK3328 boards has now been synced to Linux kernel v6.8 DTs and can migrate to use OF_UPSTREAM. Migrate all RK3328 boards to use OF_UPSTREAM. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- arch/arm/dts/Makefile | 11 ----------- arch/arm/mach-rockchip/Kconfig | 1 + configs/evb-rk3328_defconfig | 2 +- configs/nanopi-r2c-plus-rk3328_defconfig | 2 +- configs/nanopi-r2c-rk3328_defconfig | 2 +- configs/nanopi-r2s-rk3328_defconfig | 2 +- configs/orangepi-r1-plus-lts-rk3328_defconfig | 2 +- configs/orangepi-r1-plus-rk3328_defconfig | 2 +- configs/roc-cc-rk3328_defconfig | 2 +- configs/rock-pi-e-rk3328_defconfig | 2 +- configs/rock64-rk3328_defconfig | 2 +- 11 files changed, 10 insertions(+), 20 deletions(-)