From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 00/11] omap patches for review for v2.6.37 merge window
Date: Fri, 24 Sep 2010 11:12:09 -0700 [thread overview]
Message-ID: <20100924181209.GF4211@atomide.com> (raw)
In-Reply-To: <20100924085337.69c99bd8.jhnikula@gmail.com>
* Jarkko Nikula <jhnikula@gmail.com> [100923 22:45]:
> On Thu, 23 Sep 2010 18:50:38 -0700
> Tony Lindgren <tony@atomide.com> wrote:
>
> > Hi all,
> >
> > Here are some omap patches that have not yet been posted to
> > linux-arm-kernel for review.
> >
> > Jarkko Nikula (4):
> > omap: n8x0: Cleanup i2c1 and menelaus registration
> > omap: n8x0: Register i2c2 and add board info with tlv320aic3xfor N810
> > omap: n8x0: Mux i2s codec port pins for McBSP block
> > omap2: McBSP: Remove mux code for OMAP2420 McBSP2 and docleanups
> >
> ...
> > Subramaniam C.A (1):
> > omap: i2c: Avoid compilation error in case the header is included multiple times
> >
> Hmm... I wonder do I have something wrong or in patchwork but it looks
> like somehow a line feed gets introduced to subject line of some of
> my patches. And it seems to do with my patches only.
>
> Original patch in my mailbox or archive doesn't show it but it is in
> patchwork.
>
> http://marc.info/?l=linux-omap&m=128324955316265&w=2
> https://patchwork.kernel.org/patch/144841/mbox
Hmm yeah looks like patchwork wraps the subject line.. Need to look
to see where the bug is later on.
Here's the patch with fixed subject.
Tony
From: Jarkko Nikula <jhnikula@gmail.com>
Date: Tue, 31 Aug 2010 10:12:56 +0000
Subject: [PATCH] omap2: McBSP: Remove mux code for OMAP2420 McBSP2 and do cleanups
This 'legacy' OMAP2420 McBSP2 muxing code is currently broken after recent
conversion to new mux code. The omap_mcbsp_request calling this code is
usually called after booting whereas the omap_mux_init_signal is __init
marked so null pointer dereference would occur.
Fix this by removing the muxing code and let the bootloader or board file to
do it if necessary. Remove also omap2_mcbsp_ops as there is no use for it.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index 467aae2..88b8790 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -23,29 +23,6 @@
#include <plat/cpu.h>
#include <plat/mcbsp.h>
-#include "mux.h"
-
-static void omap2_mcbsp2_mux_setup(void)
-{
- omap_mux_init_signal("eac_ac_sclk.mcbsp2_clkx", OMAP_PULL_ENA);
- omap_mux_init_signal("eac_ac_fs.mcbsp2_fsx", OMAP_PULL_ENA);
- omap_mux_init_signal("eac_ac_din.mcbsp2_dr", OMAP_PULL_ENA);
- omap_mux_init_signal("eac_ac_dout.mcbsp2_dx", OMAP_PULL_ENA);
- omap_mux_init_gpio(117, OMAP_PULL_ENA);
- /*
- * TODO: Need to add MUX settings for OMAP 2430 SDP
- */
-}
-
-static void omap2_mcbsp_request(unsigned int id)
-{
- if (cpu_is_omap2420() && (id == OMAP_MCBSP2))
- omap2_mcbsp2_mux_setup();
-}
-
-static struct omap_mcbsp_ops omap2_mcbsp_ops = {
- .request = omap2_mcbsp_request,
-};
#ifdef CONFIG_ARCH_OMAP2420
static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
@@ -55,7 +32,6 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
.dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX,
.rx_irq = INT_24XX_MCBSP1_IRQ_RX,
.tx_irq = INT_24XX_MCBSP1_IRQ_TX,
- .ops = &omap2_mcbsp_ops,
},
{
.phys_base = OMAP24XX_MCBSP2_BASE,
@@ -63,7 +39,6 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
.dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX,
.rx_irq = INT_24XX_MCBSP2_IRQ_RX,
.tx_irq = INT_24XX_MCBSP2_IRQ_TX,
- .ops = &omap2_mcbsp_ops,
},
};
#define OMAP2420_MCBSP_PDATA_SZ ARRAY_SIZE(omap2420_mcbsp_pdata)
@@ -82,7 +57,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
.dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX,
.rx_irq = INT_24XX_MCBSP1_IRQ_RX,
.tx_irq = INT_24XX_MCBSP1_IRQ_TX,
- .ops = &omap2_mcbsp_ops,
},
{
.phys_base = OMAP24XX_MCBSP2_BASE,
@@ -90,7 +64,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
.dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX,
.rx_irq = INT_24XX_MCBSP2_IRQ_RX,
.tx_irq = INT_24XX_MCBSP2_IRQ_TX,
- .ops = &omap2_mcbsp_ops,
},
{
.phys_base = OMAP2430_MCBSP3_BASE,
@@ -98,7 +71,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
.dma_tx_sync = OMAP24XX_DMA_MCBSP3_TX,
.rx_irq = INT_24XX_MCBSP3_IRQ_RX,
.tx_irq = INT_24XX_MCBSP3_IRQ_TX,
- .ops = &omap2_mcbsp_ops,
},
{
.phys_base = OMAP2430_MCBSP4_BASE,
@@ -106,7 +78,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
.dma_tx_sync = OMAP24XX_DMA_MCBSP4_TX,
.rx_irq = INT_24XX_MCBSP4_IRQ_RX,
.tx_irq = INT_24XX_MCBSP4_IRQ_TX,
- .ops = &omap2_mcbsp_ops,
},
{
.phys_base = OMAP2430_MCBSP5_BASE,
@@ -114,7 +85,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
.dma_tx_sync = OMAP24XX_DMA_MCBSP5_TX,
.rx_irq = INT_24XX_MCBSP5_IRQ_RX,
.tx_irq = INT_24XX_MCBSP5_IRQ_TX,
- .ops = &omap2_mcbsp_ops,
},
};
#define OMAP2430_MCBSP_PDATA_SZ ARRAY_SIZE(omap2430_mcbsp_pdata)
@@ -133,7 +103,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
.dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX,
.rx_irq = INT_24XX_MCBSP1_IRQ_RX,
.tx_irq = INT_24XX_MCBSP1_IRQ_TX,
- .ops = &omap2_mcbsp_ops,
.buffer_size = 0x80, /* The FIFO has 128 locations */
},
{
@@ -143,7 +112,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
.dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX,
.rx_irq = INT_24XX_MCBSP2_IRQ_RX,
.tx_irq = INT_24XX_MCBSP2_IRQ_TX,
- .ops = &omap2_mcbsp_ops,
.buffer_size = 0x500, /* The FIFO has 1024 + 256 locations */
},
{
@@ -153,7 +121,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
.dma_tx_sync = OMAP24XX_DMA_MCBSP3_TX,
.rx_irq = INT_24XX_MCBSP3_IRQ_RX,
.tx_irq = INT_24XX_MCBSP3_IRQ_TX,
- .ops = &omap2_mcbsp_ops,
.buffer_size = 0x80, /* The FIFO has 128 locations */
},
{
@@ -162,7 +129,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
.dma_tx_sync = OMAP24XX_DMA_MCBSP4_TX,
.rx_irq = INT_24XX_MCBSP4_IRQ_RX,
.tx_irq = INT_24XX_MCBSP4_IRQ_TX,
- .ops = &omap2_mcbsp_ops,
.buffer_size = 0x80, /* The FIFO has 128 locations */
},
{
@@ -171,7 +137,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
.dma_tx_sync = OMAP24XX_DMA_MCBSP5_TX,
.rx_irq = INT_24XX_MCBSP5_IRQ_RX,
.tx_irq = INT_24XX_MCBSP5_IRQ_TX,
- .ops = &omap2_mcbsp_ops,
.buffer_size = 0x80, /* The FIFO has 128 locations */
},
};
@@ -189,28 +154,24 @@ static struct omap_mcbsp_platform_data omap44xx_mcbsp_pdata[] = {
.dma_rx_sync = OMAP44XX_DMA_MCBSP1_RX,
.dma_tx_sync = OMAP44XX_DMA_MCBSP1_TX,
.tx_irq = OMAP44XX_IRQ_MCBSP1,
- .ops = &omap2_mcbsp_ops,
},
{
.phys_base = OMAP44XX_MCBSP2_BASE,
.dma_rx_sync = OMAP44XX_DMA_MCBSP2_RX,
.dma_tx_sync = OMAP44XX_DMA_MCBSP2_TX,
.tx_irq = OMAP44XX_IRQ_MCBSP2,
- .ops = &omap2_mcbsp_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,
- .ops = &omap2_mcbsp_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,
- .ops = &omap2_mcbsp_ops,
},
};
#define OMAP44XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap44xx_mcbsp_pdata)
prev parent reply other threads:[~2010-09-24 18:12 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-24 1:50 [PATCH 00/11] omap patches for review for v2.6.37 merge window Tony Lindgren
2010-09-24 1:50 ` [PATCH 01/11] omap2: fix assorted compiler warnings Tony Lindgren
2010-09-24 1:50 ` [PATCH 02/11] omap: n8x0: Cleanup i2c1 and menelaus registration Tony Lindgren
2010-09-24 1:50 ` [PATCH 03/11] omap: n8x0: Register i2c2 and add board info with tlv320aic3xfor N810 Tony Lindgren
2010-09-24 1:50 ` [PATCH 04/11] omap: n8x0: Mux i2s codec port pins for McBSP block Tony Lindgren
2010-09-24 1:50 ` [PATCH 05/11] omap3: Remove non-existent config option Tony Lindgren
2010-09-24 10:00 ` Felipe Contreras
2010-09-24 15:17 ` Premi, Sanjeev
2010-09-25 15:42 ` Felipe Contreras
2010-09-27 11:02 ` Marathe, Yogesh
2010-09-27 15:56 ` Felipe Contreras
2010-09-27 16:24 ` Tony Lindgren
2010-09-27 16:28 ` Kanigeri, Hari
2010-09-29 11:34 ` Felipe Contreras
2010-09-29 13:28 ` Marathe, Yogesh
2010-09-29 19:12 ` Felipe Contreras
2010-10-01 11:29 ` Marathe, Yogesh
2010-10-06 0:14 ` Guzman Lugo, Fernando
2010-10-06 8:31 ` Marathe, Yogesh
2010-10-10 14:07 ` Felipe Contreras
2010-10-11 5:10 ` Marathe, Yogesh
2010-09-24 1:50 ` [PATCH 06/11] omap: usb: fix build warning Tony Lindgren
2010-09-24 1:51 ` [PATCH 07/11] omap: crypto: updates to enable omap aes Tony Lindgren
2010-09-24 1:51 ` [PATCH 08/11] omap: i2c: Avoid compilation error in case the header is included multiple times Tony Lindgren
2010-09-24 1:51 ` [PATCH 09/11] omap: McBSP: Do not enable SRG in slave mode Tony Lindgren
2010-09-24 1:51 ` [PATCH 10/11] omap2: McBSP: Remove mux code for OMAP2420 McBSP2 and docleanups Tony Lindgren
2010-09-24 1:51 ` [PATCH 11/11] omap: mmc: extended to pass host capabilities from board file Tony Lindgren
2010-09-24 5:53 ` [PATCH 00/11] omap patches for review for v2.6.37 merge window Jarkko Nikula
2010-09-24 18:12 ` Tony Lindgren [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100924181209.GF4211@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).