* [PATCH v2 0/2] Add device tree probe support for tty/serial/imx
@ 2011-07-05 15:05 Shawn Guo
2011-07-05 15:05 ` [PATCH v2 1/2] serial/imx: get rid of the uses of cpu_is_mx1() Shawn Guo
2011-07-05 15:05 ` [PATCH v2 2/2] serial/imx: add device tree probe support Shawn Guo
0 siblings, 2 replies; 7+ messages in thread
From: Shawn Guo @ 2011-07-05 15:05 UTC (permalink / raw)
To: linux-serial; +Cc: linux-arm-kernel, devicetree-discuss, patches
The first patch removes the use of cpu_is_mx1(). The second patch
adds device tree probe with a dependency on the following patch.
http://article.gmane.org/gmane.linux.drivers.devicetree/6128
Changes since v1:
* Address review comments given by Grant and Uwe
Shawn Guo (2):
serial/imx: get rid of the uses of cpu_is_mx1()
serial/imx: add device tree probe support
.../bindings/tty/serial/fsl-imx-uart.txt | 19 +++
arch/arm/mach-imx/clock-imx1.c | 6 +-
arch/arm/plat-mxc/devices/platform-imx-uart.c | 2 +-
drivers/tty/serial/imx.c | 148 +++++++++++++++++---
4 files changed, 149 insertions(+), 26 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH v2 1/2] serial/imx: get rid of the uses of cpu_is_mx1() 2011-07-05 15:05 [PATCH v2 0/2] Add device tree probe support for tty/serial/imx Shawn Guo @ 2011-07-05 15:05 ` Shawn Guo 2011-07-05 17:27 ` Grant Likely 2011-07-05 15:05 ` [PATCH v2 2/2] serial/imx: add device tree probe support Shawn Guo 1 sibling, 1 reply; 7+ messages in thread From: Shawn Guo @ 2011-07-05 15:05 UTC (permalink / raw) To: linux-serial Cc: linux-arm-kernel, devicetree-discuss, patches, Shawn Guo, Sascha Hauer, Alan Cox The patch removes all the uses of cpu_is_mx1(). Instead, it uses the .id_table of platform_driver to distinguish the uart device type. A couple of !cpu_is_mx1() logic gets turned into IS_IMX_UART, as the codes wrapped there are really IMX specific. It also removes macro MX1_UCR3_REF25 and MX1_UCR3_REF30 which are not used anywhere. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> --- arch/arm/mach-imx/clock-imx1.c | 6 +- arch/arm/plat-mxc/devices/platform-imx-uart.c | 2 +- drivers/tty/serial/imx.c | 65 ++++++++++++++++++++----- 3 files changed, 56 insertions(+), 17 deletions(-) diff --git a/arch/arm/mach-imx/clock-imx1.c b/arch/arm/mach-imx/clock-imx1.c index dcc4172..4aabeb2 100644 --- a/arch/arm/mach-imx/clock-imx1.c +++ b/arch/arm/mach-imx/clock-imx1.c @@ -587,9 +587,9 @@ static struct clk_lookup lookups[] __initdata = { _REGISTER_CLOCK(NULL, "mma", mma_clk) _REGISTER_CLOCK("imx_udc.0", NULL, usbd_clk) _REGISTER_CLOCK(NULL, "gpt", gpt_clk) - _REGISTER_CLOCK("imx-uart.0", NULL, uart_clk) - _REGISTER_CLOCK("imx-uart.1", NULL, uart_clk) - _REGISTER_CLOCK("imx-uart.2", NULL, uart_clk) + _REGISTER_CLOCK("imx1-uart.0", NULL, uart_clk) + _REGISTER_CLOCK("imx1-uart.1", NULL, uart_clk) + _REGISTER_CLOCK("imx1-uart.2", NULL, uart_clk) _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk) _REGISTER_CLOCK("imx1-cspi.0", NULL, spi_clk) _REGISTER_CLOCK("imx1-cspi.1", NULL, spi_clk) diff --git a/arch/arm/plat-mxc/devices/platform-imx-uart.c b/arch/arm/plat-mxc/devices/platform-imx-uart.c index cfce8c9..477271a 100644 --- a/arch/arm/plat-mxc/devices/platform-imx-uart.c +++ b/arch/arm/plat-mxc/devices/platform-imx-uart.c @@ -152,7 +152,7 @@ struct platform_device *__init imx_add_imx_uart_3irq( }, }; - return imx_add_platform_device("imx-uart", data->id, res, + return imx_add_platform_device("imx1-uart", data->id, res, ARRAY_SIZE(res), pdata, sizeof(*pdata)); } diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 22fe801..ddebb5c 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -48,7 +48,6 @@ #include <asm/io.h> #include <asm/irq.h> -#include <mach/hardware.h> #include <mach/imx-uart.h> /* Register definitions */ @@ -66,8 +65,9 @@ #define UBIR 0xa4 /* BRM Incremental Register */ #define UBMR 0xa8 /* BRM Modulator Register */ #define UBRC 0xac /* Baud Rate Count Register */ -#define MX2_ONEMS 0xb0 /* One Millisecond register */ -#define UTS (cpu_is_mx1() ? 0xd0 : 0xb4) /* UART Test Register */ +#define IMX_ONEMS 0xb0 /* One Millisecond register */ +#define IMX1_UTS 0xd0 /* UART Test Register on i.mx1 */ +#define IMX_UTS 0xb4 /* UART Test Register on all other i.mx*/ /* UART Control Register Bit Fields.*/ #define URXD_CHARRDY (1<<15) @@ -87,7 +87,7 @@ #define UCR1_RTSDEN (1<<5) /* RTS delta interrupt enable */ #define UCR1_SNDBRK (1<<4) /* Send break */ #define UCR1_TDMAEN (1<<3) /* Transmitter ready DMA enable */ -#define MX1_UCR1_UARTCLKEN (1<<2) /* UART clock enabled, mx1 only */ +#define IMX1_UCR1_UARTCLKEN (1<<2) /* UART clock enabled, i.mx1 only */ #define UCR1_DOZE (1<<1) /* Doze */ #define UCR1_UARTEN (1<<0) /* UART enabled */ #define UCR2_ESCI (1<<15) /* Escape seq interrupt enable */ @@ -113,9 +113,7 @@ #define UCR3_RXDSEN (1<<6) /* Receive status interrupt enable */ #define UCR3_AIRINTEN (1<<5) /* Async IR wake interrupt enable */ #define UCR3_AWAKEN (1<<4) /* Async wake interrupt enable */ -#define MX1_UCR3_REF25 (1<<3) /* Ref freq 25 MHz, only on mx1 */ -#define MX1_UCR3_REF30 (1<<2) /* Ref Freq 30 MHz, only on mx1 */ -#define MX2_UCR3_RXDMUXSEL (1<<2) /* RXD Muxed Input Select, on mx2/mx3 */ +#define IMX_UCR3_RXDMUXSEL (1<<2) /* RXD Muxed Input Select */ #define UCR3_INVT (1<<1) /* Inverted Infrared transmission */ #define UCR3_BPEN (1<<0) /* Preset registers enable */ #define UCR4_CTSTL_SHF 10 /* CTS trigger level shift */ @@ -181,6 +179,17 @@ #define UART_NR 8 +enum imx_uart_type { + IMX1_UART, + IMX_UART, +}; + +/* device type dependent stuff */ +struct imx_uart_data { + unsigned uts_reg; + enum imx_uart_type devtype; +}; + struct imx_port { struct uart_port port; struct timer_list timer; @@ -192,6 +201,7 @@ struct imx_port { unsigned int irda_inv_tx:1; unsigned short trcv_delay; /* transceiver delay */ struct clk *clk; + struct imx_uart_data *devdata; }; #ifdef CONFIG_IRDA @@ -200,6 +210,33 @@ struct imx_port { #define USE_IRDA(sport) (0) #endif +#define UTS (sport->devdata->uts_reg) +#define IS_IMX1_UART() (sport->devdata->devtype == IMX1_UART) +#define IS_IMX_UART() (sport->devdata->devtype == IMX_UART) + +static struct imx_uart_data imx_uart_devdata[] = { + [IMX1_UART] = { + .uts_reg = IMX1_UTS, + .devtype = IMX1_UART, + }, + [IMX_UART] = { + .uts_reg = IMX_UTS, + .devtype = IMX_UART, + }, +}; + +static struct platform_device_id imx_uart_devtype[] = { + { + .name = "imx1-uart", + .driver_data = (kernel_ulong_t) &imx_uart_devdata[IMX1_UART], + }, { + .name = "imx-uart", + .driver_data = (kernel_ulong_t) &imx_uart_devdata[IMX_UART], + }, { + /* sentinel */ + } +}; + /* * Handle any change of modem status signal since we were last called. */ @@ -689,9 +726,9 @@ static int imx_startup(struct uart_port *port) } } - if (!cpu_is_mx1()) { + if (IS_IMX_UART()) { temp = readl(sport->port.membase + UCR3); - temp |= MX2_UCR3_RXDMUXSEL; + temp |= IMX_UCR3_RXDMUXSEL; writel(temp, sport->port.membase + UCR3); } @@ -923,9 +960,9 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, writel(num, sport->port.membase + UBIR); writel(denom, sport->port.membase + UBMR); - if (!cpu_is_mx1()) + if (IS_IMX_UART()) writel(sport->port.uartclk / div / 1000, - sport->port.membase + MX2_ONEMS); + sport->port.membase + IMX_ONEMS); writel(old_ucr1, sport->port.membase + UCR1); @@ -1062,8 +1099,8 @@ imx_console_write(struct console *co, const char *s, unsigned int count) ucr1 = old_ucr1 = readl(sport->port.membase + UCR1); old_ucr2 = readl(sport->port.membase + UCR2); - if (cpu_is_mx1()) - ucr1 |= MX1_UCR1_UARTCLKEN; + if (IS_IMX1_UART()) + ucr1 |= IMX1_UCR1_UARTCLKEN; ucr1 |= UCR1_UARTEN; ucr1 &= ~(UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN); @@ -1262,6 +1299,7 @@ static int serial_imx_probe(struct platform_device *pdev) init_timer(&sport->timer); sport->timer.function = imx_timeout; sport->timer.data = (unsigned long)sport; + sport->devdata = (struct imx_uart_data *) pdev->id_entry->driver_data; sport->clk = clk_get(&pdev->dev, "uart"); if (IS_ERR(sport->clk)) { @@ -1340,6 +1378,7 @@ static struct platform_driver serial_imx_driver = { .suspend = serial_imx_suspend, .resume = serial_imx_resume, + .id_table = imx_uart_devtype, .driver = { .name = "imx-uart", .owner = THIS_MODULE, -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] serial/imx: get rid of the uses of cpu_is_mx1() 2011-07-05 15:05 ` [PATCH v2 1/2] serial/imx: get rid of the uses of cpu_is_mx1() Shawn Guo @ 2011-07-05 17:27 ` Grant Likely 2011-07-06 5:53 ` Shawn Guo 2011-07-06 6:36 ` Sascha Hauer 0 siblings, 2 replies; 7+ messages in thread From: Grant Likely @ 2011-07-05 17:27 UTC (permalink / raw) To: Shawn Guo Cc: linux-serial, patches, devicetree-discuss, linux-arm-kernel, Sascha Hauer, Alan Cox On Tue, Jul 5, 2011 at 9:05 AM, Shawn Guo <shawn.guo@linaro.org> wrote: > The patch removes all the uses of cpu_is_mx1(). Instead, it uses > the .id_table of platform_driver to distinguish the uart device type. > > A couple of !cpu_is_mx1() logic gets turned into IS_IMX_UART, as the > codes wrapped there are really IMX specific. > > It also removes macro MX1_UCR3_REF25 and MX1_UCR3_REF30 which are > not used anywhere. > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > Cc: Sascha Hauer <s.hauer@pengutronix.de> > Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Acked-by: Grant Likely <grant.likely@secretlab.ca> Who's tree is this one going to get merged through? g. > --- > arch/arm/mach-imx/clock-imx1.c | 6 +- > arch/arm/plat-mxc/devices/platform-imx-uart.c | 2 +- > drivers/tty/serial/imx.c | 65 ++++++++++++++++++++----- > 3 files changed, 56 insertions(+), 17 deletions(-) > > diff --git a/arch/arm/mach-imx/clock-imx1.c b/arch/arm/mach-imx/clock-imx1.c > index dcc4172..4aabeb2 100644 > --- a/arch/arm/mach-imx/clock-imx1.c > +++ b/arch/arm/mach-imx/clock-imx1.c > @@ -587,9 +587,9 @@ static struct clk_lookup lookups[] __initdata = { > _REGISTER_CLOCK(NULL, "mma", mma_clk) > _REGISTER_CLOCK("imx_udc.0", NULL, usbd_clk) > _REGISTER_CLOCK(NULL, "gpt", gpt_clk) > - _REGISTER_CLOCK("imx-uart.0", NULL, uart_clk) > - _REGISTER_CLOCK("imx-uart.1", NULL, uart_clk) > - _REGISTER_CLOCK("imx-uart.2", NULL, uart_clk) > + _REGISTER_CLOCK("imx1-uart.0", NULL, uart_clk) > + _REGISTER_CLOCK("imx1-uart.1", NULL, uart_clk) > + _REGISTER_CLOCK("imx1-uart.2", NULL, uart_clk) > _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk) > _REGISTER_CLOCK("imx1-cspi.0", NULL, spi_clk) > _REGISTER_CLOCK("imx1-cspi.1", NULL, spi_clk) > diff --git a/arch/arm/plat-mxc/devices/platform-imx-uart.c b/arch/arm/plat-mxc/devices/platform-imx-uart.c > index cfce8c9..477271a 100644 > --- a/arch/arm/plat-mxc/devices/platform-imx-uart.c > +++ b/arch/arm/plat-mxc/devices/platform-imx-uart.c > @@ -152,7 +152,7 @@ struct platform_device *__init imx_add_imx_uart_3irq( > }, > }; > > - return imx_add_platform_device("imx-uart", data->id, res, > + return imx_add_platform_device("imx1-uart", data->id, res, > ARRAY_SIZE(res), pdata, sizeof(*pdata)); > } > > diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c > index 22fe801..ddebb5c 100644 > --- a/drivers/tty/serial/imx.c > +++ b/drivers/tty/serial/imx.c > @@ -48,7 +48,6 @@ > > #include <asm/io.h> > #include <asm/irq.h> > -#include <mach/hardware.h> > #include <mach/imx-uart.h> > > /* Register definitions */ > @@ -66,8 +65,9 @@ > #define UBIR 0xa4 /* BRM Incremental Register */ > #define UBMR 0xa8 /* BRM Modulator Register */ > #define UBRC 0xac /* Baud Rate Count Register */ > -#define MX2_ONEMS 0xb0 /* One Millisecond register */ > -#define UTS (cpu_is_mx1() ? 0xd0 : 0xb4) /* UART Test Register */ > +#define IMX_ONEMS 0xb0 /* One Millisecond register */ > +#define IMX1_UTS 0xd0 /* UART Test Register on i.mx1 */ > +#define IMX_UTS 0xb4 /* UART Test Register on all other i.mx*/ > > /* UART Control Register Bit Fields.*/ > #define URXD_CHARRDY (1<<15) > @@ -87,7 +87,7 @@ > #define UCR1_RTSDEN (1<<5) /* RTS delta interrupt enable */ > #define UCR1_SNDBRK (1<<4) /* Send break */ > #define UCR1_TDMAEN (1<<3) /* Transmitter ready DMA enable */ > -#define MX1_UCR1_UARTCLKEN (1<<2) /* UART clock enabled, mx1 only */ > +#define IMX1_UCR1_UARTCLKEN (1<<2) /* UART clock enabled, i.mx1 only */ > #define UCR1_DOZE (1<<1) /* Doze */ > #define UCR1_UARTEN (1<<0) /* UART enabled */ > #define UCR2_ESCI (1<<15) /* Escape seq interrupt enable */ > @@ -113,9 +113,7 @@ > #define UCR3_RXDSEN (1<<6) /* Receive status interrupt enable */ > #define UCR3_AIRINTEN (1<<5) /* Async IR wake interrupt enable */ > #define UCR3_AWAKEN (1<<4) /* Async wake interrupt enable */ > -#define MX1_UCR3_REF25 (1<<3) /* Ref freq 25 MHz, only on mx1 */ > -#define MX1_UCR3_REF30 (1<<2) /* Ref Freq 30 MHz, only on mx1 */ > -#define MX2_UCR3_RXDMUXSEL (1<<2) /* RXD Muxed Input Select, on mx2/mx3 */ > +#define IMX_UCR3_RXDMUXSEL (1<<2) /* RXD Muxed Input Select */ > #define UCR3_INVT (1<<1) /* Inverted Infrared transmission */ > #define UCR3_BPEN (1<<0) /* Preset registers enable */ > #define UCR4_CTSTL_SHF 10 /* CTS trigger level shift */ > @@ -181,6 +179,17 @@ > > #define UART_NR 8 > > +enum imx_uart_type { > + IMX1_UART, > + IMX_UART, > +}; > + > +/* device type dependent stuff */ > +struct imx_uart_data { > + unsigned uts_reg; > + enum imx_uart_type devtype; > +}; > + > struct imx_port { > struct uart_port port; > struct timer_list timer; > @@ -192,6 +201,7 @@ struct imx_port { > unsigned int irda_inv_tx:1; > unsigned short trcv_delay; /* transceiver delay */ > struct clk *clk; > + struct imx_uart_data *devdata; > }; > > #ifdef CONFIG_IRDA > @@ -200,6 +210,33 @@ struct imx_port { > #define USE_IRDA(sport) (0) > #endif > > +#define UTS (sport->devdata->uts_reg) > +#define IS_IMX1_UART() (sport->devdata->devtype == IMX1_UART) > +#define IS_IMX_UART() (sport->devdata->devtype == IMX_UART) > + > +static struct imx_uart_data imx_uart_devdata[] = { > + [IMX1_UART] = { > + .uts_reg = IMX1_UTS, > + .devtype = IMX1_UART, > + }, > + [IMX_UART] = { > + .uts_reg = IMX_UTS, > + .devtype = IMX_UART, > + }, > +}; > + > +static struct platform_device_id imx_uart_devtype[] = { > + { > + .name = "imx1-uart", > + .driver_data = (kernel_ulong_t) &imx_uart_devdata[IMX1_UART], > + }, { > + .name = "imx-uart", > + .driver_data = (kernel_ulong_t) &imx_uart_devdata[IMX_UART], > + }, { > + /* sentinel */ > + } > +}; > + > /* > * Handle any change of modem status signal since we were last called. > */ > @@ -689,9 +726,9 @@ static int imx_startup(struct uart_port *port) > } > } > > - if (!cpu_is_mx1()) { > + if (IS_IMX_UART()) { > temp = readl(sport->port.membase + UCR3); > - temp |= MX2_UCR3_RXDMUXSEL; > + temp |= IMX_UCR3_RXDMUXSEL; > writel(temp, sport->port.membase + UCR3); > } > > @@ -923,9 +960,9 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, > writel(num, sport->port.membase + UBIR); > writel(denom, sport->port.membase + UBMR); > > - if (!cpu_is_mx1()) > + if (IS_IMX_UART()) > writel(sport->port.uartclk / div / 1000, > - sport->port.membase + MX2_ONEMS); > + sport->port.membase + IMX_ONEMS); > > writel(old_ucr1, sport->port.membase + UCR1); > > @@ -1062,8 +1099,8 @@ imx_console_write(struct console *co, const char *s, unsigned int count) > ucr1 = old_ucr1 = readl(sport->port.membase + UCR1); > old_ucr2 = readl(sport->port.membase + UCR2); > > - if (cpu_is_mx1()) > - ucr1 |= MX1_UCR1_UARTCLKEN; > + if (IS_IMX1_UART()) > + ucr1 |= IMX1_UCR1_UARTCLKEN; > ucr1 |= UCR1_UARTEN; > ucr1 &= ~(UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN); > > @@ -1262,6 +1299,7 @@ static int serial_imx_probe(struct platform_device *pdev) > init_timer(&sport->timer); > sport->timer.function = imx_timeout; > sport->timer.data = (unsigned long)sport; > + sport->devdata = (struct imx_uart_data *) pdev->id_entry->driver_data; > > sport->clk = clk_get(&pdev->dev, "uart"); > if (IS_ERR(sport->clk)) { > @@ -1340,6 +1378,7 @@ static struct platform_driver serial_imx_driver = { > > .suspend = serial_imx_suspend, > .resume = serial_imx_resume, > + .id_table = imx_uart_devtype, > .driver = { > .name = "imx-uart", > .owner = THIS_MODULE, > -- > 1.7.4.1 > > > _______________________________________________ > devicetree-discuss mailing list > devicetree-discuss@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/devicetree-discuss > -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] serial/imx: get rid of the uses of cpu_is_mx1() 2011-07-05 17:27 ` Grant Likely @ 2011-07-06 5:53 ` Shawn Guo 2011-07-06 6:36 ` Sascha Hauer 1 sibling, 0 replies; 7+ messages in thread From: Shawn Guo @ 2011-07-06 5:53 UTC (permalink / raw) To: Grant Likely Cc: Shawn Guo, patches, devicetree-discuss, linux-arm-kernel, linux-serial, Sascha Hauer, Alan Cox, Alan Cox On Tue, Jul 05, 2011 at 11:27:55AM -0600, Grant Likely wrote: > On Tue, Jul 5, 2011 at 9:05 AM, Shawn Guo <shawn.guo@linaro.org> wrote: > > The patch removes all the uses of cpu_is_mx1(). Instead, it uses > > the .id_table of platform_driver to distinguish the uart device type. > > > > A couple of !cpu_is_mx1() logic gets turned into IS_IMX_UART, as the > > codes wrapped there are really IMX specific. > > > > It also removes macro MX1_UCR3_REF25 and MX1_UCR3_REF30 which are > > not used anywhere. > > > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > > Cc: Sascha Hauer <s.hauer@pengutronix.de> > > Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> > > Acked-by: Grant Likely <grant.likely@secretlab.ca> > > Who's tree is this one going to get merged through? > I think it will be easier to go Sascha's tree. Alan, Sascha, what do you think? -- Regards, Shawn -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] serial/imx: get rid of the uses of cpu_is_mx1() 2011-07-05 17:27 ` Grant Likely 2011-07-06 5:53 ` Shawn Guo @ 2011-07-06 6:36 ` Sascha Hauer 2011-07-06 6:57 ` Shawn Guo 1 sibling, 1 reply; 7+ messages in thread From: Sascha Hauer @ 2011-07-06 6:36 UTC (permalink / raw) To: Grant Likely Cc: Shawn Guo, linux-serial, patches, devicetree-discuss, linux-arm-kernel, Alan Cox On Tue, Jul 05, 2011 at 11:27:55AM -0600, Grant Likely wrote: > On Tue, Jul 5, 2011 at 9:05 AM, Shawn Guo <shawn.guo@linaro.org> wrote: > > The patch removes all the uses of cpu_is_mx1(). Instead, it uses > > the .id_table of platform_driver to distinguish the uart device type. > > > > A couple of !cpu_is_mx1() logic gets turned into IS_IMX_UART, as the > > codes wrapped there are really IMX specific. > > > > It also removes macro MX1_UCR3_REF25 and MX1_UCR3_REF30 which are > > not used anywhere. > > > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > > Cc: Sascha Hauer <s.hauer@pengutronix.de> > > Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> > > Acked-by: Grant Likely <grant.likely@secretlab.ca> > > Who's tree is this one going to get merged through? Before we merge this through any tree I'd like to have a policy how the bindings are named. With the gpio part we agreed that we name the bindings after the oldest i.MX they are compatible with. For example the last change in the gpios was on the i.MX31, so every newer i.MX claims to be compatible with this the i.MX31. The patch below instead follows the approach that the currently newest i.MX gets a generic name (imx-uart instead of imx21-uart). This decision may look silly when another change to the uart core comes and we have given the generic name to some arbitrary version of the core. I really like to have a consistent scheme across all devices and we have the same problem with spi, nand and several others. Sascha > > g. > > > --- > > arch/arm/mach-imx/clock-imx1.c | 6 +- > > arch/arm/plat-mxc/devices/platform-imx-uart.c | 2 +- > > drivers/tty/serial/imx.c | 65 ++++++++++++++++++++----- > > 3 files changed, 56 insertions(+), 17 deletions(-) > > > > diff --git a/arch/arm/mach-imx/clock-imx1.c b/arch/arm/mach-imx/clock-imx1.c > > index dcc4172..4aabeb2 100644 > > --- a/arch/arm/mach-imx/clock-imx1.c > > +++ b/arch/arm/mach-imx/clock-imx1.c > > @@ -587,9 +587,9 @@ static struct clk_lookup lookups[] __initdata = { > > _REGISTER_CLOCK(NULL, "mma", mma_clk) > > _REGISTER_CLOCK("imx_udc.0", NULL, usbd_clk) > > _REGISTER_CLOCK(NULL, "gpt", gpt_clk) > > - _REGISTER_CLOCK("imx-uart.0", NULL, uart_clk) > > - _REGISTER_CLOCK("imx-uart.1", NULL, uart_clk) > > - _REGISTER_CLOCK("imx-uart.2", NULL, uart_clk) > > + _REGISTER_CLOCK("imx1-uart.0", NULL, uart_clk) > > + _REGISTER_CLOCK("imx1-uart.1", NULL, uart_clk) > > + _REGISTER_CLOCK("imx1-uart.2", NULL, uart_clk) > > _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk) > > _REGISTER_CLOCK("imx1-cspi.0", NULL, spi_clk) > > _REGISTER_CLOCK("imx1-cspi.1", NULL, spi_clk) > > diff --git a/arch/arm/plat-mxc/devices/platform-imx-uart.c b/arch/arm/plat-mxc/devices/platform-imx-uart.c > > index cfce8c9..477271a 100644 > > --- a/arch/arm/plat-mxc/devices/platform-imx-uart.c > > +++ b/arch/arm/plat-mxc/devices/platform-imx-uart.c > > @@ -152,7 +152,7 @@ struct platform_device *__init imx_add_imx_uart_3irq( > > }, > > }; > > > > - return imx_add_platform_device("imx-uart", data->id, res, > > + return imx_add_platform_device("imx1-uart", data->id, res, > > ARRAY_SIZE(res), pdata, sizeof(*pdata)); > > } > > > > diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c > > index 22fe801..ddebb5c 100644 > > --- a/drivers/tty/serial/imx.c > > +++ b/drivers/tty/serial/imx.c > > @@ -48,7 +48,6 @@ > > > > #include <asm/io.h> > > #include <asm/irq.h> > > -#include <mach/hardware.h> > > #include <mach/imx-uart.h> > > > > /* Register definitions */ > > @@ -66,8 +65,9 @@ > > #define UBIR 0xa4 /* BRM Incremental Register */ > > #define UBMR 0xa8 /* BRM Modulator Register */ > > #define UBRC 0xac /* Baud Rate Count Register */ > > -#define MX2_ONEMS 0xb0 /* One Millisecond register */ > > -#define UTS (cpu_is_mx1() ? 0xd0 : 0xb4) /* UART Test Register */ > > +#define IMX_ONEMS 0xb0 /* One Millisecond register */ > > +#define IMX1_UTS 0xd0 /* UART Test Register on i.mx1 */ > > +#define IMX_UTS 0xb4 /* UART Test Register on all other i.mx*/ > > > > /* UART Control Register Bit Fields.*/ > > #define URXD_CHARRDY (1<<15) > > @@ -87,7 +87,7 @@ > > #define UCR1_RTSDEN (1<<5) /* RTS delta interrupt enable */ > > #define UCR1_SNDBRK (1<<4) /* Send break */ > > #define UCR1_TDMAEN (1<<3) /* Transmitter ready DMA enable */ > > -#define MX1_UCR1_UARTCLKEN (1<<2) /* UART clock enabled, mx1 only */ > > +#define IMX1_UCR1_UARTCLKEN (1<<2) /* UART clock enabled, i.mx1 only */ > > #define UCR1_DOZE (1<<1) /* Doze */ > > #define UCR1_UARTEN (1<<0) /* UART enabled */ > > #define UCR2_ESCI (1<<15) /* Escape seq interrupt enable */ > > @@ -113,9 +113,7 @@ > > #define UCR3_RXDSEN (1<<6) /* Receive status interrupt enable */ > > #define UCR3_AIRINTEN (1<<5) /* Async IR wake interrupt enable */ > > #define UCR3_AWAKEN (1<<4) /* Async wake interrupt enable */ > > -#define MX1_UCR3_REF25 (1<<3) /* Ref freq 25 MHz, only on mx1 */ > > -#define MX1_UCR3_REF30 (1<<2) /* Ref Freq 30 MHz, only on mx1 */ > > -#define MX2_UCR3_RXDMUXSEL (1<<2) /* RXD Muxed Input Select, on mx2/mx3 */ > > +#define IMX_UCR3_RXDMUXSEL (1<<2) /* RXD Muxed Input Select */ > > #define UCR3_INVT (1<<1) /* Inverted Infrared transmission */ > > #define UCR3_BPEN (1<<0) /* Preset registers enable */ > > #define UCR4_CTSTL_SHF 10 /* CTS trigger level shift */ > > @@ -181,6 +179,17 @@ > > > > #define UART_NR 8 > > > > +enum imx_uart_type { > > + IMX1_UART, > > + IMX_UART, > > +}; > > + > > +/* device type dependent stuff */ > > +struct imx_uart_data { > > + unsigned uts_reg; > > + enum imx_uart_type devtype; > > +}; > > + > > struct imx_port { > > struct uart_port port; > > struct timer_list timer; > > @@ -192,6 +201,7 @@ struct imx_port { > > unsigned int irda_inv_tx:1; > > unsigned short trcv_delay; /* transceiver delay */ > > struct clk *clk; > > + struct imx_uart_data *devdata; > > }; > > > > #ifdef CONFIG_IRDA > > @@ -200,6 +210,33 @@ struct imx_port { > > #define USE_IRDA(sport) (0) > > #endif > > > > +#define UTS (sport->devdata->uts_reg) > > +#define IS_IMX1_UART() (sport->devdata->devtype == IMX1_UART) > > +#define IS_IMX_UART() (sport->devdata->devtype == IMX_UART) > > + > > +static struct imx_uart_data imx_uart_devdata[] = { > > + [IMX1_UART] = { > > + .uts_reg = IMX1_UTS, > > + .devtype = IMX1_UART, > > + }, > > + [IMX_UART] = { > > + .uts_reg = IMX_UTS, > > + .devtype = IMX_UART, > > + }, > > +}; > > + > > +static struct platform_device_id imx_uart_devtype[] = { > > + { > > + .name = "imx1-uart", > > + .driver_data = (kernel_ulong_t) &imx_uart_devdata[IMX1_UART], > > + }, { > > + .name = "imx-uart", > > + .driver_data = (kernel_ulong_t) &imx_uart_devdata[IMX_UART], > > + }, { > > + /* sentinel */ > > + } > > +}; > > + > > /* > > * Handle any change of modem status signal since we were last called. > > */ > > @@ -689,9 +726,9 @@ static int imx_startup(struct uart_port *port) > > } > > } > > > > - if (!cpu_is_mx1()) { > > + if (IS_IMX_UART()) { > > temp = readl(sport->port.membase + UCR3); > > - temp |= MX2_UCR3_RXDMUXSEL; > > + temp |= IMX_UCR3_RXDMUXSEL; > > writel(temp, sport->port.membase + UCR3); > > } > > > > @@ -923,9 +960,9 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, > > writel(num, sport->port.membase + UBIR); > > writel(denom, sport->port.membase + UBMR); > > > > - if (!cpu_is_mx1()) > > + if (IS_IMX_UART()) > > writel(sport->port.uartclk / div / 1000, > > - sport->port.membase + MX2_ONEMS); > > + sport->port.membase + IMX_ONEMS); > > > > writel(old_ucr1, sport->port.membase + UCR1); > > > > @@ -1062,8 +1099,8 @@ imx_console_write(struct console *co, const char *s, unsigned int count) > > ucr1 = old_ucr1 = readl(sport->port.membase + UCR1); > > old_ucr2 = readl(sport->port.membase + UCR2); > > > > - if (cpu_is_mx1()) > > - ucr1 |= MX1_UCR1_UARTCLKEN; > > + if (IS_IMX1_UART()) > > + ucr1 |= IMX1_UCR1_UARTCLKEN; > > ucr1 |= UCR1_UARTEN; > > ucr1 &= ~(UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN); > > > > @@ -1262,6 +1299,7 @@ static int serial_imx_probe(struct platform_device *pdev) > > init_timer(&sport->timer); > > sport->timer.function = imx_timeout; > > sport->timer.data = (unsigned long)sport; > > + sport->devdata = (struct imx_uart_data *) pdev->id_entry->driver_data; > > > > sport->clk = clk_get(&pdev->dev, "uart"); > > if (IS_ERR(sport->clk)) { > > @@ -1340,6 +1378,7 @@ static struct platform_driver serial_imx_driver = { > > > > .suspend = serial_imx_suspend, > > .resume = serial_imx_resume, > > + .id_table = imx_uart_devtype, > > .driver = { > > .name = "imx-uart", > > .owner = THIS_MODULE, > > -- > > 1.7.4.1 > > > > > > _______________________________________________ > > devicetree-discuss mailing list > > devicetree-discuss@lists.ozlabs.org > > https://lists.ozlabs.org/listinfo/devicetree-discuss > > > > > > -- > Grant Likely, B.Sc., P.Eng. > Secret Lab Technologies Ltd. > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] serial/imx: get rid of the uses of cpu_is_mx1() 2011-07-06 6:36 ` Sascha Hauer @ 2011-07-06 6:57 ` Shawn Guo 0 siblings, 0 replies; 7+ messages in thread From: Shawn Guo @ 2011-07-06 6:57 UTC (permalink / raw) To: Sascha Hauer Cc: Grant Likely, patches, devicetree-discuss, linux-arm-kernel, linux-serial, Alan Cox On Wed, Jul 06, 2011 at 08:36:48AM +0200, Sascha Hauer wrote: > On Tue, Jul 05, 2011 at 11:27:55AM -0600, Grant Likely wrote: > > On Tue, Jul 5, 2011 at 9:05 AM, Shawn Guo <shawn.guo@linaro.org> wrote: > > > The patch removes all the uses of cpu_is_mx1(). Instead, it uses > > > the .id_table of platform_driver to distinguish the uart device type. > > > > > > A couple of !cpu_is_mx1() logic gets turned into IS_IMX_UART, as the > > > codes wrapped there are really IMX specific. > > > > > > It also removes macro MX1_UCR3_REF25 and MX1_UCR3_REF30 which are > > > not used anywhere. > > > > > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > > > Cc: Sascha Hauer <s.hauer@pengutronix.de> > > > Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> > > > > Acked-by: Grant Likely <grant.likely@secretlab.ca> > > > > Who's tree is this one going to get merged through? > > Before we merge this through any tree I'd like to have a policy how > the bindings are named. With the gpio part we agreed that we name > the bindings after the oldest i.MX they are compatible with. For example > the last change in the gpios was on the i.MX31, so every newer i.MX > claims to be compatible with this the i.MX31. > > The patch below instead follows the approach that the currently newest > i.MX gets a generic name (imx-uart instead of imx21-uart). This decision > may look silly when another change to the uart core comes and we have > given the generic name to some arbitrary version of the core. > > I really like to have a consistent scheme across all devices and we have > the same problem with spi, nand and several others. > Makes sense. Will fix it in v3. -- Regards, Shawn -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] serial/imx: add device tree probe support 2011-07-05 15:05 [PATCH v2 0/2] Add device tree probe support for tty/serial/imx Shawn Guo 2011-07-05 15:05 ` [PATCH v2 1/2] serial/imx: get rid of the uses of cpu_is_mx1() Shawn Guo @ 2011-07-05 15:05 ` Shawn Guo 1 sibling, 0 replies; 7+ messages in thread From: Shawn Guo @ 2011-07-05 15:05 UTC (permalink / raw) To: linux-serial Cc: linux-arm-kernel, devicetree-discuss, patches, Shawn Guo, Jeremy Kerr, Jason Liu, Sascha Hauer, Alan Cox, Grant Likely It adds device tree probe support for imx tty/serial driver. Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by: Jason Liu <jason.hui@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Grant Likely <grant.likely@secretlab.ca> Acked-by: Grant Likely <grant.likely@secretlab.ca> --- .../bindings/tty/serial/fsl-imx-uart.txt | 19 +++++ drivers/tty/serial/imx.c | 85 +++++++++++++++++--- 2 files changed, 94 insertions(+), 10 deletions(-) create mode 100644 Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt diff --git a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt new file mode 100644 index 0000000..a9c0406 --- /dev/null +++ b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt @@ -0,0 +1,19 @@ +* Freescale i.MX Universal Asynchronous Receiver/Transmitter (UART) + +Required properties: +- compatible : Should be "fsl,<soc>-uart" +- reg : Address and length of the register set for the device +- interrupts : Should contain uart interrupt + +Optional properties: +- fsl,uart-has-rtscts : Indicate the uart has rts and cts +- fsl,irda-mode : Indicate the uart supports irda mode + +Example: + +uart@73fbc000 { + compatible = "fsl,imx51-uart", "fsl,imx21-uart"; + reg = <0x73fbc000 0x4000>; + interrupts = <31>; + fsl,uart-has-rtscts; +}; diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index ddebb5c..edafd1f 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -45,6 +45,8 @@ #include <linux/delay.h> #include <linux/rational.h> #include <linux/slab.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <asm/io.h> #include <asm/irq.h> @@ -237,6 +239,12 @@ static struct platform_device_id imx_uart_devtype[] = { } }; +static struct of_device_id imx_uart_dt_ids[] = { + { .compatible = "fsl,imx1-uart", .data = &imx_uart_devdata[IMX1_UART], }, + { .compatible = "fsl,imx21-uart", .data = &imx_uart_devdata[IMX_UART], }, + { /* sentinel */ } +}; + /* * Handle any change of modem status signal since we were last called. */ @@ -1259,6 +1267,61 @@ static int serial_imx_resume(struct platform_device *dev) return 0; } +#ifdef CONFIG_OF +static int serial_imx_probe_dt(struct imx_port *sport, + struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + const struct of_device_id *of_id = + of_match_device(imx_uart_dt_ids, &pdev->dev); + + if (!np) + return -ENODEV; + + pdev->id = of_alias_get_id(np, "serial"); + if (pdev->id < 0) { + pr_err("%s: failed to get alias id, errno %d\n", + __func__, pdev->id); + return -ENODEV; + } + + if (of_get_property(np, "fsl,uart-has-rtscts", NULL)) + sport->have_rtscts = 1; + + if (of_get_property(np, "fsl,irda-mode", NULL)) + sport->use_irda = 1; + + sport->devdata = of_id->data; + + return 0; +} +#else +static inline int serial_imx_probe_dt(struct imx_port *sport, + struct platform_device *pdev) +{ + return -ENODEV; +} +#endif + +static int serial_imx_probe_pdata(struct imx_port *sport, + struct platform_device *pdev) +{ + struct imxuart_platform_data *pdata = pdev->dev.platform_data; + + if (!pdata) + return 0; + + if (pdata->flags & IMXUART_HAVE_RTSCTS) + sport->have_rtscts = 1; + + if (pdata->flags & IMXUART_IRDA) + sport->use_irda = 1; + + sport->devdata = (struct imx_uart_data *) pdev->id_entry->driver_data; + + return 0; +} + static int serial_imx_probe(struct platform_device *pdev) { struct imx_port *sport; @@ -1271,6 +1334,12 @@ static int serial_imx_probe(struct platform_device *pdev) if (!sport) return -ENOMEM; + ret = serial_imx_probe_dt(sport, pdev); + if (ret == -ENODEV) + ret = serial_imx_probe_pdata(sport, pdev); + if (ret) + goto free; + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { ret = -ENODEV; @@ -1299,7 +1368,6 @@ static int serial_imx_probe(struct platform_device *pdev) init_timer(&sport->timer); sport->timer.function = imx_timeout; sport->timer.data = (unsigned long)sport; - sport->devdata = (struct imx_uart_data *) pdev->id_entry->driver_data; sport->clk = clk_get(&pdev->dev, "uart"); if (IS_ERR(sport->clk)) { @@ -1310,17 +1378,13 @@ static int serial_imx_probe(struct platform_device *pdev) sport->port.uartclk = clk_get_rate(sport->clk); - imx_ports[pdev->id] = sport; + if (imx_ports[sport->port.line]) { + ret = -EBUSY; + goto clkput; + } + imx_ports[sport->port.line] = sport; pdata = pdev->dev.platform_data; - if (pdata && (pdata->flags & IMXUART_HAVE_RTSCTS)) - sport->have_rtscts = 1; - -#ifdef CONFIG_IRDA - if (pdata && (pdata->flags & IMXUART_IRDA)) - sport->use_irda = 1; -#endif - if (pdata && pdata->init) { ret = pdata->init(pdev); if (ret) @@ -1382,6 +1446,7 @@ static struct platform_driver serial_imx_driver = { .driver = { .name = "imx-uart", .owner = THIS_MODULE, + .of_match_table = imx_uart_dt_ids, }, }; -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-07-06 6:51 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-07-05 15:05 [PATCH v2 0/2] Add device tree probe support for tty/serial/imx Shawn Guo 2011-07-05 15:05 ` [PATCH v2 1/2] serial/imx: get rid of the uses of cpu_is_mx1() Shawn Guo 2011-07-05 17:27 ` Grant Likely 2011-07-06 5:53 ` Shawn Guo 2011-07-06 6:36 ` Sascha Hauer 2011-07-06 6:57 ` Shawn Guo 2011-07-05 15:05 ` [PATCH v2 2/2] serial/imx: add device tree probe support Shawn Guo
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).