| Message ID | 20240504194346.2462489-2-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 RK3308 boards has now been synced to Linux kernel v6.8 DTs and can > migrate to use OF_UPSTREAM. > > Migrate all RK3308 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 | 5 ----- > arch/arm/mach-rockchip/Kconfig | 1 + > configs/evb-rk3308_defconfig | 2 +- > configs/roc-cc-rk3308_defconfig | 2 +- > configs/rock-pi-s-rk3308_defconfig | 2 +- > 5 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index c9f1b25ad647..319ec23a4fee 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -92,11 +92,6 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \ > rk3288-veyron-speedy.dtb \ > rk3288-vyasa.dtb > > -dtb-$(CONFIG_ROCKCHIP_RK3308) += \ > - rk3308-evb.dtb \ > - rk3308-roc-cc.dtb \ > - rk3308-rock-pi-s.dtb > - > dtb-$(CONFIG_ROCKCHIP_RK3328) += \ > rk3328-evb.dtb \ > rk3328-nanopi-r2c.dtb \ > diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig > index 262cb7cba3ea..f1caf4f3738b 100644 > --- a/arch/arm/mach-rockchip/Kconfig > +++ b/arch/arm/mach-rockchip/Kconfig > @@ -166,6 +166,7 @@ config ROCKCHIP_RK3308 > imply LEGACY_IMAGE_FORMAT > imply MISC > imply MISC_INIT_R > + imply OF_UPSTREAM > imply RNG_ROCKCHIP > imply ROCKCHIP_COMMON_BOARD > imply ROCKCHIP_OTP > diff --git a/configs/evb-rk3308_defconfig b/configs/evb-rk3308_defconfig > index 04a94e13a68a..f4c2ea12adaa 100644 > --- a/configs/evb-rk3308_defconfig > +++ b/configs/evb-rk3308_defconfig > @@ -2,7 +2,7 @@ CONFIG_ARM=y > CONFIG_SKIP_LOWLEVEL_INIT=y > CONFIG_COUNTER_FREQUENCY=24000000 > CONFIG_ARCH_ROCKCHIP=y > -CONFIG_DEFAULT_DEVICE_TREE="rk3308-evb" > +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-evb" > CONFIG_OF_LIBFDT_OVERLAY=y > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3308=y > diff --git a/configs/roc-cc-rk3308_defconfig b/configs/roc-cc-rk3308_defconfig > index ef58bd657532..862ea4301f25 100644 > --- a/configs/roc-cc-rk3308_defconfig > +++ b/configs/roc-cc-rk3308_defconfig > @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y > CONFIG_COUNTER_FREQUENCY=24000000 > CONFIG_ARCH_ROCKCHIP=y > CONFIG_SPL_GPIO=y > -CONFIG_DEFAULT_DEVICE_TREE="rk3308-roc-cc" > +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-roc-cc" > CONFIG_OF_LIBFDT_OVERLAY=y > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3308=y > diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig > index 37a124eae181..c15ba3d8a451 100644 > --- a/configs/rock-pi-s-rk3308_defconfig > +++ b/configs/rock-pi-s-rk3308_defconfig > @@ -2,7 +2,7 @@ CONFIG_ARM=y > CONFIG_SKIP_LOWLEVEL_INIT=y > CONFIG_COUNTER_FREQUENCY=24000000 > CONFIG_ARCH_ROCKCHIP=y > -CONFIG_DEFAULT_DEVICE_TREE="rk3308-rock-pi-s" > +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-rock-pi-s" > CONFIG_OF_LIBFDT_OVERLAY=y > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3308=y
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index c9f1b25ad647..319ec23a4fee 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -92,11 +92,6 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \ rk3288-veyron-speedy.dtb \ rk3288-vyasa.dtb -dtb-$(CONFIG_ROCKCHIP_RK3308) += \ - rk3308-evb.dtb \ - rk3308-roc-cc.dtb \ - rk3308-rock-pi-s.dtb - dtb-$(CONFIG_ROCKCHIP_RK3328) += \ rk3328-evb.dtb \ rk3328-nanopi-r2c.dtb \ diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 262cb7cba3ea..f1caf4f3738b 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -166,6 +166,7 @@ config ROCKCHIP_RK3308 imply LEGACY_IMAGE_FORMAT imply MISC imply MISC_INIT_R + imply OF_UPSTREAM imply RNG_ROCKCHIP imply ROCKCHIP_COMMON_BOARD imply ROCKCHIP_OTP diff --git a/configs/evb-rk3308_defconfig b/configs/evb-rk3308_defconfig index 04a94e13a68a..f4c2ea12adaa 100644 --- a/configs/evb-rk3308_defconfig +++ b/configs/evb-rk3308_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_DEFAULT_DEVICE_TREE="rk3308-evb" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-evb" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3308=y diff --git a/configs/roc-cc-rk3308_defconfig b/configs/roc-cc-rk3308_defconfig index ef58bd657532..862ea4301f25 100644 --- a/configs/roc-cc-rk3308_defconfig +++ b/configs/roc-cc-rk3308_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y CONFIG_SPL_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="rk3308-roc-cc" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-roc-cc" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3308=y diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig index 37a124eae181..c15ba3d8a451 100644 --- a/configs/rock-pi-s-rk3308_defconfig +++ b/configs/rock-pi-s-rk3308_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_DEFAULT_DEVICE_TREE="rk3308-rock-pi-s" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-rock-pi-s" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3308=y
All RK3308 boards has now been synced to Linux kernel v6.8 DTs and can migrate to use OF_UPSTREAM. Migrate all RK3308 boards to use OF_UPSTREAM. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- arch/arm/dts/Makefile | 5 ----- arch/arm/mach-rockchip/Kconfig | 1 + configs/evb-rk3308_defconfig | 2 +- configs/roc-cc-rk3308_defconfig | 2 +- configs/rock-pi-s-rk3308_defconfig | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-)