mbox

[GIT,PULL] Second Round of Renesas ARM Based SoC Clock Updates for v3.17

Message ID cover.1405398284.git.horms+renesas@verge.net.au
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-clock2-for-v3.17

Message

Simon Horman July 15, 2014, 9:16 a.m. UTC
Hi Olof, Hi Kevin, Hi Arnd,

Please consider these second round of Renesas ARM based SoC clock updates for v3.17.

This pull request is based on the previous round of
such requests, tagged as renesas-clock-for-v3.17,
which you have already pulled into next/soc.

CCF support for the SoCs in question is being worked on,
so I expect this code to be a temporary measure.


The following changes since commit edc8fb1d6ebdfc4efa009073586d3567c3368475:

  ARM: shmobile: Fix device node reference leakage in shmobile_init_delay (2014-06-16 19:52:00 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-clock2-for-v3.17

for you to fetch changes up to ff4ce48e1f163d945c037c1c90ce12950961d91d:

  ARM: shmobile: sh73a0: add SCI clock support for DT (2014-07-12 15:15:39 +0200)

----------------------------------------------------------------
Second Round of Renesas ARM Based SoC Clock Updates for v3.17

* Add legacy clocks for SCI for SoCs that do not yet have CCF support.
  This is to allow SCI (serial) devices to be enabled using DT and
  will be removed after CCF support is added for each SoC.

----------------------------------------------------------------
Simon Horman (4):
      ARM: shmobile: r8a7778: add SCI clock support for DT
      ARM: shmobile: r8a73a4: add SCI clock support for DT
      ARM: shmobile: r8a7740: correct SCI clock support for DT
      ARM: shmobile: sh73a0: add SCI clock support for DT

 arch/arm/mach-shmobile/clock-r8a73a4.c |  6 ++++++
 arch/arm/mach-shmobile/clock-r8a7740.c | 18 +++++++++---------
 arch/arm/mach-shmobile/clock-r8a7778.c |  6 ++++++
 arch/arm/mach-shmobile/clock-sh73a0.c  |  9 +++++++++
 4 files changed, 30 insertions(+), 9 deletions(-)

Comments

Sergei Shtylyov July 15, 2014, 1:19 p.m. UTC | #1
Hello.

On 07/15/2014 01:16 PM, Simon Horman wrote:

> This will be used when initialising SCI devices using DT
> until common clock framework support is added.

> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>   arch/arm/mach-shmobile/clock-sh73a0.c | 9 +++++++++
>   1 file changed, 9 insertions(+)

> diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
> index 0d9cd1f..4990e03 100644
> --- a/arch/arm/mach-shmobile/clock-sh73a0.c
> +++ b/arch/arm/mach-shmobile/clock-sh73a0.c
> @@ -638,16 +638,25 @@ static struct clk_lookup lookups[] = {
>   	CLKDEV_DEV_ID("e6820000.i2c", &mstp_clks[MSTP116]), /* I2C0 */
>   	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[MSTP100]), /* LCDC0 */
>   	CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP219]), /* SCIFA7 */
> +	CLKDEV_DEV_ID("e6cd0000.serial", &mstp_clks[MSTP219]), /* SCIFA7 */
>   	CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]), /* SY-DMAC */
>   	CLKDEV_DEV_ID("sh-dma-engine.1", &mstp_clks[MSTP217]), /* MP-DMAC */
>   	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */
> +	CLKDEV_DEV_ID("e6cb0000.serial", &mstp_clks[MSTP207]), /* SCIFA5 */
>   	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB */
> +	CLKDEV_DEV_ID("0xe6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */

    Eh, are you sure there should be "0x"?

WBR, Sergei
Simon Horman July 15, 2014, 11:52 p.m. UTC | #2
On Tue, Jul 15, 2014 at 05:19:37PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 07/15/2014 01:16 PM, Simon Horman wrote:
> 
> >This will be used when initialising SCI devices using DT
> >until common clock framework support is added.
> 
> >Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> >---
> >  arch/arm/mach-shmobile/clock-sh73a0.c | 9 +++++++++
> >  1 file changed, 9 insertions(+)
> 
> >diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
> >index 0d9cd1f..4990e03 100644
> >--- a/arch/arm/mach-shmobile/clock-sh73a0.c
> >+++ b/arch/arm/mach-shmobile/clock-sh73a0.c
> >@@ -638,16 +638,25 @@ static struct clk_lookup lookups[] = {
> >  	CLKDEV_DEV_ID("e6820000.i2c", &mstp_clks[MSTP116]), /* I2C0 */
> >  	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[MSTP100]), /* LCDC0 */
> >  	CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP219]), /* SCIFA7 */
> >+	CLKDEV_DEV_ID("e6cd0000.serial", &mstp_clks[MSTP219]), /* SCIFA7 */
> >  	CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]), /* SY-DMAC */
> >  	CLKDEV_DEV_ID("sh-dma-engine.1", &mstp_clks[MSTP217]), /* MP-DMAC */
> >  	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */
> >+	CLKDEV_DEV_ID("e6cb0000.serial", &mstp_clks[MSTP207]), /* SCIFA5 */
> >  	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB */
> >+	CLKDEV_DEV_ID("0xe6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */
> 
>    Eh, are you sure there should be "0x"?

Thanks, I'll clean that up in a follow-up patch.
Olof Johansson July 19, 2014, 4:31 a.m. UTC | #3
On Tue, Jul 15, 2014 at 06:16:22PM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> Please consider these second round of Renesas ARM based SoC clock updates for v3.17.
> 
> This pull request is based on the previous round of
> such requests, tagged as renesas-clock-for-v3.17,
> which you have already pulled into next/soc.
> 
> CCF support for the SoCs in question is being worked on,
> so I expect this code to be a temporary measure.
> 
> 
> The following changes since commit edc8fb1d6ebdfc4efa009073586d3567c3368475:
> 
>   ARM: shmobile: Fix device node reference leakage in shmobile_init_delay (2014-06-16 19:52:00 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-clock2-for-v3.17
> 
> for you to fetch changes up to ff4ce48e1f163d945c037c1c90ce12950961d91d:
> 
>   ARM: shmobile: sh73a0: add SCI clock support for DT (2014-07-12 15:15:39 +0200)

Merged, thanks.


-Olof