[U-Boot] [PATCH 1/3] rockchip: dts: rk3399: move the u-boot, dm-pre-reloc to the u-boot.dtsi

[Peter Robinson]

On Sun, Nov 10, 2019 at 2:35 PM Kever Yang <kever.yang at rock-chips.com> wrote:
>
>
> On 2019/11/10 上午4:30, Peter Robinson wrote:
> > The u-boot specific pieces in the dts files should be in u-boot.dtsi
> > not the main files, this allows easier sync with upstream. The
> > rk3399.dtsi has a mix of both so move them all for consistency.
> >
> > Signed-off-by: Peter Robinson <pbrobinson at gmail.com>
>
> Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

This has a typo in it, it's a simple fix (see below), do you want me
to send another version or can you fix it up inline?

> Thanks,
> - Kever
> > ---
> >   arch/arm/dts/rk3399-u-boot.dtsi | 44 +++++++++++++++++++++++++++++++++
> >   arch/arm/dts/rk3399.dtsi        | 11 ---------
> >   2 files changed, 44 insertions(+), 11 deletions(-)
> >
> > diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
> > index 2738a3889e..3ec66c6fc3 100644
> > --- a/arch/arm/dts/rk3399-u-boot.dtsi
> > +++ b/arch/arm/dts/rk3399-u-boot.dtsi
> > @@ -3,10 +3,46 @@
> >    * Copyright (C) 2019 Jagan Teki <jagan at amarulasolutions.com>
> >    */
> >
> > +&cic {
> > +     u-boot,dm-pre-reloc;
> > +};
> > +
> > +&cru {
> > +     u-boot,dm-pre-reloc;
> > +};
> > +
> > +&dmc {
> > +     u-boot,dm-pre-reloc;
> > +};
> > +
> > +&grf {
> > +     u-boot,dm-pre-reloc;
> > +};
> > +
> > +&pinctrl {
> > +     u-boot,dm-pre-reloc;
> > +};
> > +
> > +&pmu {
> > +     u-boot,dm-pre-reloc;
> > +};
> > +
> >   &pmu {
> >       u-boot,dm-pre-reloc;
> >   };
> >
> > +&pmucrc {

The above should be &pmucru not crc. Basically s/pmucrc/pmucru/

> > +     u-boot,dm-pre-reloc;
> > +};
> > +
> > +&pmusgrf {
> > +     u-boot,dm-pre-reloc;
> > +};
> > +
> > +&sdhci {
> > +     u-boot,dm-pre-reloc;
> > +};
> > +
> >   &sdmmc {
> >       u-boot,dm-pre-reloc;
> >   };
> > @@ -22,3 +58,11 @@
> >   &uart2 {
> >       u-boot,dm-pre-reloc;
> >   };
> > +
> > +&vopb {
> > +     u-boot,dm-pre-reloc;
> > +};
> > +
> > +&vopl {
> > +     u-boot,dm-pre-reloc;
> > +};
> > diff --git a/arch/arm/dts/rk3399.dtsi b/arch/arm/dts/rk3399.dtsi
> > index b73442ee34..3f773b10f4 100644
> > --- a/arch/arm/dts/rk3399.dtsi
> > +++ b/arch/arm/dts/rk3399.dtsi
> > @@ -275,7 +275,6 @@
> >       };
> >
> >       sdhci: sdhci at fe330000 {
> > -             u-boot,dm-pre-reloc;
> >               compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1";
> >               reg = <0x0 0xfe330000 0x0 0x10000>;
> >               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH 0>;
> > @@ -1072,7 +1071,6 @@
> >       };
> >
> >       pmugrf: syscon at ff320000 {
> > -             u-boot,dm-pre-reloc;
> >               compatible = "rockchip,rk3399-pmugrf", "syscon", "simple-mfd";
> >               reg = <0x0 0xff320000 0x0 0x1000>;
> >
> > @@ -1083,7 +1081,6 @@
> >       };
> >
> >       pmusgrf: syscon at ff330000 {
> > -             u-boot,dm-pre-reloc;
> >               compatible = "rockchip,rk3399-pmusgrf", "syscon";
> >               reg = <0x0 0xff330000 0x0 0xe3d4>;
> >       };
> > @@ -1204,7 +1201,6 @@
> >       };
> >
> >       cic: syscon at ff620000 {
> > -             u-boot,dm-pre-reloc;
> >               compatible = "rockchip,rk3399-cic", "syscon";
> >               reg = <0x0 0xff620000 0x0 0x100>;
> >       };
> > @@ -1219,7 +1215,6 @@
> >       };
> >
> >       dmc: dmc {
> > -             u-boot,dm-pre-reloc;
> >               compatible = "rockchip,rk3399-dmc";
> >               devfreq-events = <&dfi>;
> >               interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH 0>;
> > @@ -1268,7 +1263,6 @@
> >       };
> >
> >       pmucru: pmu-clock-controller at ff750000 {
> > -             u-boot,dm-pre-reloc;
> >               compatible = "rockchip,rk3399-pmucru";
> >               reg = <0x0 0xff750000 0x0 0x1000>;
> >               rockchip,grf = <&pmugrf>;
> > @@ -1279,7 +1273,6 @@
> >       };
> >
> >       cru: clock-controller at ff760000 {
> > -             u-boot,dm-pre-reloc;
> >               compatible = "rockchip,rk3399-cru";
> >               reg = <0x0 0xff760000 0x0 0x1000>;
> >               rockchip,grf = <&grf>;
> > @@ -1310,7 +1303,6 @@
> >       };
> >
> >       grf: syscon at ff770000 {
> > -             u-boot,dm-pre-reloc;
> >               compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd";
> >               reg = <0x0 0xff770000 0x0 0x10000>;
> >               #address-cells = <1>;
> > @@ -1520,7 +1512,6 @@
> >       };
> >
> >       vopl: vop at ff8f0000 {
> > -             u-boot,dm-pre-reloc;
> >               compatible = "rockchip,rk3399-vop-lit";
> >               reg = <0x0 0xff8f0000 0x0 0x3efc>;
> >               interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
> > @@ -1578,7 +1569,6 @@
> >       };
> >
> >       vopb: vop at ff900000 {
> > -             u-boot,dm-pre-reloc;
> >               compatible = "rockchip,rk3399-vop-big";
> >               reg = <0x0 0xff900000 0x0 0x3efc>;
> >               interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
> > @@ -1818,7 +1808,6 @@
> >       };
> >
> >       pinctrl: pinctrl {
> > -             u-boot,dm-pre-reloc;
> >               compatible = "rockchip,rk3399-pinctrl";
> >               rockchip,grf = <&grf>;
> >               rockchip,pmu = <&pmugrf>;
>
>