[PATCH v5 1/3] arm: mvebu: dts: sync DTS

Stefan Roese sr at denx.de
Thu Jul 21 14:23:10 CEST 2022


On 20.05.22 13:46, Robert Marko wrote:
> Update the uDPU DTS to the version that is pending upstream [1][2][3][4].
> 
> [1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-4-robert.marko@sartura.hr/
> [2] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-5-robert.marko@sartura.hr/
> [3] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-6-robert.marko@sartura.hr/
> [4] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-7-robert.marko@sartura.hr/
> 
> Signed-off-by: Robert Marko <robert.marko at sartura.hr>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
>   arch/arm/dts/armada-3720-uDPU.dts | 23 ++++++++++-------------
>   1 file changed, 10 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts
> index 1f534c0c65..f21a855fc6 100644
> --- a/arch/arm/dts/armada-3720-uDPU.dts
> +++ b/arch/arm/dts/armada-3720-uDPU.dts
> @@ -16,7 +16,7 @@
>   
>   / {
>   	model = "Methode uDPU Board";
> -	compatible = "methode,udpu", "marvell,armada3720";
> +	compatible = "methode,udpu", "marvell,armada3720", "marvell,armada3710";
>   
>   	chosen {
>   		stdout-path = "serial0:115200n8";
> @@ -28,35 +28,34 @@
>   	};
>   
>   	leds {
> -		pinctrl-names = "default";
>   		compatible = "gpio-leds";
>   
> -		power1 {
> +		led-power1 {
>   			label = "udpu:green:power";
>   			gpios = <&gpionb 11 GPIO_ACTIVE_LOW>;
>   		};
>   
> -		power2 {
> +		led-power2 {
>   			label = "udpu:red:power";
>   			gpios = <&gpionb 12 GPIO_ACTIVE_LOW>;
>   		};
>   
> -		network1 {
> +		led-network1 {
>   			label = "udpu:green:network";
>   			gpios = <&gpionb 13 GPIO_ACTIVE_LOW>;
>   		};
>   
> -		network2 {
> +		led-network2 {
>   			label = "udpu:red:network";
>   			gpios = <&gpionb 14 GPIO_ACTIVE_LOW>;
>   		};
>   
> -		alarm1 {
> +		led-alarm1 {
>   			label = "udpu:green:alarm";
>   			gpios = <&gpionb 15 GPIO_ACTIVE_LOW>;
>   		};
>   
> -		alarm2 {
> +		led-alarm2 {
>   			label = "udpu:red:alarm";
>   			gpios = <&gpionb 16 GPIO_ACTIVE_LOW>;
>   		};
> @@ -99,7 +98,7 @@
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&spi_quad_pins>;
>   
> -	spi-flash at 0 {
> +	flash at 0 {
>   		compatible = "jedec,spi-nor";
>   		reg = <0>;
>   		spi-max-frequency = <54000000>;
> @@ -153,14 +152,12 @@
>   	scl-gpios = <&gpionb 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
>   	sda-gpios = <&gpionb 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
>   
> -	nct375 at 48 {
> -		status = "okay";
> +	temp-sensor at 48 {
>   		compatible = "ti,tmp75c";
>   		reg = <0x48>;
>   	};
>   
> -	nct375 at 49 {
> -		status = "okay";
> +	temp-sensor at 49 {
>   		compatible = "ti,tmp75c";
>   		reg = <0x49>;
>   	};

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


More information about the U-Boot mailing list