diff options
Diffstat (limited to 'drivers/staging/tidspbridge')
-rw-r--r-- | drivers/staging/tidspbridge/core/_tiomap.h | 6 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/core/_tiomap_pwr.h | 10 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 10 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/core/ue_deh.c | 2 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/core/wdt.c | 4 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/drv_interface.c | 1 |
6 files changed, 17 insertions, 16 deletions
diff --git a/drivers/staging/tidspbridge/core/_tiomap.h b/drivers/staging/tidspbridge/core/_tiomap.h index b783bfa..65971b7 100644 --- a/drivers/staging/tidspbridge/core/_tiomap.h +++ b/drivers/staging/tidspbridge/core/_tiomap.h @@ -145,8 +145,8 @@ struct map_l4_peripheral { #define L4_PERIPHERAL_MBOX 0x48094000 #define DSPVA_PERIPHERAL_MBOX 0x11808000 -#define PM_GRPSEL_BASE 0x48307000 -#define DSPVA_GRPSEL_BASE 0x11821000 +#define PM_GRPSEL_BASE 0x48307000 +#define DSPVA_GRPSEL_BASE 0x11821000 #define L4_PERIPHERAL_SIDETONE_MCBSP2 0x49028000 #define DSPVA_PERIPHERAL_SIDETONE_MCBSP2 0x11824000 @@ -311,7 +311,7 @@ static const struct bpwr_clk_t bpwr_clks[] = { #define SET_GROUP_BITS16(reg, position, width, value) \ do {\ - reg &= ~((0xFFFF >> (16 - (width))) << (position)) ; \ + reg &= ~((0xFFFF >> (16 - (width))) << (position)); \ reg |= ((value & (0xFFFF >> (16 - (width)))) << (position)); \ } while (0); diff --git a/drivers/staging/tidspbridge/core/_tiomap_pwr.h b/drivers/staging/tidspbridge/core/_tiomap_pwr.h index bd0354d..7bbd380 100644 --- a/drivers/staging/tidspbridge/core/_tiomap_pwr.h +++ b/drivers/staging/tidspbridge/core/_tiomap_pwr.h @@ -40,7 +40,7 @@ extern int sleep_dsp(struct bridge_dev_context *dev_context, u32 dw_cmd, void *pargs); /* * ========interrupt_dsp======== - * Sends an interrupt to DSP unconditionally. + * Sends an interrupt to DSP unconditionally. */ extern void interrupt_dsp(struct bridge_dev_context *dev_context, u16 mb_val); @@ -53,24 +53,24 @@ extern int dsp_peripheral_clk_ctrl(struct bridge_dev_context *dev_context, void *pargs); /* * ======== handle_hibernation_from_dsp ======== - * Handle Hibernation requested from DSP + * Handle Hibernation requested from DSP */ int handle_hibernation_from_dsp(struct bridge_dev_context *dev_context); /* * ======== post_scale_dsp ======== - * Handle Post Scale notification to DSP + * Handle Post Scale notification to DSP */ int post_scale_dsp(struct bridge_dev_context *dev_context, void *pargs); /* * ======== pre_scale_dsp ======== - * Handle Pre Scale notification to DSP + * Handle Pre Scale notification to DSP */ int pre_scale_dsp(struct bridge_dev_context *dev_context, void *pargs); /* * ======== handle_constraints_set ======== - * Handle constraints request from DSP + * Handle constraints request from DSP */ int handle_constraints_set(struct bridge_dev_context *dev_context, void *pargs); diff --git a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c index dafa6d9..1862afd 100644 --- a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c +++ b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c @@ -51,7 +51,7 @@ /* * ======== handle_constraints_set ======== - * Sets new DSP constraint + * Sets new DSP constraint */ int handle_constraints_set(struct bridge_dev_context *dev_context, void *pargs) @@ -75,7 +75,7 @@ int handle_constraints_set(struct bridge_dev_context *dev_context, /* * ======== handle_hibernation_from_dsp ======== - * Handle Hibernation requested from DSP + * Handle Hibernation requested from DSP */ int handle_hibernation_from_dsp(struct bridge_dev_context *dev_context) { @@ -144,7 +144,7 @@ int handle_hibernation_from_dsp(struct bridge_dev_context *dev_context) /* * ======== sleep_dsp ======== - * Put DSP in low power consuming state. + * Put DSP in low power consuming state. */ int sleep_dsp(struct bridge_dev_context *dev_context, u32 dw_cmd, void *pargs) @@ -250,7 +250,7 @@ int sleep_dsp(struct bridge_dev_context *dev_context, u32 dw_cmd, /* * ======== wake_dsp ======== - * Wake up DSP from sleep. + * Wake up DSP from sleep. */ int wake_dsp(struct bridge_dev_context *dev_context, void *pargs) { @@ -276,7 +276,7 @@ int wake_dsp(struct bridge_dev_context *dev_context, void *pargs) /* * ======== dsp_peripheral_clk_ctrl ======== - * Enable/Disable the DSP peripheral clocks as needed.. + * Enable/Disable the DSP peripheral clocks as needed.. */ int dsp_peripheral_clk_ctrl(struct bridge_dev_context *dev_context, void *pargs) diff --git a/drivers/staging/tidspbridge/core/ue_deh.c b/drivers/staging/tidspbridge/core/ue_deh.c index 6aea6f1..e68f0ba 100644 --- a/drivers/staging/tidspbridge/core/ue_deh.c +++ b/drivers/staging/tidspbridge/core/ue_deh.c @@ -177,7 +177,7 @@ static void mmu_fault_print_stack(struct bridge_dev_context *dev_context) void *dummy_va_addr; resources = dev_context->resources; - dummy_va_addr = (void*)__get_free_page(GFP_ATOMIC); + dummy_va_addr = (void *)__get_free_page(GFP_ATOMIC); /* * Before acking the MMU fault, let's make sure MMU can only diff --git a/drivers/staging/tidspbridge/core/wdt.c b/drivers/staging/tidspbridge/core/wdt.c index 7ff0e6c..c7ee467 100644 --- a/drivers/staging/tidspbridge/core/wdt.c +++ b/drivers/staging/tidspbridge/core/wdt.c @@ -25,8 +25,8 @@ #include <dspbridge/host_os.h> -#define OMAP34XX_WDT3_BASE (0x49000000 + 0x30000) -#define INT_34XX_WDT3_IRQ (36 + NR_IRQS) +#define OMAP34XX_WDT3_BASE (0x49000000 + 0x30000) +#define INT_34XX_WDT3_IRQ (36 + NR_IRQS) static struct dsp_wdt_setting dsp_wdt; diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c index df0f37e..9c02056 100644 --- a/drivers/staging/tidspbridge/rmgr/drv_interface.c +++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c @@ -508,6 +508,7 @@ static int omap34_xx_bridge_probe(struct platform_device *pdev) bridge_class = class_create(THIS_MODULE, "ti_bridge"); if (IS_ERR(bridge_class)) { pr_err("%s: Error creating bridge class\n", __func__); + err = PTR_ERR(bridge_class); goto err3; } |