leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Olof Johansson
2021-06-12 08:40:27 -07:00
parent 010bf7346f cd49f71cff
commit 93d84763c1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
View File

@@ -470,7 +470,7 @@
status = "disabled"; status = "disabled";
}; };
uart0: uart@100000 { uart0: serial@100000 {
device_type = "serial"; device_type = "serial";
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x00100000 0x1000>; reg = <0x00100000 0x1000>;
@@ -481,7 +481,7 @@
status = "disabled"; status = "disabled";
}; };
uart1: uart@110000 { uart1: serial@110000 {
device_type = "serial"; device_type = "serial";
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x00110000 0x1000>; reg = <0x00110000 0x1000>;
@@ -492,7 +492,7 @@
status = "disabled"; status = "disabled";
}; };
uart2: uart@120000 { uart2: serial@120000 {
device_type = "serial"; device_type = "serial";
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x00120000 0x1000>; reg = <0x00120000 0x1000>;
@@ -503,7 +503,7 @@
status = "disabled"; status = "disabled";
}; };
uart3: uart@130000 { uart3: serial@130000 {
device_type = "serial"; device_type = "serial";
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x00130000 0x1000>; reg = <0x00130000 0x1000>;