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

Merge tag 'dt-cleanup-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into arm/dt

Browse Source 
Minor improvements in ARM DTS for v6.3, part two

Align UART node names and OPP table names with bindings (alpine, arm
boards, axm55xx, berlin, cx92755, dm814x, moxart, mstar, stih418).

* tag 'dt-cleanup-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt:
  ARM: dts: berlin: align UART node name with bindings
  ARM: dts: stih418: align OPP table names with DT schema
  ARM: dts: dm814x: align UART node name with bindings
  ARM: dts: moxart: align UART node name with bindings
  ARM: dts: axm55xx: align UART node name with bindings
  ARM: dts: alpine: align UART node name with bindings
  ARM: dts: arm: align UART node name with bindings
  ARM: dts: cx92755: align UART node name with bindings
  ARM: dts: mstar: align UART node name with bindings

Link: https://lore.kernel.org/r/20230129144525.5802-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2023-01-30 23:01:11 +01:00
parent 54a39a28ae 2ba4ff82f9
commit f0f4c73ac0
16 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/alpine.dtsi
View File

@@ -126,7 +126,7 @@ pmu {
<GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
};
uart0: uart@fd883000 {
uart0: serial@fd883000 {
compatible = "ns16550a";
reg = <0x0 0xfd883000 0x0 0x1000>;
clock-frequency = <375000000>;
@@ -135,7 +135,7 @@ uart0: uart@fd883000 {
reg-io-width = <4>;
};
uart1: uart@fd884000 {
uart1: serial@fd884000 {
compatible = "ns16550a";
reg = <0x0 0xfd884000 0x0 0x1000>;
clock-frequency = <375000000>;

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

@@ -108,7 +108,7 @@ amba {
#size-cells = <2>;
ranges;
serial0: uart@2010080000 {
serial0: serial@2010080000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x20 0x10080000 0 0x1000>;
interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
@@ -117,7 +117,7 @@ serial0: uart@2010080000 {
status = "disabled";
};
serial1: uart@2010081000 {
serial1: serial@2010081000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x20 0x10081000 0 0x1000>;
interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
@@ -126,7 +126,7 @@ serial1: uart@2010081000 {
status = "disabled";
};
serial2: uart@2010082000 {
serial2: serial@2010082000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x20 0x10082000 0 0x1000>;
interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
@@ -135,7 +135,7 @@ serial2: uart@2010082000 {
status = "disabled";
};
serial3: uart@2010083000 {
serial3: serial@2010083000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x20 0x10083000 0 0x1000>;
interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;

4
arch/arm/boot/dts/berlin2q.dtsi
View File

@@ -581,7 +581,7 @@ i2c3: i2c@8000 {
status = "disabled";
};
uart0: uart@9000 {
uart0: serial@9000 {
compatible = "snps,dw-apb-uart";
reg = <0x9000 0x100>;
interrupts = <8>;
@@ -592,7 +592,7 @@ uart0: uart@9000 {
status = "disabled";
};
uart1: uart@a000 {
uart1: serial@a000 {
compatible = "snps,dw-apb-uart";
reg = <0xa000 0x100>;
interrupts = <9>;

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

@@ -107,7 +107,7 @@ uc_regs: syscon@f00003a0 {
reg = <0xf00003a0 0x10>;
};
uart0: uart@f0000740 {
uart0: serial@f0000740 {
compatible = "cnxt,cx92755-usart";
reg = <0xf0000740 0x20>;
clocks = <&main_clk>;
@@ -115,7 +115,7 @@ uart0: uart@f0000740 {
status = "disabled";
};
uart1: uart@f0000760 {
uart1: serial@f0000760 {
compatible = "cnxt,cx92755-usart";
reg = <0xf0000760 0x20>;
clocks = <&main_clk>;
@@ -123,7 +123,7 @@ uart1: uart@f0000760 {
status = "disabled";
};
uart2: uart@f0000780 {
uart2: serial@f0000780 {
compatible = "cnxt,cx92755-usart";
reg = <0xf0000780 0x20>;
clocks = <&main_clk>;

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

@@ -333,7 +333,7 @@ timer1: timer@0 {
};
};
uart1: uart@20000 {
uart1: serial@20000 {
compatible = "ti,am3352-uart", "ti,omap3-uart";
ti,hwmods = "uart1";
reg = <0x20000 0x2000>;
@@ -343,7 +343,7 @@ uart1: uart@20000 {
dma-names = "tx", "rx";
};
uart2: uart@22000 {
uart2: serial@22000 {
compatible = "ti,am3352-uart", "ti,omap3-uart";
ti,hwmods = "uart2";
reg = <0x22000 0x2000>;
@@ -353,7 +353,7 @@ uart2: uart@22000 {
dma-names = "tx", "rx";
};
uart3: uart@24000 {
uart3: serial@24000 {
compatible = "ti,am3352-uart", "ti,omap3-uart";
ti,hwmods = "uart3";
reg = <0x24000 0x2000>;

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

@@ -522,7 +522,7 @@ timer7: timer@4804a000 {
ti,timer-pwm;
};
uart1: uart@48020000 {
uart1: serial@48020000 {
compatible = "ti,am3352-uart", "ti,omap3-uart";
ti,hwmods = "uart1";
reg = <0x48020000 0x2000>;
@@ -532,7 +532,7 @@ uart1: uart@48020000 {
dma-names = "tx", "rx";
};
uart2: uart@48022000 {
uart2: serial@48022000 {
compatible = "ti,am3352-uart", "ti,omap3-uart";
ti,hwmods = "uart2";
reg = <0x48022000 0x2000>;
@@ -542,7 +542,7 @@ uart2: uart@48022000 {
dma-names = "tx", "rx";
};
uart3: uart@48024000 {
uart3: serial@48024000 {
compatible = "ti,am3352-uart", "ti,omap3-uart";
ti,hwmods = "uart3";
reg = <0x48024000 0x2000>;

4
arch/arm/boot/dts/integrator.dtsi
View File

@@ -88,12 +88,12 @@ rtc@15000000 {
interrupts = <8>;
};
uart@16000000 {
serial@16000000 {
reg = <0x16000000 0x1000>;
interrupts = <1>;
};
uart@17000000 {
serial@17000000 {
reg = <0x17000000 0x1000>;
interrupts = <2>;
};

4
arch/arm/boot/dts/integratorap-im-pd1.dts
View File

@@ -162,7 +162,7 @@ vga_con_in: endpoint {
};
};
uart@100000 {
serial@100000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x00100000 0x1000>;
interrupts-extended = <&impd1_vic 1>;
@@ -170,7 +170,7 @@ uart@100000 {
clock-names = "uartclk", "apb_pclk";
};
uart@200000 {
serial@200000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x00200000 0x1000>;
interrupts-extended = <&impd1_vic 2>;

4
arch/arm/boot/dts/integratorap.dts
View File

@@ -218,14 +218,14 @@ rtc: rtc@15000000 {
clock-names = "apb_pclk";
};
uart0: uart@16000000 {
uart0: serial@16000000 {
compatible = "arm,pl010", "arm,primecell";
arm,primecell-periphid = <0x00041010>;
clocks = <&uartclk>, <&pclk>;
clock-names = "uartclk", "apb_pclk";
};
uart1: uart@17000000 {
uart1: serial@17000000 {
compatible = "arm,pl010", "arm,primecell";
arm,primecell-periphid = <0x00041010>;
clocks = <&uartclk>, <&pclk>;

4
arch/arm/boot/dts/integratorcp.dts
View File

@@ -244,13 +244,13 @@ rtc@15000000 {
clock-names = "apb_pclk";
};
uart@16000000 {
serial@16000000 {
compatible = "arm,pl011", "arm,primecell";
clocks = <&uartclk>, <&pclk>;
clock-names = "uartclk", "apb_pclk";
};
uart@17000000 {
serial@17000000 {
compatible = "arm,pl011", "arm,primecell";
clocks = <&uartclk>, <&pclk>;
clock-names = "uartclk", "apb_pclk";

2
arch/arm/boot/dts/moxart.dtsi
View File

@@ -138,7 +138,7 @@ mac1: mac@92000000 {
status = "disabled";
};
uart0: uart@98200000 {
uart0: serial@98200000 {
compatible = "ns16550a";
reg = <0x98200000 0x20>;
interrupts = <31 IRQ_TYPE_LEVEL_HIGH>;

2
arch/arm/boot/dts/mstar-v7.dtsi
View File

@@ -174,7 +174,7 @@ gpio: gpio@207800 {
status = "disabled";
};
pm_uart: uart@221000 {
pm_uart: serial@221000 {
compatible = "ns16550a";
reg = <0x221000 0x100>;
reg-shift = <3>;

2
arch/arm/boot/dts/stih418-b2264.dts
View File

@@ -42,7 +42,7 @@ cpu@3 {
};
};
cpu_opp_table: opp_table {
cpu_opp_table: opp-table {
compatible = "operating-points-v2";
opp-shared;

6
arch/arm/boot/dts/versatile-ab.dts
View File

@@ -237,7 +237,7 @@ dma@10130000 {
clock-names = "apb_pclk";
};
uart0: uart@101f1000 {
uart0: serial@101f1000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x101f1000 0x1000>;
interrupts = <12>;
@@ -245,7 +245,7 @@ uart0: uart@101f1000 {
clock-names = "uartclk", "apb_pclk";
};
uart1: uart@101f2000 {
uart1: serial@101f2000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x101f2000 0x1000>;
interrupts = <13>;
@@ -253,7 +253,7 @@ uart1: uart@101f2000 {
clock-names = "uartclk", "apb_pclk";
};
uart2: uart@101f3000 {
uart2: serial@101f3000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x101f3000 0x1000>;
interrupts = <14>;

2
arch/arm/boot/dts/versatile-pb.dts
View File

@@ -85,7 +85,7 @@ mmc@5000 {
*/
interrupts-extended = <&sic 22 &sic 23>;
};
uart@9000 {
serial@9000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x9000 0x1000>;
interrupt-parent = <&sic>;

8
arch/arm/boot/dts/vexpress-v2m.dtsi
View File

@@ -216,7 +216,7 @@ kmi@7000 {
clock-names = "KMIREFCLK", "apb_pclk";
};
v2m_serial0: uart@9000 {
v2m_serial0: serial@9000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x09000 0x1000>;
interrupts = <5>;
@@ -224,7 +224,7 @@ v2m_serial0: uart@9000 {
clock-names = "uartclk", "apb_pclk";
};
v2m_serial1: uart@a000 {
v2m_serial1: serial@a000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x0a000 0x1000>;
interrupts = <6>;
@@ -232,7 +232,7 @@ v2m_serial1: uart@a000 {
clock-names = "uartclk", "apb_pclk";
};
v2m_serial2: uart@b000 {
v2m_serial2: serial@b000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x0b000 0x1000>;
interrupts = <7>;
@@ -240,7 +240,7 @@ v2m_serial2: uart@b000 {
clock-names = "uartclk", "apb_pclk";
};
v2m_serial3: uart@c000 {
v2m_serial3: serial@c000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x0c000 0x1000>;
interrupts = <8>;