[PATCH] usb: add EHCI and OHCI support for SH7757

[PATCH] usb: add EHCI and OHCI support for SH7757

[Yoshihiro Shimoda]

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 drivers/usb/host/ehci-hcd.c |    3 ++-
 drivers/usb/host/ohci-hcd.c |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 4c77a81..b5aae43 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1184,7 +1184,8 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER		ehci_mxc_driver
 #endif

-#ifdef CONFIG_CPU_SUBTYPE_SH7786
+#if defined(CONFIG_CPU_SUBTYPE_SH7757) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7785)
 #include "ehci-sh.c"
 #define PLATFORM_DRIVER		ehci_hcd_sh_driver
 #endif
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 759a12f..257974e 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1070,6 +1070,7 @@ MODULE_LICENSE ("GPL");

 #if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
     defined(CONFIG_CPU_SUBTYPE_SH7721) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7757) || \
     defined(CONFIG_CPU_SUBTYPE_SH7763) || \
     defined(CONFIG_CPU_SUBTYPE_SH7786)
 #include "ohci-sh.c"
-- 
1.7.1

Re: [PATCH] usb: add EHCI and OHCI support for SH7757

[Kuninori Morimoto]

Dear Shimoda san

> -#ifdef CONFIG_CPU_SUBTYPE_SH7786
> +#if defined(CONFIG_CPU_SUBTYPE_SH7757) || \
> +    defined(CONFIG_CPU_SUBTYPE_SH7785)

Is this miss ?
you remove 7786
and add    7785 ?
              ~

Best regards
--
Kuninori Morimoto
 

Re: [PATCH] usb: add EHCI and OHCI support for SH7757

[Yoshihiro Shimoda]

Dear Morimoto-san,

2011/02/24 17:16, Kuninori Morimoto wrote:
> 
> Dear Shimoda san
> 
>> -#ifdef CONFIG_CPU_SUBTYPE_SH7786
>> +#if defined(CONFIG_CPU_SUBTYPE_SH7757) || \
>> +    defined(CONFIG_CPU_SUBTYPE_SH7785)
> 
> Is this miss ?
> you remove 7786
> and add    7785 ?
Oh, Thank you very much! I mistook the code.
I must keep the 7786 and I would like to add 7757.
I will fix it.

Best regards,
Yoshihiro Shimoda

>               ~
> 
> Best regards
> --
> Kuninori Morimoto
>  
> 

[PATCH] usb: add EHCI and OHCI support for SH7757

[Yoshihiro Shimoda]

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 about v2:
  - fix the condition for other CPU in ehci-hcd.c.

 drivers/usb/host/ehci-hcd.c |    3 ++-
 drivers/usb/host/ohci-hcd.c |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 4c77a81..b396567 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1184,7 +1184,8 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER		ehci_mxc_driver
 #endif

-#ifdef CONFIG_CPU_SUBTYPE_SH7786
+#if defined(CONFIG_CPU_SUBTYPE_SH7757) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7786)
 #include "ehci-sh.c"
 #define PLATFORM_DRIVER		ehci_hcd_sh_driver
 #endif
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 759a12f..257974e 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1070,6 +1070,7 @@ MODULE_LICENSE ("GPL");

 #if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
     defined(CONFIG_CPU_SUBTYPE_SH7721) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7757) || \
     defined(CONFIG_CPU_SUBTYPE_SH7763) || \
     defined(CONFIG_CPU_SUBTYPE_SH7786)
 #include "ohci-sh.c"
-- 
1.7.1

Re: [PATCH] usb: add EHCI and OHCI support for SH7757

[Sergei Shtylyov]

Hello.

On 24-02-2011 10:43, Yoshihiro Shimoda wrote:

> Signed-off-by: Yoshihiro Shimoda<yoshihiro.shimoda.uh@renesas.com>
[...]

> diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
> index 4c77a81..b5aae43 100644
> --- a/drivers/usb/host/ehci-hcd.c
> +++ b/drivers/usb/host/ehci-hcd.c
> @@ -1184,7 +1184,8 @@ MODULE_LICENSE ("GPL");
>   #define PLATFORM_DRIVER		ehci_mxc_driver
>   #endif
>
> -#ifdef CONFIG_CPU_SUBTYPE_SH7786
> +#if defined(CONFIG_CPU_SUBTYPE_SH7757) || \
> +    defined(CONFIG_CPU_SUBTYPE_SH7785)

    Not CONFIG_CPU_SUBTYPE_SH7786?

>   #include "ehci-sh.c"
>   #define PLATFORM_DRIVER		ehci_hcd_sh_driver
>   #endif

WBR, Sergei

Re: [PATCH] usb: add EHCI and OHCI support for SH7757

[Yoshihiro Shimoda]

Hello Sergei,

2011/02/24 20:26, Sergei Shtylyov wrote:
> Hello.
> 
> On 24-02-2011 10:43, Yoshihiro Shimoda wrote:
> 
>> Signed-off-by: Yoshihiro Shimoda<yoshihiro.shimoda.uh@renesas.com>
> [...]
> 
>> diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
>> index 4c77a81..b5aae43 100644
>> --- a/drivers/usb/host/ehci-hcd.c
>> +++ b/drivers/usb/host/ehci-hcd.c
>> @@ -1184,7 +1184,8 @@ MODULE_LICENSE ("GPL");
>>   #define PLATFORM_DRIVER		ehci_mxc_driver
>>   #endif
>>
>> -#ifdef CONFIG_CPU_SUBTYPE_SH7786
>> +#if defined(CONFIG_CPU_SUBTYPE_SH7757) || \
>> +    defined(CONFIG_CPU_SUBTYPE_SH7785)
> 
>     Not CONFIG_CPU_SUBTYPE_SH7786?
Thank you very much for your point!
I re-submitted a fixed patch yesterday.

Best regards,
Yoshihiro Shimoda

>>   #include "ehci-sh.c"
>>   #define PLATFORM_DRIVER		ehci_hcd_sh_driver
>>   #endif
> 
> WBR, Sergei
> 


-- 
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

Re: [PATCH] usb: add EHCI and OHCI support for SH7757

[Paul Mundt]

On Thu, Feb 24, 2011 at 06:47:10PM +0900, Yoshihiro Shimoda wrote:
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> ---
>  about v2:
>   - fix the condition for other CPU in ehci-hcd.c.
> 
And how exactly are you enabling this when the 7757 Kconfig entry doesn't
select either of USB_ARCH_HAS_OHCI or USB_ARCH_HAS_EHCI?

Re: [PATCH] usb: add EHCI and OHCI support for SH7757

[Yoshihiro Shimoda]

Hi Paul,

2011/02/25 12:19, Paul Mundt wrote:
> On Thu, Feb 24, 2011 at 06:47:10PM +0900, Yoshihiro Shimoda wrote:
>> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
>> ---
>>  about v2:
>>   - fix the condition for other CPU in ehci-hcd.c.
>>
> And how exactly are you enabling this when the 7757 Kconfig entry doesn't
> select either of USB_ARCH_HAS_OHCI or USB_ARCH_HAS_EHCI?
> 
I intended to submit a patch which modified Kconfig after this patch applied.
But I should also have submitted the patch together.
I will submit it and other necessary patches　to linux-sh ml.

Best regards,
Yoshihiro Shimoda

Re: [PATCH] usb: add EHCI and OHCI support for SH7757

[David Daney]

On 02/24/2011 01:47 AM, Yoshihiro Shimoda wrote:
> Signed-off-by: Yoshihiro Shimoda<yoshihiro.shimoda.uh@renesas.com>
> ---
>   about v2:
>    - fix the condition for other CPU in ehci-hcd.c.
>
>   drivers/usb/host/ehci-hcd.c |    3 ++-
>   drivers/usb/host/ohci-hcd.c |    1 +
>   2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
> index 4c77a81..b396567 100644
> --- a/drivers/usb/host/ehci-hcd.c
> +++ b/drivers/usb/host/ehci-hcd.c
> @@ -1184,7 +1184,8 @@ MODULE_LICENSE ("GPL");
>   #define PLATFORM_DRIVER		ehci_mxc_driver
>   #endif
>
> -#ifdef CONFIG_CPU_SUBTYPE_SH7786
> +#if defined(CONFIG_CPU_SUBTYPE_SH7757) || \
> +    defined(CONFIG_CPU_SUBTYPE_SH7786)
>   #include "ehci-sh.c"
>   #define PLATFORM_DRIVER		ehci_hcd_sh_driver
>   #endif
> diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
> index 759a12f..257974e 100644
> --- a/drivers/usb/host/ohci-hcd.c
> +++ b/drivers/usb/host/ohci-hcd.c
> @@ -1070,6 +1070,7 @@ MODULE_LICENSE ("GPL");
>
>   #if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
>       defined(CONFIG_CPU_SUBTYPE_SH7721) || \
> +    defined(CONFIG_CPU_SUBTYPE_SH7757) || \
>       defined(CONFIG_CPU_SUBTYPE_SH7763) || \
>       defined(CONFIG_CPU_SUBTYPE_SH7786)
>   #include "ohci-sh.c"

I wonder if all that #ifdefery could be moved into the arch/sh Kconfig.

Patching the core ehci/ohci code each time a new sh CPU variant is 
released seems like the wrong approach.

David Daney

Re: [PATCH] usb: add EHCI and OHCI support for SH7757

[Greg KH]

On Fri, Feb 25, 2011 at 01:26:18PM +0900, Yoshihiro Shimoda wrote:
> Hi Paul,
> 
> 2011/02/25 12:19, Paul Mundt wrote:
> > On Thu, Feb 24, 2011 at 06:47:10PM +0900, Yoshihiro Shimoda wrote:
> >> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> >> ---
> >>  about v2:
> >>   - fix the condition for other CPU in ehci-hcd.c.
> >>
> > And how exactly are you enabling this when the 7757 Kconfig entry doesn't
> > select either of USB_ARCH_HAS_OHCI or USB_ARCH_HAS_EHCI?
> > 
> I intended to submit a patch which modified Kconfig after this patch applied.
> But I should also have submitted the patch together.
> I will submit it and other necessary patches　to linux-sh ml.

Ok, then I will drop this one from my queue.

For such simple config patches, they can go through the sh tree, no need
to go through the usb one.

thanks,

greg k-h

Re: [PATCH] usb: add EHCI and OHCI support for SH7757

[Yoshihiro Shimoda]

Hi David,

2011/02/26 3:41, David Daney wrote:
>> diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
>> index 759a12f..257974e 100644
>> --- a/drivers/usb/host/ohci-hcd.c
>> +++ b/drivers/usb/host/ohci-hcd.c
>> @@ -1070,6 +1070,7 @@ MODULE_LICENSE ("GPL");
>>
>>   #if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
>>       defined(CONFIG_CPU_SUBTYPE_SH7721) || \
>> +    defined(CONFIG_CPU_SUBTYPE_SH7757) || \
>>       defined(CONFIG_CPU_SUBTYPE_SH7763) || \
>>       defined(CONFIG_CPU_SUBTYPE_SH7786)
>>   #include "ohci-sh.c"
> 
> I wonder if all that #ifdefery could be moved into the arch/sh Kconfig.
> 
> Patching the core ehci/ohci code each time a new sh CPU variant is 
> released seems like the wrong approach.

Thank you very much for your comment. I think so.
So I will move it into the drivers/usb/host Kconfig because
the Kconfig has some configs for architecture dependency.

Best regards,
Yoshihiro Shimoda

> David Daney
>