Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88703f27 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* '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
parents f242bbc5 c7caf4d4

drivers/staging/rtl8712/usb_intf.c

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ static struct usb_device_id rtl871x_usb_id_tbl[] = { 
	{USB_DEVICE(0x0DF6, 0x0045)},

	{USB_DEVICE(0x0DF6, 0x0059)}, /* 11n mode disable */

	{USB_DEVICE(0x0DF6, 0x004B)},

	{USB_DEVICE(0x0DF6, 0x005D)},

	{USB_DEVICE(0x0DF6, 0x0063)},

	/* Sweex */

	{USB_DEVICE(0x177F, 0x0154)},

drivers/staging/tidspbridge/core/dsp-clock.c

+12 −3
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 


/* Bridge GPT id (1 - 4), DM Timer id (5 - 8) */

#define DMT_ID(id) ((id) + 4)

#define DM_TIMER_CLOCKS		4



/* Bridge MCBSP id (6 - 10), OMAP Mcbsp id (0 - 4) */

#define MCBSP_ID(id) ((id) - 6)
@@ -114,8 +115,13 @@ static s8 get_clk_type(u8 id) 
 */

void dsp_clk_exit(void)

{

	int i;



	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(ssi.sst_fck);

	clk_put(ssi.ssr_fck);
@@ -130,9 +136,13 @@ void dsp_clk_exit(void) 
void dsp_clk_init(void)

{

	static struct platform_device dspbridge_device;

	int i, id;



	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");

	if (IS_ERR(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);

		break;

	case GPT_CLK:

		timer[clk_id - 1] =

				omap_dm_timer_request_specific(DMT_ID(clk_id));

		status = omap_dm_timer_start(timer[clk_id - 1]);

		break;

#ifdef CONFIG_OMAP_MCBSP

	case MCBSP_CLK:
@@ -281,7 +290,7 @@ int dsp_clk_disable(enum dsp_clk_id clk_id) 
		clk_disable(iva2_clk);

		break;

	case GPT_CLK:

		omap_dm_timer_free(timer[clk_id - 1]);

		status = omap_dm_timer_stop(timer[clk_id - 1]);

		break;

#ifdef CONFIG_OMAP_MCBSP

	case MCBSP_CLK:

drivers/staging/tidspbridge/rmgr/drv_interface.c

+0 −4
Original line number Diff line number Diff line
@@ -24,11 +24,7 @@ 
#include <linux/types.h>

#include <linux/platform_device.h>

#include <linux/pm.h>



#ifdef MODULE

#include <linux/module.h>

#endif



#include <linux/device.h>

#include <linux/init.h>

#include <linux/moduleparam.h>