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

Commit f91eeeb5 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.10-4' of... 

Merge tag 'asoc-v3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v3.10

A few more bug fixes, the DAPM clock fix is actually a driver specific
one since currently there's only one user of the clock support due to
the problems relying on the clock API.
parents 4ca231b2 9631c02e

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 9

SUBLEVEL = 0

EXTRAVERSION = -rc8

EXTRAVERSION =

NAME = Unicycling Gorilla



# *DOCUMENTATION*

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+11 −7
Original line number Diff line number Diff line
@@ -2714,16 +2714,22 @@ static struct omap_ocp2scp_dev ocp2scp_dev_attr[] = { 
	{ }

};



static struct omap_hwmod_opt_clk ocp2scp_usb_phy_opt_clks[] = {

	{ .role = "48mhz", .clk = "ocp2scp_usb_phy_phy_48m" },

};



/* ocp2scp_usb_phy */

static struct omap_hwmod omap44xx_ocp2scp_usb_phy_hwmod = {

	.name		= "ocp2scp_usb_phy",

	.class		= &omap44xx_ocp2scp_hwmod_class,

	.clkdm_name	= "l3_init_clkdm",

	.main_clk	= "func_48m_fclk",

	/*

	 * ocp2scp_usb_phy_phy_48m is provided by the OMAP4 PRCM IP

	 * block as an "optional clock," and normally should never be

	 * specified as the main_clk for an OMAP IP block.  However it

	 * turns out that this clock is actually the main clock for

	 * the ocp2scp_usb_phy IP block:

	 * http://lists.infradead.org/pipermail/linux-arm-kernel/2012-September/119943.html

	 * So listing ocp2scp_usb_phy_phy_48m as a main_clk here seems

	 * to be the best workaround.

	 */

	.main_clk	= "ocp2scp_usb_phy_phy_48m",

	.prcm = {

		.omap4 = {

			.clkctrl_offs = OMAP4_CM_L3INIT_USBPHYOCP2SCP_CLKCTRL_OFFSET,
@@ -2732,8 +2738,6 @@ static struct omap_hwmod omap44xx_ocp2scp_usb_phy_hwmod = { 
		},

	},

	.dev_attr	= ocp2scp_dev_attr,

	.opt_clks	= ocp2scp_usb_phy_opt_clks,

	.opt_clks_cnt	= ARRAY_SIZE(ocp2scp_usb_phy_opt_clks),

};



/*

arch/mips/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#define PAGE_SHIFT	16

#endif

#define PAGE_SIZE	(_AC(1,UL) << PAGE_SHIFT)

#define PAGE_MASK	(~(PAGE_SIZE - 1))

#define PAGE_MASK	(~((1 << PAGE_SHIFT) - 1))



#ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT

#define HPAGE_SHIFT	(PAGE_SHIFT + PAGE_SHIFT - 3)

arch/parisc/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -65,8 +65,10 @@ ifndef CONFIG_FUNCTION_TRACER 
endif



# Use long jumps instead of long branches (needed if your linker fails to

# link a too big vmlinux executable)

cflags-$(CONFIG_MLONGCALLS)	+= -mlong-calls

# link a too big vmlinux executable). Not enabled for building modules.

ifdef CONFIG_MLONGCALLS

KBUILD_CFLAGS_KERNEL += -mlong-calls

endif



# select which processor to optimise for

cflags-$(CONFIG_PA7100)		+= -march=1.1 -mschedule=7100

arch/parisc/include/asm/cacheflush.h

+4 −1
Original line number Diff line number Diff line
@@ -140,7 +140,10 @@ static inline void *kmap(struct page *page) 
	return page_address(page);

}



#define kunmap(page)			kunmap_parisc(page_address(page))

static inline void kunmap(struct page *page)

{

	kunmap_parisc(page_address(page));

}



static inline void *kmap_atomic(struct page *page)

{