[PATCH 1/2] ARM: mx27pdk: Add audio support

Subsystems: arm port, the rest

STALE5142d

10 messages, 5 authors, 2012-08-13 · open the first message on its own page

[PATCH 1/2] ARM: mx27pdk: Add audio support

From: Fabio Estevam <hidden>
Date: 2012-07-03 18:44:57 

mx27pdk has a mc13783 audio codec.

Add support for it.

Signed-off-by: Fabio Estevam <redacted>
---
 arch/arm/mach-imx/Kconfig         |    1 +
 arch/arm/mach-imx/mach-mx27_3ds.c |   21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 0da882a..deb9f37 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -300,6 +300,7 @@ config MACH_MX27_3DS
 	select IMX_HAVE_PLATFORM_IMX_FB
 	select IMX_HAVE_PLATFORM_IMX_I2C
 	select IMX_HAVE_PLATFORM_IMX_KEYPAD
+	select IMX_HAVE_PLATFORM_IMX_SSI
 	select IMX_HAVE_PLATFORM_IMX_UART
 	select IMX_HAVE_PLATFORM_MX2_CAMERA
 	select IMX_HAVE_PLATFORM_MXC_EHCI
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c
index c6d385c..3dc944e 100644
--- a/arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/arch/arm/mach-imx/mach-mx27_3ds.c
@@ -160,6 +160,11 @@ static const int mx27pdk_pins[] __initconst = {
 	PB21_PF_CSI_HSYNC,
 	CSI_PWRDWN | GPIO_GPIO | GPIO_OUT,
 	CSI_RESET | GPIO_GPIO | GPIO_OUT,
+	/* SSI4 */
+	PC16_PF_SSI4_FS,
+	PC17_PF_SSI4_RXD,
+	PC18_PF_SSI4_TXD,
+	PC19_PF_SSI4_CLK,
 };
 
 static struct gpio mx27_3ds_camera_gpios[] = {
@@ -331,13 +336,24 @@ static struct mc13xxx_regulator_init_data mx27_3ds_regulators[] = {
 };
 
 /* MC13783 */
+static struct mc13xxx_codec_platform_data mx27_3ds_codec = {
+	.dac_ssi_port = MC13783_SSI1_PORT,
+	.adc_ssi_port = MC13783_SSI1_PORT,
+};
+
 static struct mc13xxx_platform_data mc13783_pdata = {
 	.regulators = {
 		.regulators = mx27_3ds_regulators,
 		.num_regulators = ARRAY_SIZE(mx27_3ds_regulators),
 
 	},
-	.flags  = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC,
+	.flags  = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC |
+						MC13XXX_USE_CODEC,
+	.codec = &mx27_3ds_codec,
+};
+
+static struct imx_ssi_platform_data mx27_3ds_ssi_pdata = {
+	.flags = IMX_SSI_DMA | IMX_SSI_NET,
 };
 
 /* SPI */
@@ -513,6 +529,9 @@ static void __init mx27pdk_init(void)
 	}
 
 	imx27_add_mx2_camera(&mx27_3ds_cam_pdata);
+	imx27_add_imx_ssi(0, &mx27_3ds_ssi_pdata);
+
+	imx_add_platform_device("imx_mc13783", 0, NULL, 0, NULL, 0);
 }
 
 static void __init mx27pdk_timer_init(void)
-- 
1.7.1

[PATCH 2/2] ASoC: imx-mc13783: Add audmux settings for mx27pdk

From: Fabio Estevam <hidden>
Date: 2012-07-03 18:44:58 

mx27pdk board also has a mc13783 codec.

Add support for it and do a run-time machine type check to perform the correct
audiomux settings.

Cc: Mark Brown <redacted>
Cc: <redacted>
Signed-off-by: Fabio Estevam <redacted>
---
 sound/soc/fsl/imx-mc13783.c |   49 +++++++++++++++++++++++++++++--------------
 1 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/sound/soc/fsl/imx-mc13783.c b/sound/soc/fsl/imx-mc13783.c
index f59c349..549b31f 100644
--- a/sound/soc/fsl/imx-mc13783.c
+++ b/sound/soc/fsl/imx-mc13783.c
@@ -111,22 +111,39 @@ static int __devinit imx_mc13783_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	imx_audmux_v2_configure_port(MX31_AUDMUX_PORT4_SSI_PINS_4,
-		IMX_AUDMUX_V2_PTCR_SYN,
-		IMX_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT1_SSI0) |
-		IMX_AUDMUX_V2_PDCR_MODE(1) |
-		IMX_AUDMUX_V2_PDCR_INMMASK(0xfc));
-	imx_audmux_v2_configure_port(MX31_AUDMUX_PORT1_SSI0,
-		IMX_AUDMUX_V2_PTCR_SYN |
-		IMX_AUDMUX_V2_PTCR_TFSDIR |
-		IMX_AUDMUX_V2_PTCR_TFSEL(MX31_AUDMUX_PORT4_SSI_PINS_4) |
-		IMX_AUDMUX_V2_PTCR_TCLKDIR |
-		IMX_AUDMUX_V2_PTCR_TCSEL(MX31_AUDMUX_PORT4_SSI_PINS_4) |
-		IMX_AUDMUX_V2_PTCR_RFSDIR |
-		IMX_AUDMUX_V2_PTCR_RFSEL(MX31_AUDMUX_PORT4_SSI_PINS_4) |
-		IMX_AUDMUX_V2_PTCR_RCLKDIR |
-		IMX_AUDMUX_V2_PTCR_RCSEL(MX31_AUDMUX_PORT4_SSI_PINS_4),
-		IMX_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT4_SSI_PINS_4));
+	if (machine_is_mx31_3ds()) {
+		imx_audmux_v2_configure_port(MX31_AUDMUX_PORT4_SSI_PINS_4,
+			IMX_AUDMUX_V2_PTCR_SYN,
+			IMX_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT1_SSI0) |
+			IMX_AUDMUX_V2_PDCR_MODE(1) |
+			IMX_AUDMUX_V2_PDCR_INMMASK(0xfc));
+		imx_audmux_v2_configure_port(MX31_AUDMUX_PORT1_SSI0,
+			IMX_AUDMUX_V2_PTCR_SYN |
+			IMX_AUDMUX_V2_PTCR_TFSDIR |
+			IMX_AUDMUX_V2_PTCR_TFSEL(MX31_AUDMUX_PORT4_SSI_PINS_4) |
+			IMX_AUDMUX_V2_PTCR_TCLKDIR |
+			IMX_AUDMUX_V2_PTCR_TCSEL(MX31_AUDMUX_PORT4_SSI_PINS_4) |
+			IMX_AUDMUX_V2_PTCR_RFSDIR |
+			IMX_AUDMUX_V2_PTCR_RFSEL(MX31_AUDMUX_PORT4_SSI_PINS_4) |
+			IMX_AUDMUX_V2_PTCR_RCLKDIR |
+			IMX_AUDMUX_V2_PTCR_RCSEL(MX31_AUDMUX_PORT4_SSI_PINS_4),
+			IMX_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT4_SSI_PINS_4));
+	} else if (machine_is_mx27_3ds()) {
+		imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0,
+			IMX_AUDMUX_V1_PCR_SYN |
+			IMX_AUDMUX_V1_PCR_TFSDIR |
+			IMX_AUDMUX_V1_PCR_TCLKDIR |
+			IMX_AUDMUX_V1_PCR_RFSDIR |
+			IMX_AUDMUX_V1_PCR_RCLKDIR |
+			IMX_AUDMUX_V1_PCR_TFCSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) |
+			IMX_AUDMUX_V1_PCR_RFCSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) |
+			IMX_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4)
+		);
+		imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR3_SSI_PINS_4,
+			IMX_AUDMUX_V1_PCR_SYN |
+			IMX_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0)
+		);
+	}
 
 	return ret;
 }
-- 
1.7.1

[PATCH 2/2] ASoC: imx-mc13783: Add audmux settings for mx27pdk

From: Mark Brown <hidden>
Date: 2012-07-05 12:48:42 

On Tue, Jul 03, 2012 at 03:44:58PM -0300, Fabio Estevam wrote:
mx27pdk board also has a mc13783 codec.

Add support for it and do a run-time machine type check to perform the correct
audiomux settings.
Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120705/f602df0c/attachment-0001.sig>

[PATCH 1/2] ARM: mx27pdk: Add audio support

From: festevam@gmail.com (Fabio Estevam)
Date: 2012-07-25 12:21:20 

Hi Sascha,

On Tue, Jul 3, 2012 at 3:44 PM, Fabio Estevam
[off-list ref] wrote:
mx27pdk has a mc13783 audio codec.

Add support for it.

Signed-off-by: Fabio Estevam <redacted>
Is this patch OK? Can it be applied?

Regards,

Fabio Estevam

[PATCH 1/2] ARM: mx27pdk: Add audio support

From: festevam@gmail.com (Fabio Estevam)
Date: 2012-07-31 12:49:13 

Sascha,

On 7/25/12, Fabio Estevam [off-list ref] wrote:
Hi Sascha,

On Tue, Jul 3, 2012 at 3:44 PM, Fabio Estevam
[off-list ref] wrote:
quoted
mx27pdk has a mc13783 audio codec.

Add support for it.

Signed-off-by: Fabio Estevam <redacted>
Is this patch OK? Can it be applied?
Could this get into 3.6?

Thanks,

Fabio Estevam

[PATCH 1/2] ARM: mx27pdk: Add audio support

From: s.hauer@pengutronix.de (Sascha Hauer)
Date: 2012-08-03 13:59:56 

On Tue, Jul 31, 2012 at 09:49:13AM -0300, Fabio Estevam wrote:
Sascha,

On 7/25/12, Fabio Estevam [off-list ref] wrote:
quoted
Hi Sascha,

On Tue, Jul 3, 2012 at 3:44 PM, Fabio Estevam
[off-list ref] wrote:
quoted
mx27pdk has a mc13783 audio codec.

Add support for it.

Signed-off-by: Fabio Estevam <redacted>
Is this patch OK? Can it be applied?
Could this get into 3.6?
Applied now. Sorry, missed this one.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH 1/2] ARM: mx27pdk: Add audio support

From: festevam@gmail.com (Fabio Estevam)
Date: 2012-08-08 15:53:36 

On Fri, Aug 3, 2012 at 10:59 AM, Sascha Hauer [off-list ref] wrote:

Applied now. Sorry, missed this one.
Which git tree, please? I was not able to find it at
http://git.pengutronix.de/?p=imx/linux-2.6.git;a=summary

Regards,

Fabio Estevam

[PATCH 1/2] ARM: mx27pdk: Add audio support

From: Gaëtan Carlier <hidden>
Date: 2012-08-13 11:19:59 

Hi,
On 08/03/2012 03:59 PM, Sascha Hauer wrote:
On Tue, Jul 31, 2012 at 09:49:13AM -0300, Fabio Estevam wrote:
quoted
Sascha,

On 7/25/12, Fabio Estevam [off-list ref] wrote:
quoted
Hi Sascha,

On Tue, Jul 3, 2012 at 3:44 PM, Fabio Estevam
[off-list ref] wrote:
quoted
mx27pdk has a mc13783 audio codec.

Add support for it.

Signed-off-by: Fabio Estevam <redacted>
Is this patch OK? Can it be applied?
Could this get into 3.6?
Applied now. Sorry, missed this one.

Sascha
Is this patch will be applied on linux-next tree ?
Newer patch "[PATCH v2] ASoC: imx-ssi: Remove mono support" is already 
applied (I know that is not for the same branch) but not this one. Is 
there a problem with this patch ?
Best regards,
Ga?tan Carlier

[PATCH 1/2] ARM: mx27pdk: Add audio support

From: s.hauer@pengutronix.de (Sascha Hauer)
Date: 2012-08-13 18:58:25 

On Mon, Aug 13, 2012 at 01:19:59PM +0200, Ga?tan Carlier wrote:
Hi,
On 08/03/2012 03:59 PM, Sascha Hauer wrote:
quoted
On Tue, Jul 31, 2012 at 09:49:13AM -0300, Fabio Estevam wrote:
quoted
Sascha,

On 7/25/12, Fabio Estevam [off-list ref] wrote:
quoted
Hi Sascha,

On Tue, Jul 3, 2012 at 3:44 PM, Fabio Estevam
[off-list ref] wrote:
quoted
mx27pdk has a mc13783 audio codec.

Add support for it.

Signed-off-by: Fabio Estevam <redacted>
Is this patch OK? Can it be applied?
Could this get into 3.6?
Applied now. Sorry, missed this one.

Sascha
Is this patch will be applied on linux-next tree ?
This will be in linux-next once I send a pull request to Arnd. I do not
have a branch in linux-next.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH 1/2] ARM: mx27pdk: Add audio support

From: Gaëtan Carlier <hidden>
Date: 2012-08-13 19:13:25 

Hi,
On 08/13/2012 08:58 PM, Sascha Hauer wrote:
On Mon, Aug 13, 2012 at 01:19:59PM +0200, Ga?tan Carlier wrote:
quoted
Hi,
On 08/03/2012 03:59 PM, Sascha Hauer wrote:
quoted
On Tue, Jul 31, 2012 at 09:49:13AM -0300, Fabio Estevam wrote:
quoted
Sascha,

On 7/25/12, Fabio Estevam [off-list ref] wrote:
quoted
Hi Sascha,

On Tue, Jul 3, 2012 at 3:44 PM, Fabio Estevam
[off-list ref] wrote:
quoted
mx27pdk has a mc13783 audio codec.

Add support for it.

Signed-off-by: Fabio Estevam <redacted>
Is this patch OK? Can it be applied?
Could this get into 3.6?
Applied now. Sorry, missed this one.

Sascha
Is this patch will be applied on linux-next tree ?
This will be in linux-next once I send a pull request to Arnd. I do not
have a branch in linux-next.

Sascha
Ok, thanks a lot.
Ga?tan Carlier
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help