[v2,4/8] rockchip: rk3399: Move u-boot, dm-pre-reloc of uart0, uart2

Message ID 20190620185506.11449-5-jagan@amarulasolutions.com
State New
Headers show
Series
  • rockchip: rk3399: Use spl_board_init in SPL, TPL
Related show

Commit Message

Jagan Teki June 20, 2019, 6:55 p.m. UTC
u-boot,dm-pre-reloc for uart0, uart2 indeed u-boot specific
properties. Move them into rk3399-u-boot.dtsi so the boards
which enabled these node will available during SPL.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 arch/arm/dts/rk3399-gru.dtsi    | 1 -
 arch/arm/dts/rk3399-puma.dtsi   | 1 -
 arch/arm/dts/rk3399-u-boot.dtsi | 8 ++++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

Comments

Kever Yang June 22, 2019, 1:48 p.m. UTC | #1
Hi Jagan,


On 06/21/2019 02:55 AM, Jagan Teki wrote:
> u-boot,dm-pre-reloc for uart0, uart2 indeed u-boot specific
> properties. Move them into rk3399-u-boot.dtsi so the boards
> which enabled these node will available during SPL.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>  arch/arm/dts/rk3399-gru.dtsi    | 1 -
>  arch/arm/dts/rk3399-puma.dtsi   | 1 -
>  arch/arm/dts/rk3399-u-boot.dtsi | 8 ++++++++
>  3 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/dts/rk3399-gru.dtsi b/arch/arm/dts/rk3399-gru.dtsi
> index ca0fc391b2..0e2e047180 100644
> --- a/arch/arm/dts/rk3399-gru.dtsi
> +++ b/arch/arm/dts/rk3399-gru.dtsi
> @@ -629,7 +629,6 @@ ap_i2c_audio: &i2c8 {
>  
>  &uart2 {
>  	status = "okay";
> -	u-boot,dm-pre-reloc;
>  };
>  
>  &usb_host0_ohci {
> diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
> index 897e0bda85..74368da550 100644
> --- a/arch/arm/dts/rk3399-puma.dtsi
> +++ b/arch/arm/dts/rk3399-puma.dtsi
> @@ -639,7 +639,6 @@
>  };
>  
>  &uart0 {
> -	u-boot,dm-pre-reloc;
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&uart0_xfer &uart0_cts>;
>  	status = "okay";
> diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
> index 0786c1193a..fcfce9ae02 100644
> --- a/arch/arm/dts/rk3399-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-u-boot.dtsi
> @@ -10,3 +10,11 @@
>  &spi1 {
>  	u-boot,dm-pre-reloc;
>  };
> +
> +&uart0 {
> +	u-boot,dm-pre-reloc;
> +};
> +
> +&uart2 {
> +	u-boot,dm-pre-reloc;
> +};

Patch

diff --git a/arch/arm/dts/rk3399-gru.dtsi b/arch/arm/dts/rk3399-gru.dtsi
index ca0fc391b2..0e2e047180 100644
--- a/arch/arm/dts/rk3399-gru.dtsi
+++ b/arch/arm/dts/rk3399-gru.dtsi
@@ -629,7 +629,6 @@  ap_i2c_audio: &i2c8 {
 
 &uart2 {
 	status = "okay";
-	u-boot,dm-pre-reloc;
 };
 
 &usb_host0_ohci {
diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
index 897e0bda85..74368da550 100644
--- a/arch/arm/dts/rk3399-puma.dtsi
+++ b/arch/arm/dts/rk3399-puma.dtsi
@@ -639,7 +639,6 @@ 
 };
 
 &uart0 {
-	u-boot,dm-pre-reloc;
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart0_xfer &uart0_cts>;
 	status = "okay";
diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
index 0786c1193a..fcfce9ae02 100644
--- a/arch/arm/dts/rk3399-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-u-boot.dtsi
@@ -10,3 +10,11 @@ 
 &spi1 {
 	u-boot,dm-pre-reloc;
 };
+
+&uart0 {
+	u-boot,dm-pre-reloc;
+};
+
+&uart2 {
+	u-boot,dm-pre-reloc;
+};