summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2014-05-14 03:10:15 +0200
committerSimon Horman <horms+renesas@verge.net.au>2014-05-14 11:42:55 +0900
commit9fbb1ae01b878e2cce9626fa6fdc9e5dcefeb6b5 (patch)
tree640da35b1472a482638913325bd7cee0d1f9b188 /arch/arm/mach-shmobile
parent1f9c7a691fefc2158bed4d5403422cc9b99ca335 (diff)
downloadtalos-op-linux-9fbb1ae01b878e2cce9626fa6fdc9e5dcefeb6b5.tar.gz
talos-op-linux-9fbb1ae01b878e2cce9626fa6fdc9e5dcefeb6b5.zip
ARM: shmobile: r7s72100: use workaround for non DT-clocks
MTU2 is not yet prepared for DT usage, so use the common workaround via clkdev for now. Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Magnus Damm <damm+renesas@opensource.se> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/board-genmai-reference.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c
index 7630c1053e32..33015e5ed52a 100644
--- a/arch/arm/mach-shmobile/board-genmai-reference.c
+++ b/arch/arm/mach-shmobile/board-genmai-reference.c
@@ -18,18 +18,28 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <linux/clk-provider.h>
#include <linux/kernel.h>
#include <linux/of_platform.h>
+#include <mach/clock.h>
#include <mach/common.h>
#include <mach/r7s72100.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#ifdef CONFIG_COMMON_CLK
+/*
+ * This is a really crude hack to provide clkdev support to platform
+ * devices until they get moved to DT.
+ */
+static const struct clk_name clk_names[] = {
+ { "mtu2", "fck", "sh-mtu2" },
+};
+#endif
+
static void __init genmai_add_standard_devices(void)
{
#ifdef CONFIG_COMMON_CLK
- of_clk_init(NULL);
+ shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), true);
#else
r7s72100_clock_init();
#endif
OpenPOWER on IntegriCloud