Unverified Commit e356dc4c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v5.14/dt-cleanup-signed' of... 

Merge tag 'omap-for-v5.14/dt-cleanup-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt

Devicetree binding clean-up for omaps for v5.14

Minor devicetree clean-up for omaps for the binding checks:

- Drop unsupported dmas for omap2/3 i2c
- Drop redundant ehrpwm compatible
- Drop am33xx-ecap compatible no longer needed
- Correct node names for ecap
- Drop unsupported interrupts for ecap
- Drop redundant ti,pcf8575
- Correct usage for ti,pindir-d0-out-d1-in

* tag 'omap-for-v5.14/dt-cleanup-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am437x: align ti,pindir-d0-out-d1-in property with dt-shema
  ARM: dts: am335x: align ti,pindir-d0-out-d1-in property with dt-shema
  ARM: dts: dra7x-evm: Drop "ti,pcf8575"
  ARM: dts: am33xx: Drop interrupt property from ecap nodes
  ARM: dts: ti: Fix node name for all ecap dt nodes
  ARM: dts: ti: Drop usage of ti,am33xx-ecap from DT nodes
  ARM: dts: ti: drop usage of redundant compatible
  ARM: dts: omap2/3: Drop dmas property from I2C node

Link: https://lore.kernel.org/r/pull-1624002812-396117@atomide.com-2


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents def0c983 9b11fec7

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

+2 −2
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ tlv320aic23: codec@1a { 
&epwmss0 {

	status = "okay";



	ecap0: ecap@100 {

	ecap0: pwm@100 {

		status = "okay";

		pinctrl-names = "default";

		pinctrl-0 = <&ecap0_pins>;
@@ -496,7 +496,7 @@ &spi0 { 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&spi0_pins>;

	ti,pindir-d0-out-d1-in = <1>;

	ti,pindir-d0-out-d1-in;

	/* WLS1271 WiFi */

	wlcore: wlcore@1 {

		compatible = "ti,wl1271";

arch/arm/boot/dts/am335x-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ &elm { 
&epwmss0 {

	status = "okay";



	ecap0: ecap@100 {

	ecap0: pwm@100 {

		status = "okay";

		pinctrl-names = "default";

		pinctrl-0 = <&ecap0_pins>;

arch/arm/boot/dts/am335x-evmsk.dts

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ &usb1 { 
&epwmss2 {

	status = "okay";



	ecap2: ecap@100 {

	ecap2: pwm@100 {

		status = "okay";

		pinctrl-names = "default";

		pinctrl-0 = <&ecap2_pins>;

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

+9 −21
Original line number Diff line number Diff line
@@ -1995,15 +1995,12 @@ epwmss0: epwmss@0 { 
				status = "disabled";

				ranges = <0 0 0x1000>;



				ecap0: ecap@100 {

					compatible = "ti,am3352-ecap",

						     "ti,am33xx-ecap";

				ecap0: pwm@100 {

					compatible = "ti,am3352-ecap";

					#pwm-cells = <3>;

					reg = <0x100 0x80>;

					clocks = <&l4ls_gclk>;

					clock-names = "fck";

					interrupts = <31>;

					interrupt-names = "ecap0";

					status = "disabled";

				};
@@ -2017,8 +2014,7 @@ eqep0: counter@180 { 
				};



				ehrpwm0: pwm@200 {

					compatible = "ti,am3352-ehrpwm",

						     "ti,am33xx-ehrpwm";

					compatible = "ti,am3352-ehrpwm";

					#pwm-cells = <3>;

					reg = <0x200 0x80>;

					clocks = <&ehrpwm0_tbclk>, <&l4ls_gclk>;
@@ -2056,15 +2052,12 @@ epwmss1: epwmss@0 { 
				status = "disabled";

				ranges = <0 0 0x1000>;



				ecap1: ecap@100 {

					compatible = "ti,am3352-ecap",

						     "ti,am33xx-ecap";

				ecap1: pwm@100 {

					compatible = "ti,am3352-ecap";

					#pwm-cells = <3>;

					reg = <0x100 0x80>;

					clocks = <&l4ls_gclk>;

					clock-names = "fck";

					interrupts = <47>;

					interrupt-names = "ecap1";

					status = "disabled";

				};
@@ -2078,8 +2071,7 @@ eqep1: counter@180 { 
				};



				ehrpwm1: pwm@200 {

					compatible = "ti,am3352-ehrpwm",

						     "ti,am33xx-ehrpwm";

					compatible = "ti,am3352-ehrpwm";

					#pwm-cells = <3>;

					reg = <0x200 0x80>;

					clocks = <&ehrpwm1_tbclk>, <&l4ls_gclk>;
@@ -2117,15 +2109,12 @@ epwmss2: epwmss@0 { 
				status = "disabled";

				ranges = <0 0 0x1000>;



				ecap2: ecap@100 {

					compatible = "ti,am3352-ecap",

						     "ti,am33xx-ecap";

				ecap2: pwm@100 {

					compatible = "ti,am3352-ecap";

					#pwm-cells = <3>;

					reg = <0x100 0x80>;

					clocks = <&l4ls_gclk>;

					clock-names = "fck";

					interrupts = <61>;

					interrupt-names = "ecap2";

					status = "disabled";

				};
@@ -2139,8 +2128,7 @@ eqep2: counter@180 { 
				};



				ehrpwm2: pwm@200 {

					compatible = "ti,am3352-ehrpwm",

						     "ti,am33xx-ehrpwm";

					compatible = "ti,am3352-ehrpwm";

					#pwm-cells = <3>;

					reg = <0x200 0x80>;

					clocks = <&ehrpwm2_tbclk>, <&l4ls_gclk>;

arch/arm/boot/dts/am437x-l4.dtsi

+12 −21
Original line number Diff line number Diff line
@@ -1747,10 +1747,9 @@ epwmss0: epwmss@0 { 
				ranges = <0 0 0x1000>;

				status = "disabled";



				ecap0: ecap@100 {

				ecap0: pwm@100 {

					compatible = "ti,am4372-ecap",

						     "ti,am3352-ecap",

						     "ti,am33xx-ecap";

						     "ti,am3352-ecap";

					#pwm-cells = <3>;

					reg = <0x100 0x80>;

					clocks = <&l4ls_gclk>;
@@ -1760,8 +1759,7 @@ ecap0: ecap@100 { 


				ehrpwm0: pwm@200 {

					compatible = "ti,am4372-ehrpwm",

						     "ti,am3352-ehrpwm",

						     "ti,am33xx-ehrpwm";

						     "ti,am3352-ehrpwm";

					#pwm-cells = <3>;

					reg = <0x200 0x80>;

					clocks = <&ehrpwm0_tbclk>, <&l4ls_gclk>;
@@ -1799,10 +1797,9 @@ epwmss1: epwmss@0 { 
				ranges = <0 0 0x1000>;

				status = "disabled";



				ecap1: ecap@100 {

				ecap1: pwm@100 {

					compatible = "ti,am4372-ecap",

						     "ti,am3352-ecap",

						     "ti,am33xx-ecap";

						     "ti,am3352-ecap";

					#pwm-cells = <3>;

					reg = <0x100 0x80>;

					clocks = <&l4ls_gclk>;
@@ -1812,8 +1809,7 @@ ecap1: ecap@100 { 


				ehrpwm1: pwm@200 {

					compatible = "ti,am4372-ehrpwm",

						     "ti,am3352-ehrpwm",

						     "ti,am33xx-ehrpwm";

						     "ti,am3352-ehrpwm";

					#pwm-cells = <3>;

					reg = <0x200 0x80>;

					clocks = <&ehrpwm1_tbclk>, <&l4ls_gclk>;
@@ -1851,10 +1847,9 @@ epwmss2: epwmss@0 { 
				ranges = <0 0 0x1000>;

				status = "disabled";



				ecap2: ecap@100 {

				ecap2: pwm@100 {

					compatible = "ti,am4372-ecap",

						     "ti,am3352-ecap",

						     "ti,am33xx-ecap";

						     "ti,am3352-ecap";

					#pwm-cells = <3>;

					reg = <0x100 0x80>;

					clocks = <&l4ls_gclk>;
@@ -1864,8 +1859,7 @@ ecap2: ecap@100 { 


				ehrpwm2: pwm@200 {

					compatible = "ti,am4372-ehrpwm",

						     "ti,am3352-ehrpwm",

						     "ti,am33xx-ehrpwm";

						     "ti,am3352-ehrpwm";

					#pwm-cells = <3>;

					reg = <0x200 0x80>;

					clocks = <&ehrpwm2_tbclk>, <&l4ls_gclk>;
@@ -1905,8 +1899,7 @@ epwmss3: epwmss@0 { 


				ehrpwm3: pwm@200 {

					compatible = "ti,am4372-ehrpwm",

						     "ti,am3352-ehrpwm",

						     "ti,am33xx-ehrpwm";

						     "ti,am3352-ehrpwm";

					#pwm-cells = <3>;

					reg = <0x200 0x80>;

					clocks = <&ehrpwm3_tbclk>, <&l4ls_gclk>;
@@ -1946,8 +1939,7 @@ epwmss4: epwmss@0 { 


				ehrpwm4: pwm@48308200 {

					compatible = "ti,am4372-ehrpwm",

						     "ti,am3352-ehrpwm",

						     "ti,am33xx-ehrpwm";

						     "ti,am3352-ehrpwm";

					#pwm-cells = <3>;

					reg = <0x200 0x80>;

					clocks = <&ehrpwm4_tbclk>, <&l4ls_gclk>;
@@ -1987,8 +1979,7 @@ epwmss5: epwmss@0 { 


				ehrpwm5: pwm@200 {

					compatible = "ti,am4372-ehrpwm",

						     "ti,am3352-ehrpwm",

						     "ti,am33xx-ehrpwm";

						     "ti,am3352-ehrpwm";

					#pwm-cells = <3>;

					reg = <0x200 0x80>;

					clocks = <&ehrpwm5_tbclk>, <&l4ls_gclk>;