Re: [PATCH v2] ARM: dts: dra7: Fix duplicate USB4 device node

[Suman Anna]

Hi Gowtham,

On 5/26/21 12:20 PM, Gowtham Tammana wrote:
> With [1] USB4 device node got defined in dra74x.dtsi file. However,
> there was a prior defintion of the same in [2] which didn't get removed

I like this approach and is more in line with the original move of USB4 node
into dra74x.dtsi file.

Looks like you mixed up [1] and [2] or I misunderstand your terminology. Also,
let's be precise, it is the USB4 target-module node that got duplicated in [2],
USB4 node always existed but outside of ti-sysc control before [2] and did not
conflict with the target-module node added in [1].

> causing boot failures. 

on what boards? Is it affecting all of them?

regards
Suman

USB4 node is present only in DRA74x variants so
> keeping the entry in dra74x.dtsi and removing it from the top level
> interconnect hierarchy dra7-l4.dtsi file.
> 
> Since USB4 is only included in DRA74x variants, remove its reference
> for AM5718, DRA71x and DR72x boards.
> 
> [1]: commit 549fce068a311 ("ARM: dts: dra7: Add l4 interconnect
> hierarchy and ti-sysc data")
> [2]: commit c7b72abca61ec ("ARM: OMAP2+: Drop legacy platform data for
> dra7 dwc3")
> 
> Fixes: c7b72abca61ec ("ARM: OMAP2+: Drop legacy platform data for dra7 dwc3")
> Signed-off-by: Gowtham Tammana <g-tammana@xxxxxx>
> ---
> v2:
>   - changed reference to commit sha instead of line numbers
>   - added Fixes: tag
>   - moved the definition to dra74.dtsi as per Suman and Tony review comments
> 
>  arch/arm/boot/dts/am5718.dtsi  |  6 +-----
>  arch/arm/boot/dts/dra7-l4.dtsi | 22 ----------------------
>  arch/arm/boot/dts/dra71x.dtsi  |  4 ----
>  arch/arm/boot/dts/dra72x.dtsi  |  4 ----
>  arch/arm/boot/dts/dra74x.dtsi  |  2 +-
>  5 files changed, 2 insertions(+), 36 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/am5718.dtsi b/arch/arm/boot/dts/am5718.dtsi
> index ebf4d3cc1cfb..6d7530a48c73 100644
> --- a/arch/arm/boot/dts/am5718.dtsi
> +++ b/arch/arm/boot/dts/am5718.dtsi
> @@ -17,17 +17,13 @@ / {
>   * VCP1, VCP2
>   * MLB
>   * ISS
> - * USB3, USB4
> + * USB3
>   */
>  
>  &usb3_tm {
>  	status = "disabled";
>  };
>  
> -&usb4_tm {
> -	status = "disabled";
> -};
> -
>  &atl_tm {
>  	status = "disabled";
>  };
> diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi
> index 149144cdff35..648d23f7f748 100644
> --- a/arch/arm/boot/dts/dra7-l4.dtsi
> +++ b/arch/arm/boot/dts/dra7-l4.dtsi
> @@ -4129,28 +4129,6 @@ usb3: usb@10000 {
>  			};
>  		};
>  
> -		usb4_tm: target-module@140000 {		/* 0x48940000, ap 75 3c.0 */
> -			compatible = "ti,sysc-omap4", "ti,sysc";
> -			reg = <0x140000 0x4>,
> -			      <0x140010 0x4>;
> -			reg-names = "rev", "sysc";
> -			ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;
> -			ti,sysc-midle = <SYSC_IDLE_FORCE>,
> -					<SYSC_IDLE_NO>,
> -					<SYSC_IDLE_SMART>,
> -					<SYSC_IDLE_SMART_WKUP>;
> -			ti,sysc-sidle = <SYSC_IDLE_FORCE>,
> -					<SYSC_IDLE_NO>,
> -					<SYSC_IDLE_SMART>,
> -					<SYSC_IDLE_SMART_WKUP>;
> -			/* Domains (P, C): l3init_pwrdm, l3init_clkdm */
> -			clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;
> -			clock-names = "fck";
> -			#address-cells = <1>;
> -			#size-cells = <1>;
> -			ranges = <0x0 0x140000 0x20000>;
> -		};
> -
>  		target-module@170000 {			/* 0x48970000, ap 21 0a.0 */
>  			compatible = "ti,sysc-omap4", "ti,sysc";
>  			reg = <0x170010 0x4>;
> diff --git a/arch/arm/boot/dts/dra71x.dtsi b/arch/arm/boot/dts/dra71x.dtsi
> index cad0e4a2bd8d..9c270d8f75d5 100644
> --- a/arch/arm/boot/dts/dra71x.dtsi
> +++ b/arch/arm/boot/dts/dra71x.dtsi
> @@ -11,7 +11,3 @@
>  &rtctarget {
>  	status = "disabled";
>  };
> -
> -&usb4_tm {
> -	status = "disabled";
> -};
> diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi
> index d403acc754b6..f3e934ef7d3e 100644
> --- a/arch/arm/boot/dts/dra72x.dtsi
> +++ b/arch/arm/boot/dts/dra72x.dtsi
> @@ -108,7 +108,3 @@ &pcie1_ep {
>  &pcie2_rc {
>  	compatible = "ti,dra726-pcie-rc", "ti,dra7-pcie";
>  };
> -
> -&usb4_tm {
> -	status = "disabled";
> -};
> diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi
> index e1850d6c841a..60f2ab8d34d5 100644
> --- a/arch/arm/boot/dts/dra74x.dtsi
> +++ b/arch/arm/boot/dts/dra74x.dtsi
> @@ -49,7 +49,7 @@ dsp2_system: dsp_system@41500000 {
>  			reg = <0x41500000 0x100>;
>  		};
>  
> -		target-module@48940000 {
> +		usb4_tm: target-module@48940000 {
>  			compatible = "ti,sysc-omap4", "ti,sysc";
>  			reg = <0x48940000 0x4>,
>  			      <0x48940010 0x4>;
>