Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[pandora-kernel.git] / drivers / staging / tidspbridge / core / tiomap3430_pwr.c

diff --git a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
index b789f8f..fb9026e 100644 (file)
--- a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
@@ -16,9 +16,13 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/*  ----------------------------------- Host OS */
+#include <dspbridge/host_os.h>
+
+#include <plat/dsp.h>
+
 /*  ----------------------------------- DSP/BIOS Bridge */
 #include <dspbridge/dbdefs.h>
-#include <dspbridge/cfg.h>
 #include <dspbridge/drv.h>
 #include <dspbridge/io_sm.h>
 
@@ -54,8 +58,8 @@ int handle_constraints_set(struct bridge_dev_context *dev_context,
 {
 #ifdef CONFIG_TIDSPBRIDGE_DVFS
        u32 *constraint_val;
-       struct dspbridge_platform_data *pdata =
-           omap_dspbridge_dev->dev.platform_data;
+       struct omap_dsp_platform_data *pdata =
+               omap_dspbridge_dev->dev.platform_data;
 
        constraint_val = (u32 *) (pargs);
        /* Read the target value requested by DSP */
@@ -83,8 +87,8 @@ int handle_hibernation_from_dsp(struct bridge_dev_context *dev_context)
        u32 opplevel;
        struct io_mgr *hio_mgr;
 #endif
-       struct dspbridge_platform_data *pdata =
-           omap_dspbridge_dev->dev.platform_data;
+       struct omap_dsp_platform_data *pdata =
+               omap_dspbridge_dev->dev.platform_data;
 
        pwr_state = (*pdata->dsp_prm_read)(OMAP3430_IVA2_MOD, OMAP2_PM_PWSTST) &
                                                OMAP_POWERSTATEST_MASK;
@@ -152,8 +156,8 @@ int sleep_dsp(struct bridge_dev_context *dev_context, u32 dw_cmd,
 #endif /* CONFIG_TIDSPBRIDGE_NTFY_PWRERR */
        u16 timeout = PWRSTST_TIMEOUT / 10;
        u32 pwr_state, target_pwr_state;
-       struct dspbridge_platform_data *pdata =
-                               omap_dspbridge_dev->dev.platform_data;
+       struct omap_dsp_platform_data *pdata =
+               omap_dspbridge_dev->dev.platform_data;
 
        /* Check if sleep code is valid */
        if ((dw_cmd != PWR_DEEPSLEEP) && (dw_cmd != PWR_EMERGENCYDEEPSLEEP))