Skip to content

L
linux
Commit e356dc4c authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

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-2Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents def0c983 9b11fec7
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 86 deletions
arch/arm/boot/dts/am335x-cm-t335.dts
View file @ e356dc4c
......@@ -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
View file @ e356dc4c
......@@ -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
View file @ e356dc4c
......@@ -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
View file @ e356dc4c
......@@ -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
View file @ e356dc4c
......@@ -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>;
......
arch/arm/boot/dts/am43x-epos-evm.dts
View file @ e356dc4c
......@@ -860,7 +860,7 @@ &spi0 {
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 {
......@@ -868,7 +868,7 @@ &spi1 {
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 {
......
arch/arm/boot/dts/da850.dtsi
View file @ e356dc4c
......@@ -574,8 +574,7 @@ mmc1: mmc@21b000 {
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>;
......@@ -584,8 +583,7 @@ ehrpwm0: pwm@300000 {
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>;
......@@ -593,9 +591,8 @@ ehrpwm1: pwm@302000 {
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>;
......@@ -603,9 +600,8 @@ ecap0: ecap@306000 {
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>;
......@@ -613,9 +609,8 @@ ecap1: ecap@307000 {
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>;
......
arch/arm/boot/dts/dm816x.dtsi
View file @ e356dc4c
......@@ -314,8 +314,6 @@ i2c1: i2c@48028000 {
#address-cells = <1>;
#size-cells = <0>;
interrupts = <70>;
dmas = <&edma 58 0 &edma 59 0>;
dma-names = "tx", "rx";
};
i2c2: i2c@4802a000 {
......@@ -325,8 +323,6 @@ i2c2: i2c@4802a000 {
#address-cells = <1>;
#size-cells = <0>;
interrupts = <71>;
dmas = <&edma 60 0 &edma 61 0>;
dma-names = "tx", "rx";
};
intc: interrupt-controller@48200000 {
......
arch/arm/boot/dts/dra7-evm.dts
View file @ e356dc4c
......@@ -319,7 +319,7 @@ sysen2: sysen2 {
};
pcf_lcd: gpio@20 {
compatible = "ti,pcf8575", "nxp,pcf8575";
compatible = "nxp,pcf8575";
reg = <0x20>;
gpio-controller;
#gpio-cells = <2>;
......@@ -330,7 +330,7 @@ pcf_lcd: gpio@20 {
};
pcf_gpio_21: gpio@21 {
compatible = "ti,pcf8575", "nxp,pcf8575";
compatible = "nxp,pcf8575";
reg = <0x21>;
lines-initial-states = <0x1408>;
gpio-controller;
......@@ -362,7 +362,7 @@ &i2c2 {
clock-frequency = <400000>;
pcf_hdmi: gpio@26 {
compatible = "ti,pcf8575", "nxp,pcf8575";
compatible = "nxp,pcf8575";
reg = <0x26>;
gpio-controller;
#gpio-cells = <2>;
......
arch/arm/boot/dts/dra7-l4.dtsi
View file @ e356dc4c
......@@ -2561,7 +2561,7 @@ epwmss0: epwmss@0 {
status = "disabled";
ranges = <0 0 0x1000>;
ecap0: ecap@100 {
ecap0: pwm@100 {
compatible = "ti,dra746-ecap",
"ti,am3352-ecap";
#pwm-cells = <3>;
......@@ -2607,7 +2607,7 @@ epwmss1: epwmss@0 {
status = "disabled";
ranges = <0 0 0x1000>;
ecap1: ecap@100 {
ecap1: pwm@100 {
compatible = "ti,dra746-ecap",
"ti,am3352-ecap";
#pwm-cells = <3>;
......@@ -2653,7 +2653,7 @@ epwmss2: epwmss@0 {
status = "disabled";
ranges = <0 0 0x1000>;
ecap2: ecap@100 {
ecap2: pwm@100 {
compatible = "ti,dra746-ecap",
"ti,am3352-ecap";
#pwm-cells = <3>;
......
arch/arm/boot/dts/dra72-evm-common.dtsi
View file @ e356dc4c
......@@ -226,7 +226,7 @@ pcf_lcd: gpio@20 {
};
pcf_gpio_21: gpio@21 {
compatible = "ti,pcf8575", "nxp,pcf8575";
compatible = "nxp,pcf8575";
reg = <0x21>;
lines-initial-states = <0x1408>;
gpio-controller;
......@@ -256,7 +256,7 @@ &i2c5 {
clock-frequency = <400000>;
pcf_hdmi: pcf8575@26 {
compatible = "ti,pcf8575", "nxp,pcf8575";
compatible = "nxp,pcf8575";
reg = <0x26>;
gpio-controller;
#gpio-cells = <2>;
......
arch/arm/boot/dts/dra76-evm.dts
View file @ e356dc4c
......@@ -349,7 +349,7 @@ buck23_reg: buck23 {
};
pcf_lcd: pcf8757@20 {
compatible = "ti,pcf8575", "nxp,pcf8575";
compatible = "nxp,pcf8575";
reg = <0x20>;
gpio-controller;
#gpio-cells = <2>;
......@@ -360,7 +360,7 @@ pcf_lcd: pcf8757@20 {
};
pcf_gpio_21: pcf8757@21 {
compatible = "ti,pcf8575", "nxp,pcf8575";
compatible = "nxp,pcf8575";
reg = <0x21>;
gpio-controller;
#gpio-cells = <2>;
......@@ -371,7 +371,7 @@ pcf_gpio_21: pcf8757@21 {
};
pcf_hdmi: pcf8575@26 {
compatible = "ti,pcf8575", "nxp,pcf8575";
compatible = "nxp,pcf8575";
reg = <0x26>;
gpio-controller;
#gpio-cells = <2>;
......
arch/arm/boot/dts/omap2.dtsi
View file @ e356dc4c
......@@ -120,8 +120,6 @@ i2c1: i2c@48070000 {
#address-cells = <1>;
#size-cells = <0>;
interrupts = <56>;
dmas = <&sdma 27 &sdma 28>;
dma-names = "tx", "rx";
};
i2c2: i2c@48072000 {
......@@ -131,8 +129,6 @@ i2c2: i2c@48072000 {
#address-cells = <1>;
#size-cells = <0>;
interrupts = <57>;
dmas = <&sdma 29 &sdma 30>;
dma-names = "tx", "rx";
};
mcspi1: spi@48098000 {
......
arch/arm/boot/dts/omap3.dtsi
View file @ e356dc4c
......@@ -403,8 +403,6 @@ i2c1: i2c@48070000 {
compatible = "ti,omap3-i2c";
reg = <0x48070000 0x80>;
interrupts = <56>;
dmas = <&sdma 27 &sdma 28>;
dma-names = "tx", "rx";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "i2c1";
......@@ -414,8 +412,6 @@ i2c2: i2c@48072000 {
compatible = "ti,omap3-i2c";
reg = <0x48072000 0x80>;
interrupts = <57>;
dmas = <&sdma 29 &sdma 30>;
dma-names = "tx", "rx";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "i2c2";
......@@ -425,8 +421,6 @@ i2c3: i2c@48060000 {
compatible = "ti,omap3-i2c";
reg = <0x48060000 0x80>;
interrupts = <61>;
dmas = <&sdma 25 &sdma 26>;
dma-names = "tx", "rx";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "i2c3";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7