From: Grygorii Strashko <grygorii.strashko@ti.com>
To: Tony Lindgren <tony@atomide.com>, Gowtham Tammana <g-tammana@ti.com>
Cc: Suman Anna <s-anna@ti.com>, <bcousson@baylibre.com>,
<robh+dt@kernel.org>, <linux-omap@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>, Nisanth Menon <nm@ti.com>
Subject: Re: [PATCH v3] ARM: dts: dra7: Fix duplicate USB4 target module node
Date: Thu, 27 May 2021 12:03:24 +0300 [thread overview]
Message-ID: <bd903d6a-2894-fc39-e431-5dfed04a3604@ti.com> (raw)
In-Reply-To: <YK8ykeNA9AsjB89I@atomide.com>
Hi Tony,
On 27/05/2021 08:48, Tony Lindgren wrote:
> Hi,
>
> * Gowtham Tammana <g-tammana@ti.com> [210526 21:30]:
>> 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";
>> };
>
> The above makes sense as usb4 is only on dra74x and should not be even
> available otherwise.
>
>> 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>;
>> - };
>> -
>
> But let's keep the target-module@140000 here as it puts it in the right
> location rather than directly on the ocp. Let's mark it with
> status = "disabled" in dra7-l4.dtsi, and add a comment noting it's only
> available on dra74x. So similar to what you had in your v1 patch, except
> disabled.
My preference would be not to mix SoC variant specific modules in common module,
and fix dra74x instead by placing usb4 node in proper place:
&l4_per3 { /* 0x48800000 */
segment@0 {
-->
>
>> 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";
>> -};
>
> Then the above change can be kept.
>
>> 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>;
>
> And in dra74x.dtsi just set it enabled then :)
--
Best regards,
grygorii
next prev parent reply other threads:[~2021-05-27 9:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 21:30 Gowtham Tammana
2021-05-27 5:48 ` Tony Lindgren
2021-05-27 9:03 ` Grygorii Strashko [this message]
2021-05-27 9:09 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bd903d6a-2894-fc39-e431-5dfed04a3604@ti.com \
--to=grygorii.strashko@ti.com \
--cc=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=g-tammana@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=nm@ti.com \
--cc=robh+dt@kernel.org \
--cc=s-anna@ti.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®