| Message ID | 20200428100019.19155-3-jagan@amarulasolutions.com |
|---|---|
| State | Accepted |
| Commit | f44bf1b5b169ccfcb4745cf4c36cecfd42709f70 |
| Headers | show |
| Series | rk3399: Sync linux v5.7-rc1 dts(i) | expand |
On 2020/4/28 ??6:00, Jagan Teki wrote: > Move U-Boot specific properties into rk3399-evb u-boot > specific dtsi file. > > This would help to sync the devicetrees from Linux whenever > required instead of adding specific nodes. > > Signed-off-by: Jagan Teki <jagan at amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang at rock-chips.com> Thanks, - Kever > --- > Changes for v2: > - none > > arch/arm/dts/rk3399-evb-u-boot.dtsi | 8 ++++++++ > arch/arm/dts/rk3399-evb.dts | 2 -- > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi > index ccb33d34d1..a4d68f3b98 100644 > --- a/arch/arm/dts/rk3399-evb-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi > @@ -11,3 +11,11 @@ > u-boot,spl-boot-order = &sdhci, &sdmmc; > }; > }; > + > +&i2c0 { > + u-boot,dm-pre-reloc; > +}; > + > +&rk808 { > + u-boot,dm-pre-reloc; > +}; > diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts > index 4129e902a8..c72719c0d3 100644 > --- a/arch/arm/dts/rk3399-evb.dts > +++ b/arch/arm/dts/rk3399-evb.dts > @@ -199,7 +199,6 @@ > clock-frequency = <400000>; > i2c-scl-falling-time-ns = <50>; > i2c-scl-rising-time-ns = <100>; > - u-boot,dm-pre-reloc; > > rk808: pmic at 1b { > compatible = "rockchip,rk808"; > @@ -211,7 +210,6 @@ > reg = <0x1b>; > rockchip,system-power-controller; > #clock-cells = <1>; > - u-boot,dm-pre-reloc; > status = "okay"; > > vcc12-supply = <&vcc3v3_sys>;
diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi index ccb33d34d1..a4d68f3b98 100644 --- a/arch/arm/dts/rk3399-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi @@ -11,3 +11,11 @@ u-boot,spl-boot-order = &sdhci, &sdmmc; }; }; + +&i2c0 { + u-boot,dm-pre-reloc; +}; + +&rk808 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts index 4129e902a8..c72719c0d3 100644 --- a/arch/arm/dts/rk3399-evb.dts +++ b/arch/arm/dts/rk3399-evb.dts @@ -199,7 +199,6 @@ clock-frequency = <400000>; i2c-scl-falling-time-ns = <50>; i2c-scl-rising-time-ns = <100>; - u-boot,dm-pre-reloc; rk808: pmic at 1b { compatible = "rockchip,rk808"; @@ -211,7 +210,6 @@ reg = <0x1b>; rockchip,system-power-controller; #clock-cells = <1>; - u-boot,dm-pre-reloc; status = "okay"; vcc12-supply = <&vcc3v3_sys>;
Move U-Boot specific properties into rk3399-evb u-boot specific dtsi file. This would help to sync the devicetrees from Linux whenever required instead of adding specific nodes. Signed-off-by: Jagan Teki <jagan at amarulasolutions.com> --- Changes for v2: - none arch/arm/dts/rk3399-evb-u-boot.dtsi | 8 ++++++++ arch/arm/dts/rk3399-evb.dts | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-)