[v3] arm: dts: ti: drop usage of redundant compatible

Commit Message

Lokesh Vutla June 1, 2021, 5:40 a.m. UTC

Commit 229110c1aa691 ("ARM: dts: am437x/am33xx/da850: Add new ECAP and
EPWM bindings") added ti,am3352-ehrpwm compatible which is similar to
ti,am33xx-ehrpwm but without out t,hwmod properties. But with commit
58bfbea5b1c68 ("ARM: dts: am437x/am33xx: Remove hwmod entries for ECAP
and EPWM nodes") dropped support for all ti,hwmod for ehrpwm, but
missed deprecating ti,am33xx-ehrpwm compatible. So drop ti,am33xx-ehrpwm
from DT as it is no longer needed.

ti-ehrpwn driver still support ti,am33xx-ehrpwm in order to maintain
backward compatibility.

Signed-off-by: Lokesh Vutla <[e-mail]>
---
Changes since v2:
- Split from ehrpwm yaml conversion series:
  https://patchwork.kernel.org/project/linux-arm-kernel/list/?series=489981
- Dropped documentation update in this patch.

 arch/arm/boot/dts/am33xx-l4.dtsi |  9 +++------
 arch/arm/boot/dts/am437x-l4.dtsi | 18 ++++++------------
 arch/arm/boot/dts/da850.dtsi     |  6 ++----
 3 files changed, 11 insertions(+), 22 deletions(-)

Comments

Grygorii Strashko June 1, 2021, 1:04 p.m. UTC | #1

On 01/06/2021 08:40, Lokesh Vutla wrote:
> Commit 229110c1aa691 ("ARM: dts: am437x/am33xx/da850: Add new ECAP and
> EPWM bindings") added ti,am3352-ehrpwm compatible which is similar to
> ti,am33xx-ehrpwm but without out t,hwmod properties. But with commit
> 58bfbea5b1c68 ("ARM: dts: am437x/am33xx: Remove hwmod entries for ECAP
> and EPWM nodes") dropped support for all ti,hwmod for ehrpwm, but
> missed deprecating ti,am33xx-ehrpwm compatible. So drop ti,am33xx-ehrpwm
> from DT as it is no longer needed.
> 
> ti-ehrpwn driver still support ti,am33xx-ehrpwm in order to maintain
> backward compatibility.
> 
> Signed-off-by: Lokesh Vutla <[e-mail]>
> ---
> Changes since v2:
> - Split from ehrpwm yaml conversion series:
>    https://patchwork.kernel.org/project/linux-arm-kernel/list/?series=489981
> - Dropped documentation update in this patch.
> 
>   arch/arm/boot/dts/am33xx-l4.dtsi |  9 +++------
>   arch/arm/boot/dts/am437x-l4.dtsi | 18 ++++++------------
>   arch/arm/boot/dts/da850.dtsi     |  6 ++----
>   3 files changed, 11 insertions(+), 22 deletions(-)
Reviewed-by: Grygorii Strashko <[e-mail]>

Tony Lindgren June 11, 2021, 7:27 a.m. UTC | #2

* Grygorii Strashko <[e-mail]> [210601 13:05]:
> On 01/06/2021 08:40, Lokesh Vutla wrote:
> > Commit 229110c1aa691 ("ARM: dts: am437x/am33xx/da850: Add new ECAP and
> > EPWM bindings") added ti,am3352-ehrpwm compatible which is similar to
> > ti,am33xx-ehrpwm but without out t,hwmod properties. But with commit
> > 58bfbea5b1c68 ("ARM: dts: am437x/am33xx: Remove hwmod entries for ECAP
> > and EPWM nodes") dropped support for all ti,hwmod for ehrpwm, but
> > missed deprecating ti,am33xx-ehrpwm compatible. So drop ti,am33xx-ehrpwm
> > from DT as it is no longer needed.
> > 
> > ti-ehrpwn driver still support ti,am33xx-ehrpwm in order to maintain
> > backward compatibility.
...

> Reviewed-by: Grygorii Strashko <[e-mail]>

Applying into omap-for-v5.14/dt thanks.

Tony

Patch

diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi
index 039a9ab4c7ea..fbf3458ab246 100644
--- a/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -2017,8 +2017,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>;
@@ -2078,8 +2077,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>;
@@ -2139,8 +2137,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>;
diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
index e217ffc09770..e796b9bcc54e 100644
--- a/arch/arm/boot/dts/am437x-l4.dtsi
+++ b/arch/arm/boot/dts/am437x-l4.dtsi
@@ -1760,8 +1760,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>;
@@ -1812,8 +1811,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>;
@@ -1864,8 +1862,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 +1902,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 +1942,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 +1982,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>;
diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index 7cf31b6e48b7..afdf3d3747ce 100644
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -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>;