diff mbox series

[U-Boot,v2,1/4] arm: dts: socfpga: Add u-boot, dm-pre-reloc for sysmgr and clkmgr nodes

Message ID 1568104683-2609-2-git-send-email-ley.foon.tan@intel.com
State Superseded, archived
Delegated to: Simon Goldschmidt
Headers show
Series arm: socfpga: Convert drivers from struct to defines | expand

Commit Message

Ley Foon Tan Sept. 10, 2019, 8:38 a.m. UTC 
Add u-boot,dm-pre-reloc for sysmgr and clkmgr nodes to use it in SPL.
In preparation to get base address from DT.

Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com>
---
 arch/arm/dts/socfpga-common-u-boot.dtsi          | 8 ++++++++
 arch/arm/dts/socfpga.dtsi                        | 2 +-
 arch/arm/dts/socfpga_arria10.dtsi                | 2 +-
 arch/arm/dts/socfpga_arria10_socdk.dtsi          | 8 ++++++++
 arch/arm/dts/socfpga_stratix10.dtsi              | 2 +-
 arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi | 8 ++++++++
 6 files changed, 27 insertions(+), 3 deletions(-)

Comments

Dinh Nguyen Sept. 16, 2019, 2:09 p.m. UTC | #1 
On 9/10/19 3:38 AM, Ley Foon Tan wrote:
> Add u-boot,dm-pre-reloc for sysmgr and clkmgr nodes to use it in SPL.
> In preparation to get base address from DT.
> 
> Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com>
> ---
>  arch/arm/dts/socfpga-common-u-boot.dtsi          | 8 ++++++++
>  arch/arm/dts/socfpga.dtsi                        | 2 +-
>  arch/arm/dts/socfpga_arria10.dtsi                | 2 +-
>  arch/arm/dts/socfpga_arria10_socdk.dtsi          | 8 ++++++++
>  arch/arm/dts/socfpga_stratix10.dtsi              | 2 +-
>  arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi | 8 ++++++++
>  6 files changed, 27 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/dts/socfpga-common-u-boot.dtsi b/arch/arm/dts/socfpga-common-u-boot.dtsi
> index 322c858c4b..d55460755f 100644
> --- a/arch/arm/dts/socfpga-common-u-boot.dtsi
> +++ b/arch/arm/dts/socfpga-common-u-boot.dtsi
> @@ -10,6 +10,10 @@
>  	};
>  };
>  
> +&clkmgr {
> +	u-boot,dm-pre-reloc;
> +};
> +
>  &rst {
>  	u-boot,dm-pre-reloc;
>  };
> @@ -17,3 +21,7 @@
>  &sdr {
>  	u-boot,dm-pre-reloc;
>  };
> +
> +&sysmgr {
> +	u-boot,dm-pre-reloc;
> +};
> diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
> index 51a6a51b53..eda558f2fe 100644
> --- a/arch/arm/dts/socfpga.dtsi
> +++ b/arch/arm/dts/socfpga.dtsi
> @@ -114,7 +114,7 @@
>  			status = "disabled";
>  		};
>  
> -		clkmgr@ffd04000 {
> +		clkmgr: clkmgr@ffd04000 {
>  				compatible = "altr,clk-mgr";
>  				reg = <0xffd04000 0x1000>;
>  
> diff --git a/arch/arm/dts/socfpga_arria10.dtsi b/arch/arm/dts/socfpga_arria10.dtsi
> index c11a5c0cc1..cc529bcd11 100644
> --- a/arch/arm/dts/socfpga_arria10.dtsi
> +++ b/arch/arm/dts/socfpga_arria10.dtsi
> @@ -96,7 +96,7 @@
>  			fpga-mgr = <&fpga_mgr>;
>  		};
>  
> -		clkmgr@ffd04000 {
> +		clkmgr: clkmgr@ffd04000 {
>  				compatible = "altr,clk-mgr";
>  				reg = <0xffd04000 0x1000>;
>  				u-boot,dm-pre-reloc;
> diff --git a/arch/arm/dts/socfpga_arria10_socdk.dtsi b/arch/arm/dts/socfpga_arria10_socdk.dtsi
> index 6e5578d7bd..ef10708ee8 100644
> --- a/arch/arm/dts/socfpga_arria10_socdk.dtsi
> +++ b/arch/arm/dts/socfpga_arria10_socdk.dtsi
> @@ -180,3 +180,11 @@
>  &l4_sp_clk {
>  	u-boot,dm-pre-reloc;
>  };
> +
> +&clkmgr {
> +	u-boot,dm-pre-reloc;
> +};
> +
> +&sysmgr {
> +	u-boot,dm-pre-reloc;
> +};
> diff --git a/arch/arm/dts/socfpga_stratix10.dtsi b/arch/arm/dts/socfpga_stratix10.dtsi
> index bd68a78a37..91f4e27ef5 100755
> --- a/arch/arm/dts/socfpga_stratix10.dtsi
> +++ b/arch/arm/dts/socfpga_stratix10.dtsi
> @@ -82,7 +82,7 @@
>  		ranges = <0 0 0 0xffffffff>;
>  		u-boot,dm-pre-reloc;
>  
> -		clkmgr@ffd1000 {
> +		clkmgr: clkmgr@ffd1000 {

Missing another zero in the address.

Dinh
Ley Foon Tan Sept. 18, 2019, 2:32 a.m. UTC | #2 
On Mon, Sep 16, 2019 at 10:12 PM Dinh Nguyen <dinguyen@kernel.org> wrote:
>
>
>
> On 9/10/19 3:38 AM, Ley Foon Tan wrote:
> > Add u-boot,dm-pre-reloc for sysmgr and clkmgr nodes to use it in SPL.
> > In preparation to get base address from DT.
> >
> > Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com>
> > ---
> >  arch/arm/dts/socfpga-common-u-boot.dtsi          | 8 ++++++++
> >  arch/arm/dts/socfpga.dtsi                        | 2 +-
> >  arch/arm/dts/socfpga_arria10.dtsi                | 2 +-
> >  arch/arm/dts/socfpga_arria10_socdk.dtsi          | 8 ++++++++
> >  arch/arm/dts/socfpga_stratix10.dtsi              | 2 +-
> >  arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi | 8 ++++++++
> >  6 files changed, 27 insertions(+), 3 deletions(-)
> >
> > diff --git a/arch/arm/dts/socfpga-common-u-boot.dtsi b/arch/arm/dts/socfpga-common-u-boot.dtsi
> > index 322c858c4b..d55460755f 100644
> > --- a/arch/arm/dts/socfpga-common-u-boot.dtsi
> > +++ b/arch/arm/dts/socfpga-common-u-boot.dtsi
> > @@ -10,6 +10,10 @@
> >       };
> >  };
> >
> > +&clkmgr {
> > +     u-boot,dm-pre-reloc;
> > +};
> > +
> >  &rst {
> >       u-boot,dm-pre-reloc;
> >  };
> > @@ -17,3 +21,7 @@
> >  &sdr {
> >       u-boot,dm-pre-reloc;
> >  };
> > +
> > +&sysmgr {
> > +     u-boot,dm-pre-reloc;
> > +};
> > diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
> > index 51a6a51b53..eda558f2fe 100644
> > --- a/arch/arm/dts/socfpga.dtsi
> > +++ b/arch/arm/dts/socfpga.dtsi
> > @@ -114,7 +114,7 @@
> >                       status = "disabled";
> >               };
> >
> > -             clkmgr@ffd04000 {
> > +             clkmgr: clkmgr@ffd04000 {
> >                               compatible = "altr,clk-mgr";
> >                               reg = <0xffd04000 0x1000>;
> >
> > diff --git a/arch/arm/dts/socfpga_arria10.dtsi b/arch/arm/dts/socfpga_arria10.dtsi
> > index c11a5c0cc1..cc529bcd11 100644
> > --- a/arch/arm/dts/socfpga_arria10.dtsi
> > +++ b/arch/arm/dts/socfpga_arria10.dtsi
> > @@ -96,7 +96,7 @@
> >                       fpga-mgr = <&fpga_mgr>;
> >               };
> >
> > -             clkmgr@ffd04000 {
> > +             clkmgr: clkmgr@ffd04000 {
> >                               compatible = "altr,clk-mgr";
> >                               reg = <0xffd04000 0x1000>;
> >                               u-boot,dm-pre-reloc;
> > diff --git a/arch/arm/dts/socfpga_arria10_socdk.dtsi b/arch/arm/dts/socfpga_arria10_socdk.dtsi
> > index 6e5578d7bd..ef10708ee8 100644
> > --- a/arch/arm/dts/socfpga_arria10_socdk.dtsi
> > +++ b/arch/arm/dts/socfpga_arria10_socdk.dtsi
> > @@ -180,3 +180,11 @@
> >  &l4_sp_clk {
> >       u-boot,dm-pre-reloc;
> >  };
> > +
> > +&clkmgr {
> > +     u-boot,dm-pre-reloc;
> > +};
> > +
> > +&sysmgr {
> > +     u-boot,dm-pre-reloc;
> > +};
> > diff --git a/arch/arm/dts/socfpga_stratix10.dtsi b/arch/arm/dts/socfpga_stratix10.dtsi
> > index bd68a78a37..91f4e27ef5 100755
> > --- a/arch/arm/dts/socfpga_stratix10.dtsi
> > +++ b/arch/arm/dts/socfpga_stratix10.dtsi
> > @@ -82,7 +82,7 @@
> >               ranges = <0 0 0 0xffffffff>;
> >               u-boot,dm-pre-reloc;
> >
> > -             clkmgr@ffd1000 {
> > +             clkmgr: clkmgr@ffd1000 {
>
> Missing another zero in the address.
Noted.

Regards
Ley Foon
Simon Goldschmidt Oct. 2, 2019, 9:18 a.m. UTC | #3 
On Tue, Sep 10, 2019 at 10:38 AM Ley Foon Tan <ley.foon.tan@intel.com> wrote:
>
> Add u-boot,dm-pre-reloc for sysmgr and clkmgr nodes to use it in SPL.
> In preparation to get base address from DT.
>
> Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com>

I'm OK with this change as long as it doesn't blow SPL size limits because of
the additional DT nodes.

Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>

> ---
>  arch/arm/dts/socfpga-common-u-boot.dtsi          | 8 ++++++++
>  arch/arm/dts/socfpga.dtsi                        | 2 +-
>  arch/arm/dts/socfpga_arria10.dtsi                | 2 +-
>  arch/arm/dts/socfpga_arria10_socdk.dtsi          | 8 ++++++++
>  arch/arm/dts/socfpga_stratix10.dtsi              | 2 +-
>  arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi | 8 ++++++++
>  6 files changed, 27 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/dts/socfpga-common-u-boot.dtsi b/arch/arm/dts/socfpga-common-u-boot.dtsi
> index 322c858c4b..d55460755f 100644
> --- a/arch/arm/dts/socfpga-common-u-boot.dtsi
> +++ b/arch/arm/dts/socfpga-common-u-boot.dtsi
> @@ -10,6 +10,10 @@
>         };
>  };
>
> +&clkmgr {
> +       u-boot,dm-pre-reloc;
> +};
> +
>  &rst {
>         u-boot,dm-pre-reloc;
>  };
> @@ -17,3 +21,7 @@
>  &sdr {
>         u-boot,dm-pre-reloc;
>  };
> +
> +&sysmgr {
> +       u-boot,dm-pre-reloc;
> +};
> diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
> index 51a6a51b53..eda558f2fe 100644
> --- a/arch/arm/dts/socfpga.dtsi
> +++ b/arch/arm/dts/socfpga.dtsi
> @@ -114,7 +114,7 @@
>                         status = "disabled";
>                 };
>
> -               clkmgr@ffd04000 {
> +               clkmgr: clkmgr@ffd04000 {
>                                 compatible = "altr,clk-mgr";
>                                 reg = <0xffd04000 0x1000>;
>
> diff --git a/arch/arm/dts/socfpga_arria10.dtsi b/arch/arm/dts/socfpga_arria10.dtsi
> index c11a5c0cc1..cc529bcd11 100644
> --- a/arch/arm/dts/socfpga_arria10.dtsi
> +++ b/arch/arm/dts/socfpga_arria10.dtsi
> @@ -96,7 +96,7 @@
>                         fpga-mgr = <&fpga_mgr>;
>                 };
>
> -               clkmgr@ffd04000 {
> +               clkmgr: clkmgr@ffd04000 {
>                                 compatible = "altr,clk-mgr";
>                                 reg = <0xffd04000 0x1000>;
>                                 u-boot,dm-pre-reloc;
> diff --git a/arch/arm/dts/socfpga_arria10_socdk.dtsi b/arch/arm/dts/socfpga_arria10_socdk.dtsi
> index 6e5578d7bd..ef10708ee8 100644
> --- a/arch/arm/dts/socfpga_arria10_socdk.dtsi
> +++ b/arch/arm/dts/socfpga_arria10_socdk.dtsi
> @@ -180,3 +180,11 @@
>  &l4_sp_clk {
>         u-boot,dm-pre-reloc;
>  };
> +
> +&clkmgr {
> +       u-boot,dm-pre-reloc;
> +};
> +
> +&sysmgr {
> +       u-boot,dm-pre-reloc;
> +};
> diff --git a/arch/arm/dts/socfpga_stratix10.dtsi b/arch/arm/dts/socfpga_stratix10.dtsi
> index bd68a78a37..91f4e27ef5 100755
> --- a/arch/arm/dts/socfpga_stratix10.dtsi
> +++ b/arch/arm/dts/socfpga_stratix10.dtsi
> @@ -82,7 +82,7 @@
>                 ranges = <0 0 0 0xffffffff>;
>                 u-boot,dm-pre-reloc;
>
> -               clkmgr@ffd1000 {
> +               clkmgr: clkmgr@ffd1000 {
>                         compatible = "altr,clk-mgr";
>                         reg = <0xffd10000 0x1000>;
>                 };
> diff --git a/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi
> index e1cfb522bf..38855aecd7 100755
> --- a/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi
> +++ b/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi
> @@ -11,6 +11,10 @@
>         };
>  };
>
> +&clkmgr {
> +       u-boot,dm-pre-reloc;
> +};
> +
>  &qspi {
>         status = "okay";
>         u-boot,dm-pre-reloc;
> @@ -23,3 +27,7 @@
>         spi-rx-bus-width = <4>;
>         u-boot,dm-pre-reloc;
>  };
> +
> +&sysmgr {
> +       u-boot,dm-pre-reloc;
> +};
> --
> 2.19.0
>
diff mbox series

Patch

diff --git a/arch/arm/dts/socfpga-common-u-boot.dtsi b/arch/arm/dts/socfpga-common-u-boot.dtsi
index 322c858c4b..d55460755f 100644
--- a/arch/arm/dts/socfpga-common-u-boot.dtsi
+++ b/arch/arm/dts/socfpga-common-u-boot.dtsi
@@ -10,6 +10,10 @@ 
 	};
 };
 
+&clkmgr {
+	u-boot,dm-pre-reloc;
+};
+
 &rst {
 	u-boot,dm-pre-reloc;
 };
@@ -17,3 +21,7 @@ 
 &sdr {
 	u-boot,dm-pre-reloc;
 };
+
+&sysmgr {
+	u-boot,dm-pre-reloc;
+};
diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
index 51a6a51b53..eda558f2fe 100644
--- a/arch/arm/dts/socfpga.dtsi
+++ b/arch/arm/dts/socfpga.dtsi
@@ -114,7 +114,7 @@ 
 			status = "disabled";
 		};
 
-		clkmgr@ffd04000 {
+		clkmgr: clkmgr@ffd04000 {
 				compatible = "altr,clk-mgr";
 				reg = <0xffd04000 0x1000>;
 
diff --git a/arch/arm/dts/socfpga_arria10.dtsi b/arch/arm/dts/socfpga_arria10.dtsi
index c11a5c0cc1..cc529bcd11 100644
--- a/arch/arm/dts/socfpga_arria10.dtsi
+++ b/arch/arm/dts/socfpga_arria10.dtsi
@@ -96,7 +96,7 @@ 
 			fpga-mgr = <&fpga_mgr>;
 		};
 
-		clkmgr@ffd04000 {
+		clkmgr: clkmgr@ffd04000 {
 				compatible = "altr,clk-mgr";
 				reg = <0xffd04000 0x1000>;
 				u-boot,dm-pre-reloc;
diff --git a/arch/arm/dts/socfpga_arria10_socdk.dtsi b/arch/arm/dts/socfpga_arria10_socdk.dtsi
index 6e5578d7bd..ef10708ee8 100644
--- a/arch/arm/dts/socfpga_arria10_socdk.dtsi
+++ b/arch/arm/dts/socfpga_arria10_socdk.dtsi
@@ -180,3 +180,11 @@ 
 &l4_sp_clk {
 	u-boot,dm-pre-reloc;
 };
+
+&clkmgr {
+	u-boot,dm-pre-reloc;
+};
+
+&sysmgr {
+	u-boot,dm-pre-reloc;
+};
diff --git a/arch/arm/dts/socfpga_stratix10.dtsi b/arch/arm/dts/socfpga_stratix10.dtsi
index bd68a78a37..91f4e27ef5 100755
--- a/arch/arm/dts/socfpga_stratix10.dtsi
+++ b/arch/arm/dts/socfpga_stratix10.dtsi
@@ -82,7 +82,7 @@ 
 		ranges = <0 0 0 0xffffffff>;
 		u-boot,dm-pre-reloc;
 
-		clkmgr@ffd1000 {
+		clkmgr: clkmgr@ffd1000 {
 			compatible = "altr,clk-mgr";
 			reg = <0xffd10000 0x1000>;
 		};
diff --git a/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi
index e1cfb522bf..38855aecd7 100755
--- a/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi
+++ b/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi
@@ -11,6 +11,10 @@ 
 	};
 };
 
+&clkmgr {
+	u-boot,dm-pre-reloc;
+};
+
 &qspi {
 	status = "okay";
 	u-boot,dm-pre-reloc;
@@ -23,3 +27,7 @@ 
 	spi-rx-bus-width = <4>;
 	u-boot,dm-pre-reloc;
 };
+
+&sysmgr {
+	u-boot,dm-pre-reloc;
+};