From: Russ Dill <russ.dill@gmail.com> To: "Govindraj.R" <govindraj.raja@ti.com> Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Felipe Balbi <balbi@ti.com>, Kevin Hilman <khilman@ti.com>, Tony Lindgren <tony@atomide.com> Subject: Re: [PATCH 1/2] OMAP2+: UART: Fix incorrect population of default uart pads Date: Fri, 13 Apr 2012 16:14:21 -0700 [thread overview] Message-ID: <CA+Bv8XZ9D35RGX7Nub8YH5fk9j4mWUnVFAz036DJfNkq2Hwx6g@mail.gmail.com> (raw) In-Reply-To: <1334065246-21294-2-git-send-email-govindraj.raja@ti.com> On Tue, Apr 10, 2012 at 6:40 AM, Govindraj.R <govindraj.raja@ti.com> wrote: > From: "Govindraj.R" <govindraj.raja@ti.com> > > The following commit: > (7496ba3 ARM: OMAP2+: UART: Add default mux for all uarts) > added default pads for all uarts. But not all boards tend to > use all uarts and most of unused uart pins are muxed for > other purpose. This commit breaks the modules which where trying > to use unused uart pins on their boards. > > So remove the default pads adding. > > Cc: Felipe Balbi <balbi@ti.com> > Cc: Kevin Hilman <khilman@ti.com> > Cc: Russ Dill <russ.dill@gmail.com> > Reported-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Govindraj.R <govindraj.raja@ti.com> Acked-by: Russ Dill <russ.dill@ti.com> > --- > arch/arm/mach-omap2/serial.c | 116 ------------------------------------------ > 1 files changed, 0 insertions(+), 116 deletions(-) > > diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c > index c9503a7..1554233 100644 > --- a/arch/arm/mach-omap2/serial.c > +++ b/arch/arm/mach-omap2/serial.c > @@ -120,124 +120,8 @@ static void omap_uart_set_smartidle(struct platform_device *pdev) {} > #endif /* CONFIG_PM */ > > #ifdef CONFIG_OMAP_MUX > -static struct omap_device_pad default_uart1_pads[] __initdata = { > - { > - .name = "uart1_cts.uart1_cts", > - .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - }, > - { > - .name = "uart1_rts.uart1_rts", > - .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - }, > - { > - .name = "uart1_tx.uart1_tx", > - .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - }, > - { > - .name = "uart1_rx.uart1_rx", > - .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, > - .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - .idle = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - }, > -}; > - > -static struct omap_device_pad default_uart2_pads[] __initdata = { > - { > - .name = "uart2_cts.uart2_cts", > - .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - }, > - { > - .name = "uart2_rts.uart2_rts", > - .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - }, > - { > - .name = "uart2_tx.uart2_tx", > - .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - }, > - { > - .name = "uart2_rx.uart2_rx", > - .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, > - .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - .idle = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - }, > -}; > - > -static struct omap_device_pad default_uart3_pads[] __initdata = { > - { > - .name = "uart3_cts_rctx.uart3_cts_rctx", > - .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - }, > - { > - .name = "uart3_rts_sd.uart3_rts_sd", > - .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - }, > - { > - .name = "uart3_tx_irtx.uart3_tx_irtx", > - .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - }, > - { > - .name = "uart3_rx_irrx.uart3_rx_irrx", > - .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, > - .enable = OMAP_PIN_INPUT | OMAP_MUX_MODE0, > - .idle = OMAP_PIN_INPUT | OMAP_MUX_MODE0, > - }, > -}; > - > -static struct omap_device_pad default_omap36xx_uart4_pads[] __initdata = { > - { > - .name = "gpmc_wait2.uart4_tx", > - .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - }, > - { > - .name = "gpmc_wait3.uart4_rx", > - .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, > - .enable = OMAP_PIN_INPUT | OMAP_MUX_MODE2, > - .idle = OMAP_PIN_INPUT | OMAP_MUX_MODE2, > - }, > -}; > - > -static struct omap_device_pad default_omap4_uart4_pads[] __initdata = { > - { > - .name = "uart4_tx.uart4_tx", > - .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - }, > - { > - .name = "uart4_rx.uart4_rx", > - .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, > - .enable = OMAP_PIN_INPUT | OMAP_MUX_MODE0, > - .idle = OMAP_PIN_INPUT | OMAP_MUX_MODE0, > - }, > -}; > - > static void omap_serial_fill_default_pads(struct omap_board_data *bdata) > { > - switch (bdata->id) { > - case 0: > - bdata->pads = default_uart1_pads; > - bdata->pads_cnt = ARRAY_SIZE(default_uart1_pads); > - break; > - case 1: > - bdata->pads = default_uart2_pads; > - bdata->pads_cnt = ARRAY_SIZE(default_uart2_pads); > - break; > - case 2: > - bdata->pads = default_uart3_pads; > - bdata->pads_cnt = ARRAY_SIZE(default_uart3_pads); > - break; > - case 3: > - if (cpu_is_omap44xx()) { > - bdata->pads = default_omap4_uart4_pads; > - bdata->pads_cnt = > - ARRAY_SIZE(default_omap4_uart4_pads); > - } else if (cpu_is_omap3630()) { > - bdata->pads = default_omap36xx_uart4_pads; > - bdata->pads_cnt = > - ARRAY_SIZE(default_omap36xx_uart4_pads); > - } > - break; > - default: > - break; > - } > } > #else > static void omap_serial_fill_default_pads(struct omap_board_data *bdata) {} > -- > 1.7.9 >
WARNING: multiple messages have this Message-ID (diff)
From: russ.dill@gmail.com (Russ Dill) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] OMAP2+: UART: Fix incorrect population of default uart pads Date: Fri, 13 Apr 2012 16:14:21 -0700 [thread overview] Message-ID: <CA+Bv8XZ9D35RGX7Nub8YH5fk9j4mWUnVFAz036DJfNkq2Hwx6g@mail.gmail.com> (raw) In-Reply-To: <1334065246-21294-2-git-send-email-govindraj.raja@ti.com> On Tue, Apr 10, 2012 at 6:40 AM, Govindraj.R <govindraj.raja@ti.com> wrote: > From: "Govindraj.R" <govindraj.raja@ti.com> > > The following commit: > (7496ba3 ?ARM: OMAP2+: UART: Add default mux for all uarts) > added default pads for all uarts. But not all boards tend to > use all uarts and most of unused uart pins are muxed for > other purpose. This commit breaks the modules which where trying > to use unused uart pins on their boards. > > So remove the default pads adding. > > Cc: Felipe Balbi <balbi@ti.com> > Cc: Kevin Hilman <khilman@ti.com> > Cc: Russ Dill <russ.dill@gmail.com> > Reported-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Govindraj.R <govindraj.raja@ti.com> Acked-by: Russ Dill <russ.dill@ti.com> > --- > ?arch/arm/mach-omap2/serial.c | ?116 ------------------------------------------ > ?1 files changed, 0 insertions(+), 116 deletions(-) > > diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c > index c9503a7..1554233 100644 > --- a/arch/arm/mach-omap2/serial.c > +++ b/arch/arm/mach-omap2/serial.c > @@ -120,124 +120,8 @@ static void omap_uart_set_smartidle(struct platform_device *pdev) {} > ?#endif /* CONFIG_PM */ > > ?#ifdef CONFIG_OMAP_MUX > -static struct omap_device_pad default_uart1_pads[] __initdata = { > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart1_cts.uart1_cts", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart1_rts.uart1_rts", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart1_tx.uart1_tx", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart1_rx.uart1_rx", > - ? ? ? ? ? ? ? .flags ?= OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - ? ? ? ? ? ? ? .idle ? = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - ? ? ? }, > -}; > - > -static struct omap_device_pad default_uart2_pads[] __initdata = { > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart2_cts.uart2_cts", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart2_rts.uart2_rts", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart2_tx.uart2_tx", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart2_rx.uart2_rx", > - ? ? ? ? ? ? ? .flags ?= OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - ? ? ? ? ? ? ? .idle ? = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - ? ? ? }, > -}; > - > -static struct omap_device_pad default_uart3_pads[] __initdata = { > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart3_cts_rctx.uart3_cts_rctx", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart3_rts_sd.uart3_rts_sd", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart3_tx_irtx.uart3_tx_irtx", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart3_rx_irrx.uart3_rx_irrx", > - ? ? ? ? ? ? ? .flags ?= OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT | OMAP_MUX_MODE0, > - ? ? ? ? ? ? ? .idle ? = OMAP_PIN_INPUT | OMAP_MUX_MODE0, > - ? ? ? }, > -}; > - > -static struct omap_device_pad default_omap36xx_uart4_pads[] __initdata = { > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "gpmc_wait2.uart4_tx", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "gpmc_wait3.uart4_rx", > - ? ? ? ? ? ? ? .flags ?= OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT | OMAP_MUX_MODE2, > - ? ? ? ? ? ? ? .idle ? = OMAP_PIN_INPUT | OMAP_MUX_MODE2, > - ? ? ? }, > -}; > - > -static struct omap_device_pad default_omap4_uart4_pads[] __initdata = { > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart4_tx.uart4_tx", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart4_rx.uart4_rx", > - ? ? ? ? ? ? ? .flags ?= OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT | OMAP_MUX_MODE0, > - ? ? ? ? ? ? ? .idle ? = OMAP_PIN_INPUT | OMAP_MUX_MODE0, > - ? ? ? }, > -}; > - > ?static void omap_serial_fill_default_pads(struct omap_board_data *bdata) > ?{ > - ? ? ? switch (bdata->id) { > - ? ? ? case 0: > - ? ? ? ? ? ? ? bdata->pads = default_uart1_pads; > - ? ? ? ? ? ? ? bdata->pads_cnt = ARRAY_SIZE(default_uart1_pads); > - ? ? ? ? ? ? ? break; > - ? ? ? case 1: > - ? ? ? ? ? ? ? bdata->pads = default_uart2_pads; > - ? ? ? ? ? ? ? bdata->pads_cnt = ARRAY_SIZE(default_uart2_pads); > - ? ? ? ? ? ? ? break; > - ? ? ? case 2: > - ? ? ? ? ? ? ? bdata->pads = default_uart3_pads; > - ? ? ? ? ? ? ? bdata->pads_cnt = ARRAY_SIZE(default_uart3_pads); > - ? ? ? ? ? ? ? break; > - ? ? ? case 3: > - ? ? ? ? ? ? ? if (cpu_is_omap44xx()) { > - ? ? ? ? ? ? ? ? ? ? ? bdata->pads = default_omap4_uart4_pads; > - ? ? ? ? ? ? ? ? ? ? ? bdata->pads_cnt = > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ARRAY_SIZE(default_omap4_uart4_pads); > - ? ? ? ? ? ? ? } else if (cpu_is_omap3630()) { > - ? ? ? ? ? ? ? ? ? ? ? bdata->pads = default_omap36xx_uart4_pads; > - ? ? ? ? ? ? ? ? ? ? ? bdata->pads_cnt = > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ARRAY_SIZE(default_omap36xx_uart4_pads); > - ? ? ? ? ? ? ? } > - ? ? ? ? ? ? ? break; > - ? ? ? default: > - ? ? ? ? ? ? ? break; > - ? ? ? } > ?} > ?#else > ?static void omap_serial_fill_default_pads(struct omap_board_data *bdata) {} > -- > 1.7.9 >
next prev parent reply other threads:[~2012-04-13 23:14 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-04-10 13:40 [PATCH 0/2] OMAP2+: UART: Fix usage of default mux pads Govindraj.R 2012-04-10 13:40 ` Govindraj.R 2012-04-10 13:40 ` [PATCH 1/2] OMAP2+: UART: Fix incorrect population of default uart pads Govindraj.R 2012-04-10 13:40 ` Govindraj.R 2012-04-11 20:14 ` Russ Dill 2012-04-11 20:14 ` Russ Dill 2012-04-13 23:14 ` Russ Dill [this message] 2012-04-13 23:14 ` Russ Dill 2012-04-17 17:50 ` Tony Lindgren 2012-04-17 17:50 ` Tony Lindgren 2012-04-23 23:45 ` Kevin Hilman 2012-04-23 23:45 ` Kevin Hilman 2012-04-24 8:38 ` Raja, Govindraj 2012-04-24 8:38 ` Raja, Govindraj 2012-05-04 17:24 ` Tony Lindgren 2012-05-04 17:24 ` Tony Lindgren 2012-05-07 17:39 ` Kevin Hilman 2012-05-07 17:39 ` Kevin Hilman 2012-05-07 17:54 ` Tony Lindgren 2012-05-07 17:54 ` Tony Lindgren 2012-04-10 13:40 ` [PATCH 2/2] OMAP2+: UART: Add mechanism to probe uart pins and configure rx wakeup Govindraj.R 2012-04-10 13:40 ` Govindraj.R 2012-04-10 16:11 ` Tony Lindgren 2012-04-10 16:11 ` Tony Lindgren 2012-04-10 16:40 ` Russ Dill 2012-04-10 16:40 ` Russ Dill 2012-04-11 11:50 ` Raja, Govindraj 2012-04-11 11:50 ` Raja, Govindraj 2012-04-11 20:16 ` Russ Dill 2012-04-11 20:16 ` Russ Dill 2012-04-13 23:39 ` Russ Dill 2012-04-13 23:39 ` Russ Dill 2012-04-17 1:41 ` Tony Lindgren 2012-04-17 1:41 ` Tony Lindgren 2012-04-17 12:47 ` Raja, Govindraj 2012-04-17 12:47 ` Raja, Govindraj 2012-04-17 17:47 ` Tony Lindgren 2012-04-17 17:47 ` Tony Lindgren
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=CA+Bv8XZ9D35RGX7Nub8YH5fk9j4mWUnVFAz036DJfNkq2Hwx6g@mail.gmail.com \ --to=russ.dill@gmail.com \ --cc=balbi@ti.com \ --cc=govindraj.raja@ti.com \ --cc=khilman@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=tony@atomide.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.