[v3,03/13] rockchip: dts: rk3399: Create initial rk3399-u-boot.dtsi

Message ID 20190425173427.13445-4-jagan@amarulasolutions.com
State New
Headers show
Series
  • rockchip: Add new rk3399 boards
Related show

Commit Message

Jagan Teki April 25, 2019, 5:34 p.m. UTC
u-boot,dm-pre-reloc is required for SDMMC booted rk3399 boards and
which is U-Boot specific devicetrees binding.

Move it on global rk3399-u-boot.dtsi file and rest of the U-Boot
bindings will move it future based on the requirement.

This would help to sync the devicetrees from Linux whenever required
instead of adding specific nodes.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
---
 arch/arm/dts/rk3399-evb.dts     | 1 -
 arch/arm/dts/rk3399-firefly.dts | 1 -
 arch/arm/dts/rk3399-puma.dtsi   | 1 -
 arch/arm/dts/rk3399-u-boot.dtsi | 8 ++++++++
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 arch/arm/dts/rk3399-u-boot.dtsi

Comments

Jagan Teki April 26, 2019, 1:21 p.m. UTC | #1
On Thu, Apr 25, 2019 at 11:04 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> u-boot,dm-pre-reloc is required for SDMMC booted rk3399 boards and
> which is U-Boot specific devicetrees binding.
>
> Move it on global rk3399-u-boot.dtsi file and rest of the U-Boot
> bindings will move it future based on the requirement.
>
> This would help to sync the devicetrees from Linux whenever required
> instead of adding specific nodes.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
> ---
>  arch/arm/dts/rk3399-evb.dts     | 1 -
>  arch/arm/dts/rk3399-firefly.dts | 1 -
>  arch/arm/dts/rk3399-puma.dtsi   | 1 -
>  arch/arm/dts/rk3399-u-boot.dtsi | 8 ++++++++
>  4 files changed, 8 insertions(+), 3 deletions(-)
>  create mode 100644 arch/arm/dts/rk3399-u-boot.dtsi
>
> diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts
> index ce004d0d18..9162f3dd50 100644
> --- a/arch/arm/dts/rk3399-evb.dts
> +++ b/arch/arm/dts/rk3399-evb.dts
> @@ -155,7 +155,6 @@
>  };
>
>  &sdmmc {
> -       u-boot,dm-pre-reloc;
>         bus-width = <4>;
>         status = "okay";
>  };
> diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts
> index f90e7e88db..46f2ffaf8d 100644
> --- a/arch/arm/dts/rk3399-firefly.dts
> +++ b/arch/arm/dts/rk3399-firefly.dts
> @@ -592,7 +592,6 @@
>  };
>
>  &sdmmc {
> -       u-boot,dm-pre-reloc;
>         bus-width = <4>;
>         status = "okay";
>  };
> diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
> index 8304f67192..9049694243 100644
> --- a/arch/arm/dts/rk3399-puma.dtsi
> +++ b/arch/arm/dts/rk3399-puma.dtsi
> @@ -492,7 +492,6 @@
>  };
>
>  &sdmmc {
> -       u-boot,dm-pre-reloc;

We need to explicitly include rk3399-u-boot.dtsi to these files since
the SoC name is rockchip, I'm sending other series for these changes.
and I have send v3.1 patches for only this change [1] and rest
unchanged.

Sorry for not noticing before.

[1] https://patchwork.ozlabs.org/patch/1091534/
Paul Kocialkowski April 26, 2019, 1:33 p.m. UTC | #2
Hi,

On Fri, 2019-04-26 at 18:51 +0530, Jagan Teki wrote:
> On Thu, Apr 25, 2019 at 11:04 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
> > u-boot,dm-pre-reloc is required for SDMMC booted rk3399 boards and
> > which is U-Boot specific devicetrees binding.
> > 
> > Move it on global rk3399-u-boot.dtsi file and rest of the U-Boot
> > bindings will move it future based on the requirement.
> > 
> > This would help to sync the devicetrees from Linux whenever required
> > instead of adding specific nodes.
> > 
> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> > Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
> > ---
> >  arch/arm/dts/rk3399-evb.dts     | 1 -
> >  arch/arm/dts/rk3399-firefly.dts | 1 -
> >  arch/arm/dts/rk3399-puma.dtsi   | 1 -
> >  arch/arm/dts/rk3399-u-boot.dtsi | 8 ++++++++
> >  4 files changed, 8 insertions(+), 3 deletions(-)
> >  create mode 100644 arch/arm/dts/rk3399-u-boot.dtsi
> > 
> > diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts
> > index ce004d0d18..9162f3dd50 100644
> > --- a/arch/arm/dts/rk3399-evb.dts
> > +++ b/arch/arm/dts/rk3399-evb.dts
> > @@ -155,7 +155,6 @@
> >  };
> > 
> >  &sdmmc {
> > -       u-boot,dm-pre-reloc;
> >         bus-width = <4>;
> >         status = "okay";
> >  };
> > diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts
> > index f90e7e88db..46f2ffaf8d 100644
> > --- a/arch/arm/dts/rk3399-firefly.dts
> > +++ b/arch/arm/dts/rk3399-firefly.dts
> > @@ -592,7 +592,6 @@
> >  };
> > 
> >  &sdmmc {
> > -       u-boot,dm-pre-reloc;
> >         bus-width = <4>;
> >         status = "okay";
> >  };
> > diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
> > index 8304f67192..9049694243 100644
> > --- a/arch/arm/dts/rk3399-puma.dtsi
> > +++ b/arch/arm/dts/rk3399-puma.dtsi
> > @@ -492,7 +492,6 @@
> >  };
> > 
> >  &sdmmc {
> > -       u-boot,dm-pre-reloc;
> 
> We need to explicitly include rk3399-u-boot.dtsi to these files since
> the SoC name is rockchip, I'm sending other series for these changes.
> and I have send v3.1 patches for only this change [1] and rest
> unchanged.

Does this mean that the rk3399-u-boot.dtsi file won't be auto-included
from the boards dtsi? If so, we should probably create -u-boot.dtsi
files for each device, to include rk3399-u-boot.dtsi.

Cheers,

Paul

> Sorry for not noticing before.
> 
> [1] https://patchwork.ozlabs.org/patch/1091534/

Patch

diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts
index ce004d0d18..9162f3dd50 100644
--- a/arch/arm/dts/rk3399-evb.dts
+++ b/arch/arm/dts/rk3399-evb.dts
@@ -155,7 +155,6 @@ 
 };
 
 &sdmmc {
-	u-boot,dm-pre-reloc;
 	bus-width = <4>;
 	status = "okay";
 };
diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts
index f90e7e88db..46f2ffaf8d 100644
--- a/arch/arm/dts/rk3399-firefly.dts
+++ b/arch/arm/dts/rk3399-firefly.dts
@@ -592,7 +592,6 @@ 
 };
 
 &sdmmc {
-	u-boot,dm-pre-reloc;
 	bus-width = <4>;
 	status = "okay";
 };
diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
index 8304f67192..9049694243 100644
--- a/arch/arm/dts/rk3399-puma.dtsi
+++ b/arch/arm/dts/rk3399-puma.dtsi
@@ -492,7 +492,6 @@ 
 };
 
 &sdmmc {
-	u-boot,dm-pre-reloc;
 	clock-frequency = <150000000>;
 	max-frequency = <40000000>;
 	supports-sd;
diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
new file mode 100644
index 0000000000..f533ed95eb
--- /dev/null
+++ b/arch/arm/dts/rk3399-u-boot.dtsi
@@ -0,0 +1,8 @@ 
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
+ */
+
+&sdmmc {
+	u-boot,dm-pre-reloc;
+};