3 files changed, 55 insertions, 54 deletions
diff --git a/arch/arm/mach-s3c64xx/dev-spi.c b/arch/arm/mach-s3c64xx/dev-spi.c
index a492b982aa06..405e62128917 100644
--- a/arch/arm/mach-s3c64xx/dev-spi.c
+++ b/arch/arm/mach-s3c64xx/dev-spi.c
@@ -18,10 +18,11 @@
 #include <mach/map.h>
 #include <mach/gpio-bank-c.h>
 #include <mach/spi-clocks.h>
+#include <mach/irqs.h>
 #include <plat/s3c64xx-spi.h>
 #include <plat/gpio-cfg.h>
-#include <plat/irqs.h>
+#include <plat/devs.h>
 static char *spi_src_clks[] = {
        [S3C64XX_SPI_SRCCLK_PCLK] = "pclk",
diff --git a/arch/arm/mach-s3c64xx/include/mach/vmalloc.h b/arch/arm/mach-s3c64xx/include/mach/vmalloc.h
index 7411ef3711a6..bc0e91389864 100644
--- a/arch/arm/mach-s3c64xx/include/mach/vmalloc.h
+++ b/arch/arm/mach-s3c64xx/include/mach/vmalloc.h
@@ -15,6 +15,6 @@
 #ifndef __ASM_ARCH_VMALLOC_H
 #define __ASM_ARCH_VMALLOC_H
-#define VMALLOC_END       (0xE0000000)
+#define VMALLOC_END     0xE0000000UL
 #endif /* __ASM_ARCH_VMALLOC_H */
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c
index 5c07d013b23d..e130379ba0e8 100644
--- a/arch/arm/mach-s3c64xx/mach-real6410.c
+++ b/arch/arm/mach-s3c64xx/mach-real6410.c
@@ -30,73 +30,73 @@
 #include <plat/devs.h>
 #include <plat/regs-serial.h>
-#define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK
+#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)
-#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
+#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)
-#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
+#define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)
 static struct s3c2410_uartcfg real6410_uartcfgs[] __initdata = {
        [0] = {
-                .hwport      = 0,
+                .hwport = 0,
-                .flags       = 0,
+                .flags  = 0,
-                .ucon        = UCON,
+                .ucon   = UCON,
-                .ulcon       = ULCON,
+                .ulcon  = ULCON,
-                .ufcon       = UFCON,
+                .ufcon  = UFCON,
        },
        [1] = {
-                .hwport      = 1,
+                .hwport = 1,
-                .flags       = 0,
+                .flags  = 0,
-                .ucon        = UCON,
+                .ucon   = UCON,
-                .ulcon       = ULCON,
+                .ulcon  = ULCON,
-                .ufcon       = UFCON,
+                .ufcon  = UFCON,
        },
        [2] = {
-                .hwport      = 2,
+                .hwport = 2,
-                .flags       = 0,
+                .flags  = 0,
-                .ucon        = UCON,
+                .ucon   = UCON,
-                .ulcon       = ULCON,
+                .ulcon  = ULCON,
-                .ufcon       = UFCON,
+                .ufcon  = UFCON,
        },
        [3] = {
-                .hwport      = 3,
+                .hwport = 3,
-                .flags       = 0,
+                .flags  = 0,
-                .ucon        = UCON,
+                .ucon   = UCON,
-                .ulcon       = ULCON,
+                .ulcon  = ULCON,
-                .ufcon       = UFCON,
+                .ufcon  = UFCON,
        },
 };
 /* DM9000AEP 10/100 ethernet controller */
 static struct resource real6410_dm9k_resource[] = {
-        [0] = {
+        [0] = {
-                .start = S3C64XX_PA_XM0CSN1,
+                .start  = S3C64XX_PA_XM0CSN1,
-                .end   = S3C64XX_PA_XM0CSN1 + 1,
+                .end    = S3C64XX_PA_XM0CSN1 + 1,
-                .flags = IORESOURCE_MEM
+                .flags  = IORESOURCE_MEM
-        },
+        },
-        [1] = {
+        [1] = {
-                .start = S3C64XX_PA_XM0CSN1 + 4,
+                .start  = S3C64XX_PA_XM0CSN1 + 4,
-                .end   = S3C64XX_PA_XM0CSN1 + 5,
+                .end    = S3C64XX_PA_XM0CSN1 + 5,
-                .flags = IORESOURCE_MEM
+                .flags  = IORESOURCE_MEM
-        },
+        },
-        [2] = {
+        [2] = {
-                .start = S3C_EINT(7),
+                .start  = S3C_EINT(7),
-                .end   = S3C_EINT(7),
+                .end    = S3C_EINT(7),
-                .flags = IORESOURCE_IRQ,
+                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL
-        }
+        }
 };
 static struct dm9000_plat_data real6410_dm9k_pdata = {
-        .flags          = (DM9000_PLATF_16BITONLY | DM9000_PLATF_NO_EEPROM),
+        .flags          = (DM9000_PLATF_16BITONLY | DM9000_PLATF_NO_EEPROM),
 };
 static struct platform_device real6410_device_eth = {
-        .name           = "dm9000",
+        .name           = "dm9000",
-        .id             = -1,
+        .id             = -1,
-        .num_resources  = ARRAY_SIZE(real6410_dm9k_resource),
+        .num_resources  = ARRAY_SIZE(real6410_dm9k_resource),
-        .resource       = real6410_dm9k_resource,
+        .resource       = real6410_dm9k_resource,
-        .dev            = {
+        .dev            = {
-                .platform_data  = &real6410_dm9k_pdata,
+                .platform_data  = &real6410_dm9k_pdata,
-        },
+        },
 };
 static struct platform_device *real6410_devices[] __initdata = {
@@ -129,12 +129,12 @@ static void __init real6410_machine_init(void)
        /* set timing for nCS1 suitable for ethernet chip */
        __raw_writel((0 << S3C64XX_SROM_BCX__PMC__SHIFT) |
-                        (6 << S3C64XX_SROM_BCX__TACP__SHIFT) |
+                (6 << S3C64XX_SROM_BCX__TACP__SHIFT) |
-                        (4 << S3C64XX_SROM_BCX__TCAH__SHIFT) |
+                (4 << S3C64XX_SROM_BCX__TCAH__SHIFT) |
-                        (1 << S3C64XX_SROM_BCX__TCOH__SHIFT) |
+                (1 << S3C64XX_SROM_BCX__TCOH__SHIFT) |
-                        (13 << S3C64XX_SROM_BCX__TACC__SHIFT) |
+                (13 << S3C64XX_SROM_BCX__TACC__SHIFT) |
-                        (4 << S3C64XX_SROM_BCX__TCOS__SHIFT) |
+                (4 << S3C64XX_SROM_BCX__TCOS__SHIFT) |
-                        (0 << S3C64XX_SROM_BCX__TACS__SHIFT), S3C64XX_SROM_BC1);
+                (0 << S3C64XX_SROM_BCX__TACS__SHIFT), S3C64XX_SROM_BC1);
        platform_add_devices(real6410_devices, ARRAY_SIZE(real6410_devices));
 }

diff --git a/arch/arm/mach-s3c64xx/dev-spi.c b/arch/arm/mach-s3c64xx/dev-spi.c index a492b982aa06..405e62128917 100644 --- a/arch/arm/mach-s3c64xx/dev-spi.c +++ b/arch/arm/mach-s3c64xx/dev-spi.c
@@ -18,10 +18,11 @@
18	#include <mach/map.h>	18	#include <mach/map.h>
19	#include <mach/gpio-bank-c.h>	19	#include <mach/gpio-bank-c.h>
20	#include <mach/spi-clocks.h>	20	#include <mach/spi-clocks.h>
		21	#include <mach/irqs.h>
21		22
22	#include <plat/s3c64xx-spi.h>	23	#include <plat/s3c64xx-spi.h>
23	#include <plat/gpio-cfg.h>	24	#include <plat/gpio-cfg.h>
24	#include <plat/irqs.h>	25	#include <plat/devs.h>
25		26
26	static char *spi_src_clks[] = {	27	static char *spi_src_clks[] = {
27	[S3C64XX_SPI_SRCCLK_PCLK] = "pclk",	28	[S3C64XX_SPI_SRCCLK_PCLK] = "pclk",


diff --git a/arch/arm/mach-s3c64xx/include/mach/vmalloc.h b/arch/arm/mach-s3c64xx/include/mach/vmalloc.h index 7411ef3711a6..bc0e91389864 100644 --- a/arch/arm/mach-s3c64xx/include/mach/vmalloc.h +++ b/arch/arm/mach-s3c64xx/include/mach/vmalloc.h
@@ -15,6 +15,6 @@
15	#ifndef __ASM_ARCH_VMALLOC_H	15	#ifndef __ASM_ARCH_VMALLOC_H
16	#define __ASM_ARCH_VMALLOC_H	16	#define __ASM_ARCH_VMALLOC_H
17		17
18	#define VMALLOC_END (0xE0000000)	18	#define VMALLOC_END 0xE0000000UL
19		19
20	#endif /* __ASM_ARCH_VMALLOC_H */	20	#endif /* __ASM_ARCH_VMALLOC_H */


diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c index 5c07d013b23d..e130379ba0e8 100644 --- a/arch/arm/mach-s3c64xx/mach-real6410.c +++ b/arch/arm/mach-s3c64xx/mach-real6410.c
@@ -30,73 +30,73 @@
30	#include <plat/devs.h>	30	#include <plat/devs.h>
31	#include <plat/regs-serial.h>	31	#include <plat/regs-serial.h>
32		32
33	#define UCON S3C2410_UCON_DEFAULT \| S3C2410_UCON_UCLK	33	#define UCON (S3C2410_UCON_DEFAULT \| S3C2410_UCON_UCLK)
34	#define ULCON S3C2410_LCON_CS8 \| S3C2410_LCON_PNONE \| S3C2410_LCON_STOPB	34	#define ULCON (S3C2410_LCON_CS8 \| S3C2410_LCON_PNONE \| S3C2410_LCON_STOPB)
35	#define UFCON S3C2410_UFCON_RXTRIG8 \| S3C2410_UFCON_FIFOMODE	35	#define UFCON (S3C2410_UFCON_RXTRIG8 \| S3C2410_UFCON_FIFOMODE)
36		36
37	static struct s3c2410_uartcfg real6410_uartcfgs[] __initdata = {	37	static struct s3c2410_uartcfg real6410_uartcfgs[] __initdata = {
38	[0] = {	38	[0] = {
39	.hwport = 0,	39	.hwport = 0,
40	.flags = 0,	40	.flags = 0,
41	.ucon = UCON,	41	.ucon = UCON,
42	.ulcon = ULCON,	42	.ulcon = ULCON,
43	.ufcon = UFCON,	43	.ufcon = UFCON,
44	},	44	},
45	[1] = {	45	[1] = {
46	.hwport = 1,	46	.hwport = 1,
47	.flags = 0,	47	.flags = 0,
48	.ucon = UCON,	48	.ucon = UCON,
49	.ulcon = ULCON,	49	.ulcon = ULCON,
50	.ufcon = UFCON,	50	.ufcon = UFCON,
51	},	51	},
52	[2] = {	52	[2] = {
53	.hwport = 2,	53	.hwport = 2,
54	.flags = 0,	54	.flags = 0,
55	.ucon = UCON,	55	.ucon = UCON,
56	.ulcon = ULCON,	56	.ulcon = ULCON,
57	.ufcon = UFCON,	57	.ufcon = UFCON,
58	},	58	},
59	[3] = {	59	[3] = {
60	.hwport = 3,	60	.hwport = 3,
61	.flags = 0,	61	.flags = 0,
62	.ucon = UCON,	62	.ucon = UCON,
63	.ulcon = ULCON,	63	.ulcon = ULCON,
64	.ufcon = UFCON,	64	.ufcon = UFCON,
65	},	65	},
66	};	66	};
67		67
68	/* DM9000AEP 10/100 ethernet controller */	68	/* DM9000AEP 10/100 ethernet controller */
69		69
70	static struct resource real6410_dm9k_resource[] = {	70	static struct resource real6410_dm9k_resource[] = {
71	[0] = {	71	[0] = {
72	.start = S3C64XX_PA_XM0CSN1,	72	.start = S3C64XX_PA_XM0CSN1,
73	.end = S3C64XX_PA_XM0CSN1 + 1,	73	.end = S3C64XX_PA_XM0CSN1 + 1,
74	.flags = IORESOURCE_MEM	74	.flags = IORESOURCE_MEM
75	},	75	},
76	[1] = {	76	[1] = {
77	.start = S3C64XX_PA_XM0CSN1 + 4,	77	.start = S3C64XX_PA_XM0CSN1 + 4,
78	.end = S3C64XX_PA_XM0CSN1 + 5,	78	.end = S3C64XX_PA_XM0CSN1 + 5,
79	.flags = IORESOURCE_MEM	79	.flags = IORESOURCE_MEM
80	},	80	},
81	[2] = {	81	[2] = {
82	.start = S3C_EINT(7),	82	.start = S3C_EINT(7),
83	.end = S3C_EINT(7),	83	.end = S3C_EINT(7),
84	.flags = IORESOURCE_IRQ,	84	.flags = IORESOURCE_IRQ \| IORESOURCE_IRQ_HIGHLEVEL
85	}	85	}
86	};	86	};
87		87
88	static struct dm9000_plat_data real6410_dm9k_pdata = {	88	static struct dm9000_plat_data real6410_dm9k_pdata = {
89	.flags = (DM9000_PLATF_16BITONLY \| DM9000_PLATF_NO_EEPROM),	89	.flags = (DM9000_PLATF_16BITONLY \| DM9000_PLATF_NO_EEPROM),
90	};	90	};
91		91
92	static struct platform_device real6410_device_eth = {	92	static struct platform_device real6410_device_eth = {
93	.name = "dm9000",	93	.name = "dm9000",
94	.id = -1,	94	.id = -1,
95	.num_resources = ARRAY_SIZE(real6410_dm9k_resource),	95	.num_resources = ARRAY_SIZE(real6410_dm9k_resource),
96	.resource = real6410_dm9k_resource,	96	.resource = real6410_dm9k_resource,
97	.dev = {	97	.dev = {
98	.platform_data = &real6410_dm9k_pdata,	98	.platform_data = &real6410_dm9k_pdata,
99	},	99	},
100	};	100	};
101		101
102	static struct platform_device *real6410_devices[] __initdata = {	102	static struct platform_device *real6410_devices[] __initdata = {
@@ -129,12 +129,12 @@ static void __init real6410_machine_init(void)
129	/* set timing for nCS1 suitable for ethernet chip */	129	/* set timing for nCS1 suitable for ethernet chip */
130		130
131	__raw_writel((0 << S3C64XX_SROM_BCX__PMC__SHIFT) \|	131	__raw_writel((0 << S3C64XX_SROM_BCX__PMC__SHIFT) \|
132	(6 << S3C64XX_SROM_BCX__TACP__SHIFT) \|	132	(6 << S3C64XX_SROM_BCX__TACP__SHIFT) \|
133	(4 << S3C64XX_SROM_BCX__TCAH__SHIFT) \|	133	(4 << S3C64XX_SROM_BCX__TCAH__SHIFT) \|
134	(1 << S3C64XX_SROM_BCX__TCOH__SHIFT) \|	134	(1 << S3C64XX_SROM_BCX__TCOH__SHIFT) \|
135	(13 << S3C64XX_SROM_BCX__TACC__SHIFT) \|	135	(13 << S3C64XX_SROM_BCX__TACC__SHIFT) \|
136	(4 << S3C64XX_SROM_BCX__TCOS__SHIFT) \|	136	(4 << S3C64XX_SROM_BCX__TCOS__SHIFT) \|
137	(0 << S3C64XX_SROM_BCX__TACS__SHIFT), S3C64XX_SROM_BC1);	137	(0 << S3C64XX_SROM_BCX__TACS__SHIFT), S3C64XX_SROM_BC1);
138		138
139	platform_add_devices(real6410_devices, ARRAY_SIZE(real6410_devices));	139	platform_add_devices(real6410_devices, ARRAY_SIZE(real6410_devices));
140	}	140	}