linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 0/3] ARM/ASoC: OMAP McBSP: Correct CLKR/FSR source selection
@ 2012-03-08  9:22 Peter Ujfalusi
  2012-03-08  9:22 ` [PATCH v2 1/3] ARM: OMAP2+: McBSP: Correct CLKR/FSR clock source mux configuration Peter Ujfalusi
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Peter Ujfalusi @ 2012-03-08  9:22 UTC (permalink / raw)
  To: linux-arm-kernel

Hello,

Changes since v1:
- Adapted to the moved mcbsp code which helped to reduce the number of patches
  from 5 to 3.
- Clock selection related defines moved from arch to ASoC header.

No change in functionality otherwise.

This series fixes the CLKR/FSR mux selection (on McBSP ports with 6 pin setup).
OMAP2/3 has 6 pin setup on McBSP1 port while OMAP4 has the 6 pin setup on McBSP4
port.
Add support for OMAP4 CLKR/FSR source selection, and simplify the ASoC part of
CLK mux configuration.

This series should go via ASoC with the rest of McBSP changes.

Regards,
Peter
---
Peter Ujfalusi (3):
  ARM: OMAP2+: McBSP: Correct CLKR/FSR clock source mux configuration
  ARM/ASoC: OMAP McBSP: Move remainig defines from arch to ASoC header
  ASoC: omap-mcbsp: Single function CLKR/FSR source mux configuration

 arch/arm/mach-omap2/mcbsp.c             |   46 ++++++++++++++++++++++++++++-
 arch/arm/plat-omap/include/plat/mcbsp.h |   12 --------
 sound/soc/omap/mcbsp.c                  |   48 ++++++++++++++----------------
 sound/soc/omap/mcbsp.h                  |   13 +++++++-
 sound/soc/omap/omap-mcbsp.c             |    8 ++--
 5 files changed, 81 insertions(+), 46 deletions(-)

-- 
1.7.8.5

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH v2 1/3] ARM: OMAP2+: McBSP: Correct CLKR/FSR clock source mux configuration
  2012-03-08  9:22 [PATCH v2 0/3] ARM/ASoC: OMAP McBSP: Correct CLKR/FSR source selection Peter Ujfalusi
@ 2012-03-08  9:22 ` Peter Ujfalusi
  2012-03-08 21:12   ` Tony Lindgren
  2012-03-08  9:22 ` [PATCH v2 2/3] ARM/ASoC: OMAP McBSP: Move remainig defines from arch to ASoC header Peter Ujfalusi
  2012-03-08  9:22 ` [PATCH v2 3/3] ASoC: omap-mcbsp: Single function CLKR/FSR source mux configuration Peter Ujfalusi
  2 siblings, 1 reply; 9+ messages in thread
From: Peter Ujfalusi @ 2012-03-08  9:22 UTC (permalink / raw)
  To: linux-arm-kernel

On OMAP2/3 McBSP1 port has 6 pin setup, while on OMAP4 the port is McBSP4.
Implement the CLKR/FSR clock mux selection for OMAP4, and make sure that
we add the correct callback for the correct port across supported OMAP
versions.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
---
 arch/arm/mach-omap2/mcbsp.c |   46 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index 49ff5b8..ecc039e 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -34,7 +34,7 @@
 #include "cm2xxx_3xxx.h"
 #include "cm-regbits-34xx.h"
 
-/* McBSP internal signal muxing function */
+/* McBSP1 internal signal muxing function for OMAP2/3 */
 static int omap2_mcbsp1_mux_rx_clk(struct device *dev, const char *signal,
 				   const char *src)
 {
@@ -65,6 +65,42 @@ static int omap2_mcbsp1_mux_rx_clk(struct device *dev, const char *signal,
 	return 0;
 }
 
+/* McBSP4 internal signal muxing function for OMAP4 */
+#define OMAP4_CONTROL_MCBSPLP_ALBCTRLRX_FSX	(1 << 31)
+#define OMAP4_CONTROL_MCBSPLP_ALBCTRLRX_CLKX	(1 << 30)
+static int omap4_mcbsp4_mux_rx_clk(struct device *dev, const char *signal,
+				   const char *src)
+{
+	u32 v;
+
+	/*
+	 * In CONTROL_MCBSPLP register only bit 30 (CLKR mux), and bit 31 (FSR
+	 * mux) is used */
+	v = omap4_ctrl_pad_readl(OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_MCBSPLP);
+
+	if (!strcmp(signal, "clkr")) {
+		if (!strcmp(src, "clkr"))
+			v &= ~OMAP4_CONTROL_MCBSPLP_ALBCTRLRX_CLKX;
+		else if (!strcmp(src, "clkx"))
+			v |= OMAP4_CONTROL_MCBSPLP_ALBCTRLRX_CLKX;
+		else
+			return -EINVAL;
+	} else if (!strcmp(signal, "fsr")) {
+		if (!strcmp(src, "fsr"))
+			v &= ~OMAP4_CONTROL_MCBSPLP_ALBCTRLRX_FSX;
+		else if (!strcmp(src, "fsx"))
+			v |= OMAP4_CONTROL_MCBSPLP_ALBCTRLRX_FSX;
+		else
+			return -EINVAL;
+	} else {
+		return -EINVAL;
+	}
+
+	omap4_ctrl_pad_writel(v, OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_MCBSPLP);
+
+	return 0;
+}
+
 /* McBSP CLKS source switching function */
 static int omap2_mcbsp_set_clk_src(struct device *dev, struct clk *clk,
 				   const char *src)
@@ -146,9 +182,15 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
 		pdata->has_ccr = true;
 	}
 	pdata->set_clk_src = omap2_mcbsp_set_clk_src;
-	if (id == 1)
+
+	/* On OMAP2/3 the McBSP1 port has 6 pin configuration */
+	if (id == 1 && oh->class->rev < MCBSP_CONFIG_TYPE4)
 		pdata->mux_signal = omap2_mcbsp1_mux_rx_clk;
 
+	/* On OMAP4 the McBSP4 port has 6 pin configuration */
+	if (id == 4 && oh->class->rev == MCBSP_CONFIG_TYPE4)
+		pdata->mux_signal = omap4_mcbsp4_mux_rx_clk;
+
 	if (oh->class->rev == MCBSP_CONFIG_TYPE3) {
 		if (id == 2)
 			/* The FIFO has 1024 + 256 locations */
-- 
1.7.8.5

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH v2 2/3] ARM/ASoC: OMAP McBSP: Move remainig defines from arch to ASoC header
  2012-03-08  9:22 [PATCH v2 0/3] ARM/ASoC: OMAP McBSP: Correct CLKR/FSR source selection Peter Ujfalusi
  2012-03-08  9:22 ` [PATCH v2 1/3] ARM: OMAP2+: McBSP: Correct CLKR/FSR clock source mux configuration Peter Ujfalusi
@ 2012-03-08  9:22 ` Peter Ujfalusi
  2012-03-08  9:29   ` Peter Ujfalusi
  2012-03-08 10:58   ` Mark Brown
  2012-03-08  9:22 ` [PATCH v2 3/3] ASoC: omap-mcbsp: Single function CLKR/FSR source mux configuration Peter Ujfalusi
  2 siblings, 2 replies; 9+ messages in thread
From: Peter Ujfalusi @ 2012-03-08  9:22 UTC (permalink / raw)
  To: linux-arm-kernel

Clock signal muxing, and functional clock related defines are only needed
in ASoC drivers.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
---
 arch/arm/plat-omap/include/plat/mcbsp.h |   12 ------------
 sound/soc/omap/mcbsp.h                  |   12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
index 8eb9b0e..1881412 100644
--- a/arch/arm/plat-omap/include/plat/mcbsp.h
+++ b/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -31,18 +31,6 @@
 #define MCBSP_CONFIG_TYPE3	0x3
 #define MCBSP_CONFIG_TYPE4	0x4
 
-/* CLKR signal muxing options */
-#define CLKR_SRC_CLKR		0
-#define CLKR_SRC_CLKX		1
-
-/* FSR signal muxing options */
-#define FSR_SRC_FSR		0
-#define FSR_SRC_FSX		1
-
-/* McBSP functional clock sources */
-#define MCBSP_CLKS_PRCM_SRC	0
-#define MCBSP_CLKS_PAD_SRC	1
-
 /* Platform specific configuration */
 struct omap_mcbsp_ops {
 	void (*request)(unsigned int);
diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h
index a5518d7..acc9470 100644
--- a/sound/soc/omap/mcbsp.h
+++ b/sound/soc/omap/mcbsp.h
@@ -230,6 +230,18 @@ enum {
 #define XRDYEN			BIT(10)
 #define XEMPTYEOFEN		BIT(14)
 
+/* CLKR signal muxing options */
+#define CLKR_SRC_CLKR		0
+#define CLKR_SRC_CLKX		1
+
+/* FSR signal muxing options */
+#define FSR_SRC_FSR		0
+#define FSR_SRC_FSX		1
+
+/* McBSP functional clock sources */
+#define MCBSP_CLKS_PRCM_SRC	0
+#define MCBSP_CLKS_PAD_SRC	1
+
 /* we don't do multichannel for now */
 struct omap_mcbsp_reg_cfg {
 	u16 spcr2;
-- 
1.7.8.5

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH v2 3/3] ASoC: omap-mcbsp: Single function CLKR/FSR source mux configuration
  2012-03-08  9:22 [PATCH v2 0/3] ARM/ASoC: OMAP McBSP: Correct CLKR/FSR source selection Peter Ujfalusi
  2012-03-08  9:22 ` [PATCH v2 1/3] ARM: OMAP2+: McBSP: Correct CLKR/FSR clock source mux configuration Peter Ujfalusi
  2012-03-08  9:22 ` [PATCH v2 2/3] ARM/ASoC: OMAP McBSP: Move remainig defines from arch to ASoC header Peter Ujfalusi
@ 2012-03-08  9:22 ` Peter Ujfalusi
  2012-03-08 10:59   ` Mark Brown
  2 siblings, 1 reply; 9+ messages in thread
From: Peter Ujfalusi @ 2012-03-08  9:22 UTC (permalink / raw)
  To: linux-arm-kernel

Use single function for the CLKR/FSR mux configuration.
OMAP2/3 has 6 pin configuration on McBSP1 instance, while on OMAP4
McBSP4 instance have the 6 pin configuration so the omap2_mcbsp1_mux_* is
not correct name for all support OMAP versions

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
---
 sound/soc/omap/mcbsp.c      |   48 +++++++++++++++++++-----------------------
 sound/soc/omap/mcbsp.h      |   15 +++++--------
 sound/soc/omap/omap-mcbsp.c |    8 +++---
 3 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index c3e31de..95413a1 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -687,40 +687,36 @@ int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id)
 		return -EINVAL;
 }
 
-void omap2_mcbsp1_mux_clkr_src(struct omap_mcbsp *mcbsp, u8 mux)
+int omap_mcbsp_6pin_src_mux(struct omap_mcbsp *mcbsp, u8 mux)
 {
-	const char *src;
-
-	if (mcbsp->id != 1)
-		return;
+	const char *signal, *src;
+	int ret = 0;
 
-	if (mux == CLKR_SRC_CLKR)
+	switch (mux) {
+	case CLKR_SRC_CLKR:
+		signal = "clkr";
 		src = "clkr";
-	else if (mux == CLKR_SRC_CLKX)
+		break;
+	case CLKR_SRC_CLKX:
+		signal = "clkr";
 		src = "clkx";
-	else
-		return;
-
-	if (mcbsp->pdata->mux_signal)
-		mcbsp->pdata->mux_signal(mcbsp->dev, "clkr", src);
-}
-
-void omap2_mcbsp1_mux_fsr_src(struct omap_mcbsp *mcbsp, u8 mux)
-{
-	const char *src;
-
-	if (mcbsp->id != 1)
-		return;
-
-	if (mux == FSR_SRC_FSR)
+		break;
+	case FSR_SRC_FSR:
+		signal = "fsr";
 		src = "fsr";
-	else if (mux == FSR_SRC_FSX)
+		break;
+	case FSR_SRC_FSX:
+		signal = "fsr";
 		src = "fsx";
-	else
-		return;
+		break;
+	default:
+		return -EINVAL;
+	}
 
 	if (mcbsp->pdata->mux_signal)
-		mcbsp->pdata->mux_signal(mcbsp->dev, "fsr", src);
+		ret = mcbsp->pdata->mux_signal(mcbsp->dev, signal, src);
+
+	return ret;
 }
 
 #define max_thres(m)			(mcbsp->pdata->buffer_size)
diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h
index acc9470..a944fcc 100644
--- a/sound/soc/omap/mcbsp.h
+++ b/sound/soc/omap/mcbsp.h
@@ -230,13 +230,11 @@ enum {
 #define XRDYEN			BIT(10)
 #define XEMPTYEOFEN		BIT(14)
 
-/* CLKR signal muxing options */
-#define CLKR_SRC_CLKR		0
-#define CLKR_SRC_CLKX		1
-
-/* FSR signal muxing options */
-#define FSR_SRC_FSR		0
-#define FSR_SRC_FSX		1
+/* Clock signal muxing options */
+#define CLKR_SRC_CLKR		0 /* CLKR signal is from the CLKR pin */
+#define CLKR_SRC_CLKX		1 /* CLKR signal is from the CLKX pin */
+#define FSR_SRC_FSR		2 /* FSR signal is from the FSR pin */
+#define FSR_SRC_FSX		3 /* FSR signal is from the FSX pin */
 
 /* McBSP functional clock sources */
 #define MCBSP_CLKS_PRCM_SRC	0
@@ -333,8 +331,7 @@ void omap_mcbsp_stop(struct omap_mcbsp *mcbsp, int tx, int rx);
 int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id);
 
 /* McBSP signal muxing API */
-void omap2_mcbsp1_mux_clkr_src(struct omap_mcbsp *mcbsp, u8 mux);
-void omap2_mcbsp1_mux_fsr_src(struct omap_mcbsp *mcbsp, u8 mux);
+int omap_mcbsp_6pin_src_mux(struct omap_mcbsp *mcbsp, u8 mux);
 
 /* Sidetone specific API */
 int omap_st_set_chgain(struct omap_mcbsp *mcbsp, int channel, s16 chgain);
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 10eb645..d8409b0 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -554,22 +554,22 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
 	case OMAP_MCBSP_CLKR_SRC_CLKR:
 		if (cpu_class_is_omap1())
 			break;
-		omap2_mcbsp1_mux_clkr_src(mcbsp, CLKR_SRC_CLKR);
+		err = omap_mcbsp_6pin_src_mux(mcbsp, CLKR_SRC_CLKR);
 		break;
 	case OMAP_MCBSP_CLKR_SRC_CLKX:
 		if (cpu_class_is_omap1())
 			break;
-		omap2_mcbsp1_mux_clkr_src(mcbsp, CLKR_SRC_CLKX);
+		err = omap_mcbsp_6pin_src_mux(mcbsp, CLKR_SRC_CLKX);
 		break;
 	case OMAP_MCBSP_FSR_SRC_FSR:
 		if (cpu_class_is_omap1())
 			break;
-		omap2_mcbsp1_mux_fsr_src(mcbsp, FSR_SRC_FSR);
+		err = omap_mcbsp_6pin_src_mux(mcbsp, FSR_SRC_FSR);
 		break;
 	case OMAP_MCBSP_FSR_SRC_FSX:
 		if (cpu_class_is_omap1())
 			break;
-		omap2_mcbsp1_mux_fsr_src(mcbsp, FSR_SRC_FSX);
+		err = omap_mcbsp_6pin_src_mux(mcbsp, FSR_SRC_FSX);
 		break;
 	default:
 		err = -ENODEV;
-- 
1.7.8.5

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH v2 2/3] ARM/ASoC: OMAP McBSP: Move remainig defines from arch to ASoC header
  2012-03-08  9:22 ` [PATCH v2 2/3] ARM/ASoC: OMAP McBSP: Move remainig defines from arch to ASoC header Peter Ujfalusi
@ 2012-03-08  9:29   ` Peter Ujfalusi
  2012-03-08  9:37     ` Jarkko Nikula
  2012-03-08 10:58   ` Mark Brown
  1 sibling, 1 reply; 9+ messages in thread
From: Peter Ujfalusi @ 2012-03-08  9:29 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Jarkko,

On 03/08/2012 11:22 AM, Peter Ujfalusi wrote:
> Clock signal muxing, and functional clock related defines are only needed
> in ASoC drivers.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>

I have added your ack to this patch by accident when I updated the
series. Sorry about that.
Please confirm if you are OK with this change.

Sorry again,
P?ter

> ---
>  arch/arm/plat-omap/include/plat/mcbsp.h |   12 ------------
>  sound/soc/omap/mcbsp.h                  |   12 ++++++++++++
>  2 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
> index 8eb9b0e..1881412 100644
> --- a/arch/arm/plat-omap/include/plat/mcbsp.h
> +++ b/arch/arm/plat-omap/include/plat/mcbsp.h
> @@ -31,18 +31,6 @@
>  #define MCBSP_CONFIG_TYPE3	0x3
>  #define MCBSP_CONFIG_TYPE4	0x4
>  
> -/* CLKR signal muxing options */
> -#define CLKR_SRC_CLKR		0
> -#define CLKR_SRC_CLKX		1
> -
> -/* FSR signal muxing options */
> -#define FSR_SRC_FSR		0
> -#define FSR_SRC_FSX		1
> -
> -/* McBSP functional clock sources */
> -#define MCBSP_CLKS_PRCM_SRC	0
> -#define MCBSP_CLKS_PAD_SRC	1
> -
>  /* Platform specific configuration */
>  struct omap_mcbsp_ops {
>  	void (*request)(unsigned int);
> diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h
> index a5518d7..acc9470 100644
> --- a/sound/soc/omap/mcbsp.h
> +++ b/sound/soc/omap/mcbsp.h
> @@ -230,6 +230,18 @@ enum {
>  #define XRDYEN			BIT(10)
>  #define XEMPTYEOFEN		BIT(14)
>  
> +/* CLKR signal muxing options */
> +#define CLKR_SRC_CLKR		0
> +#define CLKR_SRC_CLKX		1
> +
> +/* FSR signal muxing options */
> +#define FSR_SRC_FSR		0
> +#define FSR_SRC_FSX		1
> +
> +/* McBSP functional clock sources */
> +#define MCBSP_CLKS_PRCM_SRC	0
> +#define MCBSP_CLKS_PAD_SRC	1
> +
>  /* we don't do multichannel for now */
>  struct omap_mcbsp_reg_cfg {
>  	u16 spcr2;

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH v2 2/3] ARM/ASoC: OMAP McBSP: Move remainig defines from arch to ASoC header
  2012-03-08  9:29   ` Peter Ujfalusi
@ 2012-03-08  9:37     ` Jarkko Nikula
  0 siblings, 0 replies; 9+ messages in thread
From: Jarkko Nikula @ 2012-03-08  9:37 UTC (permalink / raw)
  To: linux-arm-kernel

On 03/08/2012 11:29 AM, Peter Ujfalusi wrote:
> Hi Jarkko,
> 
> On 03/08/2012 11:22 AM, Peter Ujfalusi wrote:
>> Clock signal muxing, and functional clock related defines are only needed
>> in ASoC drivers.
>>
>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
>> Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
> 
> I have added your ack to this patch by accident when I updated the
> series. Sorry about that.
> Please confirm if you are OK with this change.
> 
Go ahead :-)

-- 
Jarkko

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH v2 2/3] ARM/ASoC: OMAP McBSP: Move remainig defines from arch to ASoC header
  2012-03-08  9:22 ` [PATCH v2 2/3] ARM/ASoC: OMAP McBSP: Move remainig defines from arch to ASoC header Peter Ujfalusi
  2012-03-08  9:29   ` Peter Ujfalusi
@ 2012-03-08 10:58   ` Mark Brown
  1 sibling, 0 replies; 9+ messages in thread
From: Mark Brown @ 2012-03-08 10:58 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Mar 08, 2012 at 11:22:16AM +0200, Peter Ujfalusi wrote:
> Clock signal muxing, and functional clock related defines are only needed
> in ASoC drivers.

Acked-by: Mark Brown <broonoie@opensource.wolfsonmicro.com>
-------------- 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/20120308/74984923/attachment.sig>

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH v2 3/3] ASoC: omap-mcbsp: Single function CLKR/FSR source mux configuration
  2012-03-08  9:22 ` [PATCH v2 3/3] ASoC: omap-mcbsp: Single function CLKR/FSR source mux configuration Peter Ujfalusi
@ 2012-03-08 10:59   ` Mark Brown
  0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2012-03-08 10:59 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Mar 08, 2012 at 11:22:17AM +0200, Peter Ujfalusi wrote:
> Use single function for the CLKR/FSR mux configuration.
> OMAP2/3 has 6 pin configuration on McBSP1 instance, while on OMAP4
> McBSP4 instance have the 6 pin configuration so the omap2_mcbsp1_mux_* is
> not correct name for all support OMAP versions

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-------------- 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/20120308/9d7272e7/attachment.sig>

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH v2 1/3] ARM: OMAP2+: McBSP: Correct CLKR/FSR clock source mux configuration
  2012-03-08  9:22 ` [PATCH v2 1/3] ARM: OMAP2+: McBSP: Correct CLKR/FSR clock source mux configuration Peter Ujfalusi
@ 2012-03-08 21:12   ` Tony Lindgren
  0 siblings, 0 replies; 9+ messages in thread
From: Tony Lindgren @ 2012-03-08 21:12 UTC (permalink / raw)
  To: linux-arm-kernel

* Peter Ujfalusi <peter.ujfalusi@ti.com> [120308 00:50]:
> On OMAP2/3 McBSP1 port has 6 pin setup, while on OMAP4 the port is McBSP4.
> Implement the CLKR/FSR clock mux selection for OMAP4, and make sure that
> we add the correct callback for the correct port across supported OMAP
> versions.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>

Acked-by: Tony Lindgren <tony@atomide.com>

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2012-03-08 21:12 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-08  9:22 [PATCH v2 0/3] ARM/ASoC: OMAP McBSP: Correct CLKR/FSR source selection Peter Ujfalusi
2012-03-08  9:22 ` [PATCH v2 1/3] ARM: OMAP2+: McBSP: Correct CLKR/FSR clock source mux configuration Peter Ujfalusi
2012-03-08 21:12   ` Tony Lindgren
2012-03-08  9:22 ` [PATCH v2 2/3] ARM/ASoC: OMAP McBSP: Move remainig defines from arch to ASoC header Peter Ujfalusi
2012-03-08  9:29   ` Peter Ujfalusi
2012-03-08  9:37     ` Jarkko Nikula
2012-03-08 10:58   ` Mark Brown
2012-03-08  9:22 ` [PATCH v2 3/3] ASoC: omap-mcbsp: Single function CLKR/FSR source mux configuration Peter Ujfalusi
2012-03-08 10:59   ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).