[PATCH 5/5] arm: mvebu: armada-38x-controlcenterdc.dts: Move u-boot,dm-pre-reloc to -u-boot.dtsi

[Stefan Roese]

On 03.08.22 13:00, Pali Rohár wrote:
> Move U-Boot specific device tree property u-boot,dm-pre-reloc into U-Boot
> specific device tree include file armada-38x-controlcenterdc-u-boot.dtsi.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   .../armada-38x-controlcenterdc-u-boot.dtsi    | 25 +++++++++++++++++++
>   arch/arm/dts/armada-38x-controlcenterdc.dts   | 16 ------------
>   2 files changed, 25 insertions(+), 16 deletions(-)
>   create mode 100644 arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi
> 
> diff --git a/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi b/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi
> new file mode 100644
> index 000000000000..0a94df923058
> --- /dev/null
> +++ b/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi
> @@ -0,0 +1,25 @@
> +&gpio0 {
> +	u-boot,dm-pre-reloc;
> +};
> +
> +&gpio1 {
> +	u-boot,dm-pre-reloc;
> +};
> +
> +&uart1 {
> +	u-boot,dm-pre-reloc;
> +};
> +
> +&spi1 {
> +	u-boot,dm-pre-reloc;
> +};
> +
> +&I2C0 {
> +	u-boot,dm-pre-reloc;
> +};
> +
> +&PCA22 {
> +	u-boot,dm-pre-reloc;
> +};
> +
> +#include "mvebu-u-boot.dtsi"
> diff --git a/arch/arm/dts/armada-38x-controlcenterdc.dts b/arch/arm/dts/armada-38x-controlcenterdc.dts
> index b5d76f8b22d6..79ea6f090958 100644
> --- a/arch/arm/dts/armada-38x-controlcenterdc.dts
> +++ b/arch/arm/dts/armada-38x-controlcenterdc.dts
> @@ -16,18 +16,6 @@
>   
>   #include "armada-388.dtsi"
>   
> -&gpio0 {
> -	u-boot,dm-pre-reloc;
> -};
> -
> -&gpio1 {
> -	u-boot,dm-pre-reloc;
> -};
> -
> -&uart1 {
> -	u-boot,dm-pre-reloc;
> -};
> -
>   / {
>   	model = "Controlcenter Digital Compact";
>   	compatible = "marvell,a385-db", "marvell,armada388",
> @@ -71,7 +59,6 @@
>   			I2C0: i2c at 11000 {
>   				status = "okay";
>   				clock-frequency = <1000000>;
> -				u-boot,dm-pre-reloc;
>   				PCA21: pca9698 at 21 {
>   					compatible = "nxp,pca9698";
>   					reg = <0x21>;
> @@ -80,7 +67,6 @@
>   				};
>   				PCA22: pca9698 at 22 {
>   					compatible = "nxp,pca9698";
> -					u-boot,dm-pre-reloc;
>   					reg = <0x22>;
>   					#gpio-cells = <2>;
>   					gpio-controller;
> @@ -565,7 +551,6 @@
>   
>   &spi1 {
>   	status = "okay";
> -	u-boot,dm-pre-reloc;
>   	spi-flash at 0 {
>   		#address-cells = <1>;
>   		#size-cells = <1>;
> @@ -579,6 +564,5 @@
>   		compatible = "n25q128a11", "jedec,spi-nor";
>   		reg = <1>; /* Chip select 1 */
>   		spi-max-frequency = <108000000>;
> -		u-boot,dm-pre-reloc;
>   	};
>   };

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de