diff mbox

[v2] ARM: shmobile: r8a7790: link PCI USB devices to USB PHY

Message ID 201405270217.33057.sergei.shtylyov@cogentembedded.com (mailing list archive)
State Changes Requested
Headers show

Commit Message

Sergei Shtylyov May 26, 2014, 10:17 p.m. UTC
Describe the PCI USB devices that are behind the PCI bridges, adding necessary
links to the USB PHY device.

Based on the original work by Ben Dooks <ben.dooks@codethink.co.uk>.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
This patch is against 'renesas-devel-v3.15-rc7-20140526' tag of Simon Horman's
'renesas.git' repo plus R8A7790/Lager PCI and USB PHY support patches posted
before. The patch requires the internal PCI DT support, USB PHY driver, and
USB HCD generic PHY support (also already posted) in order to work.

Changes in version 2:
- renamed the PCI OHCI/EHCI device nodes to comply with the PCI binding;
- changed the PHY specifier in the PCI#2 node to reflect that channel #1 support
  was dropped;
- resolved rejects, refreshed the patch.

 arch/arm/boot/dts/r8a7790.dtsi |   28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Magnus Damm May 26, 2014, 10:36 p.m. UTC | #1
On Tue, May 27, 2014 at 7:17 AM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> Describe the PCI USB devices that are behind the PCI bridges, adding necessary
> links to the USB PHY device.
>
> Based on the original work by Ben Dooks <ben.dooks@codethink.co.uk>.
>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>
> ---
> This patch is against 'renesas-devel-v3.15-rc7-20140526' tag of Simon Horman's
> 'renesas.git' repo plus R8A7790/Lager PCI and USB PHY support patches posted
> before. The patch requires the internal PCI DT support, USB PHY driver, and
> USB HCD generic PHY support (also already posted) in order to work.
>
> Changes in version 2:
> - renamed the PCI OHCI/EHCI device nodes to comply with the PCI binding;
> - changed the PHY specifier in the PCI#2 node to reflect that channel #1 support
>   was dropped;
> - resolved rejects, refreshed the patch.
>
>  arch/arm/boot/dts/r8a7790.dtsi |   28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
>
> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi
> ===================================================================
> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi
> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi
> @@ -919,6 +919,20 @@
>                 interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
>                                  0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
>                                  0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;
> +
> +               usb@0,1 {
> +                       reg = <0x800 0 0 0 0>;
> +                       device_type = "pci";
> +                       phys = <&usbphy 0 0>;
> +                       phy-names = "usb";
> +               };
> +
> +               usb@0,2 {
> +                       reg = <0x1000 0 0 0 0>;
> +                       device_type = "pci";
> +                       phys = <&usbphy 0 0>;
> +                       phy-names = "usb";
> +               };
>         };
>
>         pci1: pci@ee0b0000 {
> @@ -955,5 +969,19 @@
>                 interrupt-map = <0x0000 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
>                                  0x0800 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
>                                  0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
> +
> +               usb@0,1 {
> +                       reg = <0x800 0 0 0 0>;
> +                       device_type = "pci";
> +                       phys = <&usbphy 1 0>;
> +                       phy-names = "usb";
> +               };
> +
> +               usb@0,2 {
> +                       reg = <0x1000 0 0 0 0>;
> +                       device_type = "pci";
> +                       phys = <&usbphy 1 0>;
> +                       phy-names = "usb";
> +               };
>         };
>  };

Hi Sergei,

Above I see two hunks of DTS code but my r8a7790 data sheet contains
three USB PCI devices. Perhaps my understanding is wrong, or may there
is some other patch available to enable all USB PCI devices included
in the SoC?

Thanks,

/ magnus
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sergei Shtylyov May 26, 2014, 10:46 p.m. UTC | #2
Hello.

On 05/27/2014 02:36 AM, Magnus Damm wrote:

>> Describe the PCI USB devices that are behind the PCI bridges, adding necessary
>> links to the USB PHY device.

>> Based on the original work by Ben Dooks <ben.dooks@codethink.co.uk>.

>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

>> ---
>> This patch is against 'renesas-devel-v3.15-rc7-20140526' tag of Simon Horman's
>> 'renesas.git' repo plus R8A7790/Lager PCI and USB PHY support patches posted
>> before. The patch requires the internal PCI DT support, USB PHY driver, and
>> USB HCD generic PHY support (also already posted) in order to work.

>> Changes in version 2:
>> - renamed the PCI OHCI/EHCI device nodes to comply with the PCI binding;
>> - changed the PHY specifier in the PCI#2 node to reflect that channel #1 support
>>    was dropped;
>> - resolved rejects, refreshed the patch.

>>   arch/arm/boot/dts/r8a7790.dtsi |   28 ++++++++++++++++++++++++++++
>>   1 file changed, 28 insertions(+)

>> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi
>> ===================================================================
>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi
>> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi
>> @@ -919,6 +919,20 @@
>>                  interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
>>                                   0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
>>                                   0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;
>> +
>> +               usb@0,1 {
>> +                       reg = <0x800 0 0 0 0>;
>> +                       device_type = "pci";
>> +                       phys = <&usbphy 0 0>;
>> +                       phy-names = "usb";
>> +               };
>> +
>> +               usb@0,2 {
>> +                       reg = <0x1000 0 0 0 0>;
>> +                       device_type = "pci";
>> +                       phys = <&usbphy 0 0>;
>> +                       phy-names = "usb";
>> +               };
>>          };
>>
>>          pci1: pci@ee0b0000 {
>> @@ -955,5 +969,19 @@
>>                  interrupt-map = <0x0000 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
>>                                   0x0800 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
>>                                   0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
>> +
>> +               usb@0,1 {
>> +                       reg = <0x800 0 0 0 0>;
>> +                       device_type = "pci";
>> +                       phys = <&usbphy 1 0>;
>> +                       phy-names = "usb";
>> +               };
>> +
>> +               usb@0,2 {
>> +                       reg = <0x1000 0 0 0 0>;
>> +                       device_type = "pci";
>> +                       phys = <&usbphy 1 0>;
>> +                       phy-names = "usb";
>> +               };
>>          };
>>   };

> Hi Sergei,

> Above I see two hunks of DTS code but my r8a7790 data sheet contains
> three USB PCI devices. Perhaps my understanding is wrong, or may there

    You probably wanted to say 6 (OHCI and EHCI are 2 different PCI devices).

> is some other patch available to enable all USB PCI devices included
> in the SoC?

    This patch doesn't enable USB devices, it just links them to the PHY where 
it makes sense (for USB channel #1 it doesn't).

> Thanks,
> / magnus

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Magnus Damm May 27, 2014, 12:41 a.m. UTC | #3
On Tue, May 27, 2014 at 7:46 AM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> On 05/27/2014 02:36 AM, Magnus Damm wrote:
>
>>> Describe the PCI USB devices that are behind the PCI bridges, adding
>>> necessary
>>> links to the USB PHY device.
>
>
>>> Based on the original work by Ben Dooks <ben.dooks@codethink.co.uk>.
>
>
>>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>
>
>>> ---
>>> This patch is against 'renesas-devel-v3.15-rc7-20140526' tag of Simon
>>> Horman's
>>> 'renesas.git' repo plus R8A7790/Lager PCI and USB PHY support patches
>>> posted
>>> before. The patch requires the internal PCI DT support, USB PHY driver,
>>> and
>>> USB HCD generic PHY support (also already posted) in order to work.
>
>
>>> Changes in version 2:
>>> - renamed the PCI OHCI/EHCI device nodes to comply with the PCI binding;
>>> - changed the PHY specifier in the PCI#2 node to reflect that channel #1
>>> support
>>>    was dropped;
>>> - resolved rejects, refreshed the patch.
>
>
>>>   arch/arm/boot/dts/r8a7790.dtsi |   28 ++++++++++++++++++++++++++++
>>>   1 file changed, 28 insertions(+)
>
>
>>> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi
>>> ===================================================================
>>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi
>>> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi
>>> @@ -919,6 +919,20 @@
>>>                  interrupt-map = <0x0000 0 0 1 &gic 0 108
>>> IRQ_TYPE_LEVEL_HIGH
>>>                                   0x0800 0 0 1 &gic 0 108
>>> IRQ_TYPE_LEVEL_HIGH
>>>                                   0x1000 0 0 2 &gic 0 108
>>> IRQ_TYPE_LEVEL_HIGH>;
>>> +
>>> +               usb@0,1 {
>>> +                       reg = <0x800 0 0 0 0>;
>>> +                       device_type = "pci";
>>> +                       phys = <&usbphy 0 0>;
>>> +                       phy-names = "usb";
>>> +               };
>>> +
>>> +               usb@0,2 {
>>> +                       reg = <0x1000 0 0 0 0>;
>>> +                       device_type = "pci";
>>> +                       phys = <&usbphy 0 0>;
>>> +                       phy-names = "usb";
>>> +               };
>>>          };
>>>
>>>          pci1: pci@ee0b0000 {
>>> @@ -955,5 +969,19 @@
>>>                  interrupt-map = <0x0000 0 0 1 &gic 0 113
>>> IRQ_TYPE_LEVEL_HIGH
>>>                                   0x0800 0 0 1 &gic 0 113
>>> IRQ_TYPE_LEVEL_HIGH
>>>                                   0x1000 0 0 2 &gic 0 113
>>> IRQ_TYPE_LEVEL_HIGH>;
>>> +
>>> +               usb@0,1 {
>>> +                       reg = <0x800 0 0 0 0>;
>>> +                       device_type = "pci";
>>> +                       phys = <&usbphy 1 0>;
>>> +                       phy-names = "usb";
>>> +               };
>>> +
>>> +               usb@0,2 {
>>> +                       reg = <0x1000 0 0 0 0>;
>>> +                       device_type = "pci";
>>> +                       phys = <&usbphy 1 0>;
>>> +                       phy-names = "usb";
>>> +               };
>>>          };
>>>   };
>
>
>> Hi Sergei,
>
>
>> Above I see two hunks of DTS code but my r8a7790 data sheet contains
>> three USB PCI devices. Perhaps my understanding is wrong, or may there
>
>
>    You probably wanted to say 6 (OHCI and EHCI are 2 different PCI devices).

Sure. I guess it depends on if you count PCI host controllers or USB
host controllers..

>> is some other patch available to enable all USB PCI devices included
>> in the SoC?
>
>
>    This patch doesn't enable USB devices, it just links them to the PHY
> where it makes sense (for USB channel #1 it doesn't).

I know we've discussed this before, and for USB channel #1 you tend to
say that the PHY is not necessary for operation. From my side I am not
so sure. Over the months I seen several shortcuts and missing pieces
so for now just assume this is another rushed attempt. As usual I
would like to make sure the dependencies are correctly described in DT
before merging anything.

Like I mentioned earlier there are shared bits in UGCTRL register in
the PHY. Those may or may not affect USB channel #1. Furthermore, on
top of this we have the MSTP bit for the PHY that may or may not be
related to USB channel #1.

My opinion is that if the USB PHY requires the MSTP clock to be
enabled when using USB channel #1 _or_ the UGCTRL bits affect the USB
Channel #1 then DT needs to point out the relationship between the PHY
and the USB Host so Runtime PM can be used in the PHY driver to
dynamically manage the clock.

Thanks,

/ magnus
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sergei Shtylyov May 28, 2014, 9:51 p.m. UTC | #4
Hello.

On 05/27/2014 04:41 AM, Magnus Damm wrote:

>>>> Describe the PCI USB devices that are behind the PCI bridges, adding
>>>> necessary
>>>> links to the USB PHY device.

>>>> Based on the original work by Ben Dooks <ben.dooks@codethink.co.uk>.

>>>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

>>>> ---
>>>> This patch is against 'renesas-devel-v3.15-rc7-20140526' tag of Simon
>>>> Horman's
>>>> 'renesas.git' repo plus R8A7790/Lager PCI and USB PHY support patches
>>>> posted
>>>> before. The patch requires the internal PCI DT support, USB PHY driver,
>>>> and
>>>> USB HCD generic PHY support (also already posted) in order to work.

>>>> Changes in version 2:
>>>> - renamed the PCI OHCI/EHCI device nodes to comply with the PCI binding;
>>>> - changed the PHY specifier in the PCI#2 node to reflect that channel #1
>>>> support
>>>>     was dropped;
>>>> - resolved rejects, refreshed the patch.

>>>>    arch/arm/boot/dts/r8a7790.dtsi |   28 ++++++++++++++++++++++++++++
>>>>    1 file changed, 28 insertions(+)

>>>> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi
>>>> ===================================================================
>>>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi
>>>> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi
>>>> @@ -919,6 +919,20 @@
>>>>                   interrupt-map = <0x0000 0 0 1 &gic 0 108
>>>> IRQ_TYPE_LEVEL_HIGH
>>>>                                    0x0800 0 0 1 &gic 0 108
>>>> IRQ_TYPE_LEVEL_HIGH
>>>>                                    0x1000 0 0 2 &gic 0 108
>>>> IRQ_TYPE_LEVEL_HIGH>;
>>>> +
>>>> +               usb@0,1 {
>>>> +                       reg = <0x800 0 0 0 0>;
>>>> +                       device_type = "pci";
>>>> +                       phys = <&usbphy 0 0>;
>>>> +                       phy-names = "usb";
>>>> +               };
>>>> +
>>>> +               usb@0,2 {
>>>> +                       reg = <0x1000 0 0 0 0>;
>>>> +                       device_type = "pci";
>>>> +                       phys = <&usbphy 0 0>;
>>>> +                       phy-names = "usb";
>>>> +               };
>>>>           };
>>>>
>>>>           pci1: pci@ee0b0000 {
>>>> @@ -955,5 +969,19 @@
>>>>                   interrupt-map = <0x0000 0 0 1 &gic 0 113
>>>> IRQ_TYPE_LEVEL_HIGH
>>>>                                    0x0800 0 0 1 &gic 0 113
>>>> IRQ_TYPE_LEVEL_HIGH
>>>>                                    0x1000 0 0 2 &gic 0 113
>>>> IRQ_TYPE_LEVEL_HIGH>;
>>>> +
>>>> +               usb@0,1 {
>>>> +                       reg = <0x800 0 0 0 0>;
>>>> +                       device_type = "pci";
>>>> +                       phys = <&usbphy 1 0>;
>>>> +                       phy-names = "usb";
>>>> +               };
>>>> +
>>>> +               usb@0,2 {
>>>> +                       reg = <0x1000 0 0 0 0>;
>>>> +                       device_type = "pci";
>>>> +                       phys = <&usbphy 1 0>;
>>>> +                       phy-names = "usb";
>>>> +               };
>>>>           };
>>>>    };

>>> Hi Sergei,

>>> Above I see two hunks of DTS code but my r8a7790 data sheet contains
>>> three USB PCI devices. Perhaps my understanding is wrong, or may there

>>     You probably wanted to say 6 (OHCI and EHCI are 2 different PCI devices).

> Sure. I guess it depends on if you count PCI host controllers or USB
> host controllers..

    You said "USB PCI devices", so I thought you meant the latter.

>>> is some other patch available to enable all USB PCI devices included
>>> in the SoC?

>>     This patch doesn't enable USB devices, it just links them to the PHY
>> where it makes sense (for USB channel #1 it doesn't).

> I know we've discussed this before, and for USB channel #1 you tend to
> say that the PHY is not necessary for operation. From my side I am not
> so sure. Over the months I seen several shortcuts and missing pieces
> so for now just assume this is another rushed attempt. As usual I
> would like to make sure the dependencies are correctly described in DT
> before merging anything.

> Like I mentioned earlier there are shared bits in UGCTRL register in

    Did you mean UGCTRL or UGCTRL2 register? My testing didn't prove that the 
UGCTRL bits (CONNECT and PLLRESET) affect anything but the USBHS controller -- 
my PHY driver only touches these bits if the PHY selected corresponds to the 
USBHS itself (which is not supported by DT yet)...

> the PHY. Those may or may not affect USB channel #1. Furthermore, on
> top of this we have the MSTP bit for the PHY that may or may not be
> related to USB channel #1.

    There is no MSTP bit for the PHY, there's MSTP bit for USBHS controller of 
which this PHY is a part.

> My opinion is that if the USB PHY requires the MSTP clock to be
> enabled when using USB channel #1 _or_ the UGCTRL bits affect the USB
> Channel #1 then DT needs to point out the relationship between the PHY
> and the USB Host

    I agree and I can conduct some additional tests only linking the USB 
channel #1 to the PHY driver, and hence enabling the USBHS clock only for it...

> so Runtime PM can be used in the PHY driver to
> dynamically manage the clock.

    Er, do you insist on using the runtime PM vs clock API? I'm not yet sure 
it'll work with a named clock...

> Thanks,
> / magnus

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sergei Shtylyov June 4, 2014, 8:03 p.m. UTC | #5
Hello.

On 05/29/2014 01:51 AM, Sergei Shtylyov wrote:

>>>>> Describe the PCI USB devices that are behind the PCI bridges, adding
>>>>> necessary
>>>>> links to the USB PHY device.

>>>>> Based on the original work by Ben Dooks <ben.dooks@codethink.co.uk>.

>>>>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

>>>>> ---
>>>>> This patch is against 'renesas-devel-v3.15-rc7-20140526' tag of Simon
>>>>> Horman's
>>>>> 'renesas.git' repo plus R8A7790/Lager PCI and USB PHY support patches
>>>>> posted
>>>>> before. The patch requires the internal PCI DT support, USB PHY driver,
>>>>> and
>>>>> USB HCD generic PHY support (also already posted) in order to work.

>>>>> Changes in version 2:
>>>>> - renamed the PCI OHCI/EHCI device nodes to comply with the PCI binding;
>>>>> - changed the PHY specifier in the PCI#2 node to reflect that channel #1
>>>>> support
>>>>>     was dropped;
>>>>> - resolved rejects, refreshed the patch.

>>>>>    arch/arm/boot/dts/r8a7790.dtsi |   28 ++++++++++++++++++++++++++++
>>>>>    1 file changed, 28 insertions(+)

>>>>> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi
>>>>> ===================================================================
>>>>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi
>>>>> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi
>>>>> @@ -919,6 +919,20 @@
>>>>>                   interrupt-map = <0x0000 0 0 1 &gic 0 108
>>>>> IRQ_TYPE_LEVEL_HIGH
>>>>>                                    0x0800 0 0 1 &gic 0 108
>>>>> IRQ_TYPE_LEVEL_HIGH
>>>>>                                    0x1000 0 0 2 &gic 0 108
>>>>> IRQ_TYPE_LEVEL_HIGH>;
>>>>> +
>>>>> +               usb@0,1 {
>>>>> +                       reg = <0x800 0 0 0 0>;
>>>>> +                       device_type = "pci";
>>>>> +                       phys = <&usbphy 0 0>;
>>>>> +                       phy-names = "usb";
>>>>> +               };
>>>>> +
>>>>> +               usb@0,2 {
>>>>> +                       reg = <0x1000 0 0 0 0>;
>>>>> +                       device_type = "pci";
>>>>> +                       phys = <&usbphy 0 0>;
>>>>> +                       phy-names = "usb";
>>>>> +               };
>>>>>           };
>>>>>
>>>>>           pci1: pci@ee0b0000 {
>>>>> @@ -955,5 +969,19 @@
>>>>>                   interrupt-map = <0x0000 0 0 1 &gic 0 113
>>>>> IRQ_TYPE_LEVEL_HIGH
>>>>>                                    0x0800 0 0 1 &gic 0 113
>>>>> IRQ_TYPE_LEVEL_HIGH
>>>>>                                    0x1000 0 0 2 &gic 0 113
>>>>> IRQ_TYPE_LEVEL_HIGH>;
>>>>> +
>>>>> +               usb@0,1 {
>>>>> +                       reg = <0x800 0 0 0 0>;
>>>>> +                       device_type = "pci";
>>>>> +                       phys = <&usbphy 1 0>;
>>>>> +                       phy-names = "usb";
>>>>> +               };
>>>>> +
>>>>> +               usb@0,2 {
>>>>> +                       reg = <0x1000 0 0 0 0>;
>>>>> +                       device_type = "pci";
>>>>> +                       phys = <&usbphy 1 0>;
>>>>> +                       phy-names = "usb";
>>>>> +               };
>>>>>           };
>>>>>    };

[...]

>> I know we've discussed this before, and for USB channel #1 you tend to
>> say that the PHY is not necessary for operation. From my side I am not
>> so sure. Over the months I seen several shortcuts and missing pieces
>> so for now just assume this is another rushed attempt. As usual I
>> would like to make sure the dependencies are correctly described in DT
>> before merging anything.

>> Like I mentioned earlier there are shared bits in UGCTRL register in

>     Did you mean UGCTRL or UGCTRL2 register? My testing didn't prove that the
> UGCTRL bits (CONNECT and PLLRESET) affect anything but the USBHS controller --
> my PHY driver only touches these bits if the PHY selected corresponds to the
> USBHS itself (which is not supported by DT yet)...

>> the PHY. Those may or may not affect USB channel #1. Furthermore, on
>> top of this we have the MSTP bit for the PHY that may or may not be
>> related to USB channel #1.

>     There is no MSTP bit for the PHY, there's MSTP bit for USBHS controller of
> which this PHY is a part.

>> My opinion is that if the USB PHY requires the MSTP clock to be
>> enabled when using USB channel #1 _or_ the UGCTRL bits affect the USB
>> Channel #1 then DT needs to point out the relationship between the PHY
>> and the USB Host

>     I agree and I can conduct some additional tests only linking the USB
> channel #1 to the PHY driver, and hence enabling the USBHS clock only for it...

    OK, I've done additional testing and USB channel #1 on R8A7790 works 
regardless of the USBHS clock being enabled or not.

>> Thanks,
>> / magnus

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Magnus Damm June 5, 2014, 12:43 a.m. UTC | #6
On Thu, Jun 5, 2014 at 5:03 AM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> Hello.
>
>
> On 05/29/2014 01:51 AM, Sergei Shtylyov wrote:
>
>>>>>> Describe the PCI USB devices that are behind the PCI bridges, adding
>>>>>> necessary
>>>>>> links to the USB PHY device.
>
>
>>>>>> Based on the original work by Ben Dooks <ben.dooks@codethink.co.uk>.
>
>
>>>>>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>
>
>>>>>> ---
>>>>>> This patch is against 'renesas-devel-v3.15-rc7-20140526' tag of Simon
>>>>>> Horman's
>>>>>> 'renesas.git' repo plus R8A7790/Lager PCI and USB PHY support patches
>>>>>> posted
>>>>>> before. The patch requires the internal PCI DT support, USB PHY
>>>>>> driver,
>>>>>> and
>>>>>> USB HCD generic PHY support (also already posted) in order to work.
>
>
>>>>>> Changes in version 2:
>>>>>> - renamed the PCI OHCI/EHCI device nodes to comply with the PCI
>>>>>> binding;
>>>>>> - changed the PHY specifier in the PCI#2 node to reflect that channel
>>>>>> #1
>>>>>> support
>>>>>>     was dropped;
>>>>>> - resolved rejects, refreshed the patch.
>
>
>>>>>>    arch/arm/boot/dts/r8a7790.dtsi |   28 ++++++++++++++++++++++++++++
>>>>>>    1 file changed, 28 insertions(+)
>
>
>>>>>> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi
>>>>>> ===================================================================
>>>>>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi
>>>>>> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi
>>>>>> @@ -919,6 +919,20 @@
>>>>>>                   interrupt-map = <0x0000 0 0 1 &gic 0 108
>>>>>> IRQ_TYPE_LEVEL_HIGH
>>>>>>                                    0x0800 0 0 1 &gic 0 108
>>>>>> IRQ_TYPE_LEVEL_HIGH
>>>>>>                                    0x1000 0 0 2 &gic 0 108
>>>>>> IRQ_TYPE_LEVEL_HIGH>;
>>>>>> +
>>>>>> +               usb@0,1 {
>>>>>> +                       reg = <0x800 0 0 0 0>;
>>>>>> +                       device_type = "pci";
>>>>>> +                       phys = <&usbphy 0 0>;
>>>>>> +                       phy-names = "usb";
>>>>>> +               };
>>>>>> +
>>>>>> +               usb@0,2 {
>>>>>> +                       reg = <0x1000 0 0 0 0>;
>>>>>> +                       device_type = "pci";
>>>>>> +                       phys = <&usbphy 0 0>;
>>>>>> +                       phy-names = "usb";
>>>>>> +               };
>>>>>>           };
>>>>>>
>>>>>>           pci1: pci@ee0b0000 {
>>>>>> @@ -955,5 +969,19 @@
>>>>>>                   interrupt-map = <0x0000 0 0 1 &gic 0 113
>>>>>> IRQ_TYPE_LEVEL_HIGH
>>>>>>                                    0x0800 0 0 1 &gic 0 113
>>>>>> IRQ_TYPE_LEVEL_HIGH
>>>>>>                                    0x1000 0 0 2 &gic 0 113
>>>>>> IRQ_TYPE_LEVEL_HIGH>;
>>>>>> +
>>>>>> +               usb@0,1 {
>>>>>> +                       reg = <0x800 0 0 0 0>;
>>>>>> +                       device_type = "pci";
>>>>>> +                       phys = <&usbphy 1 0>;
>>>>>> +                       phy-names = "usb";
>>>>>> +               };
>>>>>> +
>>>>>> +               usb@0,2 {
>>>>>> +                       reg = <0x1000 0 0 0 0>;
>>>>>> +                       device_type = "pci";
>>>>>> +                       phys = <&usbphy 1 0>;
>>>>>> +                       phy-names = "usb";
>>>>>> +               };
>>>>>>           };
>>>>>>    };
>
>
> [...]
>
>
>>> I know we've discussed this before, and for USB channel #1 you tend to
>>> say that the PHY is not necessary for operation. From my side I am not
>>> so sure. Over the months I seen several shortcuts and missing pieces
>>> so for now just assume this is another rushed attempt. As usual I
>>> would like to make sure the dependencies are correctly described in DT
>>> before merging anything.
>
>
>>> Like I mentioned earlier there are shared bits in UGCTRL register in
>
>
>>     Did you mean UGCTRL or UGCTRL2 register? My testing didn't prove that
>> the
>> UGCTRL bits (CONNECT and PLLRESET) affect anything but the USBHS
>> controller --
>> my PHY driver only touches these bits if the PHY selected corresponds to
>> the
>> USBHS itself (which is not supported by DT yet)...
>
>
>>> the PHY. Those may or may not affect USB channel #1. Furthermore, on
>>> top of this we have the MSTP bit for the PHY that may or may not be
>>> related to USB channel #1.
>
>
>>     There is no MSTP bit for the PHY, there's MSTP bit for USBHS
>> controller of
>> which this PHY is a part.
>
>
>>> My opinion is that if the USB PHY requires the MSTP clock to be
>>> enabled when using USB channel #1 _or_ the UGCTRL bits affect the USB
>>> Channel #1 then DT needs to point out the relationship between the PHY
>>> and the USB Host
>
>
>>     I agree and I can conduct some additional tests only linking the USB
>> channel #1 to the PHY driver, and hence enabling the USBHS clock only for
>> it...
>
>
>    OK, I've done additional testing and USB channel #1 on R8A7790 works
> regardless of the USBHS clock being enabled or not.

Thanks for testing! So I suppose this means that we can manage the USB
PHY clock used for channel #0 and #2 independently of channel #1?

Cheers,

/ magnus
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

Index: renesas/arch/arm/boot/dts/r8a7790.dtsi
===================================================================
--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi
+++ renesas/arch/arm/boot/dts/r8a7790.dtsi
@@ -919,6 +919,20 @@ 
 		interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
 			      	 0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
 			      	 0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;
+
+		usb@0,1 {
+			reg = <0x800 0 0 0 0>;
+			device_type = "pci";
+			phys = <&usbphy 0 0>;
+			phy-names = "usb";
+		};
+
+		usb@0,2 {
+			reg = <0x1000 0 0 0 0>;
+			device_type = "pci";
+			phys = <&usbphy 0 0>;
+			phy-names = "usb";
+		};
 	};
 
 	pci1: pci@ee0b0000 {
@@ -955,5 +969,19 @@ 
 		interrupt-map = <0x0000 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
 			      	 0x0800 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
 			      	 0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
+
+		usb@0,1 {
+			reg = <0x800 0 0 0 0>;
+			device_type = "pci";
+			phys = <&usbphy 1 0>;
+			phy-names = "usb";
+		};
+
+		usb@0,2 {
+			reg = <0x1000 0 0 0 0>;
+			device_type = "pci";
+			phys = <&usbphy 1 0>;
+			phy-names = "usb";
+		};
 	};
 };