ARM: OMAP3: hwmod data and setup code for band gap thermal driver

[pandora-kernel.git] / arch / arm / mach-omap2 / devices.c

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 68ec031..982eba8 100644 (file)
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -318,18 +318,10 @@ static inline void omap_init_audio(void) {}
 #if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
                defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)
 
-static struct omap_device_pm_latency omap_mcpdm_latency[] = {
-       {
-               .deactivate_func = omap_device_idle_hwmods,
-               .activate_func = omap_device_enable_hwmods,
-               .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
-       },
-};
-
 static void omap_init_mcpdm(void)
 {
        struct omap_hwmod *oh;
-       struct omap_device *od;
+       struct platform_device *pdev;
 
        oh = omap_hwmod_lookup("mcpdm");
        if (!oh) {
@@ -337,11 +329,8 @@ static void omap_init_mcpdm(void)
                return;
        }
 
-       od = omap_device_build("omap-mcpdm", -1, oh, NULL, 0,
-                               omap_mcpdm_latency,
-                               ARRAY_SIZE(omap_mcpdm_latency), 0);
-       if (IS_ERR(od))
-               printk(KERN_ERR "Could not build omap_device for omap-mcpdm-dai\n");
+       pdev = omap_device_build("omap-mcpdm", -1, oh, NULL, 0, NULL, 0, 0);
+       WARN(IS_ERR(pdev), "Can't build omap_device for omap-mcpdm.\n");
 }
 #else
 static inline void omap_init_mcpdm(void) {}
@@ -684,6 +673,29 @@ static inline void omap_init_vout(void) {}
 
 /*-------------------------------------------------------------------------*/
 
+#if defined(CONFIG_ARCH_OMAP3) && \
+       (defined(CONFIG_OMAP3_THERMAL) || defined(CONFIG_OMAP3_THERMAL_MODULE))
+static void omap_init_temp_sensor(void)
+{
+       struct omap_hwmod *oh;
+       struct platform_device *pdev;
+
+       oh = omap_hwmod_lookup("bandgap_ts");
+       if (!oh) {
+               pr_err("%s: unable to find hwmod\n", __func__);
+               return;
+       }
+
+       pdev = omap_device_build("omap3-thermal", -1, oh, NULL, 0, NULL, 0, 0);
+       WARN(IS_ERR(pdev), "%s: could not build device, err %ld\n",
+                          __func__, PTR_ERR(pdev));
+}
+#else
+static inline void omap_init_temp_sensor(void) {}
+#endif
+
+/*-------------------------------------------------------------------------*/
+
 static int __init omap2_init_devices(void)
 {
        /*
@@ -701,6 +713,7 @@ static int __init omap2_init_devices(void)
        omap_init_sham();
        omap_init_aes();
        omap_init_vout();
+       omap_init_temp_sensor();
 
        return 0;
 }