[Gta04-owner] fm-tuner - was Re: hw routing audio patch removed in 3.7?

[Andreas Kemnade]

Hi,

On Wed, 2013-10-23 at 22:48 +0200, Andreas Kemnade wrote: 
> On Wed, 2013-10-23 at 22:38 +0200, Andreas Kemnade wrote: 
> > Hi,
> > 
> 
> > I just compiled 3.11-nplus. arecord does just give timeouts, no data.
> > 
> And then I found this. This looks really, really wrong:
> 
> http://git.goldelico.com/?p=gta04-kernel.git;a=blobdiff;f=arch/arm/mach-omap2/board-omap3gta04.c;h=97a04f303e399743f7000b56360225b46a733bbd;hp=fe8f002b2aa2b010d85f272740c70d0ffbf001d6;hb=055bd1b74c781539ad4e03bfa66200ff231e7672;hpb=d7277285cf1450513c06cb21dc5cb926609a0f8b
> 

here is the missing bit of the patch taken from the one in the 3.7-nplus
tree. With that, the mcbsp1 does work again in 3.11-nplus.

diff --git a/arch/arm/mach-omap2/board-omap3gta04.c b/arch/arm/mach-omap2/board-omap3gta04.c
index 2ffa769..4b9faa1 100644
--- a/arch/arm/mach-omap2/board-omap3gta04.c
+++ b/arch/arm/mach-omap2/board-omap3gta04.c
@@ -1794,6 +1794,21 @@ static void __init gta04_init(void)
 
 	pm_set_vt_switch(0);
 
+	/* handle special wiring of our Si47xx
+	 * FSX, CLKX, DX, DR are wired as usual for 4-wire
+	 * FSR must be the 6-wire FSR output and have the same signal as FSX
+	 * CLKR must be ignored (Interrupt GPIO!) and be internally driven by CLKX
+	 */
+	{ /* disconnect CLKR from McBSP1 and drive from CLKX
+	   * see https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/sound/soc/omap/omap-mcbsp.c?id=8fef6263ea68f6160637f370a5864d 0a455c620d
+	   */
+		u32 devconf0;
+		devconf0 = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
+		devconf0 |= OMAP2_MCBSP1_CLKR_MASK;
+		omap_ctrl_writel(devconf0, OMAP2_CONTROL_DEVCONF0);
+		printk("CONTROL_DEVCONF0 = %08lx\n", (unsigned long int) devconf0);
+	}
+
 	printk("gta04_init done...\n");
 }