Re: [PATCH 04/19] ARM: dts: update RN102 Linux DTS

On 2026-07-23 15:57, Luca Lauro via B4 Relay wrote:
> From: Luca Lauro <[email protected]>
>=20
> ---
>  dts/src/arm/marvell/armada-370-netgear-rn102.dts | 114 ++++++++++++++---=
------
>  1 file changed, 71 insertions(+), 43 deletions(-)
>=20
> diff --git a/dts/src/arm/marvell/armada-370-netgear-rn102.dts b/dts/src/a=
rm/marvell/armada-370-netgear-rn102.dts

The files in dts/ are directly taken from the Linux upstream device tree
files. Changes to them are overwritten with the next sync.

You have to put a dts file into arch/arm/dts/ with your changes and
include the upstream version instead.

Sascha

> index 079b37cf14..f1bad2a233 100644
> --- a/dts/src/arm/marvell/armada-370-netgear-rn102.dts
> +++ b/dts/src/arm/marvell/armada-370-netgear-rn102.dts
> @@ -15,6 +15,10 @@ / {
>  	model =3D "NETGEAR ReadyNAS 102";
>  	compatible =3D "netgear,readynas-102", "marvell,armada370", "marvell,ar=
mada-370-xp";
> =20
> +	aliases {
> +		state =3D &state_nand;
> +    };
> +
>  	chosen {
>  		stdout-path =3D "serial0:115200n8";
>  	};
> @@ -54,7 +58,7 @@ ethernet@74000 {
>  				phy-mode =3D "rgmii-id";
>  			};
> =20
> -			usb@50000 {
> +            usb@50000 {
>  				status =3D "okay";
>  			};
> =20
> @@ -153,10 +157,35 @@ backup-button {
> =20
>  	gpio-poweroff {
>  		compatible =3D "gpio-poweroff";
> -		pinctrl-0 =3D <&poweroff>;
> +		pinctrl-0 =3D <&poweroff_pin>;
>  		pinctrl-names =3D "default";
>  		gpios =3D <&gpio0 8 GPIO_ACTIVE_LOW>;
>  	};
> +
> +	/* configure nand partition to store barebox environment */
> +	environment {
> +      compatible =3D "barebox,environment";
> +      device-path =3D &nand_controller, "partname:environment";
> +	};
> +
> +	/* configure nand partition to store barebox-state backend */
> +	state_nand: nand_state_memory {
> +        #address-cells =3D <1>;
> +        #size-cells =3D <1>;
> +        compatible =3D "barebox,state";
> +        magic =3D <0xab67421f>;
> +        backend-type =3D "raw";
> +        backend =3D <&backend_state_nand>;
> +        backend-storage-type =3D "circular";
> +		backend-stridesize =3D <32>;
> +
> +       =20
> +        variable@0 {
> +                reg =3D <0x0 0x1>;
> +                type =3D"uint8";
> +                default =3D <0x1>;
> +        };
> +	};
>  };
> =20
>  &pciec {
> @@ -219,58 +248,57 @@ reset_button_pin: reset-button-pin {
>  		marvell,function =3D "gpio";
>  	};
> =20
> -	poweroff: poweroff {
> +	poweroff_pin: poweroff-pin {
>  		marvell,pins =3D "mpp8";
>  		marvell,function =3D "gpio";
>  	};
>  };
> =20
>  &nand_controller {
> +	compatible =3D "marvell,armada370-nand", "marvell,pxa3xx-nand";
>  	status =3D "okay";
> =20
> -	nand@0 {
> -		reg =3D <0>;
> -		label =3D "pxa3xx_nand-0";
> -		nand-rb =3D <0>;
> -		marvell,nand-keep-config;
> -		nand-on-flash-bbt;
> -
> -		/* Use Hardware BCH ECC */
> -		nand-ecc-strength =3D <4>;
> -		nand-ecc-step-size =3D <512>;
> -
> -		partitions {
> -			compatible =3D "fixed-partitions";
> -			#address-cells =3D <1>;
> -			#size-cells =3D <1>;
> -
> -			partition@0 {
> -				label =3D "u-boot";
> -				reg =3D <0x0000000 0x180000>;  /* 1.5MB */
> -				read-only;
> -			};
> +	label =3D <&nand_controller>;
> +	nand-rb =3D <0>;
> +	marvell,nand-keep-config;
> +	nand-on-flash-bbt;
> +=09
> +	/* Use Hardware BCH ECC */
> +	nand-ecc-strength =3D <4>;
> +	nand-ecc-step-size =3D <512>;
> +
> +	partitions {
> +		compatible =3D "fixed-partitions";
> +		#address-cells =3D <1>;
> +		#size-cells =3D <1>;
> +	=09
> +		partition@0 {
> +			label =3D "bootloader";
> +			reg =3D <0x0 0x400000>;		 /* 4MB */
> +			//read-only;
> +		};
> =20
> -			partition@180000 {
> -				label =3D "u-boot-env";
> -				reg =3D <0x180000 0x20000>;    /* 128KB */
> -				read-only;
> -			};
> +		partition@0x400000 {
> +			label =3D "environment";
> +			reg =3D <0x400000 0x80000>;    /* 0.5MB */
> +			//read-only;
> +		};
> =20
> -			partition@200000 {
> -				label =3D "uImage";
> -				reg =3D <0x0200000 0x600000>;    /* 6MB */
> -			};
> +		backend_state_nand: partition@0x480000 {
> +			label =3D "state";
> +			reg =3D <0x480000 0x80000>;    /* 0.5MB */
> +		};
> =20
> -			partition@800000 {
> -				label =3D "minirootfs";
> -				reg =3D <0x0800000 0x400000>;    /* 4MB */
> -			};
> +		partition@0x500000 {
> +			label =3D "kernel";
> +			reg =3D <0x500000 0x1400000>;    /* 20MB */
> +		};
> =20
> -			/* Last MB is for the BBT, i.e. not writable */
> -			partition@c00000 {
> -				label =3D "ubifs";
> -				reg =3D <0x0c00000 0x7400000>; /* 116MB */
> -			};
> +		partition@0x1900000 {
> +			label =3D "minirootfs";
> +			reg =3D <0x1900000 0x6000000>;    /* 100MB */
>  		};
> +
> +		/* Last MB is for the BBT, i.e. not writable */
>  	};
> -};
> +};
> \ No newline at end of file
>=20
> --=20
> 2.47.3
>=20
>=20
>=20

--=20
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |