[PATCH] ARM: OMAP: Hack add some OMAP3 McBSP muxing

Jarkko Nikula jarkko.nikula at nokia.com
Thu Oct 9 14:28:02 CEST 2008


Signed-off-by: Jarkko Nikula <jarkko.nikula at nokia.com>
---
 arch/arm/mach-omap2/mux.c             |   52 +++++++++++++++++++++++++++++++++
 arch/arm/plat-omap/include/mach/mux.h |   29 ++++++++++++++++++
 2 files changed, 81 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index dacb41f..1dff09e 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -261,6 +261,58 @@ static struct pin_config __initdata_or_module omap34xx_pins[] = {
  *		mux-mode | [active-mode | off-mode]
  */
 
+/* Primary McBSP multiplexing */
+MUX_CFG_34XX("Y21_3430_MCBSP1_CLKR", 0x18c,
+		OMAP34XX_MUX_MODE0)
+MUX_CFG_34XX("AA21_3430_MCBSP1_FSR", 0x18e,
+		OMAP34XX_MUX_MODE0)
+MUX_CFG_34XX("Y21_3430_MCBSP1_DX", 0x190,
+		OMAP34XX_MUX_MODE0)
+MUX_CFG_34XX("U21_3430_MCBSP1_DR", 0x192,
+		OMAP34XX_MUX_MODE0)
+MUX_CFG_34XX("T21_3430_MCBSP1_CLKS", 0x194,
+		OMAP34XX_MUX_MODE0)
+MUX_CFG_34XX("K26_3430_MCBSP1_FSX", 0x196,
+		OMAP34XX_MUX_MODE0)
+MUX_CFG_34XX("W21_3430_MCBSP1_CLKX", 0x198,
+		OMAP34XX_MUX_MODE0)
+
+MUX_CFG_34XX("P21_3430_MCBSP2_FSX", 0x13c,
+		OMAP34XX_MUX_MODE0)
+MUX_CFG_34XX("N21_3430_MCBSP2_CLKX", 0x13e,
+		OMAP34XX_MUX_MODE0)
+MUX_CFG_34XX("R21_3430_MCBSP2_DR", 0x140,
+		OMAP34XX_MUX_MODE0)
+MUX_CFG_34XX("M21_3430_MCBSP2_DX", 0x142,
+		OMAP34XX_MUX_MODE0)
+
+MUX_CFG_34XX("AF6_3430_MCBSP3_DX", 0x16c,
+		OMAP34XX_MUX_MODE0)
+MUX_CFG_34XX("AE6_3430_MCBSP3_DR", 0x16e,
+		OMAP34XX_MUX_MODE0)
+MUX_CFG_34XX("AF5_3430_MCBSP3_CLKX", 0x170,
+		OMAP34XX_MUX_MODE0)
+MUX_CFG_34XX("AE5_3430_MCBSP3_FSX", 0x172,
+		OMAP34XX_MUX_MODE0)
+
+MUX_CFG_34XX("AE1_3430_MCBSP4_CLKX", 0x184,
+		OMAP34XX_MUX_MODE0)
+MUX_CFG_34XX("AD1_3430_MCBSP4_DR", 0x186,
+		OMAP34XX_MUX_MODE0)
+MUX_CFG_34XX("AD2_3430_MCBSP4_DX", 0x188,
+		OMAP34XX_MUX_MODE0)
+MUX_CFG_34XX("AC1_3430_MCBSP4_FSX", 0x18a,
+		OMAP34XX_MUX_MODE0)
+
+MUX_CFG_34XX("AF10_3430_MCBSP5_CLKX", 0x5d8,
+		OMAP34XX_MUX_MODE1)
+MUX_CFG_34XX("AE11_3430_MCBSP5_DR", 0x5e4,
+		OMAP34XX_MUX_MODE1)
+MUX_CFG_34XX("AH9_3430_MCBSP5_FSX", 0x5e6,
+		OMAP34XX_MUX_MODE1)
+MUX_CFG_34XX("AF13_3430_MCBSP5_DX", 0x5e8,
+		OMAP34XX_MUX_MODE1)
+
 /* 34xx I2C */
 MUX_CFG_34XX("K21_34XX_I2C1_SCL", 0x1ba,
 		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP)
diff --git a/arch/arm/plat-omap/include/mach/mux.h b/arch/arm/plat-omap/include/mach/mux.h
index f4362b8..c0cfa73 100644
--- a/arch/arm/plat-omap/include/mach/mux.h
+++ b/arch/arm/plat-omap/include/mach/mux.h
@@ -677,6 +677,35 @@ enum omap24xx_index {
 };
 
 enum omap34xx_index {
+	/* Primary McBSP multiplexing */
+	Y21_3430_MCBSP1_CLKR,
+	AA21_3430_MCBSP1_FSR,
+	Y21_3430_MCBSP1_DX,
+	U21_3430_MCBSP1_DR,
+	T21_3430_MCBSP1_CLKS,
+	K26_3430_MCBSP1_FSX,
+	W21_3430_MCBSP1_CLKX,
+
+	P21_3430_MCBSP2_FSX,
+	N21_3430_MCBSP2_CLKX,
+	R21_3430_MCBSP2_DR,
+	M21_3430_MCBSP2_DX,
+
+	AF6_3430_MCBSP3_DX,
+	AE6_3430_MCBSP3_DR,
+	AF5_3430_MCBSP3_CLKX,
+	AE5_3430_MCBSP3_FSX,
+
+	AE1_3430_MCBSP4_CLKX,
+	AD1_3430_MCBSP4_DR,
+	AD2_3430_MCBSP4_DX,
+	AC1_3430_MCBSP4_FSX,
+
+	AF10_3430_MCBSP5_CLKX,
+	AE11_3430_MCBSP5_DR,
+	AH9_3430_MCBSP5_FSX,
+	AF13_3430_MCBSP5_DX,
+
 	/* 34xx I2C */
 	K21_34XX_I2C1_SCL,
 	J21_34XX_I2C1_SDA,
-- 
1.5.6.5


--Multipart=_Thu__2_Apr_2009_19_56_53_+0300_OCGZiXCSMdXq4.P8--


More information about the Alsa-devel mailing list