From patchwork Tue Apr 28 10:00:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 238714 List-Id: U-Boot discussion From: jagan at amarulasolutions.com (Jagan Teki) Date: Tue, 28 Apr 2020 15:30:14 +0530 Subject: [PATCH v2 1/6] arm64: dts: rk3399-puma: Move u-boot properties into -u-boot.dtsi In-Reply-To: <20200428100019.19155-1-jagan@amarulasolutions.com> References: <20200428100019.19155-1-jagan@amarulasolutions.com> Message-ID: <20200428100019.19155-2-jagan@amarulasolutions.com> Move U-Boot specific properties into rk3399-puma u-boot specific dtsi file. This would help to sync the devicetrees from Linux whenever required instead of adding specific nodes. Cc: Peter Robinson Signed-off-by: Jagan Teki Reviewed-by: Kever Yang Reviewed-by: Kever Yang --- Changes for v2: - none arch/arm/dts/rk3399-puma-u-boot.dtsi | 16 ++++++++++++++++ arch/arm/dts/rk3399-puma.dtsi | 11 ----------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/arch/arm/dts/rk3399-puma-u-boot.dtsi b/arch/arm/dts/rk3399-puma-u-boot.dtsi index 52f62b5d39..e664779227 100644 --- a/arch/arm/dts/rk3399-puma-u-boot.dtsi +++ b/arch/arm/dts/rk3399-puma-u-boot.dtsi @@ -22,3 +22,19 @@ }; }; + +&bios_enable { + u-boot,dm-pre-reloc; +}; + +&gpio1 { + u-boot,dm-pre-reloc; +}; + +&gpio3 { + u-boot,dm-pre-reloc; +}; + +&spiflash { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi index 558b6337df..246a892cb7 100644 --- a/arch/arm/dts/rk3399-puma.dtsi +++ b/arch/arm/dts/rk3399-puma.dtsi @@ -91,7 +91,6 @@ */ bios_enable: bios_enable { compatible = "regulator-fixed"; - u-boot,dm-pre-reloc; regulator-name = "bios_enable"; enable-active-high; gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>; @@ -520,14 +519,6 @@ status = "okay"; }; -&gpio1 { - u-boot,dm-pre-reloc; -}; - -&gpio3 { - u-boot,dm-pre-reloc; -}; - &pinctrl { /* Pins that are not explicitely used by any devices */ pinctrl-names = "default"; @@ -633,8 +624,6 @@ #size-cells = <0>; spiflash: w25q32dw at 0 { - u-boot,dm-pre-reloc; - compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <49500000>;