Patchwork [GIT,PULL,v2] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7

login
register
mail settings
Submitter Simon Horman
Date Aug. 31, 2012, 1:28 a.m.
Message ID <1346376502-12114-1-git-send-email-horms@verge.net.au>
Download mbox
Permalink /patch/180890/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git marzen

Comments

Simon Horman - Aug. 31, 2012, 1:28 a.m.
Hi Olof, Hi Arnd,

please consider the following enhancements to the Marzen board
and r8a7779 SoC by Phil Edworthy, Morimoto-san and myself for 3.7.

* This pull requests superceedes the previous request,
  "[GIT PULL v2] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7"
  which I made earlier today. The difference to that request is that
  I have pushed one more patch. There was no rebase.

* This pull request is based on the usb-next branch of Greg KH's USB tree,
  git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git,
  which is based on v3.6-rc3.

  This is to satisfy compile-time dependencies.
  Please let me know if you would like this handled a different way.

----------------------------------------------------------------
The following changes since commit a7bdf7fa33127bf08eb0810698bca607a9462df4:

  Merge v3.6-rc3 into usb-next (2012-08-27 07:15:30 -0700)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git marzen

for you to fetch changes up to 3553395437f2ac42a73255a0ffac09efc9acf5c4:

  ARM: shmobile: marzen: add USB OHCI driver support (2012-08-31 09:41:44 +0900)

----------------------------------------------------------------
Kuninori Morimoto (8):
      ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx
      ARM: shmobile: r8a7779: add USB common phy initializer
      ARM: shmobile: r8a7779: add USB EHCI clock support
      ARM: shmobile: r8a7779: add USB OHCI clock support
      ARM: shmobile: marzen: add USB EHCI driver support
      ARM: shmobile: marzen: fixup regulator id for smsc911x
      ARM: shmobile: marzen: enable thermal sensor
      ARM: shmobile: marzen: add USB OHCI driver support

Phil Edworthy (2):
      r8a7779: add SDHI clock support
      marzen: add SDHI0 support

Simon Horman (1):
      ARM: mach-shmobile: marzen: defconfig update

 arch/arm/configs/marzen_defconfig             |  30 ++--
 arch/arm/mach-shmobile/Kconfig                |   2 +
 arch/arm/mach-shmobile/board-marzen.c         | 213 +++++++++++++++++++++++++-
 arch/arm/mach-shmobile/clock-r8a7779.c        |  18 ++-
 arch/arm/mach-shmobile/include/mach/common.h  |   1 +
 arch/arm/mach-shmobile/include/mach/r8a7779.h |   2 +-
 arch/arm/mach-shmobile/pfc-r8a7779.c          |  16 +-
 arch/arm/mach-shmobile/setup-r8a7779.c        |  93 +++++++++++
 8 files changed, 355 insertions(+), 20 deletions(-)
Simon Horman - Aug. 31, 2012, 6:24 a.m.
On Fri, Aug 31, 2012 at 10:28:11AM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
> 
> please consider the following enhancements to the Marzen board
> and r8a7779 SoC by Phil Edworthy, Morimoto-san and myself for 3.7.
> 
> * This pull requests superceedes the previous request,
>   "[GIT PULL v2] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7"

    The line above should be:

    "[GIT PULL] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7"

>   which I made earlier today. The difference to that request is that
>   I have pushed one more patch. There was no rebase.
> 
> * This pull request is based on the usb-next branch of Greg KH's USB tree,
>   git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git,
>   which is based on v3.6-rc3.
> 
>   This is to satisfy compile-time dependencies.
>   Please let me know if you would like this handled a different way.
> 
> ----------------------------------------------------------------
> The following changes since commit a7bdf7fa33127bf08eb0810698bca607a9462df4:
> 
>   Merge v3.6-rc3 into usb-next (2012-08-27 07:15:30 -0700)
> 
> are available in the git repository at:
> 
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git marzen
> 
> for you to fetch changes up to 3553395437f2ac42a73255a0ffac09efc9acf5c4:
> 
>   ARM: shmobile: marzen: add USB OHCI driver support (2012-08-31 09:41:44 +0900)
> 
> ----------------------------------------------------------------
> Kuninori Morimoto (8):
>       ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx
>       ARM: shmobile: r8a7779: add USB common phy initializer
>       ARM: shmobile: r8a7779: add USB EHCI clock support
>       ARM: shmobile: r8a7779: add USB OHCI clock support
>       ARM: shmobile: marzen: add USB EHCI driver support
>       ARM: shmobile: marzen: fixup regulator id for smsc911x
>       ARM: shmobile: marzen: enable thermal sensor
>       ARM: shmobile: marzen: add USB OHCI driver support
> 
> Phil Edworthy (2):
>       r8a7779: add SDHI clock support
>       marzen: add SDHI0 support
> 
> Simon Horman (1):
>       ARM: mach-shmobile: marzen: defconfig update
> 
>  arch/arm/configs/marzen_defconfig             |  30 ++--
>  arch/arm/mach-shmobile/Kconfig                |   2 +
>  arch/arm/mach-shmobile/board-marzen.c         | 213 +++++++++++++++++++++++++-
>  arch/arm/mach-shmobile/clock-r8a7779.c        |  18 ++-
>  arch/arm/mach-shmobile/include/mach/common.h  |   1 +
>  arch/arm/mach-shmobile/include/mach/r8a7779.h |   2 +-
>  arch/arm/mach-shmobile/pfc-r8a7779.c          |  16 +-
>  arch/arm/mach-shmobile/setup-r8a7779.c        |  93 +++++++++++
>  8 files changed, 355 insertions(+), 20 deletions(-)
>
Arnd Bergmann - Sept. 3, 2012, 9:38 p.m.
On Friday 31 August 2012, Simon Horman wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> This patch adds common USB phy ports initializer for r8a7779.
> 
> The note is that each USB IP have own MSTP clock bit,
> and common USB phy port doesn't have MSTP clock,
> but this USB phy needs USB clock.
> Each USB driver / platform should keep USB MSTP clock somehow.
> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Signed-off-by: Simon Horman <horms@verge.net.au>
> ---
>  arch/arm/mach-shmobile/include/mach/common.h |  1 +
>  arch/arm/mach-shmobile/setup-r8a7779.c       | 93 ++++++++++++++++++++++++++++
>  2 files changed, 94 insertions(+)

Shouldn't the USB PHY driver go to drivers/usb/phy/ or
drivers/usb/host/ehci-sh.c?

We are trying hard to move driver code out of the platform and into driver
directories these days, and having it wired up as part of the platform
the way you do also means it is always powered on.

On Friday 31 August 2012, Simon Horman wrote:
> +#ifdef CONFIG_ARCH_SUPPORTS_BIG_ENDIAN
> +# define xHCI_ENDIAN "BIG"
> +# define xHCI_NO_SWAP 0x00000003
> +#else
> +# define xHCI_ENDIAN "LITTLE"
> +# define xHCI_NO_SWAP 0x00000000
> +#endif
> +
> +/*
> + * USB initial/install operation.
> + *
> + * This function setup USB phy.
> + * The used value and setting order came from
> + * [USB :: Initial setting] on datasheet.
> + */
> +int __init r8a7779_usb_phy_init(u32 usbpctrl0)
> +{
> +       void __iomem *reg0, *reg1;
> +       int i;
> +       u32 val;
> +
> +       reg0 = ioremap_nocache(0xffe70000, 0x900);
> +       reg1 = ioremap_nocache(0xfff70000, 0x900);
> +

I see neither big-endian support on shmobile, nor any XHCI (USB-3.0) driver, just
the old EHCI (USB-2.0) and OHCI (USB-1.1) drivers. Are you submitting the XHCI
support and big-endian platform code separately?

	Arnd
Kuninori Morimoto - Sept. 4, 2012, 12:21 a.m.
Hi Arnd, Simon

> > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > 
> > This patch adds common USB phy ports initializer for r8a7779.
> > 
> > The note is that each USB IP have own MSTP clock bit,
> > and common USB phy port doesn't have MSTP clock,
> > but this USB phy needs USB clock.
> > Each USB driver / platform should keep USB MSTP clock somehow.
> > 
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > Signed-off-by: Simon Horman <horms@verge.net.au>
> > ---
> >  arch/arm/mach-shmobile/include/mach/common.h |  1 +
> >  arch/arm/mach-shmobile/setup-r8a7779.c       | 93 ++++++++++++++++++++++++++++
> >  2 files changed, 94 insertions(+)
> 
> Shouldn't the USB PHY driver go to drivers/usb/phy/ or
> drivers/usb/host/ehci-sh.c?
> 
> We are trying hard to move driver code out of the platform and into driver
> directories these days, and having it wired up as part of the platform
> the way you do also means it is always powered on.

I see.
I can move this code to under driver.
Can I send additional patch for it ?
 - move usb phy code to driver (to Simon, USB ML)

Or should I send multi patches ?
 - remove this patch (to Simon)
 - add usb phy driver patch (to USB ML)
 - use usb phy driver patch (to Simon)

> I see neither big-endian support on shmobile, nor any XHCI (USB-3.0) driver, just
> the old EHCI (USB-2.0) and OHCI (USB-1.1) drivers. Are you submitting the XHCI
> support and big-endian platform code separately?

Sorry for very confusing naming.
I fix it

Best regards
---
Kuninori Morimoto
Simon Horman - Sept. 4, 2012, 12:34 a.m.
On Mon, Sep 03, 2012 at 05:21:22PM -0700, Kuninori Morimoto wrote:
> 
> Hi Arnd, Simon
> 
> > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > > 
> > > This patch adds common USB phy ports initializer for r8a7779.
> > > 
> > > The note is that each USB IP have own MSTP clock bit,
> > > and common USB phy port doesn't have MSTP clock,
> > > but this USB phy needs USB clock.
> > > Each USB driver / platform should keep USB MSTP clock somehow.
> > > 
> > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > > Signed-off-by: Simon Horman <horms@verge.net.au>
> > > ---
> > >  arch/arm/mach-shmobile/include/mach/common.h |  1 +
> > >  arch/arm/mach-shmobile/setup-r8a7779.c       | 93 ++++++++++++++++++++++++++++
> > >  2 files changed, 94 insertions(+)
> > 
> > Shouldn't the USB PHY driver go to drivers/usb/phy/ or
> > drivers/usb/host/ehci-sh.c?
> > 
> > We are trying hard to move driver code out of the platform and into driver
> > directories these days, and having it wired up as part of the platform
> > the way you do also means it is always powered on.
> 
> I see.
> I can move this code to under driver.
> Can I send additional patch for it ?
>  - move usb phy code to driver (to Simon, USB ML)
> 
> Or should I send multi patches ?
>  - remove this patch (to Simon)
>  - add usb phy driver patch (to USB ML)
>  - use usb phy driver patch (to Simon)

I think that the best approach would be for
a) me to remove the patches in question from your tree
b) you to send fresh patches, perhaps the USB ones need
   to go through another tree (= other than my renesas tree)
c) I will send a fresh pull request.

I am guessing this may take a little time. If so, as the end of opportunity
to get fresh code into 3.7 is approaching I may post an intermediate pull
request that omits the USB changes.

> > I see neither big-endian support on shmobile, nor any XHCI (USB-3.0) driver, just
> > the old EHCI (USB-2.0) and OHCI (USB-1.1) drivers. Are you submitting the XHCI
> > support and big-endian platform code separately?
> 
> Sorry for very confusing naming.
> I fix it
> 
> Best regards
> ---
> Kuninori Morimoto
>
Simon Horman - Sept. 5, 2012, 1:20 a.m.
On Mon, Sep 03, 2012 at 09:50:03PM -0700, Kuninori Morimoto wrote:
> f9929ab55cf967791c65a3b58696d77e26d19a6f
> (ARM: shmobile: r8a7779: add USB common phy initializer)
> added r8a7779 USB phy initializer,
> but ARM kernel is trying hard to move driver code out of the platform
> and into driver directories.
> This patch remove USB phy initializer code from platform.

Hi Morimoto-san,

my preferred approach is to drop the following patches from the marzen
branch and get the remaining changes merged (hopefully). Then look at
USB once again.

f58f278 ARM: shmobile: marzen: add USB EHCI driver support
4150c1d ARM: shmobile: r8a7779: add USB OHCI clock support
535b372c ARM: shmobile: r8a7779: add USB EHCI clock support
f9929ab ARM: shmobile: r8a7779: add USB common phy initializer
Simon Horman - Sept. 5, 2012, 1:23 a.m.
On Wed, Sep 05, 2012 at 10:20:57AM +0900, Simon Horman wrote:
> On Mon, Sep 03, 2012 at 09:50:03PM -0700, Kuninori Morimoto wrote:
> > f9929ab55cf967791c65a3b58696d77e26d19a6f
> > (ARM: shmobile: r8a7779: add USB common phy initializer)
> > added r8a7779 USB phy initializer,
> > but ARM kernel is trying hard to move driver code out of the platform
> > and into driver directories.
> > This patch remove USB phy initializer code from platform.
> 
> Hi Morimoto-san,
> 
> my preferred approach is to drop the following patches from the marzen
> branch and get the remaining changes merged (hopefully). Then look at
> USB once again.
> 
> f58f278 ARM: shmobile: marzen: add USB EHCI driver support
> 4150c1d ARM: shmobile: r8a7779: add USB OHCI clock support
> 535b372c ARM: shmobile: r8a7779: add USB EHCI clock support
> f9929ab ARM: shmobile: r8a7779: add USB common phy initializer

and

3553395 ARM: shmobile: marzen: add USB OHCI driver support
Kuninori Morimoto - Sept. 5, 2012, 2 a.m.
Hi Simon

> > my preferred approach is to drop the following patches from the marzen
> > branch and get the remaining changes merged (hopefully). Then look at
> > USB once again.
> > 
> > f58f278 ARM: shmobile: marzen: add USB EHCI driver support
> > 4150c1d ARM: shmobile: r8a7779: add USB OHCI clock support
> > 535b372c ARM: shmobile: r8a7779: add USB EHCI clock support
> > f9929ab ARM: shmobile: r8a7779: add USB common phy initializer
> 
> and
> 
> 3553395 ARM: shmobile: marzen: add USB OHCI driver support

Thank you for your help
Simon Horman - Sept. 5, 2012, 8:13 a.m.
On Wed, Sep 05, 2012 at 11:00:22AM +0900, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> > > my preferred approach is to drop the following patches from the marzen
> > > branch and get the remaining changes merged (hopefully). Then look at
> > > USB once again.
> > > 
> > > f58f278 ARM: shmobile: marzen: add USB EHCI driver support
> > > 4150c1d ARM: shmobile: r8a7779: add USB OHCI clock support
> > > 535b372c ARM: shmobile: r8a7779: add USB EHCI clock support
> > > f9929ab ARM: shmobile: r8a7779: add USB common phy initializer
> > 
> > and
> > 
> > 3553395 ARM: shmobile: marzen: add USB OHCI driver support
> 
> Thank you for your help

Thanks, I have pushed a rebased marzen tree accordingly.
Simon Horman - Sept. 12, 2012, 5:16 a.m.
On Wed, Sep 05, 2012 at 05:13:20PM +0900, Simon Horman wrote:
> On Wed, Sep 05, 2012 at 11:00:22AM +0900, Kuninori Morimoto wrote:
> > 
> > Hi Simon
> > 
> > > > my preferred approach is to drop the following patches from the marzen
> > > > branch and get the remaining changes merged (hopefully). Then look at
> > > > USB once again.
> > > > 
> > > > f58f278 ARM: shmobile: marzen: add USB EHCI driver support
> > > > 4150c1d ARM: shmobile: r8a7779: add USB OHCI clock support
> > > > 535b372c ARM: shmobile: r8a7779: add USB EHCI clock support
> > > > f9929ab ARM: shmobile: r8a7779: add USB common phy initializer
> > > 
> > > and
> > > 
> > > 3553395 ARM: shmobile: marzen: add USB OHCI driver support
> > 
> > Thank you for your help
> 
> Thanks, I have pushed a rebased marzen tree accordingly.

Hi Morimoto-san,

I realise you are busy at the moment, but when you get a chance
could you let me know what the status of the above changes is?

I believe that I am waiting for fresh "use usb phy driver" patches.
But perhaps these depend on "add usb phy driver" patches being
accepted into the USB tree first?
Kuninori Morimoto - Sept. 12, 2012, 5:31 a.m.
Hi Simon, Felipe

Thank you for your reply

> I realise you are busy at the moment, but when you get a chance
> could you let me know what the status of the above changes is?
> 
> I believe that I am waiting for fresh "use usb phy driver" patches.
> But perhaps these depend on "add usb phy driver" patches being
> accepted into the USB tree first?

Yes.
I sent "usb: phy: add R-Car USB phy driver" patch to USB ML few days ago.

>> Felipe

Please let us know current status of this patch ?

Best regards
---
Kuninori Morimoto
Felipe Balbi - Sept. 12, 2012, 6:30 a.m.
Hi,

On Tue, Sep 11, 2012 at 10:31:28PM -0700, Kuninori Morimoto wrote:
> 
> Hi Simon, Felipe
> 
> Thank you for your reply
> 
> > I realise you are busy at the moment, but when you get a chance
> > could you let me know what the status of the above changes is?
> > 
> > I believe that I am waiting for fresh "use usb phy driver" patches.
> > But perhaps these depend on "add usb phy driver" patches being
> > accepted into the USB tree first?
> 
> Yes.
> I sent "usb: phy: add R-Car USB phy driver" patch to USB ML few days ago.
> 
> >> Felipe
> 
> Please let us know current status of this patch ?

It will have to wait for v3.8... there wasn't enough time for me to pick
that up, sorry.
Kuninori Morimoto - Sept. 12, 2012, 7:16 a.m.
Hi Simon, Felipe

> > >> Felipe
> > 
> > Please let us know current status of this patch ?
> 
> It will have to wait for v3.8... there wasn't enough time for me to pick
> that up, sorry.

OK. no worry

>> Simon

Marzen board USB depends on this phy driver.
So, let's aim to v3.8.
Is is OK ?

Best regards
---
Kuninori Morimoto
Simon Horman - Sept. 12, 2012, 7:19 a.m.
On Wed, Sep 12, 2012 at 12:16:00AM -0700, Kuninori Morimoto wrote:
> 
> Hi Simon, Felipe
> 
> > > >> Felipe
> > > 
> > > Please let us know current status of this patch ?
> > 
> > It will have to wait for v3.8... there wasn't enough time for me to pick
> > that up, sorry.
> 
> OK. no worry
> 
> >> Simon
> 
> Marzen board USB depends on this phy driver.
> So, let's aim to v3.8.
> Is is OK ?

Its ok by me.