From: 安容 <[email protected]> The Linux devicetree of the NanoPi Zero2 has been split into a common rk3528-nanopi.dtsi, which the NanoPi R28S builds on. Both boards use the same PWM regulators for vdd_arm and vdd_logic.
Move the U-Boot specific parts of the NanoPi Zero2 into a common rk3528-nanopi-u-boot.dtsi in the same way, so that the NanoPi R28S can include it instead of duplicating it. No functional change. Signed-off-by: 安容 <[email protected]> --- arch/arm/dts/rk3528-nanopi-u-boot.dtsi | 11 +++++++++++ arch/arm/dts/rk3528-nanopi-zero2-u-boot.dtsi | 10 +--------- arch/arm/mach-rockchip/rk3528/MAINTAINERS | 1 + 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/arch/arm/dts/rk3528-nanopi-u-boot.dtsi b/arch/arm/dts/rk3528-nanopi-u-boot.dtsi new file mode 100644 index 00000000000..3e2fbd81da1 --- /dev/null +++ b/arch/arm/dts/rk3528-nanopi-u-boot.dtsi @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +#include "rk3528-u-boot.dtsi" + +&vdd_arm { + regulator-init-microvolt = <953000>; +}; + +&vdd_logic { + regulator-init-microvolt = <900000>; +}; diff --git a/arch/arm/dts/rk3528-nanopi-zero2-u-boot.dtsi b/arch/arm/dts/rk3528-nanopi-zero2-u-boot.dtsi index 3e2fbd81da1..151f1872fed 100644 --- a/arch/arm/dts/rk3528-nanopi-zero2-u-boot.dtsi +++ b/arch/arm/dts/rk3528-nanopi-zero2-u-boot.dtsi @@ -1,11 +1,3 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -#include "rk3528-u-boot.dtsi" - -&vdd_arm { - regulator-init-microvolt = <953000>; -}; - -&vdd_logic { - regulator-init-microvolt = <900000>; -}; +#include "rk3528-nanopi-u-boot.dtsi" diff --git a/arch/arm/mach-rockchip/rk3528/MAINTAINERS b/arch/arm/mach-rockchip/rk3528/MAINTAINERS index 95543b40dd3..d1810fb0528 100644 --- a/arch/arm/mach-rockchip/rk3528/MAINTAINERS +++ b/arch/arm/mach-rockchip/rk3528/MAINTAINERS @@ -13,6 +13,7 @@ F: configs/hinlink-h28k-rk3528_defconfig NANOPI-ZERO2-RK3528 M: Jonas Karlman <[email protected]> S: Maintained +F: arch/arm/dts/rk3528-nanopi-u-boot.dtsi F: arch/arm/dts/rk3528-nanopi-zero2* F: configs/nanopi-zero2-rk3528_defconfig -- 2.56.0
