Commit 26116b98 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v6.18/dt-signed' of... 

Merge tag 'omap-for-v6.18/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/dt

ARM: dts: ti: omap updates for v6.18

These are all minor corrections to the dts files.

* tag 'omap-for-v6.18/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap

:
  ARM: dts: omap: am335x-cm-t335: Remove unused mcasp num-serializer property
  ARM: dts: ti: omap: omap3-devkit8000-lcd: Fix ti,keep-vref-on property to use correct boolean syntax in DTS
  ARM: dts: ti: omap: am335x-baltos: Fix ti,en-ck32k-xtal property in DTS to use correct boolean syntax
  ARM: dts: omap: Minor whitespace cleanup
  ARM: dts: omap: dm816x: Split 'reg' per entry
  ARM: dts: omap: dm814x: Split 'reg' per entry
  ARM: dts: am33xx-l4: fix UART compatible
  ARM: dts: ti: omap4: Use generic "ethernet" as node name

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 345518c0 27322753

arch/arm/boot/dts/ti/omap/am335x-baltos.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ &tps { 
	vcc7-supply = <&vbat>;

	vccio-supply = <&vbat>;



	ti,en-ck32k-xtal = <1>;

	ti,en-ck32k-xtal;



	regulators {

		vrtc_reg: regulator@0 {

arch/arm/boot/dts/ti/omap/am335x-cm-t335.dts

+0 −2
Original line number Diff line number Diff line
@@ -483,8 +483,6 @@ &mcasp1 { 


		op-mode = <0>;          /* MCASP_IIS_MODE */

		tdm-slots = <2>;

		/* 16 serializers */

		num-serializer = <16>;

		serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */

			0 0 2 1 0 0 0 0 0 0 0 0 0 0 0 0

		>;

arch/arm/boot/dts/ti/omap/am33xx-l4.dtsi

+10 −10
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ SYSC_OMAP2_SOFTRESET | 
			ranges = <0x0 0x9000 0x1000>;



			uart0: serial@0 {

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				compatible = "ti,am3352-uart";

				clock-frequency = <48000000>;

				reg = <0x0 0x1000>;

				interrupts = <72>;
@@ -1108,7 +1108,7 @@ SYSC_OMAP2_SOFTRESET | 
			ranges = <0x0 0x22000 0x1000>;



			uart1: serial@0 {

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				compatible = "ti,am3352-uart";

				clock-frequency = <48000000>;

				reg = <0x0 0x1000>;

				interrupts = <73>;
@@ -1139,7 +1139,7 @@ SYSC_OMAP2_SOFTRESET | 
			ranges = <0x0 0x24000 0x1000>;



			uart2: serial@0 {

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				compatible = "ti,am3352-uart";

				clock-frequency = <48000000>;

				reg = <0x0 0x1000>;

				interrupts = <74>;
@@ -1770,7 +1770,7 @@ SYSC_OMAP2_SOFTRESET | 
			ranges = <0x0 0xa6000 0x1000>;



			uart3: serial@0 {

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				compatible = "ti,am3352-uart";

				clock-frequency = <48000000>;

				reg = <0x0 0x1000>;

				interrupts = <44>;
@@ -1799,7 +1799,7 @@ SYSC_OMAP2_SOFTRESET | 
			ranges = <0x0 0xa8000 0x1000>;



			uart4: serial@0 {

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				compatible = "ti,am3352-uart";

				clock-frequency = <48000000>;

				reg = <0x0 0x1000>;

				interrupts = <45>;
@@ -1828,7 +1828,7 @@ SYSC_OMAP2_SOFTRESET | 
			ranges = <0x0 0xaa000 0x1000>;



			uart5: serial@0 {

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				compatible = "ti,am3352-uart";

				clock-frequency = <48000000>;

				reg = <0x0 0x1000>;

				interrupts = <46>;

arch/arm/boot/dts/ti/omap/dm814x.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -155,10 +155,10 @@ &cppi41dma 26 1 &cppi41dma 27 1 


			cppi41dma: dma-controller@47402000 {

				compatible = "ti,am3359-cppi41";

				reg =  <0x47400000 0x1000

					0x47402000 0x1000

					0x47403000 0x1000

					0x47404000 0x4000>;

				reg = <0x47400000 0x1000>,

				      <0x47402000 0x1000>,

				      <0x47403000 0x1000>,

				      <0x47404000 0x4000>;

				reg-names = "glue", "controller", "scheduler", "queuemgr";

				interrupts = <17>;

				interrupt-names = "glue";

arch/arm/boot/dts/ti/omap/dm816x.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -643,10 +643,10 @@ &cppi41dma 26 1 &cppi41dma 27 1 


			cppi41dma: dma-controller@47402000 {

				compatible = "ti,am3359-cppi41";

				reg =  <0x47400000 0x1000

					0x47402000 0x1000

					0x47403000 0x1000

					0x47404000 0x4000>;

				reg = <0x47400000 0x1000>,

				      <0x47402000 0x1000>,

				      <0x47403000 0x1000>,

				      <0x47404000 0x4000>;

				reg-names = "glue", "controller", "scheduler", "queuemgr";

				interrupts = <17>;

				interrupt-names = "glue";