diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-12-10 17:22:55 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-10 17:22:55 +0900 |
| commit | ea8d8a911f4850312834a0ff45c3d5ebc31fb1f1 (patch) | |
| tree | f405f2aa433878ea783a28d7d99952c1bd4bd401 /arch/arm/mach-shmobile/clock-r7s72100.c | |
| parent | fee05eb3d2ce4813b5e9a70ab888d2bc0047f4e1 (diff) | |
| parent | 8af3f18b7b42e32387b54d2e2f8300589b0198e9 (diff) | |
| download | linux-ea8d8a911f4850312834a0ff45c3d5ebc31fb1f1.tar.gz linux-ea8d8a911f4850312834a0ff45c3d5ebc31fb1f1.tar.bz2 linux-ea8d8a911f4850312834a0ff45c3d5ebc31fb1f1.zip | |
Merge tag 'renesas-cleanup-for-v3.14' into boards-base
Renesas ARM based SoC cleanups for v3.14
* Tidy up clock table order for r7s72100, r8a7779, r8a7779, r8a7790,
sh7372 and sh73a0 SoCs.
* Tidy up camera-rcar header for r8a7779 SoC
* Tidy up registration of VIN on r8a7779 SoC
* Tidy up PFC registration on r8a7790 SoC
* Correct typo in clocks for r8a7790 SoC
* Don't use named resources for IPMMU, I2C and TMU on sh73a0 SoC
* Don't use named resources for MMCIF and SDHI on ape6evm board
* Don't use named resources for MMCIF on lager board
* Tidy up device registration on lager board
* Tidy up headers for bockw board
Diffstat (limited to 'arch/arm/mach-shmobile/clock-r7s72100.c')
| -rw-r--r-- | arch/arm/mach-shmobile/clock-r7s72100.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/clock-r7s72100.c b/arch/arm/mach-shmobile/clock-r7s72100.c index 1c9d261df03f..7b457aed8253 100644 --- a/arch/arm/mach-shmobile/clock-r7s72100.c +++ b/arch/arm/mach-shmobile/clock-r7s72100.c @@ -170,6 +170,9 @@ static struct clk_lookup lookups[] = { CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]), /* MSTP clocks */ + CLKDEV_CON_ID("mtu2_fck", &mstp_clks[MSTP33]), + + /* ICK */ CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP47]), CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP46]), CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP45]), |