[PATCH 1/2] serial/imx: get rid of the uses of cpu_is_mx1()

[Uwe Kleine-König]

On Mon, Jul 04, 2011 at 10:19:25AM +0800, Shawn Guo wrote:
> Hi Grant,
> 
> Thanks for the review.
> 
> On Sun, Jul 03, 2011 at 03:10:07PM -0600, Grant Likely wrote:
> > On Sun, Jul 03, 2011 at 03:55:59PM +0800, Shawn Guo 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.
> > > 
> > > Signed-off-by: Shawn Guo <shawn.guo at linaro.org>
> > > Cc: Sascha Hauer <s.hauer at pengutronix.de>
> > > Cc: Alan Cox <alan at 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                      |   51 ++++++++++++++++++++++--
> > >  3 files changed, 50 insertions(+), 9 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..983f3bd 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 */
> > > @@ -67,7 +66,8 @@
> > >  #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 MX1_UTS 0xd0 /* UART Test Register on mx1 */
> > > +#define MX2_UTS 0xb4 /* UART Test Register on mx2 and later */
> > >  
> > >  /* UART Control Register Bit Fields.*/
> > >  #define  URXD_CHARRDY    (1<<15)
> > > @@ -181,6 +181,17 @@
> > >  
> > >  #define UART_NR 8
> > >  
> > > +enum imx_uart_type {
> > > +	IMX1_UART,
> > > +	IMX2_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 +203,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 +212,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_IMX2_UART() (sport->devdata->devtype == IMX2_UART)
> > > +
> > > +static struct imx_uart_data imx_uart_devdata[] = {
> > > +	[IMX1_UART] = {
> > > +		.uts_reg = MX1_UTS,
> > > +		.devtype = IMX1_UART,
> > > +	},
> > > +	[IMX2_UART] = {
> > > +		.uts_reg = MX2_UTS,
> > > +		.devtype = IMX2_UART,
> > > +	},
> > > +};
> > > +
> > > +static struct platform_device_id imx_uart_devtype[] = {
> > > +	{
> > > +		.name = "imx1-uart",
> > > +		.driver_data = IMX1_UART,
> > > +	}, {
> > > +		.name = "imx-uart",
> > > +		.driver_data = IMX2_UART,
It feels strange to introduce IMX2 today meaning
i.MX{21,25,27,31,35,50,51,53}. I didn't check the changes in detail, but
if the only relevant change is that the UTS register is at a different
location, I'd prefer to make it as follows:

	#define IMX_UART_UTS_AT_D0	1

	{
		.name = "imx1-uart",
		.driver_data = IMX_UART_UTS_AT_D0,
	}, {
		.name = "imx-uart",
		.driver_data = 0,
	}

and then do

	u32 imx_uart_read_UTS(...)
	{
		if (get_driver_data() & IMX_UART_UTS_AT_D0)
			return read(0xd0);
		else
			return read(0xb4);
	}

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |