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

Commit 7fc06d8c authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

imx2x: convert serial.c to use soc-prefixed constants 



This makes the file compilable for a kernel that supports both imx21 and
imx27.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 08f9bf16

arch/arm/mach-mx2/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
obj-y	:=  generic.o devices.o serial.o

CFLAGS_generic.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS

CFLAGS_devices.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS

CFLAGS_serial.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS



obj-$(CONFIG_MACH_MX21) += clock_imx21.o

arch/arm/mach-mx2/serial.c

+24 −24
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ 


static struct resource uart0[] = {

	{

		.start = UART1_BASE_ADDR,

		.end = UART1_BASE_ADDR + 0x0B5,

		.start = MX2x_UART1_BASE_ADDR,

		.end = MX2x_UART1_BASE_ADDR + 0x0B5,

		.flags = IORESOURCE_MEM,

	}, {

		.start = MXC_INT_UART1,

		.end = MXC_INT_UART1,

		.start = MX2x_INT_UART1,

		.end = MX2x_INT_UART1,

		.flags = IORESOURCE_IRQ,

	},

};
@@ -45,12 +45,12 @@ struct platform_device mxc_uart_device0 = { 


static struct resource uart1[] = {

	{

		.start = UART2_BASE_ADDR,

		.end = UART2_BASE_ADDR + 0x0B5,

		.start = MX2x_UART2_BASE_ADDR,

		.end = MX2x_UART2_BASE_ADDR + 0x0B5,

		.flags = IORESOURCE_MEM,

	}, {

		.start = MXC_INT_UART2,

		.end = MXC_INT_UART2,

		.start = MX2x_INT_UART2,

		.end = MX2x_INT_UART2,

		.flags = IORESOURCE_IRQ,

	},

};
@@ -64,12 +64,12 @@ struct platform_device mxc_uart_device1 = { 


static struct resource uart2[] = {

	{

		.start = UART3_BASE_ADDR,

		.end = UART3_BASE_ADDR + 0x0B5,

		.start = MX2x_UART3_BASE_ADDR,

		.end = MX2x_UART3_BASE_ADDR + 0x0B5,

		.flags = IORESOURCE_MEM,

	}, {

		.start = MXC_INT_UART3,

		.end = MXC_INT_UART3,

		.start = MX2x_INT_UART3,

		.end = MX2x_INT_UART3,

		.flags = IORESOURCE_IRQ,

	},

};
@@ -83,12 +83,12 @@ struct platform_device mxc_uart_device2 = { 


static struct resource uart3[] = {

	{

		.start = UART4_BASE_ADDR,

		.end = UART4_BASE_ADDR + 0x0B5,

		.start = MX2x_UART4_BASE_ADDR,

		.end = MX2x_UART4_BASE_ADDR + 0x0B5,

		.flags = IORESOURCE_MEM,

	}, {

		.start = MXC_INT_UART4,

		.end = MXC_INT_UART4,

		.start = MX2x_INT_UART4,

		.end = MX2x_INT_UART4,

		.flags = IORESOURCE_IRQ,

	},

};
@@ -103,12 +103,12 @@ struct platform_device mxc_uart_device3 = { 
#ifdef CONFIG_MACH_MX27

static struct resource uart4[] = {

	{

		.start = UART5_BASE_ADDR,

		.end = UART5_BASE_ADDR + 0x0B5,

		.start = MX27_UART5_BASE_ADDR,

		.end = MX27_UART5_BASE_ADDR + 0x0B5,

		.flags = IORESOURCE_MEM,

	}, {

		.start = MXC_INT_UART5,

		.end = MXC_INT_UART5,

		.start = MX27_INT_UART5,

		.end = MX27_INT_UART5,

		.flags = IORESOURCE_IRQ,

	},

};
@@ -122,12 +122,12 @@ struct platform_device mxc_uart_device4 = { 


static struct resource uart5[] = {

	{

		.start = UART6_BASE_ADDR,

		.end = UART6_BASE_ADDR + 0x0B5,

		.start = MX27_UART6_BASE_ADDR,

		.end = MX27_UART6_BASE_ADDR + 0x0B5,

		.flags = IORESOURCE_MEM,

	}, {

		.start = MXC_INT_UART6,

		.end = MXC_INT_UART6,

		.start = MX27_INT_UART6,

		.end = MX27_INT_UART6,

		.flags = IORESOURCE_IRQ,

	},

};