mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-29 01:09:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2023-01-30 22:55:09 +01:00
parent ffe4bd3db8 031eeba110
commit 0c826ec36d
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/bcm11351.dtsi
View File

@@ -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>;

2
arch/arm/boot/dts/bcm21664-garnet.dts
View File

@@ -16,7 +16,7 @@ memory@80000000 {
reg = <0x80000000 0x40000000>; /* 1 GB */
};
uart@3e000000 {
serial@3e000000 {
status = "okay";
};

6
arch/arm/boot/dts/bcm21664.dtsi
View File

@@ -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>;

2
arch/arm/boot/dts/bcm28155-ap.dts
View File

@@ -16,7 +16,7 @@ memory@80000000 {
reg = <0x80000000 0x40000000>; /* 1 GB */
};
uart@3e000000 {
serial@3e000000 {
status = "okay";
};