On Tue, Apr 10, 2012 at 9:41 PM, Tony Lindgren <tony@xxxxxxxxxxx> wrote:
> * Govindraj.R <govindraj.raja@xxxxxx> [120410 06:44]:
>> --- a/arch/arm/mach-omap2/serial.c
>> +++ b/arch/arm/mach-omap2/serial.c
>> @@ -120,11 +120,63 @@ static void omap_uart_set_smartidle(struct platform_device *pdev) {}
>> #endif /* CONFIG_PM */
>>
>> #ifdef CONFIG_OMAP_MUX
>> -static void omap_serial_fill_default_pads(struct omap_board_data *bdata)
>> +
>> +#define OMAP_UART_DEFAULT_PAD_NAME_LEN 28
>> +static char rx_pad_name[OMAP_UART_DEFAULT_PAD_NAME_LEN],
>> + tx_pad_name[OMAP_UART_DEFAULT_PAD_NAME_LEN] __initdata;
>> +static struct omap_device_pad default_omap_uart_pads[2] __initdata;
>
> Won't the default_omap_uart_pads get overwritten for each port?
> We need that information in the driver too for each port? Why don't you
> just allocate bdata.pads in omap_serial_board_init as we now assume it's
> needed for each port?
>
Yes can be part of omap_uart_state structure.
>> +static void __init omap_serial_fill_default_pads(struct omap_board_data *bdata)
>> {
>> + struct omap_mux_partition *tx_partition = NULL, *rx_partition = NULL;
>> + struct omap_mux *rx_mux = NULL, *tx_mux = NULL;
>> +
>> + if (bdata->id != 2) {
>> + snprintf(rx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN,
>> + "uart%d_rx.uart%d_rx", bdata->id + 1, bdata->id + 1);
>> + snprintf(tx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN,
>> + "uart%d_tx.uart%d_tx", bdata->id + 1, bdata->id + 1);
>> + } else {
>> + snprintf(rx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN,
>> + "uart%d_rx_irrx.uart%d_rx_irrx", bdata->id + 1,
>> + bdata->id + 1);
>> + snprintf(tx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN,
>> + "uart%d_tx_irtx.uart%d_tx_irtx", bdata->id + 1,
>> + bdata->id + 1);
>> + }
>
> This would be simpler with something like this (untested):
>
> 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";
> }
>
> 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);
>
okay fine.
>> + if (omap_mux_get_by_name(rx_pad_name, &rx_partition, &rx_mux) >= 0 &&
>> + omap_mux_get_by_name
>> + (tx_pad_name, &tx_partition, &tx_mux) >= 0) {
>> + u16 tx_mode, rx_mode;
>> +
>> + tx_mode = omap_mux_read(tx_partition, tx_mux->reg_offset);
>> + rx_mode = omap_mux_read(rx_partition, rx_mux->reg_offset);
>> +
>> + /*
>> + * Check if uart is used in default tx/rx mode i.e. in mux mode0
>> + * if yes then configure rx pin for wake up capability
>> + */
>> + if (!(rx_mode & 0x07) && !(tx_mode & 0x07)) {
>> + default_omap_uart_pads[0].name = rx_pad_name;
>> + default_omap_uart_pads[0].flags =
>> + OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP;
>> + default_omap_uart_pads[0].enable = OMAP_PIN_INPUT |
>> + OMAP_MUX_MODE0;
>> + default_omap_uart_pads[0].idle = OMAP_PIN_INPUT |
>> + OMAP_MUX_MODE0;
>> +
>> + default_omap_uart_pads[1].name = tx_pad_name;
>> + default_omap_uart_pads[1].enable = OMAP_PIN_OUTPUT |
>> + OMAP_MUX_MODE0;
>> + bdata->pads = default_omap_uart_pads;
>> + bdata->pads_cnt = ARRAY_SIZE(default_omap_uart_pads);
>> + }
>> + }
>> }
>
> Then looking at omap_serial_board_init, it still looks wrong:
>
> void __init omap_serial_board_init(struct omap_uart_port_info *info)
> {
> struct omap_uart_state *uart;
> struct omap_board_data bdata;
>
> list_for_each_entry(uart, &uart_list, node) {
> bdata.id = uart->num;
> bdata.flags = 0;
> bdata.pads = NULL;
> bdata.pads_cnt = 0;
>
> if (cpu_is_omap44xx() || cpu_is_omap34xx())
> omap_serial_fill_default_pads(&bdata);
>
> Why don't you fill the pads for omap2? It has the same pads, although
> it does not have the serial wake-up events working.
>
> And why don't you exit if omap_serial_fill_default_pads fails for the
> no info case?
>
> Shouldn't it be something like:
>
> if (!info) {
> res = omap_serial_fill_default_pads(&bdata);
> if (!res)
> return;
> port = NULL;
> } else {
> port = &info[uart->num];
> }
> omap_serial_init_port(&bdata, port);
>
Yes if filling of default pads fails we can avoid registering that port
however I think that should not depend on availability of port info.
Here [1] is the updated patch.
--
Thanks,
Govindraj.R
[1]:
>From ea06c7d5014b68f622b3e2ca226e5a5194d48e9a Mon Sep 17 00:00:00 2001
From: "Govindraj.R" <govindraj.raja@xxxxxx>
Date: Tue, 10 Apr 2012 18:21:52 +0530
Subject: [PATCH 2/2] OMAP2+: UART: Add mechanism to probe uart pins and
configure rx wakeup
Default pad populating procedure should first probe whether the uart
pins are available as uart tx/rx pins if yes then we can configure them
and use rx pin for wakeup capability.
Utilise the mux api available to probe the availability of mux pins
in uart mode.
Cc: Felipe Balbi <balbi@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxx>
Cc: Russ Dill <russ.dill@xxxxxxxxx>
Reported-by: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Govindraj.R <govindraj.raja@xxxxxx>
---
arch/arm/mach-omap2/mux.c | 3 +-
arch/arm/mach-omap2/mux.h | 10 ++++++
arch/arm/mach-omap2/serial.c | 73 +++++++++++++++++++++++++++++++++++++++--
3 files changed, 80 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 65c3391..d937ddd 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -217,8 +217,7 @@ static int __init _omap_mux_get_by_name(struct
omap_mux_partition *partition,
return -ENODEV;
}
-static int __init
-omap_mux_get_by_name(const char *muxname,
+int __init omap_mux_get_by_name(const char *muxname,
struct omap_mux_partition **found_partition,
struct omap_mux **found_mux)
{
diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h
index 69fe060..68927f1 100644
--- a/arch/arm/mach-omap2/mux.h
+++ b/arch/arm/mach-omap2/mux.h
@@ -225,8 +225,18 @@ omap_hwmod_mux_init(struct omap_device_pad
*bpads, int nr_pads);
*/
void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state);
+int omap_mux_get_by_name(const char *muxname,
+ struct omap_mux_partition **found_partition,
+ struct omap_mux **found_mux);
#else
+static inline int omap_mux_get_by_name(const char *muxname,
+ struct omap_mux_partition **found_partition,
+ struct omap_mux **found_mux)
+{
+ return 0;
+}
+
static inline int omap_mux_init_gpio(int gpio, int val)
{
return 0;
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 2e351f5..9d62cae 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -57,6 +57,7 @@ struct omap_uart_state {
struct list_head node;
struct omap_hwmod *oh;
+ struct omap_device_pad default_omap_uart_pads[2];
};
static LIST_HEAD(uart_list);
@@ -120,11 +121,75 @@ static void omap_uart_set_smartidle(struct
platform_device *pdev) {}
#endif /* CONFIG_PM */
#ifdef CONFIG_OMAP_MUX
-static void omap_serial_fill_default_pads(struct omap_board_data *bdata)
+
+#define OMAP_UART_DEFAULT_PAD_NAME_LEN 28
+static char rx_pad_name[OMAP_UART_DEFAULT_PAD_NAME_LEN],
+ tx_pad_name[OMAP_UART_DEFAULT_PAD_NAME_LEN] __initdata;
+
+static void __init
+omap_serial_fill_uart_tx_rx_pads(struct omap_board_data *bdata,
+ struct omap_uart_state *uart)
{
+ uart->default_omap_uart_pads[0].name = rx_pad_name;
+ uart->default_omap_uart_pads[0].flags = OMAP_DEVICE_PAD_REMUX |
+ OMAP_DEVICE_PAD_WAKEUP;
+ uart->default_omap_uart_pads[0].enable = OMAP_PIN_INPUT |
+ OMAP_MUX_MODE0;
+ uart->default_omap_uart_pads[0].idle = OMAP_PIN_INPUT | OMAP_MUX_MODE0;
+ uart->default_omap_uart_pads[1].name = tx_pad_name;
+ uart->default_omap_uart_pads[1].enable = OMAP_PIN_OUTPUT |
+ OMAP_MUX_MODE0;
+ bdata->pads = uart->default_omap_uart_pads;
+ bdata->pads_cnt = ARRAY_SIZE(uart->default_omap_uart_pads);
+}
+
+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;
+
+ 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);
+
+ if (omap_mux_get_by_name(rx_pad_name, &rx_partition, &rx_mux) >= 0 &&
+ omap_mux_get_by_name
+ (tx_pad_name, &tx_partition, &tx_mux) >= 0) {
+ u16 tx_mode, rx_mode;
+
+ tx_mode = omap_mux_read(tx_partition, tx_mux->reg_offset);
+ rx_mode = omap_mux_read(rx_partition, rx_mux->reg_offset);
+
+ /*
+ * Check if uart is used in default tx/rx mode i.e. in mux mode0
+ * if yes then configure rx pin for wake up capability
+ */
+ if (!(rx_mode & 0x07) && !(tx_mode & 0x07)) {
+ omap_serial_fill_uart_tx_rx_pads(bdata, uart);
+ return 0;
+ }
+ }
+
+ return -ENODEV;
}
#else
-static void omap_serial_fill_default_pads(struct omap_board_data *bdata) {}
+static int __init omap_serial_fill_default_pads(struct omap_board_data *bdata
+ struct omap_uart_state *uart)
+{
+ return 0;
+}
#endif
char *cmdline_find_option(char *str)
@@ -289,8 +354,8 @@ void __init omap_serial_board_init(struct
omap_uart_port_info *info)
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 (!info)
omap_serial_init_port(&bdata, NULL);
--
1.7.9
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
