Commit 93d84763 authored Jun 12, 2021 by Olof Johansson

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

This pull request contains Broadcom ARM64-based SoCs changes for 5.14,
please pull the following:

- Zhen fixes the Broadcom stingray serial node unit names to fix a DT
  binding warning

* tag 'arm-soc/for-5.14/devicetree-arm64' of https://github.com/Broadcom/stblinux:
  arm64: dts: broadcom: normalize the node name of the UART devices

Link: https://lore.kernel.org/r/20210610194836.309869-2-f.fainelli@gmail.com


Signed-off-by: Olof Johansson <olof@lixom.net>

parents 010bf734 cd49f71c

arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi

+4 −4

Original line number	Diff line number	Diff line
		@@ -470,7 +470,7 @@ i2c1: i2c@e0000 {
		status = "disabled";
		};

		uart0: uart@100000 {
		uart0: serial@100000 {
		device_type = "serial";
		compatible = "snps,dw-apb-uart";
		reg = <0x00100000 0x1000>;
		@@ -481,7 +481,7 @@ uart0: uart@100000 {
		status = "disabled";
		};

		uart1: uart@110000 {
		uart1: serial@110000 {
		device_type = "serial";
		compatible = "snps,dw-apb-uart";
		reg = <0x00110000 0x1000>;
		@@ -492,7 +492,7 @@ uart1: uart@110000 {
		status = "disabled";
		};

		uart2: uart@120000 {
		uart2: serial@120000 {
		device_type = "serial";
		compatible = "snps,dw-apb-uart";
		reg = <0x00120000 0x1000>;
		@@ -503,7 +503,7 @@ uart2: uart@120000 {
		status = "disabled";
		};

		uart3: uart@130000 {
		uart3: serial@130000 {
		device_type = "serial";
		compatible = "snps,dw-apb-uart";
		reg = <0x00130000 0x1000>;