[PATCH 1/4] arm: dts: ti: drop usage of redundant compatible

[Grygorii Strashko]

On 26/05/2021 11:43, 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 <lokeshvutla at ti.com>
> ---
>   .../devicetree/bindings/pwm/pwm-tiehrpwm.txt   | 13 ++++++-------
>   arch/arm/boot/dts/am33xx-l4.dtsi               |  9 +++------
>   arch/arm/boot/dts/am437x-l4.dtsi               | 18 ++++++------------
>   arch/arm/boot/dts/da850.dtsi                   |  6 ++----
>   4 files changed, 17 insertions(+), 29 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt b/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
> index c7e28f6d28be..e124e41418d8 100644
> --- a/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
> +++ b/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
> @@ -2,10 +2,10 @@ TI SOC EHRPWM based PWM controller
>   
>   Required properties:
>   - compatible: Must be "ti,<soc>-ehrpwm".
> -  for am33xx  - compatible = "ti,am3352-ehrpwm", "ti,am33xx-ehrpwm";
> -  for am4372  - compatible = "ti,am4372-ehrpwm", "ti-am3352-ehrpwm", "ti,am33xx-ehrpwm";
> +  for am33xx  - compatible = "ti,am3352-ehrpwm";
> +  for am4372  - compatible = "ti,am4372-ehrpwm", "ti-am3352-ehrpwm";
>     for am654   - compatible = "ti,am654-ehrpwm", "ti-am3352-ehrpwm";
> -  for da850   - compatible = "ti,da850-ehrpwm", "ti-am3352-ehrpwm", "ti,am33xx-ehrpwm";
> +  for da850   - compatible = "ti,da850-ehrpwm", "ti-am3352-ehrpwm";
>     for dra746 - compatible = "ti,dra746-ehrpwm", "ti-am3352-ehrpwm";
>   - #pwm-cells: should be 3. See pwm.yaml in this directory for a description of
>     the cells format. The only third cell flag supported by this binding is
> @@ -19,7 +19,7 @@ Optional properties:
>   Example:
>   
>   ehrpwm0: pwm at 48300200 { /* EHRPWM on am33xx */
> -	compatible = "ti,am3352-ehrpwm", "ti,am33xx-ehrpwm";
> +	compatible = "ti,am3352-ehrpwm";
>   	#pwm-cells = <3>;
>   	reg = <0x48300200 0x100>;
>   	clocks = <&ehrpwm0_tbclk>, <&l4ls_gclk>;
> @@ -27,16 +27,15 @@ ehrpwm0: pwm at 48300200 { /* EHRPWM on am33xx */
>   };
>   
>   ehrpwm0: pwm at 48300200 { /* EHRPWM on am4372 */
> -	compatible = "ti,am4372-ehrpwm", "ti,am3352-ehrpwm", "ti,am33xx-ehrpwm";
> +	compatible = "ti,am4372-ehrpwm", "ti,am3352-ehrpwm";
>   	#pwm-cells = <3>;
>   	reg = <0x48300200 0x80>;
>   	clocks = <&ehrpwm0_tbclk>, <&l4ls_gclk>;
>   	clock-names = "tbclk", "fck";
> -	ti,hwmods = "ehrpwm0";
>   };
>   
>   ehrpwm0: pwm at 1f00000 { /* EHRPWM on da850 */
> -	compatible = "ti,da850-ehrpwm", "ti,am3352-ehrpwm", "ti,am33xx-ehrpwm";
> +	compatible = "ti,da850-ehrpwm", "ti,am3352-ehrpwm";
>   	#pwm-cells = <3>;
>   	reg = <0x1f00000 0x2000>;
>   };
> 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 at 180 {
>   				};
>   
>   				ehrpwm0: pwm at 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 at 180 {
>   				};
>   
>   				ehrpwm1: pwm at 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 at 180 {
>   				};
>   
>   				ehrpwm2: pwm at 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

[...]

> 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 at 21b000 {
>   			status = "disabled";
>   		};
>   		ehrpwm0: pwm at 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 at 300000 {
>   			status = "disabled";
>   		};
>   		ehrpwm1: pwm at 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>;
> 

I think, the DT changes can be split and posted standalone while bindings fixed
as part of yaml conversation.
Personally I do not see reasons for separate .txt bindings fix here as ymal conversation just
reveals inconsistency between DT bindings, DTBs and code which leads to DTBs fix.

But, of course, it's up to Rob first of all.

-- 
Best regards,
grygorii