Skip to content

Commit

Permalink
Merge tag 'omap-for-v5.14/dt-cleanup-signed' of git://git.kernel.org/…
Browse files Browse the repository at this point in the history 
…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/[email protected]
Signed-off-by: Olof Johansson <[email protected]>
  • Loading branch information
@olofj
olofj committed Jun 24, 2021
2 parents def0c98 + 9b11fec commit e356dc4
Show file tree
Hide file tree
Showing 14 changed files with 46 additions and 86 deletions.
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/am335x-cm-t335.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ status = "okay";
&epwmss0 {
status = "okay";

ecap0: ecap@100 {
ecap0: pwm@100 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&ecap0_pins>;
Expand Down Expand Up @@ -496,7 +496,7 @@ status = "okay";
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";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am335x-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@
&epwmss0 {
status = "okay";

ecap0: ecap@100 {
ecap0: pwm@100 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&ecap0_pins>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am335x-evmsk.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@
&epwmss2 {
status = "okay";

ecap2: ecap@100 {
ecap2: pwm@100 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&ecap2_pins>;
Expand Down
30 changes: 9 additions & 21 deletions arch/arm/boot/dts/am33xx-l4.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1995,15 +1995,12 @@
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";
};

Expand All @@ -2017,8 +2014,7 @@
};

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>;
Expand Down Expand Up @@ -2056,15 +2052,12 @@
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";
};

Expand All @@ -2078,8 +2071,7 @@
};

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>;
Expand Down Expand Up @@ -2117,15 +2109,12 @@
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";
};

Expand All @@ -2139,8 +2128,7 @@
};

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>;
Expand Down
33 changes: 12 additions & 21 deletions arch/arm/boot/dts/am437x-l4.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1747,10 +1747,9 @@
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>;
Expand All @@ -1760,8 +1759,7 @@

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>;
Expand Down Expand Up @@ -1799,10 +1797,9 @@
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>;
Expand All @@ -1812,8 +1809,7 @@

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>;
Expand Down Expand Up @@ -1851,10 +1847,9 @@
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>;
Expand All @@ -1864,8 +1859,7 @@

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>;
Expand Down Expand Up @@ -1905,8 +1899,7 @@

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>;
Expand Down Expand Up @@ -1946,8 +1939,7 @@

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>;
Expand Down Expand Up @@ -1987,8 +1979,7 @@

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>;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/am43x-epos-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -860,15 +860,15 @@
pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi0_pins_default>;
pinctrl-1 = <&spi0_pins_sleep>;
ti,pindir-d0-out-d1-in = <1>;
ti,pindir-d0-out-d1-in;
};

&spi1 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi1_pins_default>;
pinctrl-1 = <&spi1_pins_sleep>;
ti,pindir-d0-out-d1-in = <1>;
ti,pindir-d0-out-d1-in;
};

&usb2_phy1 {
Expand Down
21 changes: 8 additions & 13 deletions arch/arm/boot/dts/da850.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,8 +574,7 @@
status = "disabled";
};
ehrpwm0: pwm@300000 {
compatible = "ti,da850-ehrpwm", "ti,am3352-ehrpwm",
"ti,am33xx-ehrpwm";
compatible = "ti,da850-ehrpwm", "ti,am3352-ehrpwm";
#pwm-cells = <3>;
reg = <0x300000 0x2000>;
clocks = <&psc1 17>, <&ehrpwm_tbclk>;
Expand All @@ -584,38 +583,34 @@
status = "disabled";
};
ehrpwm1: pwm@302000 {
compatible = "ti,da850-ehrpwm", "ti,am3352-ehrpwm",
"ti,am33xx-ehrpwm";
compatible = "ti,da850-ehrpwm", "ti,am3352-ehrpwm";
#pwm-cells = <3>;
reg = <0x302000 0x2000>;
clocks = <&psc1 17>, <&ehrpwm_tbclk>;
clock-names = "fck", "tbclk";
power-domains = <&psc1 17>;
status = "disabled";
};
ecap0: ecap@306000 {
compatible = "ti,da850-ecap", "ti,am3352-ecap",
"ti,am33xx-ecap";
ecap0: pwm@306000 {
compatible = "ti,da850-ecap", "ti,am3352-ecap";
#pwm-cells = <3>;
reg = <0x306000 0x80>;
clocks = <&psc1 20>;
clock-names = "fck";
power-domains = <&psc1 20>;
status = "disabled";
};
ecap1: ecap@307000 {
compatible = "ti,da850-ecap", "ti,am3352-ecap",
"ti,am33xx-ecap";
ecap1: pwm@307000 {
compatible = "ti,da850-ecap", "ti,am3352-ecap";
#pwm-cells = <3>;
reg = <0x307000 0x80>;
clocks = <&psc1 20>;
clock-names = "fck";
power-domains = <&psc1 20>;
status = "disabled";
};
ecap2: ecap@308000 {
compatible = "ti,da850-ecap", "ti,am3352-ecap",
"ti,am33xx-ecap";
ecap2: pwm@308000 {
compatible = "ti,da850-ecap", "ti,am3352-ecap";
#pwm-cells = <3>;
reg = <0x308000 0x80>;
clocks = <&psc1 20>;
Expand Down
4 changes: 0 additions & 4 deletions arch/arm/boot/dts/dm816x.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,6 @@
#address-cells = <1>;
#size-cells = <0>;
interrupts = <70>;
dmas = <&edma 58 0 &edma 59 0>;
dma-names = "tx", "rx";
};

i2c2: i2c@4802a000 {
Expand All @@ -325,8 +323,6 @@
#address-cells = <1>;
#size-cells = <0>;
interrupts = <71>;
dmas = <&edma 60 0 &edma 61 0>;
dma-names = "tx", "rx";
};

intc: interrupt-controller@48200000 {
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/boot/dts/dra7-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
};

pcf_lcd: gpio@20 {
compatible = "ti,pcf8575", "nxp,pcf8575";
compatible = "nxp,pcf8575";
reg = <0x20>;
gpio-controller;
#gpio-cells = <2>;
Expand All @@ -330,7 +330,7 @@
};

pcf_gpio_21: gpio@21 {
compatible = "ti,pcf8575", "nxp,pcf8575";
compatible = "nxp,pcf8575";
reg = <0x21>;
lines-initial-states = <0x1408>;
gpio-controller;
Expand Down Expand Up @@ -362,7 +362,7 @@
clock-frequency = <400000>;

pcf_hdmi: gpio@26 {
compatible = "ti,pcf8575", "nxp,pcf8575";
compatible = "nxp,pcf8575";
reg = <0x26>;
gpio-controller;
#gpio-cells = <2>;
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/boot/dts/dra7-l4.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2561,7 +2561,7 @@
status = "disabled";
ranges = <0 0 0x1000>;

ecap0: ecap@100 {
ecap0: pwm@100 {
compatible = "ti,dra746-ecap",
"ti,am3352-ecap";
#pwm-cells = <3>;
Expand Down Expand Up @@ -2607,7 +2607,7 @@
status = "disabled";
ranges = <0 0 0x1000>;

ecap1: ecap@100 {
ecap1: pwm@100 {
compatible = "ti,dra746-ecap",
"ti,am3352-ecap";
#pwm-cells = <3>;
Expand Down Expand Up @@ -2653,7 +2653,7 @@
status = "disabled";
ranges = <0 0 0x1000>;

ecap2: ecap@100 {
ecap2: pwm@100 {
compatible = "ti,dra746-ecap",
"ti,am3352-ecap";
#pwm-cells = <3>;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/dra72-evm-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
};

pcf_gpio_21: gpio@21 {
compatible = "ti,pcf8575", "nxp,pcf8575";
compatible = "nxp,pcf8575";
reg = <0x21>;
lines-initial-states = <0x1408>;
gpio-controller;
Expand Down Expand Up @@ -256,7 +256,7 @@
clock-frequency = <400000>;

pcf_hdmi: pcf8575@26 {
compatible = "ti,pcf8575", "nxp,pcf8575";
compatible = "nxp,pcf8575";
reg = <0x26>;
gpio-controller;
#gpio-cells = <2>;
Expand Down
Loading

0 comments on commit e356dc4

Please sign in to comment.