From: Olof Johansson <olof@lixom.net>
Date: Tue, 9 Oct 2012 21:06:10 +0000 (-0700)
Subject: Merge tag 'omap-for-v3.7-rc1/fixes-asoc-regression-signed' of git://git.kernel.org... 
X-Git-Tag: upstream/snapshot3+hdmi~6471^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6bd5dbda2adeabba69c969886511e501a65b6e3c;hp=-c;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'omap-for-v3.7-rc1/fixes-asoc-regression-signed' of git://git./linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:

This branch contains regression fixes for omap4/5 ASoC
audio that were caused by the fact that u-boot stopped
muxing non essential pins.

As omap audio and dmaengine development happens on
these platforms, let's make sure they are usable.

Of course this should have been fixed earlier and
not during the -rc cycle.

* tag 'omap-for-v3.7-rc1/fixes-asoc-regression-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM/dts: omap5-evm: pinmux configuration for audio
  ARM/dts: Add pinctrl driver entries for omap5
  ARM/dts: omap4-panda: pinmux configuration for audio
  ARM/dts: omap4-sdp: pinmux configuration for audio
  ARM/dts: omap5-evm: Disable unused McBSP3
  ARM/dts: omap4-sdp: Disable unused McBSP3
  ARM/dts: omap4-panda: Disable unused audio IPs
  ARM: OMAP: board-omap4panda: Pin mux configuration for audio needs
  ARM: OMAP: board-4430-sdp: Pin mux configuration for audio needs
---

6bd5dbda2adeabba69c969886511e501a65b6e3c
diff --combined arch/arm/mach-omap2/board-omap4panda.c
index c3832ddb,645e857..f62b903
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@@ -247,7 -247,8 +247,7 @@@ static struct platform_device omap_vwla
  };
  
  static struct wl12xx_platform_data omap_panda_wlan_data  __initdata = {
 -	/* PANDA ref clock is 38.4 MHz */
 -	.board_ref_clock = 2,
 +	.board_ref_clock = WL12XX_REFCLOCK_38, /* 38.4 MHz */
  };
  
  static struct twl6040_codec_data twl6040_codec = {
@@@ -387,6 -388,21 +387,21 @@@ static struct omap_board_mux board_mux[
  	/* NIRQ2 for twl6040 */
  	OMAP4_MUX(SYS_NIRQ2, OMAP_MUX_MODE0 |
  		  OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE),
+ 	/* GPIO_127 for twl6040 */
+ 	OMAP4_MUX(HDQ_SIO, OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT),
+ 	/* McPDM */
+ 	OMAP4_MUX(ABE_PDM_UL_DATA, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),
+ 	OMAP4_MUX(ABE_PDM_DL_DATA, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),
+ 	OMAP4_MUX(ABE_PDM_FRAME, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP),
+ 	OMAP4_MUX(ABE_PDM_LB_CLK, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),
+ 	OMAP4_MUX(ABE_CLKS, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),
+ 	/* McBSP1 */
+ 	OMAP4_MUX(ABE_MCBSP1_CLKX, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
+ 	OMAP4_MUX(ABE_MCBSP1_DR, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),
+ 	OMAP4_MUX(ABE_MCBSP1_DX, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT |
+ 		  OMAP_PULL_ENA),
+ 	OMAP4_MUX(ABE_MCBSP1_FSX, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
+ 
  	{ .reg_offset = OMAP_MUX_TERMINATOR },
  };