diff mbox

[RFC] ARM: dts: am335x: update USB DT references

Message ID 1397647595-10927-1-git-send-email-leigh@solinno.co.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Leigh Brown April 16, 2014, 11:26 a.m. UTC
In "ARM: dts: am33xx: correcting dt node unit address for usb", the
usb_ctrl_mod and cppi41dma nodes were updated with the correct register
addresses.  However, the dts files that reference these nodes were not
updated, and those devices are no longer being enabled.

This patch corrects the references for the affected dts files.

Signed-off-by: Leigh Brown <leigh@solinno.co.uk>
---
 arch/arm/boot/dts/am335x-bone-common.dtsi | 4 ++--
 arch/arm/boot/dts/am335x-evm.dts          | 4 ++--
 arch/arm/boot/dts/am335x-evmsk.dts        | 4 ++--
 arch/arm/boot/dts/am335x-igep0033.dtsi    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

Comments

Benoit Cousson April 22, 2014, 2:14 p.m. UTC | #1
Hi Leigh,

On 16/04/2014 13:26, Leigh Brown wrote:
> In "ARM: dts: am33xx: correcting dt node unit address for usb", the
> usb_ctrl_mod and cppi41dma nodes were updated with the correct register
> addresses.  However, the dts files that reference these nodes were not
> updated, and those devices are no longer being enabled.
>
> This patch corrects the references for the affected dts files.

Thanks for the fix. BTW, why is it a RFC? Do you plan to send an updated 
version?

FYI, even with this fix, the BBB still does not have a working MUSB on 
3.15-rc2. Have you observed that as well?

> Signed-off-by: Leigh Brown <leigh@solinno.co.uk>

If this is a final version, I'll apply it for -rc3.

Thanks,
Benoit


> ---
>   arch/arm/boot/dts/am335x-bone-common.dtsi | 4 ++--
>   arch/arm/boot/dts/am335x-evm.dts          | 4 ++--
>   arch/arm/boot/dts/am335x-evmsk.dts        | 4 ++--
>   arch/arm/boot/dts/am335x-igep0033.dtsi    | 4 ++--
>   4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
> index e3f27ec..2e7d932 100644
> --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
> +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
> @@ -183,7 +183,7 @@
>   &usb {
>   	status = "okay";
>
> -	control@44e10000 {
> +	control@44e10620 {
>   		status = "okay";
>   	};
>
> @@ -204,7 +204,7 @@
>   		dr_mode = "host";
>   	};
>
> -	dma-controller@07402000  {
> +	dma-controller@47402000  {
>   		status = "okay";
>   	};
>   };
> diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
> index 28ae040..77df10d 100644
> --- a/arch/arm/boot/dts/am335x-evm.dts
> +++ b/arch/arm/boot/dts/am335x-evm.dts
> @@ -331,7 +331,7 @@
>   &usb {
>   	status = "okay";
>
> -	control@44e10000 {
> +	control@44e10620 {
>   		status = "okay";
>   	};
>
> @@ -352,7 +352,7 @@
>   		dr_mode = "host";
>   	};
>
> -	dma-controller@07402000  {
> +	dma-controller@47402000  {
>   		status = "okay";
>   	};
>   };
> diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
> index ec08f6f..ab23885 100644
> --- a/arch/arm/boot/dts/am335x-evmsk.dts
> +++ b/arch/arm/boot/dts/am335x-evmsk.dts
> @@ -364,7 +364,7 @@
>   &usb {
>   	status = "okay";
>
> -	control@44e10000 {
> +	control@44e10620 {
>   		status = "okay";
>   	};
>
> @@ -385,7 +385,7 @@
>   		dr_mode = "host";
>   	};
>
> -	dma-controller@07402000  {
> +	dma-controller@47402000  {
>   		status = "okay";
>   	};
>   };
> diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi
> index 7063311..5942e7d 100644
> --- a/arch/arm/boot/dts/am335x-igep0033.dtsi
> +++ b/arch/arm/boot/dts/am335x-igep0033.dtsi
> @@ -202,7 +202,7 @@
>   &usb {
>   	status = "okay";
>
> -	control@44e10000 {
> +	control@44e10620 {
>   		status = "okay";
>   	};
>
> @@ -223,7 +223,7 @@
>   		dr_mode = "host";
>   	};
>
> -	dma-controller@07402000  {
> +	dma-controller@47402000  {
>   		status = "okay";
>   	};
>   };
>
Tony Lindgren April 23, 2014, 2:48 p.m. UTC | #2
* Benoit Cousson <bcousson@baylibre.com> [140422 07:14]:
> Hi Leigh,
> 
> On 16/04/2014 13:26, Leigh Brown wrote:
> >In "ARM: dts: am33xx: correcting dt node unit address for usb", the
> >usb_ctrl_mod and cppi41dma nodes were updated with the correct register
> >addresses.  However, the dts files that reference these nodes were not
> >updated, and those devices are no longer being enabled.
> >
> >This patch corrects the references for the affected dts files.
> 
> Thanks for the fix. BTW, why is it a RFC? Do you plan to send an updated
> version?
> 
> FYI, even with this fix, the BBB still does not have a working MUSB on
> 3.15-rc2. Have you observed that as well?
> 
> >Signed-off-by: Leigh Brown <leigh@solinno.co.uk>
> 
> If this is a final version, I'll apply it for -rc3.

Looks like I already have this in omap-for-v3.15/fixes-v2, sorry
looks like I never replied to this one.

Regards,

Tony 
 
> >---
> >  arch/arm/boot/dts/am335x-bone-common.dtsi | 4 ++--
> >  arch/arm/boot/dts/am335x-evm.dts          | 4 ++--
> >  arch/arm/boot/dts/am335x-evmsk.dts        | 4 ++--
> >  arch/arm/boot/dts/am335x-igep0033.dtsi    | 4 ++--
> >  4 files changed, 8 insertions(+), 8 deletions(-)
> >
> >diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
> >index e3f27ec..2e7d932 100644
> >--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
> >+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
> >@@ -183,7 +183,7 @@
> >  &usb {
> >  	status = "okay";
> >
> >-	control@44e10000 {
> >+	control@44e10620 {
> >  		status = "okay";
> >  	};
> >
> >@@ -204,7 +204,7 @@
> >  		dr_mode = "host";
> >  	};
> >
> >-	dma-controller@07402000  {
> >+	dma-controller@47402000  {
> >  		status = "okay";
> >  	};
> >  };
> >diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
> >index 28ae040..77df10d 100644
> >--- a/arch/arm/boot/dts/am335x-evm.dts
> >+++ b/arch/arm/boot/dts/am335x-evm.dts
> >@@ -331,7 +331,7 @@
> >  &usb {
> >  	status = "okay";
> >
> >-	control@44e10000 {
> >+	control@44e10620 {
> >  		status = "okay";
> >  	};
> >
> >@@ -352,7 +352,7 @@
> >  		dr_mode = "host";
> >  	};
> >
> >-	dma-controller@07402000  {
> >+	dma-controller@47402000  {
> >  		status = "okay";
> >  	};
> >  };
> >diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
> >index ec08f6f..ab23885 100644
> >--- a/arch/arm/boot/dts/am335x-evmsk.dts
> >+++ b/arch/arm/boot/dts/am335x-evmsk.dts
> >@@ -364,7 +364,7 @@
> >  &usb {
> >  	status = "okay";
> >
> >-	control@44e10000 {
> >+	control@44e10620 {
> >  		status = "okay";
> >  	};
> >
> >@@ -385,7 +385,7 @@
> >  		dr_mode = "host";
> >  	};
> >
> >-	dma-controller@07402000  {
> >+	dma-controller@47402000  {
> >  		status = "okay";
> >  	};
> >  };
> >diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi
> >index 7063311..5942e7d 100644
> >--- a/arch/arm/boot/dts/am335x-igep0033.dtsi
> >+++ b/arch/arm/boot/dts/am335x-igep0033.dtsi
> >@@ -202,7 +202,7 @@
> >  &usb {
> >  	status = "okay";
> >
> >-	control@44e10000 {
> >+	control@44e10620 {
> >  		status = "okay";
> >  	};
> >
> >@@ -223,7 +223,7 @@
> >  		dr_mode = "host";
> >  	};
> >
> >-	dma-controller@07402000  {
> >+	dma-controller@47402000  {
> >  		status = "okay";
> >  	};
> >  };
> >
> 
> 
> -- 
> Benoît Cousson
> BayLibre
> Embedded Linux Technology Lab
> www.baylibre.com
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ezequiel Garcia April 23, 2014, 3:17 p.m. UTC | #3
On Apr 23, Tony Lindgren wrote:
> * Benoit Cousson <bcousson@baylibre.com> [140422 07:14]:
> > Hi Leigh,
> > 
> > On 16/04/2014 13:26, Leigh Brown wrote:
> > >In "ARM: dts: am33xx: correcting dt node unit address for usb", the
> > >usb_ctrl_mod and cppi41dma nodes were updated with the correct register
> > >addresses.  However, the dts files that reference these nodes were not
> > >updated, and those devices are no longer being enabled.
> > >
> > >This patch corrects the references for the affected dts files.

Maybe someone can take care of using phandles instead?

This way, the board's dts files would be immune to such .dtsi changes.
Benoit Cousson April 23, 2014, 3:35 p.m. UTC | #4
Hi Tony,

On 23/04/2014 16:48, Tony Lindgren wrote:
> * Benoit Cousson <bcousson@baylibre.com> [140422 07:14]:
>> Hi Leigh,
>>
>> On 16/04/2014 13:26, Leigh Brown wrote:
>>> In "ARM: dts: am33xx: correcting dt node unit address for usb", the
>>> usb_ctrl_mod and cppi41dma nodes were updated with the correct register
>>> addresses.  However, the dts files that reference these nodes were not
>>> updated, and those devices are no longer being enabled.
>>>
>>> This patch corrects the references for the affected dts files.
>>
>> Thanks for the fix. BTW, why is it a RFC? Do you plan to send an updated
>> version?
>>
>> FYI, even with this fix, the BBB still does not have a working MUSB on
>> 3.15-rc2. Have you observed that as well?
>>
>>> Signed-off-by: Leigh Brown <leigh@solinno.co.uk>
>>
>> If this is a final version, I'll apply it for -rc3.
>
> Looks like I already have this in omap-for-v3.15/fixes-v2, sorry
> looks like I never replied to this one.

:-)

OK, I'll let you handle this one.

Thanks,
Benoit

>
> Regards,
>
> Tony
>
>>> ---
>>>   arch/arm/boot/dts/am335x-bone-common.dtsi | 4 ++--
>>>   arch/arm/boot/dts/am335x-evm.dts          | 4 ++--
>>>   arch/arm/boot/dts/am335x-evmsk.dts        | 4 ++--
>>>   arch/arm/boot/dts/am335x-igep0033.dtsi    | 4 ++--
>>>   4 files changed, 8 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
>>> index e3f27ec..2e7d932 100644
>>> --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
>>> +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
>>> @@ -183,7 +183,7 @@
>>>   &usb {
>>>   	status = "okay";
>>>
>>> -	control@44e10000 {
>>> +	control@44e10620 {
>>>   		status = "okay";
>>>   	};
>>>
>>> @@ -204,7 +204,7 @@
>>>   		dr_mode = "host";
>>>   	};
>>>
>>> -	dma-controller@07402000  {
>>> +	dma-controller@47402000  {
>>>   		status = "okay";
>>>   	};
>>>   };
>>> diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
>>> index 28ae040..77df10d 100644
>>> --- a/arch/arm/boot/dts/am335x-evm.dts
>>> +++ b/arch/arm/boot/dts/am335x-evm.dts
>>> @@ -331,7 +331,7 @@
>>>   &usb {
>>>   	status = "okay";
>>>
>>> -	control@44e10000 {
>>> +	control@44e10620 {
>>>   		status = "okay";
>>>   	};
>>>
>>> @@ -352,7 +352,7 @@
>>>   		dr_mode = "host";
>>>   	};
>>>
>>> -	dma-controller@07402000  {
>>> +	dma-controller@47402000  {
>>>   		status = "okay";
>>>   	};
>>>   };
>>> diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
>>> index ec08f6f..ab23885 100644
>>> --- a/arch/arm/boot/dts/am335x-evmsk.dts
>>> +++ b/arch/arm/boot/dts/am335x-evmsk.dts
>>> @@ -364,7 +364,7 @@
>>>   &usb {
>>>   	status = "okay";
>>>
>>> -	control@44e10000 {
>>> +	control@44e10620 {
>>>   		status = "okay";
>>>   	};
>>>
>>> @@ -385,7 +385,7 @@
>>>   		dr_mode = "host";
>>>   	};
>>>
>>> -	dma-controller@07402000  {
>>> +	dma-controller@47402000  {
>>>   		status = "okay";
>>>   	};
>>>   };
>>> diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi
>>> index 7063311..5942e7d 100644
>>> --- a/arch/arm/boot/dts/am335x-igep0033.dtsi
>>> +++ b/arch/arm/boot/dts/am335x-igep0033.dtsi
>>> @@ -202,7 +202,7 @@
>>>   &usb {
>>>   	status = "okay";
>>>
>>> -	control@44e10000 {
>>> +	control@44e10620 {
>>>   		status = "okay";
>>>   	};
>>>
>>> @@ -223,7 +223,7 @@
>>>   		dr_mode = "host";
>>>   	};
>>>
>>> -	dma-controller@07402000  {
>>> +	dma-controller@47402000  {
>>>   		status = "okay";
>>>   	};
>>>   };
>>>
>>
>>
>> --
>> Benoît Cousson
>> BayLibre
>> Embedded Linux Technology Lab
>> www.baylibre.com
Benoit Cousson April 23, 2014, 3:40 p.m. UTC | #5
Hi Ezequiel,

On 23/04/2014 17:17, Ezequiel Garcia wrote:
> On Apr 23, Tony Lindgren wrote:
>> * Benoit Cousson <bcousson@baylibre.com> [140422 07:14]:
>>> Hi Leigh,
>>>
>>> On 16/04/2014 13:26, Leigh Brown wrote:
>>>> In "ARM: dts: am33xx: correcting dt node unit address for usb", the
>>>> usb_ctrl_mod and cppi41dma nodes were updated with the correct register
>>>> addresses.  However, the dts files that reference these nodes were not
>>>> updated, and those devices are no longer being enabled.
>>>>
>>>> This patch corrects the references for the affected dts files.
>
> Maybe someone can take care of using phandles instead?
>
> This way, the board's dts files would be immune to such .dtsi changes.

Indeed, that will avoid such issues.

Are you volunteer for that cleanup ? :-)

Thanks,
Benoit
Ezequiel Garcia April 23, 2014, 3:48 p.m. UTC | #6
On Apr 23, Benoit Cousson wrote:
> Hi Ezequiel,
> 
> On 23/04/2014 17:17, Ezequiel Garcia wrote:
> >On Apr 23, Tony Lindgren wrote:
> >>* Benoit Cousson <bcousson@baylibre.com> [140422 07:14]:
> >>>Hi Leigh,
> >>>
> >>>On 16/04/2014 13:26, Leigh Brown wrote:
> >>>>In "ARM: dts: am33xx: correcting dt node unit address for usb", the
> >>>>usb_ctrl_mod and cppi41dma nodes were updated with the correct register
> >>>>addresses.  However, the dts files that reference these nodes were not
> >>>>updated, and those devices are no longer being enabled.
> >>>>
> >>>>This patch corrects the references for the affected dts files.
> >
> >Maybe someone can take care of using phandles instead?
> >
> >This way, the board's dts files would be immune to such .dtsi changes.
> 
> Indeed, that will avoid such issues.
> 
> Are you volunteer for that cleanup ? :-)
> 

Sure, I've already done that for my custom dts. It's a simple change.

If someone feels like doing this before I get to send the patches,
be my guest :-)
diff mbox

Patch

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index e3f27ec..2e7d932 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -183,7 +183,7 @@ 
 &usb {
 	status = "okay";
 
-	control@44e10000 {
+	control@44e10620 {
 		status = "okay";
 	};
 
@@ -204,7 +204,7 @@ 
 		dr_mode = "host";
 	};
 
-	dma-controller@07402000  {
+	dma-controller@47402000  {
 		status = "okay";
 	};
 };
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 28ae040..77df10d 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -331,7 +331,7 @@ 
 &usb {
 	status = "okay";
 
-	control@44e10000 {
+	control@44e10620 {
 		status = "okay";
 	};
 
@@ -352,7 +352,7 @@ 
 		dr_mode = "host";
 	};
 
-	dma-controller@07402000  {
+	dma-controller@47402000  {
 		status = "okay";
 	};
 };
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index ec08f6f..ab23885 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -364,7 +364,7 @@ 
 &usb {
 	status = "okay";
 
-	control@44e10000 {
+	control@44e10620 {
 		status = "okay";
 	};
 
@@ -385,7 +385,7 @@ 
 		dr_mode = "host";
 	};
 
-	dma-controller@07402000  {
+	dma-controller@47402000  {
 		status = "okay";
 	};
 };
diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi
index 7063311..5942e7d 100644
--- a/arch/arm/boot/dts/am335x-igep0033.dtsi
+++ b/arch/arm/boot/dts/am335x-igep0033.dtsi
@@ -202,7 +202,7 @@ 
 &usb {
 	status = "okay";
 
-	control@44e10000 {
+	control@44e10620 {
 		status = "okay";
 	};
 
@@ -223,7 +223,7 @@ 
 		dr_mode = "host";
 	};
 
-	dma-controller@07402000  {
+	dma-controller@47402000  {
 		status = "okay";
 	};
 };