Patchwork [GIT,PULL,v2] Renesas ARM-based SoC for v3.8 #2

login
register
mail settings
Submitter Simon Horman
Date Nov. 9, 2012, 7:29 a.m.
Message ID <1352446165-19298-1-git-send-email-horms@verge.net.au>
Download mbox
Permalink /patch/197960/
State New
Headers show

Pull-request

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

Comments

Simon Horman - Nov. 9, 2012, 7:29 a.m.
Hi Olof, Hi Arnd,

please consider the following SoC enhancements for 3.8.

* This series is based on the renesas/soc branch of the arm-soc tree.
  There will be a subquent 'SoC2' pull request which is based on this
  pull-request and a pull-request for boards.

----------------------------------------------------------------
The following changes since commit 86bc52ef4373be64867b56f3a9e30cbabf64e0dd:

  ARM: shmobile: r8a7740: Enable PMU (2012-11-06 13:47:24 +0900)

are available in the git repository at:

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

for you to fetch changes up to 2944628607f76e4755660cd710f22a4748ef88d8:

  ARM: shmobile: add fsi external clock sh7372 (2012-11-08 15:22:06 +0900)

----------------------------------------------------------------
Kuninori Morimoto (10):
      ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx
      ARM: shmobile: r8a7740: add USB24 clock explain
      ARM: shmobile: r8a7779: add USB EHCI clock support
      ARM: shmobile: r8a7779: add USB OHCI clock support
      sh: clkfwk: add sh_clk_fsidiv_register()
      ARM: shmobile: sh7372: sh7372_fsidivX_clk become non-global
      ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks
      ARM: shmobile: r8a7740: add FSI-DVI clocks
      ARM: shmobile: add fsi external clock on r8a7740
      ARM: shmobile: add fsi external clock sh7372

 arch/arm/mach-shmobile/board-ap4evb.c         |    2 +-
 arch/arm/mach-shmobile/board-mackerel.c       |    2 +-
 arch/arm/mach-shmobile/clock-r8a7740.c        |   34 +++++++++
 arch/arm/mach-shmobile/clock-r8a7779.c        |    7 ++
 arch/arm/mach-shmobile/clock-sh7372.c         |   94 ++++---------------------
 arch/arm/mach-shmobile/include/mach/r8a7779.h |    2 +-
 arch/arm/mach-shmobile/include/mach/sh7372.h  |    2 -
 arch/arm/mach-shmobile/pfc-r8a7779.c          |   16 ++---
 drivers/sh/clk/cpg.c                          |   86 ++++++++++++++++++++++
 include/linux/sh_clk.h                        |    9 +++
 10 files changed, 159 insertions(+), 95 deletions(-)
Arnd Bergmann - Nov. 12, 2012, 8:49 p.m.
On Friday 09 November 2012, Simon Horman wrote:
> Hi Olof, Hi Arnd,
> 
> please consider the following SoC enhancements for 3.8.
> 
> * This series is based on the renesas/soc branch of the arm-soc tree.
>   There will be a subquent 'SoC2' pull request which is based on this
>   pull-request and a pull-request for boards.

Pulled into next/soc branch on top of the earlier shmobile soc changes.

Thanks,

	Arnd
Arnd Bergmann - Nov. 12, 2012, 10:43 p.m.
On Friday 09 November 2012, Simon Horman wrote:
> +
> +static int fsidiv_set_rate(struct clk *clk, unsigned long rate)
> +{
> +       u32 val;
> +       int idx;
> +
> +       idx = (clk->parent->rate / rate) & 0xffff;
> +       if (idx < 2)
> +               __raw_writel(0, clk->mapping->base);
> +       else
> +               __raw_writel(idx << 16, clk->mapping->base);
> +
> +       return 0;
> +}

This gives me a new warning about an unused variable "val" now.

	Arnd
Sergei Shtylyov - March 14, 2013, 12:10 a.m.
Hello.

On 11/09/2012 10:29 AM, Simon Horman wrote:

> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> ehci-platform driver require these clocks
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Signed-off-by: Simon Horman <horms@verge.net.au>
> ---
>   arch/arm/mach-shmobile/clock-r8a7779.c |    5 +++++
>   1 file changed, 5 insertions(+)
>
> diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
> index 24f5a84..4ba4e3c 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7779.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7779.c
[...]
> @@ -153,6 +156,8 @@ static struct clk_lookup lookups[] = {
>   	CLKDEV_CON_ID("peripheral_clk",	&div4_clks[DIV4_P]),
>   
>   	/* MSTP32 clocks */
> +	CLKDEV_DEV_ID("ehci-platform.1", &mstp_clks[MSTP101]), /* USB EHCI port2 */
> +	CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */

    But how are those used? I don't see clk API support in ehci-platform.c.
Are they used via runtime PM? I'm just not familiar enough with it...

WBR, Sergei
Kuninori Morimoto - March 14, 2013, 12:57 a.m.
Hi Sergei

> >   	/* MSTP32 clocks */
> > +	CLKDEV_DEV_ID("ehci-platform.1", &mstp_clks[MSTP101]), /* USB EHCI port2 */
> > +	CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */
> 
>     But how are those used? I don't see clk API support in ehci-platform.c.
> Are they used via runtime PM? I'm just not familiar enough with it...

Yes exactry

    - board-marzen.c :: usb_power_on()
    - clock-r8a7779.c :: mstp_clks[]

Best regards
---
Kuninori Morimoto