Unverified Commit f0f4c73a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'dt-cleanup-6.3-2' of... 

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

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 54a39a28 2ba4ff82

arch/arm/boot/dts/alpine.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/axm55xx.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/berlin2q.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/cx92755.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/dm814x.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -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>;