Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Apr 2011 19:49:01 +0000 (12:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Apr 2011 19:49:01 +0000 (12:49 -0700)
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  ARM: arch-shmobile: only run FSI init on respective boards
  ARM: arch-shmobile: only run HDMI init on respective boards
  ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL

arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-mackerel.c
arch/arm/mach-shmobile/include/mach/mmc.h
arch/arm/mach-shmobile/include/mach/zboot.h

index 783b66f..1e35fa9 100644 (file)
@@ -947,7 +947,7 @@ static struct platform_device *ap4evb_devices[] __initdata = {
        &ap4evb_camera,
 };
 
-static int __init hdmi_init_pm_clock(void)
+static void __init hdmi_init_pm_clock(void)
 {
        struct clk *hdmi_ick = clk_get(&hdmi_device.dev, "ick");
        int ret;
@@ -988,20 +988,15 @@ static int __init hdmi_init_pm_clock(void)
        pr_debug("PLLC2 set frequency %lu\n", rate);
 
        ret = clk_set_parent(hdmi_ick, &sh7372_pllc2_clk);
-       if (ret < 0) {
+       if (ret < 0)
                pr_err("Cannot set HDMI parent: %d\n", ret);
-               goto out;
-       }
 
 out:
        if (!IS_ERR(hdmi_ick))
                clk_put(hdmi_ick);
-       return ret;
 }
 
-device_initcall(hdmi_init_pm_clock);
-
-static int __init fsi_init_pm_clock(void)
+static void __init fsi_init_pm_clock(void)
 {
        struct clk *fsia_ick;
        int ret;
@@ -1010,7 +1005,7 @@ static int __init fsi_init_pm_clock(void)
        if (IS_ERR(fsia_ick)) {
                ret = PTR_ERR(fsia_ick);
                pr_err("Cannot get FSI ICK: %d\n", ret);
-               return ret;
+               return;
        }
 
        ret = clk_set_parent(fsia_ick, &sh7372_fsiack_clk);
@@ -1018,10 +1013,7 @@ static int __init fsi_init_pm_clock(void)
                pr_err("Cannot set FSI-A parent: %d\n", ret);
 
        clk_put(fsia_ick);
-
-       return ret;
 }
-device_initcall(fsi_init_pm_clock);
 
 /*
  * FIXME !!
@@ -1348,6 +1340,9 @@ static void __init ap4evb_init(void)
        __raw_writel(srcr4 & ~(1 << 13), SRCR4);
 
        platform_add_devices(ap4evb_devices, ARRAY_SIZE(ap4evb_devices));
+
+       hdmi_init_pm_clock();
+       fsi_init_pm_clock();
 }
 
 static void __init ap4evb_timer_init(void)
index 8184d4d..7da2ca2 100644 (file)
@@ -423,7 +423,7 @@ static struct platform_device fsi_hdmi_device = {
        .name           = "sh_fsi2_b_hdmi",
 };
 
-static int __init hdmi_init_pm_clock(void)
+static void __init hdmi_init_pm_clock(void)
 {
        struct clk *hdmi_ick = clk_get(&hdmi_device.dev, "ick");
        int ret;
@@ -467,17 +467,13 @@ static int __init hdmi_init_pm_clock(void)
        pr_debug("PLLC2 set frequency %lu\n", rate);
 
        ret = clk_set_parent(hdmi_ick, &sh7372_pllc2_clk);
-       if (ret < 0) {
+       if (ret < 0)
                pr_err("Cannot set HDMI parent: %d\n", ret);
-               goto out;
-       }
 
 out:
        if (!IS_ERR(hdmi_ick))
                clk_put(hdmi_ick);
-       return ret;
 }
-device_initcall(hdmi_init_pm_clock);
 
 /* USB1 (Host) */
 static void usb1_host_port_power(int port, int power)
@@ -1218,6 +1214,8 @@ static void __init mackerel_init(void)
        sh7372_add_standard_devices();
 
        platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices));
+
+       hdmi_init_pm_clock();
 }
 
 static void __init mackerel_timer_init(void)
index e11560a..21a59db 100644 (file)
@@ -9,7 +9,7 @@
 
 #ifdef CONFIG_MACH_AP4EVB
 #include "mach/mmc-ap4eb.h"
-#elif CONFIG_MACH_MACKEREL
+#elif defined(CONFIG_MACH_MACKEREL)
 #include "mach/mmc-mackerel.h"
 #else
 #error "unsupported board."
index 6d6a205..9320aff 100644 (file)
@@ -13,7 +13,7 @@
 #ifdef CONFIG_MACH_AP4EVB
 #define MACH_TYPE      MACH_TYPE_AP4EVB
 #include "mach/head-ap4evb.txt"
-#elif CONFIG_MACH_MACKEREL
+#elif defined(CONFIG_MACH_MACKEREL)
 #define MACH_TYPE      MACH_TYPE_MACKEREL
 #include "mach/head-mackerel.txt"
 #else