[10/10] ARM: dts: omap4: Use "syscon-otghs" instead of "ctrl-module" in USB node
diff mbox

Message ID 1438702233-8027-11-git-send-email-kishon@ti.com
State New
Headers show

Commit Message

Kishon Vijay Abraham I Aug. 4, 2015, 3:30 p.m. UTC
Add "syscon-otghs" property and remove the deprecated "ctrl-module"
property from MUSB devicetree node.

Since "omap_control_usbotg" devicetree node is no longer used, remove
it.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 arch/arm/boot/dts/omap4.dtsi |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

Comments

Roger Quadros Aug. 5, 2015, 8:02 a.m. UTC | #1
Kishon,

On 04/08/15 18:30, Kishon Vijay Abraham I wrote:
> Add "syscon-otghs" property and remove the deprecated "ctrl-module"
> property from MUSB devicetree node.
> 
> Since "omap_control_usbotg" devicetree node is no longer used, remove
> it.
> 
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> ---
>  arch/arm/boot/dts/omap4.dtsi |    8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> index b27634d..2fb49a5 100644
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -854,12 +854,6 @@
>  			};
>  		};
>  
> -		omap_control_usbotg: control-phy@4a00233c {
> -			compatible = "ti,control-phy-otghs";
> -			reg = <0x4a00233c 0x4>;
> -			reg-names = "otghs_control";
> -		};
> -
>  		usb_otg_hs: usb_otg_hs@4a0ab000 {
>  			compatible = "ti,omap4-musb";
>  			reg = <0x4a0ab000 0x7ff>;
> @@ -872,7 +866,7 @@
>  			multipoint = <1>;
>  			num-eps = <16>;
>  			ram-bits = <12>;
> -			ctrl-module = <&omap_control_usbotg>;
> +			syscon-otghs = <&scm_conf 0x33c>;

All other properties were of the format "syscon-phy-foo".
Why use a different format here?

Other than that

Acked-by: Roger Quadros <rogerq@ti.com>

cheers,
-roger


>  		};
>  
>  		aes: aes@4b501000 {
> 
--
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
Roger Quadros Aug. 5, 2015, 8:08 a.m. UTC | #2
On 05/08/15 11:02, Roger Quadros wrote:
> Kishon,
> 
> On 04/08/15 18:30, Kishon Vijay Abraham I wrote:
>> Add "syscon-otghs" property and remove the deprecated "ctrl-module"
>> property from MUSB devicetree node.
>>
>> Since "omap_control_usbotg" devicetree node is no longer used, remove
>> it.
>>
>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>> ---
>>  arch/arm/boot/dts/omap4.dtsi |    8 +-------
>>  1 file changed, 1 insertion(+), 7 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
>> index b27634d..2fb49a5 100644
>> --- a/arch/arm/boot/dts/omap4.dtsi
>> +++ b/arch/arm/boot/dts/omap4.dtsi
>> @@ -854,12 +854,6 @@
>>  			};
>>  		};
>>  
>> -		omap_control_usbotg: control-phy@4a00233c {
>> -			compatible = "ti,control-phy-otghs";
>> -			reg = <0x4a00233c 0x4>;
>> -			reg-names = "otghs_control";
>> -		};
>> -
>>  		usb_otg_hs: usb_otg_hs@4a0ab000 {
>>  			compatible = "ti,omap4-musb";
>>  			reg = <0x4a0ab000 0x7ff>;
>> @@ -872,7 +866,7 @@
>>  			multipoint = <1>;
>>  			num-eps = <16>;
>>  			ram-bits = <12>;
>> -			ctrl-module = <&omap_control_usbotg>;
>> +			syscon-otghs = <&scm_conf 0x33c>;
> 
> All other properties were of the format "syscon-phy-foo".
> Why use a different format here?
> 

Ah, looks like we don't have a dedicated phy driver for this?
We will need to add a PHY driver I guess then and handle this register
in that driver rather than in the musb driver.

cheers,
-roger
> 
> 
>>  		};
>>  
>>  		aes: aes@4b501000 {
>>
> --
> 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
> 
--
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
Kishon Vijay Abraham I Aug. 5, 2015, 2:25 p.m. UTC | #3
Hi Roger,

On Wednesday 05 August 2015 01:38 PM, Roger Quadros wrote:
> On 05/08/15 11:02, Roger Quadros wrote:
>> Kishon,
>>
>> On 04/08/15 18:30, Kishon Vijay Abraham I wrote:
>>> Add "syscon-otghs" property and remove the deprecated "ctrl-module"
>>> property from MUSB devicetree node.
>>>
>>> Since "omap_control_usbotg" devicetree node is no longer used, remove
>>> it.
>>>
>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>>> ---
>>>  arch/arm/boot/dts/omap4.dtsi |    8 +-------
>>>  1 file changed, 1 insertion(+), 7 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
>>> index b27634d..2fb49a5 100644
>>> --- a/arch/arm/boot/dts/omap4.dtsi
>>> +++ b/arch/arm/boot/dts/omap4.dtsi
>>> @@ -854,12 +854,6 @@
>>>  			};
>>>  		};
>>>  
>>> -		omap_control_usbotg: control-phy@4a00233c {
>>> -			compatible = "ti,control-phy-otghs";
>>> -			reg = <0x4a00233c 0x4>;
>>> -			reg-names = "otghs_control";
>>> -		};
>>> -
>>>  		usb_otg_hs: usb_otg_hs@4a0ab000 {
>>>  			compatible = "ti,omap4-musb";
>>>  			reg = <0x4a0ab000 0x7ff>;
>>> @@ -872,7 +866,7 @@
>>>  			multipoint = <1>;
>>>  			num-eps = <16>;
>>>  			ram-bits = <12>;
>>> -			ctrl-module = <&omap_control_usbotg>;
>>> +			syscon-otghs = <&scm_conf 0x33c>;
>>
>> All other properties were of the format "syscon-phy-foo".
>> Why use a different format here?
>>
> 
> Ah, looks like we don't have a dedicated phy driver for this?
> We will need to add a PHY driver I guess then and handle this register
> in that driver rather than in the musb driver.

I was explaining in the other thread to Tony on why this shouldn't be done in a
PHY driver [1].

Thanks
Kishon

[1] -> https://lkml.org/lkml/2015/8/5/455
--
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
Tony Lindgren Aug. 6, 2015, 8:48 a.m. UTC | #4
* Kishon Vijay Abraham I <kishon@ti.com> [150805 07:28]:
> Hi Roger,
> 
> On Wednesday 05 August 2015 01:38 PM, Roger Quadros wrote:
> > On 05/08/15 11:02, Roger Quadros wrote:
> >> Kishon,
> >>
> >> On 04/08/15 18:30, Kishon Vijay Abraham I wrote:
> >>> Add "syscon-otghs" property and remove the deprecated "ctrl-module"
> >>> property from MUSB devicetree node.
> >>>
> >>> Since "omap_control_usbotg" devicetree node is no longer used, remove
> >>> it.
> >>>
> >>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> >>> ---
> >>>  arch/arm/boot/dts/omap4.dtsi |    8 +-------
> >>>  1 file changed, 1 insertion(+), 7 deletions(-)
> >>>
> >>> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> >>> index b27634d..2fb49a5 100644
> >>> --- a/arch/arm/boot/dts/omap4.dtsi
> >>> +++ b/arch/arm/boot/dts/omap4.dtsi
> >>> @@ -854,12 +854,6 @@
> >>>  			};
> >>>  		};
> >>>  
> >>> -		omap_control_usbotg: control-phy@4a00233c {
> >>> -			compatible = "ti,control-phy-otghs";
> >>> -			reg = <0x4a00233c 0x4>;
> >>> -			reg-names = "otghs_control";
> >>> -		};
> >>> -
> >>>  		usb_otg_hs: usb_otg_hs@4a0ab000 {
> >>>  			compatible = "ti,omap4-musb";
> >>>  			reg = <0x4a0ab000 0x7ff>;
> >>> @@ -872,7 +866,7 @@
> >>>  			multipoint = <1>;
> >>>  			num-eps = <16>;
> >>>  			ram-bits = <12>;
> >>> -			ctrl-module = <&omap_control_usbotg>;
> >>> +			syscon-otghs = <&scm_conf 0x33c>;
> >>
> >> All other properties were of the format "syscon-phy-foo".
> >> Why use a different format here?
> >>
> > 
> > Ah, looks like we don't have a dedicated phy driver for this?
> > We will need to add a PHY driver I guess then and handle this register
> > in that driver rather than in the musb driver.
> 
> I was explaining in the other thread to Tony on why this shouldn't be done in a
> PHY driver [1].

And I just suggested thhere that it should be in the drivers/phy/phy-omap-usb2.c
PHY driver instead of the MUSB driver.

Regards,

Tony 
 
> [1] -> https://lkml.org/lkml/2015/8/5/455
--
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

Patch
diff mbox

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index b27634d..2fb49a5 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -854,12 +854,6 @@ 
 			};
 		};
 
-		omap_control_usbotg: control-phy@4a00233c {
-			compatible = "ti,control-phy-otghs";
-			reg = <0x4a00233c 0x4>;
-			reg-names = "otghs_control";
-		};
-
 		usb_otg_hs: usb_otg_hs@4a0ab000 {
 			compatible = "ti,omap4-musb";
 			reg = <0x4a0ab000 0x7ff>;
@@ -872,7 +866,7 @@ 
 			multipoint = <1>;
 			num-eps = <16>;
 			ram-bits = <12>;
-			ctrl-module = <&omap_control_usbotg>;
+			syscon-otghs = <&scm_conf 0x33c>;
 		};
 
 		aes: aes@4b501000 {