Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 13:11:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: r8712u: Add new USB ID
  staging: tidspbridge: request dmtimer clocks on init
  staging: tidspbridge: include module.h by default
This commit is contained in:
Linus Torvalds 2011-12-15 14:15:01 -08:00
commit 88703f2775
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/rtl8712/usb_intf.c
View File

@ -89,6 +89,7 @@ static struct usb_device_id rtl871x_usb_id_tbl[] = {
{USB_DEVICE(0x0DF6, 0x0045)}, {USB_DEVICE(0x0DF6, 0x0045)},
{USB_DEVICE(0x0DF6, 0x0059)}, /* 11n mode disable */ {USB_DEVICE(0x0DF6, 0x0059)}, /* 11n mode disable */
{USB_DEVICE(0x0DF6, 0x004B)}, {USB_DEVICE(0x0DF6, 0x004B)},
{USB_DEVICE(0x0DF6, 0x005D)},
{USB_DEVICE(0x0DF6, 0x0063)}, {USB_DEVICE(0x0DF6, 0x0063)},
/* Sweex */ /* Sweex */
{USB_DEVICE(0x177F, 0x0154)}, {USB_DEVICE(0x177F, 0x0154)},

15
drivers/staging/tidspbridge/core/dsp-clock.c
View File

@ -54,6 +54,7 @@
/* Bridge GPT id (1 - 4), DM Timer id (5 - 8) */ /* Bridge GPT id (1 - 4), DM Timer id (5 - 8) */
#define DMT_ID(id) ((id) + 4) #define DMT_ID(id) ((id) + 4)
#define DM_TIMER_CLOCKS 4
/* Bridge MCBSP id (6 - 10), OMAP Mcbsp id (0 - 4) */ /* Bridge MCBSP id (6 - 10), OMAP Mcbsp id (0 - 4) */
#define MCBSP_ID(id) ((id) - 6) #define MCBSP_ID(id) ((id) - 6)
@ -114,8 +115,13 @@ static s8 get_clk_type(u8 id)
*/ */
void dsp_clk_exit(void) void dsp_clk_exit(void)
{ {
int i;
dsp_clock_disable_all(dsp_clocks); dsp_clock_disable_all(dsp_clocks);
for (i = 0; i < DM_TIMER_CLOCKS; i++)
omap_dm_timer_free(timer[i]);
clk_put(iva2_clk); clk_put(iva2_clk);
clk_put(ssi.sst_fck); clk_put(ssi.sst_fck);
clk_put(ssi.ssr_fck); clk_put(ssi.ssr_fck);
@ -130,9 +136,13 @@ void dsp_clk_exit(void)
void dsp_clk_init(void) void dsp_clk_init(void)
{ {
static struct platform_device dspbridge_device; static struct platform_device dspbridge_device;
int i, id;
dspbridge_device.dev.bus = &platform_bus_type; dspbridge_device.dev.bus = &platform_bus_type;
for (i = 0, id = 5; i < DM_TIMER_CLOCKS; i++, id++)
timer[i] = omap_dm_timer_request_specific(id);
iva2_clk = clk_get(&dspbridge_device.dev, "iva2_ck"); iva2_clk = clk_get(&dspbridge_device.dev, "iva2_ck");
if (IS_ERR(iva2_clk)) if (IS_ERR(iva2_clk))
dev_err(bridge, "failed to get iva2 clock %p\n", iva2_clk); dev_err(bridge, "failed to get iva2 clock %p\n", iva2_clk);
@ -204,8 +214,7 @@ int dsp_clk_enable(enum dsp_clk_id clk_id)
clk_enable(iva2_clk); clk_enable(iva2_clk);
break; break;
case GPT_CLK: case GPT_CLK:
timer[clk_id - 1] = status = omap_dm_timer_start(timer[clk_id - 1]);
omap_dm_timer_request_specific(DMT_ID(clk_id));
break; break;
#ifdef CONFIG_OMAP_MCBSP #ifdef CONFIG_OMAP_MCBSP
case MCBSP_CLK: case MCBSP_CLK:
@ -281,7 +290,7 @@ int dsp_clk_disable(enum dsp_clk_id clk_id)
clk_disable(iva2_clk); clk_disable(iva2_clk);
break; break;
case GPT_CLK: case GPT_CLK:
omap_dm_timer_free(timer[clk_id - 1]); status = omap_dm_timer_stop(timer[clk_id - 1]);
break; break;
#ifdef CONFIG_OMAP_MCBSP #ifdef CONFIG_OMAP_MCBSP
case MCBSP_CLK: case MCBSP_CLK:

4
drivers/staging/tidspbridge/rmgr/drv_interface.c
View File

@ -24,11 +24,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm.h> #include <linux/pm.h>
#ifdef MODULE
#include <linux/module.h> #include <linux/module.h>
#endif
#include <linux/device.h> #include <linux/device.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>