diff for duplicates of <20120417174752.GD21106@atomide.com> diff --git a/a/1.txt b/N1/1.txt index d7ff05d..878bb0c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,26 +7,26 @@ > > * Raja, Govindraj <govindraj.raja@ti.com> [120411 04:53]: > > ... > > -> >> +static int __init omap_serial_fill_default_pads(struct omap_board_data *bdata, -> >> + struct omap_uart_state *uart) +> >> +static int ?__init omap_serial_fill_default_pads(struct omap_board_data *bdata, +> >> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? struct omap_uart_state *uart) > >> +{ -> >> + struct omap_mux_partition *tx_partition = NULL, *rx_partition = NULL; -> >> + struct omap_mux *rx_mux = NULL, *tx_mux = NULL; -> >> + char *rx_fmt, *tx_fmt; -> >> + int uart_nr = bdata->id + 1; +> >> + ? ? struct omap_mux_partition *tx_partition = NULL, *rx_partition = NULL; +> >> + ? ? struct omap_mux *rx_mux = NULL, *tx_mux = NULL; +> >> + ? ? char *rx_fmt, *tx_fmt; +> >> + ? ? int uart_nr = bdata->id + 1; > >> + -> >> + if (bdata->id != 2) { -> >> + rx_fmt = "uart%d_rx.uart%d_rx"; -> >> + tx_fmt = "uart%d_tx.uart%d_tx"; -> >> + } else { -> >> + rx_fmt = "uart%d_rx_irrx.uart%d_rx_irrx"; -> >> + tx_fmt = "uart%d_tx_irtx.uart%d_tx_irtx"; -> >> + } +> >> + ? ? if (bdata->id != 2) { +> >> + ? ? ? ? ? ? rx_fmt = "uart%d_rx.uart%d_rx"; +> >> + ? ? ? ? ? ? tx_fmt = "uart%d_tx.uart%d_tx"; +> >> + ? ? } else { +> >> + ? ? ? ? ? ? rx_fmt = "uart%d_rx_irrx.uart%d_rx_irrx"; +> >> + ? ? ? ? ? ? tx_fmt = "uart%d_tx_irtx.uart%d_tx_irtx"; +> >> + ? ? } > >> + -> >> + snprintf(rx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN, rx_fmt, -> >> + uart_nr, uart_nr); -> >> + snprintf(tx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN, tx_fmt, -> >> + uart_nr, uart_nr); +> >> + ? ? snprintf(rx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN, rx_fmt, +> >> + ? ? ? ? ? ? ? ? ? ? uart_nr, uart_nr); +> >> + ? ? snprintf(tx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN, tx_fmt, +> >> + ? ? ? ? ? ? ? ? ? ? uart_nr, uart_nr); > > > > This naming won't work for the fourth port on 3630 as there are no "uart4_rx" > > or "uart4_tx" mux entries, they are "gpmc_wait2.uart4_tx" and @@ -43,16 +43,16 @@ the pads, which will produce a warning on 3630. > >> @@ -289,8 +354,8 @@ void __init omap_serial_board_init(struct > >> omap_uart_port_info *info) -> >> bdata.pads = NULL; -> >> bdata.pads_cnt = 0; +> >> ? ? ? ? ? ? ? bdata.pads = NULL; +> >> ? ? ? ? ? ? ? bdata.pads_cnt = 0; > >> -> >> - if (cpu_is_omap44xx() || cpu_is_omap34xx()) -> >> - omap_serial_fill_default_pads(&bdata); -> >> + if (omap_serial_fill_default_pads(&bdata, uart)) -> >> + continue; +> >> - ? ? ? ? ? ? if (cpu_is_omap44xx() || cpu_is_omap34xx()) +> >> - ? ? ? ? ? ? ? ? ? ? omap_serial_fill_default_pads(&bdata); +> >> + ? ? ? ? ? ? if (omap_serial_fill_default_pads(&bdata, uart)) +> >> + ? ? ? ? ? ? ? ? ? ? continue; > >> -> >> if (!info) -> >> omap_serial_init_port(&bdata, NULL); +> >> ? ? ? ? ? ? ? if (!info) +> >> ? ? ? ? ? ? ? ? ? ? ? omap_serial_init_port(&bdata, NULL); > > > > Can't the omap_serial_board_init() now be just be omap_serial_init(void) > > as it's not used anywhere else? @@ -104,7 +104,3 @@ out for unmuxed uarts because some boards use alternative pads like Regards, Tony --- -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 diff --git a/a/content_digest b/N1/content_digest index b1756a5..1e816f4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,16 +4,10 @@ "ref\0CAMrsUdK2ZqCGWtL104tBC_h-XHD0UMMFagch_eSER+92zC1FiQ@mail.gmail.com\0" "ref\020120417014103.GA21106@atomide.com\0" "ref\0CAMrsUd+v-qhVPLbJp1ecE2+e5ayJAQrAzALr1sviH9RDJv3aMg@mail.gmail.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 2/2] OMAP2+: UART: Add mechanism to probe uart pins and configure rx wakeup\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 2/2] OMAP2+: UART: Add mechanism to probe uart pins and configure rx wakeup\0" "Date\0Tue, 17 Apr 2012 10:47:52 -0700\0" - "To\0Raja" - " Govindraj <govindraj.raja@ti.com>\0" - "Cc\0linux-omap@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - Felipe Balbi <balbi@ti.com> - Kevin Hilman <khilman@ti.com> - " Russ Dill <russ.dill@gmail.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Raja, Govindraj <govindraj.raja@ti.com> [120417 05:51]:\n" @@ -25,26 +19,26 @@ "> > * Raja, Govindraj <govindraj.raja@ti.com> [120411 04:53]:\n" "> > ...\n" "> >\n" - "> >> +static int \302\240__init omap_serial_fill_default_pads(struct omap_board_data *bdata,\n" - "> >> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 struct omap_uart_state *uart)\n" + "> >> +static int ?__init omap_serial_fill_default_pads(struct omap_board_data *bdata,\n" + "> >> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? struct omap_uart_state *uart)\n" "> >> +{\n" - "> >> + \302\240 \302\240 struct omap_mux_partition *tx_partition = NULL, *rx_partition = NULL;\n" - "> >> + \302\240 \302\240 struct omap_mux *rx_mux = NULL, *tx_mux = NULL;\n" - "> >> + \302\240 \302\240 char *rx_fmt, *tx_fmt;\n" - "> >> + \302\240 \302\240 int uart_nr = bdata->id + 1;\n" + "> >> + ? ? struct omap_mux_partition *tx_partition = NULL, *rx_partition = NULL;\n" + "> >> + ? ? struct omap_mux *rx_mux = NULL, *tx_mux = NULL;\n" + "> >> + ? ? char *rx_fmt, *tx_fmt;\n" + "> >> + ? ? int uart_nr = bdata->id + 1;\n" "> >> +\n" - "> >> + \302\240 \302\240 if (bdata->id != 2) {\n" - "> >> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 rx_fmt = \"uart%d_rx.uart%d_rx\";\n" - "> >> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 tx_fmt = \"uart%d_tx.uart%d_tx\";\n" - "> >> + \302\240 \302\240 } else {\n" - "> >> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 rx_fmt = \"uart%d_rx_irrx.uart%d_rx_irrx\";\n" - "> >> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 tx_fmt = \"uart%d_tx_irtx.uart%d_tx_irtx\";\n" - "> >> + \302\240 \302\240 }\n" + "> >> + ? ? if (bdata->id != 2) {\n" + "> >> + ? ? ? ? ? ? rx_fmt = \"uart%d_rx.uart%d_rx\";\n" + "> >> + ? ? ? ? ? ? tx_fmt = \"uart%d_tx.uart%d_tx\";\n" + "> >> + ? ? } else {\n" + "> >> + ? ? ? ? ? ? rx_fmt = \"uart%d_rx_irrx.uart%d_rx_irrx\";\n" + "> >> + ? ? ? ? ? ? tx_fmt = \"uart%d_tx_irtx.uart%d_tx_irtx\";\n" + "> >> + ? ? }\n" "> >> +\n" - "> >> + \302\240 \302\240 snprintf(rx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN, rx_fmt,\n" - "> >> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 uart_nr, uart_nr);\n" - "> >> + \302\240 \302\240 snprintf(tx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN, tx_fmt,\n" - "> >> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 uart_nr, uart_nr);\n" + "> >> + ? ? snprintf(rx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN, rx_fmt,\n" + "> >> + ? ? ? ? ? ? ? ? ? ? uart_nr, uart_nr);\n" + "> >> + ? ? snprintf(tx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN, tx_fmt,\n" + "> >> + ? ? ? ? ? ? ? ? ? ? uart_nr, uart_nr);\n" "> >\n" "> > This naming won't work for the fourth port on 3630 as there are no \"uart4_rx\"\n" "> > or \"uart4_tx\" mux entries, they are \"gpmc_wait2.uart4_tx\" and\n" @@ -61,16 +55,16 @@ "\n" "> >> @@ -289,8 +354,8 @@ void __init omap_serial_board_init(struct\n" "> >> omap_uart_port_info *info)\n" - "> >> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 bdata.pads = NULL;\n" - "> >> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 bdata.pads_cnt = 0;\n" + "> >> ? ? ? ? ? ? ? bdata.pads = NULL;\n" + "> >> ? ? ? ? ? ? ? bdata.pads_cnt = 0;\n" "> >>\n" - "> >> - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 if (cpu_is_omap44xx() || cpu_is_omap34xx())\n" - "> >> - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 omap_serial_fill_default_pads(&bdata);\n" - "> >> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 if (omap_serial_fill_default_pads(&bdata, uart))\n" - "> >> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 continue;\n" + "> >> - ? ? ? ? ? ? if (cpu_is_omap44xx() || cpu_is_omap34xx())\n" + "> >> - ? ? ? ? ? ? ? ? ? ? omap_serial_fill_default_pads(&bdata);\n" + "> >> + ? ? ? ? ? ? if (omap_serial_fill_default_pads(&bdata, uart))\n" + "> >> + ? ? ? ? ? ? ? ? ? ? continue;\n" "> >>\n" - "> >> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 if (!info)\n" - "> >> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 omap_serial_init_port(&bdata, NULL);\n" + "> >> ? ? ? ? ? ? ? if (!info)\n" + "> >> ? ? ? ? ? ? ? ? ? ? ? omap_serial_init_port(&bdata, NULL);\n" "> >\n" "> > Can't the omap_serial_board_init() now be just be omap_serial_init(void)\n" "> > as it's not used anywhere else?\n" @@ -121,10 +115,6 @@ "\n" "Regards,\n" "\n" - "Tony\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + Tony -96f2979b718742b29e5fbea0064aa0c360230f57451aff09af35265ae58002ef +2e11544263499b848bc42a718eadf9b7f5bc4cb1fb05715da73f2bfac4c14a6e
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.