Unverified Commit 0c826ec3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-6.3/devicetree' of https://github.com/Broadcom/stblinux into arm/dt 

This pull request contains Broadcom ARM SoCs Device Tree updates for
6.3, please pull the following:

- Krzysztof aligns the various Broadcom SoCs DTS UART nodes with the
  binding convention to use "serial"

* tag 'arm-soc/for-6.3/devicetree' of https://github.com/Broadcom/stblinux:
  ARM: dts: broadcom: align UART node name with bindings

Link: https://lore.kernel.org/r/20230128193829.1628773-1-f.fainelli@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ffe4bd3d 031eeba1

arch/arm/boot/dts/bcm11351.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ smc@3404c000 { 
		reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */

	};



	uart@3e000000 {

	serial@3e000000 {

		compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";

		status = "disabled";

		reg = <0x3e000000 0x1000>;
@@ -60,7 +60,7 @@ uart@3e000000 { 
		reg-io-width = <4>;

	};



	uart@3e001000 {

	serial@3e001000 {

		compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";

		status = "disabled";

		reg = <0x3e001000 0x1000>;
@@ -70,7 +70,7 @@ uart@3e001000 { 
		reg-io-width = <4>;

	};



	uart@3e002000 {

	serial@3e002000 {

		compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";

		status = "disabled";

		reg = <0x3e002000 0x1000>;
@@ -80,7 +80,7 @@ uart@3e002000 { 
		reg-io-width = <4>;

	};



	uart@3e003000 {

	serial@3e003000 {

		compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";

		status = "disabled";

		reg = <0x3e003000 0x1000>;

arch/arm/boot/dts/bcm21664-garnet.dts

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ memory@80000000 { 
		reg = <0x80000000 0x40000000>; /* 1 GB */

	};



	uart@3e000000 {

	serial@3e000000 {

		status = "okay";

	};

arch/arm/boot/dts/bcm21664.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ smc@3404e000 { 
		reg = <0x3404e000 0x400>; /* 1 KiB in SRAM */

	};



	uart@3e000000 {

	serial@3e000000 {

		compatible = "brcm,bcm21664-dw-apb-uart", "snps,dw-apb-uart";

		status = "disabled";

		reg = <0x3e000000 0x118>;
@@ -60,7 +60,7 @@ uart@3e000000 { 
		reg-io-width = <4>;

	};



	uart@3e001000 {

	serial@3e001000 {

		compatible = "brcm,bcm21664-dw-apb-uart", "snps,dw-apb-uart";

		status = "disabled";

		reg = <0x3e001000 0x118>;
@@ -70,7 +70,7 @@ uart@3e001000 { 
		reg-io-width = <4>;

	};



	uart@3e002000 {

	serial@3e002000 {

		compatible = "brcm,bcm21664-dw-apb-uart", "snps,dw-apb-uart";

		status = "disabled";

		reg = <0x3e002000 0x118>;

arch/arm/boot/dts/bcm28155-ap.dts

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ memory@80000000 { 
		reg = <0x80000000 0x40000000>; /* 1 GB */

	};



	uart@3e000000 {

	serial@3e000000 {

		status = "okay";

	};