summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/include
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-05-05 13:51:15 -0700
committerOlof Johansson <olof@lixom.net>2014-05-05 13:51:15 -0700
commit814789e2f16fa708420a894844a94a36597fa1bb (patch)
tree14ed24ba5dd531fe4516ae4561f0babf4ec7df75 /arch/arm/mach-shmobile/include
parent15e824dd2261f23cd80c9c65571d445697c84ace (diff)
parent932616eed0308cbebbb20a079e4bed3674bf1117 (diff)
Merge tag 'renesas-clock-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Merge "Renesas ARM Based SoC Clock Updates for v3.16" from Simon Horman: SH Mobile shared clock code * Introduce shmobile_clk_workaround() r8a7791 (R-Car M2) SoC * Rename VSP1_SY clocks to VSP1_S * Correct the I2C clocks parents r8a7790 (R-Car H2) SoC * Remove old style audio clock * Rename VSP1_(SY|RT) clocks to VSP1_(S|R) * Fix the I2C clocks parents r8a7778 (R-Car M1) SoC * Remove old style audio clock * tag 'renesas-clock-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7790: remove old style audio clock ARM: shmobile: r8a7778: remove old style audio clock ARM: shmobile: r8a7791: Rename VSP1_SY clocks to VSP1_S ARM: shmobile: r8a7790: Rename VSP1_(SY|RT) clocks to VSP1_(S|R) ARM: shmobile: r8a7791: Fix the I2C clocks parents in legacy code ARM: shmobile: r8a7790: Fix the I2C clocks parents in legacy code ARM: shmobile: Introduce shmobile_clk_workaround() ARM: shmobile: r8a7791: Use rcar_gen2_read_mode_pins() helper Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/include')
-rw-r--r--arch/arm/mach-shmobile/include/mach/clock.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/clock.h b/arch/arm/mach-shmobile/include/mach/clock.h
index 03e56074928..9a93cf924b9 100644
--- a/arch/arm/mach-shmobile/include/mach/clock.h
+++ b/arch/arm/mach-shmobile/include/mach/clock.h
@@ -1,6 +1,21 @@
#ifndef CLOCK_H
#define CLOCK_H
+#ifdef CONFIG_COMMON_CLK
+/* temporary clock configuration helper for platform devices */
+
+struct clk_name {
+ const char *clk;
+ const char *con_id;
+ const char *dev_id;
+};
+
+void shmobile_clk_workaround(const struct clk_name *clks, int nr_clks,
+ bool enable);
+
+#else /* CONFIG_COMMON_CLK */
+/* legacy clock implementation */
+
unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk);
extern struct sh_clk_ops shmobile_fixed_ratio_clk_ops;
@@ -36,4 +51,5 @@ do { \
(p)->div = d; \
} while (0)
+#endif /* CONFIG_COMMON_CLK */
#endif