Merge tag 'renesas-clock-fixes-for-v3.17' of git://git.kernel.org/pub/scm/linux/kerne...

Merge "Renesas ARM Based SoC Clock Fixes For v3.17" from Simon Horman:

* ARM: shmobile: r8a7791: add missing 0x0100 for SDCKCR

  This resolves a problem introduced by 4bfb358b1d6cdeff
  ("ARM: shmobile: Add r8a7791 legacy SDHI clocks")
  which was included in v3.15.

  This fix does not have any run-time affect at this time.

* ARM: shmobile: r8a7790: add missing 0x0100 for SDCKCR

  This resolves a problem introduced by 9f13ee6f83c52065
  ("ARM: shmobile: r8a7790: add div4 clocks")
  which was included in v3.11.

  This fix does not have any run-time affect at this time.

* ARM: shmobile: sh73a0: Remove spurious 0x from SCIFB clock name

  This resolves a problem introduced by a0f7e7496d56ac2d
  ("ARM: shmobile: sh73a0: add CMT1 clock support for DT")
  which was included in v3.17-rc1.

  This fix does not have any run-time affect at this time as the clock in
  question is used by a SCIF device that is not enabled by default.

* tag 'renesas-clock-fixes-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7791: add missing 0x0100 for SDCKCR
  ARM: shmobile: r8a7790: add missing 0x0100 for SDCKCR
  ARM: shmobile: sh73a0: Remove spurious 0x from SCIFB clock name

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/mach-shmobile/clock-r8a7790.c
index 17435c1aa2fe318ceeb4692632bd986ce5484655,c62bfe76a17e6189a146cc01cf6798d44d99b0e8..126ddafad5265dc62793fd6e7f25aea16b7c42e1
--- 1/arch/arm/mach-shmobile/clock-r8a7790.c
--- 2/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@@ -22,11 -22,9 +22,11 @@@
  #include <linux/kernel.h>
  #include <linux/sh_clk.h>
  #include <linux/clkdev.h>
 -#include <mach/clock.h>
 -#include <mach/common.h>
 -#include <mach/r8a7790.h>
 +
 +#include "clock.h"
 +#include "common.h"
 +#include "r8a7790.h"
 +#include "rcar-gen2.h"
  
  /*
   *   MD               EXTAL           PLL0    PLL1    PLL3
@@@ -183,8 -181,8 +183,8 @@@ enum 
  
  static struct clk div4_clks[DIV4_NR] = {
        [DIV4_SDH] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 8, 0x0dff, CLK_ENABLE_ON_INIT),
-       [DIV4_SD0] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 4, 0x1de0, CLK_ENABLE_ON_INIT),
-       [DIV4_SD1] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 0, 0x1de0, CLK_ENABLE_ON_INIT),
+       [DIV4_SD0] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 4, 0x1df0, CLK_ENABLE_ON_INIT),
+       [DIV4_SD1] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 0, 0x1df0, CLK_ENABLE_ON_INIT),
  };
  
  /* DIV6 clocks */

diff --combined arch/arm/mach-shmobile/clock-r8a7791.c
index 10e193d707f531216776695b5da2cf0c65de418a,53161c4c97f66c971fc8d60edde3ff57397367b2..453b23129cfa0cd3903e7ebdc3aaef8009bb3542
--- 1/arch/arm/mach-shmobile/clock-r8a7791.c
--- 2/arch/arm/mach-shmobile/clock-r8a7791.c
+++ b/arch/arm/mach-shmobile/clock-r8a7791.c
@@@ -23,9 -23,9 +23,9 @@@
  #include <linux/kernel.h>
  #include <linux/sh_clk.h>
  #include <linux/clkdev.h>
 -#include <mach/clock.h>
 -#include <mach/common.h>
 -#include <mach/rcar-gen2.h>
 +#include "clock.h"
 +#include "common.h"
 +#include "rcar-gen2.h"
  
  /*
   *   MD               EXTAL           PLL0    PLL1    PLL3
@@@ -152,7 -152,7 +152,7 @@@ enum 
  
  static struct clk div4_clks[DIV4_NR] = {
        [DIV4_SDH] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 8, 0x0dff, CLK_ENABLE_ON_INIT),
-       [DIV4_SD0] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 4, 0x1de0, CLK_ENABLE_ON_INIT),
+       [DIV4_SD0] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 4, 0x1df0, CLK_ENABLE_ON_INIT),
  };
  
  /* DIV6 clocks */

diff --combined arch/arm/mach-shmobile/clock-sh73a0.c
index d8c4048b9e338d345bb5e5ceb682e3ded7df09ce,b0993a52e66de85b30ddaa977394baf33e6ec77a..02a6f45a0b9e1c832d5c5d6bfcb79395a42363a2
--- 1/arch/arm/mach-shmobile/clock-sh73a0.c
--- 2/arch/arm/mach-shmobile/clock-sh73a0.c
+++ b/arch/arm/mach-shmobile/clock-sh73a0.c
@@@ -22,8 -22,8 +22,8 @@@
  #include <linux/sh_clk.h>
  #include <linux/clkdev.h>
  #include <asm/processor.h>
 -#include <mach/clock.h>
 -#include <mach/common.h>
 +#include "clock.h"
 +#include "common.h"
  
  #define FRQCRA                IOMEM(0xe6150000)
  #define FRQCRB                IOMEM(0xe6150004)
@@@ -644,7 -644,7 +644,7 @@@ static struct clk_lookup lookups[] = 
        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 */
+       CLKDEV_DEV_ID("e6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */
        CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */
        CLKDEV_DEV_ID("e6c40000.serial", &mstp_clks[MSTP204]), /* SCIFA0 */
        CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]), /* SCIFA1 */