Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65e866a9 authored by Mark A. Greer's avatar Mark A. Greer Committed by Kevin Hilman
Browse files

davinci: Move serial platform_device into SoC-specific files 



Currently, there is one set of platform_device and platform_data
structures for all DaVinci SoCs.  The differences in the data
between the various SoCs is handled by davinci_serial_init()
by checking the SoC type.  However, as new SoCs appear, this
routine will become more & more cluttered.

To clean up the routine and make it easier to add support for new
SoCs, move the platform_device and platform_data structures into the
SoC-specific code and use the SoC infrastructure to provide access
to the data.

In the process, fix a bug where the wrong irq is used for uart2
of the dm646x.

Signed-off-by: default avatarMark A. Greer <mgreer@mvista.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent a994955c

arch/arm/mach-davinci/dm355.c

+41 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/clk.h>

#include <linux/serial_8250.h>

#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <linux/gpio.h>
@@ -27,6 +28,7 @@ 
#include <mach/mux.h>

#include <mach/irqs.h>

#include <mach/time.h>

#include <mach/serial.h>

#include <mach/common.h>



#include "clock.h"
@@ -630,6 +632,44 @@ struct davinci_timer_info dm355_timer_info = { 
	.clocksource_id	= T0_TOP,

};



static struct plat_serial8250_port dm355_serial_platform_data[] = {

	{

		.mapbase	= DAVINCI_UART0_BASE,

		.irq		= IRQ_UARTINT0,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |

				  UPF_IOREMAP,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

	},

	{

		.mapbase	= DAVINCI_UART1_BASE,

		.irq		= IRQ_UARTINT1,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |

				  UPF_IOREMAP,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

	},

	{

		.mapbase	= DM355_UART2_BASE,

		.irq		= IRQ_DM355_UARTINT2,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |

				  UPF_IOREMAP,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

	},

	{

		.flags		= 0

	},

};



static struct platform_device dm355_serial_device = {

	.name			= "serial8250",

	.id			= PLAT8250_DEV_PLATFORM,

	.dev			= {

		.platform_data	= dm355_serial_platform_data,

	},

};



static struct davinci_soc_info davinci_soc_info_dm355 = {

	.io_desc		= dm355_io_desc,

	.io_desc_num		= ARRAY_SIZE(dm355_io_desc),
@@ -651,6 +691,7 @@ static struct davinci_soc_info davinci_soc_info_dm355 = { 
	.gpio_base		= IO_ADDRESS(DAVINCI_GPIO_BASE),

	.gpio_num		= 104,

	.gpio_irq		= IRQ_DM355_GPIOBNK0,

	.serial_dev		= &dm355_serial_device,

};



void __init dm355_init(void)

arch/arm/mach-davinci/dm644x.c

+41 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/clk.h>

#include <linux/serial_8250.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>
@@ -24,6 +25,7 @@ 
#include <mach/psc.h>

#include <mach/mux.h>

#include <mach/time.h>

#include <mach/serial.h>

#include <mach/common.h>



#include "clock.h"
@@ -573,6 +575,44 @@ struct davinci_timer_info dm644x_timer_info = { 
	.clocksource_id	= T0_TOP,

};



static struct plat_serial8250_port dm644x_serial_platform_data[] = {

	{

		.mapbase	= DAVINCI_UART0_BASE,

		.irq		= IRQ_UARTINT0,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |

				  UPF_IOREMAP,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

	},

	{

		.mapbase	= DAVINCI_UART1_BASE,

		.irq		= IRQ_UARTINT1,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |

				  UPF_IOREMAP,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

	},

	{

		.mapbase	= DAVINCI_UART2_BASE,

		.irq		= IRQ_UARTINT2,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |

				  UPF_IOREMAP,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

	},

	{

		.flags		= 0

	},

};



static struct platform_device dm644x_serial_device = {

	.name			= "serial8250",

	.id			= PLAT8250_DEV_PLATFORM,

	.dev			= {

		.platform_data	= dm644x_serial_platform_data,

	},

};



static struct davinci_soc_info davinci_soc_info_dm644x = {

	.io_desc		= dm644x_io_desc,

	.io_desc_num		= ARRAY_SIZE(dm644x_io_desc),
@@ -594,6 +634,7 @@ static struct davinci_soc_info davinci_soc_info_dm644x = { 
	.gpio_base		= IO_ADDRESS(DAVINCI_GPIO_BASE),

	.gpio_num		= 71,

	.gpio_irq		= IRQ_GPIOBNK0,

	.serial_dev		= &dm644x_serial_device,

};



void __init dm644x_init(void)

arch/arm/mach-davinci/dm646x.c

+41 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/clk.h>

#include <linux/serial_8250.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>
@@ -24,6 +25,7 @@ 
#include <mach/psc.h>

#include <mach/mux.h>

#include <mach/time.h>

#include <mach/serial.h>

#include <mach/common.h>



#include "clock.h"
@@ -552,6 +554,44 @@ struct davinci_timer_info dm646x_timer_info = { 
	.clocksource_id	= T0_TOP,

};



static struct plat_serial8250_port dm646x_serial_platform_data[] = {

	{

		.mapbase	= DAVINCI_UART0_BASE,

		.irq		= IRQ_UARTINT0,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |

				  UPF_IOREMAP,

		.iotype		= UPIO_MEM32,

		.regshift	= 2,

	},

	{

		.mapbase	= DAVINCI_UART1_BASE,

		.irq		= IRQ_UARTINT1,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |

				  UPF_IOREMAP,

		.iotype		= UPIO_MEM32,

		.regshift	= 2,

	},

	{

		.mapbase	= DAVINCI_UART2_BASE,

		.irq		= IRQ_DM646X_UARTINT2,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |

				  UPF_IOREMAP,

		.iotype		= UPIO_MEM32,

		.regshift	= 2,

	},

	{

		.flags		= 0

	},

};



static struct platform_device dm646x_serial_device = {

	.name			= "serial8250",

	.id			= PLAT8250_DEV_PLATFORM,

	.dev			= {

		.platform_data	= dm646x_serial_platform_data,

	},

};



static struct davinci_soc_info davinci_soc_info_dm646x = {

	.io_desc		= dm646x_io_desc,

	.io_desc_num		= ARRAY_SIZE(dm646x_io_desc),
@@ -573,6 +613,7 @@ static struct davinci_soc_info davinci_soc_info_dm646x = { 
	.gpio_base		= IO_ADDRESS(DAVINCI_GPIO_BASE),

	.gpio_num		= 43, /* Only 33 usable */

	.gpio_irq		= IRQ_DM646X_GPIOBNK0,

	.serial_dev		= &dm646x_serial_device,

};



void __init dm646x_init(void)

arch/arm/mach-davinci/include/mach/common.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ struct davinci_soc_info { 
	void __iomem			*gpio_base;

	unsigned			gpio_num;

	unsigned			gpio_irq;

	struct platform_device		*serial_dev;

};



extern struct davinci_soc_info davinci_soc_info;

arch/arm/mach-davinci/include/mach/serial.h

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,6 @@ struct davinci_uart_config { 
	unsigned int enabled_uarts;

};



extern void davinci_serial_init(struct davinci_uart_config *);

extern int davinci_serial_init(struct davinci_uart_config *);



#endif /* __ASM_ARCH_SERIAL_H */