sh: sh_mobile keysc clock framework support

Add clock framework support to the sh_mobile keysc driver and
adjust the board specific code accordingly.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

2 files changed, 2 insertions, 3 deletions

diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 975281980299..95dea1b02565 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -89,6 +89,7 @@ static struct resource sh_keysc_resources[] = {
 
 static struct platform_device sh_keysc_device = {
         .name           = "sh_keysc",
+        .id             = 0, /* "keysc0" clock */
         .num_resources  = ARRAY_SIZE(sh_keysc_resources),
         .resource       = sh_keysc_resources,
         .dev    = {
@@ -479,7 +480,6 @@ static int __init migor_devices_setup(void)
         ctrl_outl(0x00110080, BSC_CS4WCR);
 
         /* KEYSC */
-        clk_always_enable("mstp214"); /* KEYSC */
         gpio_request(GPIO_FN_KEYOUT0, NULL);
         gpio_request(GPIO_FN_KEYOUT1, NULL);
         gpio_request(GPIO_FN_KEYOUT2, NULL);
diff --git a/arch/sh/boards/mach-se/7722/setup.c b/arch/sh/boards/mach-se/7722/setup.c
index fe6f96517e12..02035bbf2cc2 100644
--- a/arch/sh/boards/mach-se/7722/setup.c
+++ b/arch/sh/boards/mach-se/7722/setup.c
@@ -130,6 +130,7 @@ static struct resource sh_keysc_resources[] = {
 
 static struct platform_device sh_keysc_device = {
         .name           = "sh_keysc",
+        .id             = 0, /* "keysc0" clock */
         .num_resources  = ARRAY_SIZE(sh_keysc_resources),
         .resource       = sh_keysc_resources,
         .dev    = {
@@ -146,8 +147,6 @@ static struct platform_device *se7722_devices[] __initdata = {
 
 static int __init se7722_devices_setup(void)
 {
-        clk_always_enable("mstp214"); /* KEYSC */
-
         return platform_add_devices(se7722_devices,
                 ARRAY_SIZE(se7722_devices));
 }