[PATCH 1/3] OMAP: McBSP: Fix CLKR and FSR signal muxing

[PATCH 1/3] OMAP: McBSP: Fix CLKR and FSR signal muxing

[Jarkko Nikula]

Fix bit clear. Now it clears all other bits than mask bit where it should
clear only it.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Paul Walmsley <paul@pwsan.com>
---
 arch/arm/mach-omap2/mcbsp.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index eba9fa1..f6b772e 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -34,7 +34,7 @@ void omap2_mcbsp1_mux_clkr_src(u8 mux)
 
 	v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
 	if (mux == CLKR_SRC_CLKR)
-		v &= OMAP2_MCBSP1_CLKR_MASK;
+		v &= ~OMAP2_MCBSP1_CLKR_MASK;
 	else if (mux == CLKR_SRC_CLKX)
 		v |= OMAP2_MCBSP1_CLKR_MASK;
 	omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);
@@ -47,7 +47,7 @@ void omap2_mcbsp1_mux_fsr_src(u8 mux)
 
 	v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
 	if (mux == FSR_SRC_FSR)
-		v &= OMAP2_MCBSP1_FSR_MASK;
+		v &= ~OMAP2_MCBSP1_FSR_MASK;
 	else if (mux == FSR_SRC_FSX)
 		v |= OMAP2_MCBSP1_FSR_MASK;
 	omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);
-- 
1.7.1

[PATCH 2/3] OMAP: McBSP: Swap CLKS source definition

[Jarkko Nikula]

This is just a readability and debugging improvement. As selection bit in
DEVCONF register is cleared when using 96 MHz PRCM source and set when using
external CLKS pin, change definitions to be sync with these.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Paul Walmsley <paul@pwsan.com>
---
 arch/arm/plat-omap/include/plat/mcbsp.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
index 4da6f94..e19abf2 100644
--- a/arch/arm/plat-omap/include/plat/mcbsp.h
+++ b/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -321,8 +321,8 @@
 #define FSR_SRC_FSX		1
 
 /* McBSP functional clock sources */
-#define MCBSP_CLKS_PAD_SRC	0
-#define MCBSP_CLKS_PRCM_SRC	1
+#define MCBSP_CLKS_PRCM_SRC	0
+#define MCBSP_CLKS_PAD_SRC	1
 
 /* we don't do multichannel for now */
 struct omap_mcbsp_reg_cfg {
-- 
1.7.1

Re: [PATCH 2/3] OMAP: McBSP: Swap CLKS source definition

[Paul Walmsley]

On Tue, 5 Oct 2010, Jarkko Nikula wrote:

> This is just a readability and debugging improvement. As selection bit in
> DEVCONF register is cleared when using 96 MHz PRCM source and set when using
> external CLKS pin, change definitions to be sync with these.
> 
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> Cc: Paul Walmsley <paul@pwsan.com>

Acked-by: Paul Walmsley <paul@pwsan.com>


- Paul

Re: [PATCH 2/3] OMAP: McBSP: Swap CLKS source definition

[Peter Ujfalusi]

On Tuesday 05 October 2010 15:29:34 ext Jarkko Nikula wrote:
> This is just a readability and debugging improvement. As selection bit in
> DEVCONF register is cleared when using 96 MHz PRCM source and set when
> using external CLKS pin, change definitions to be sync with these.
> 
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> Cc: Paul Walmsley <paul@pwsan.com>

Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>

[PATCH 3/3] OMAP: McBSP: Remove null omap44xx ops comment

[Jarkko Nikula]

It seems these comments where accidentally added so remove them.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Paul Walmsley <paul@pwsan.com>
---
 arch/arm/mach-omap2/mcbsp.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index f6b772e..f9c9df5 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -240,21 +240,18 @@ static struct omap_mcbsp_platform_data omap44xx_mcbsp_pdata[] = {
 		.dma_rx_sync    = OMAP44XX_DMA_MCBSP2_RX,
 		.dma_tx_sync    = OMAP44XX_DMA_MCBSP2_TX,
 		.tx_irq         = OMAP44XX_IRQ_MCBSP2,
-		/* XXX .ops ? */
 	},
 	{
 		.phys_base      = OMAP44XX_MCBSP3_BASE,
 		.dma_rx_sync    = OMAP44XX_DMA_MCBSP3_RX,
 		.dma_tx_sync    = OMAP44XX_DMA_MCBSP3_TX,
 		.tx_irq         = OMAP44XX_IRQ_MCBSP3,
-		/* XXX .ops ? */
 	},
 	{
 		.phys_base      = OMAP44XX_MCBSP4_BASE,
 		.dma_rx_sync    = OMAP44XX_DMA_MCBSP4_RX,
 		.dma_tx_sync    = OMAP44XX_DMA_MCBSP4_TX,
 		.tx_irq         = OMAP44XX_IRQ_MCBSP4,
-		/* XXX .ops ? */
 	},
 };
 #define OMAP44XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap44xx_mcbsp_pdata)
-- 
1.7.1

Re: [PATCH 3/3] OMAP: McBSP: Remove null omap44xx ops comment

[Paul Walmsley]

On Tue, 5 Oct 2010, Jarkko Nikula wrote:

> It seems these comments where accidentally added so remove them.
> 
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> Cc: Paul Walmsley <paul@pwsan.com>

Acked-by: Paul Walmsley <paul@pwsan.com>


- Paul

Re: [PATCH 3/3] OMAP: McBSP: Remove null omap44xx ops comment

[Peter Ujfalusi]

On Tuesday 05 October 2010 15:29:35 ext Jarkko Nikula wrote:
> It seems these comments where accidentally added so remove them.
> 
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> Cc: Paul Walmsley <paul@pwsan.com>

Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>

Re: [PATCH 1/3] OMAP: McBSP: Fix CLKR and FSR signal muxing

[Paul Walmsley]

On Tue, 5 Oct 2010, Jarkko Nikula wrote:

> Fix bit clear. Now it clears all other bits than mask bit where it should
> clear only it.
> 
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> Cc: Paul Walmsley <paul@pwsan.com>

Doh.  Thanks Jarkko.

Obviously this is an important patch and should go in ASAP.

Acked-by: Paul Walmsley <paul@pwsan.com>


- Paul

Re: [PATCH 1/3] OMAP: McBSP: Fix CLKR and FSR signal muxing

[Tony Lindgren]

* Paul Walmsley <paul@pwsan.com> [101005 08:03]:
> On Tue, 5 Oct 2010, Jarkko Nikula wrote:
> 
> > Fix bit clear. Now it clears all other bits than mask bit where it should
> > clear only it.
> > 
> > Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> > Cc: Paul Walmsley <paul@pwsan.com>
> 
> Doh.  Thanks Jarkko.
> 
> Obviously this is an important patch and should go in ASAP.
> 
> Acked-by: Paul Walmsley <paul@pwsan.com>

Jarkko, please repost this one more time with linux-arm-kernel list
Cc'd so I don't need to repost it before applying.

Regards,

Tony

Re: [PATCH 1/3] OMAP: McBSP: Fix CLKR and FSR signal muxing

[Peter Ujfalusi]

On Tuesday 05 October 2010 15:29:33 ext Jarkko Nikula wrote:
> Fix bit clear. Now it clears all other bits than mask bit where it should
> clear only it.
> 
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> Cc: Paul Walmsley <paul@pwsan.com>

Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>

-- 
Péter
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html