diff options
Diffstat (limited to 'arch/arm/mach-s3c64xx')
22 files changed, 115 insertions, 22 deletions
diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c index 64edda37bde3..76ab595d849b 100644 --- a/arch/arm/mach-s3c64xx/common.c +++ b/arch/arm/mach-s3c64xx/common.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <linux/irq.h> | 32 | #include <linux/irq.h> |
33 | #include <linux/gpio.h> | 33 | #include <linux/gpio.h> |
34 | #include <linux/irqchip/arm-vic.h> | 34 | #include <linux/irqchip/arm-vic.h> |
35 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
36 | #include <clocksource/samsung_pwm.h> | 35 | #include <clocksource/samsung_pwm.h> |
37 | 36 | ||
38 | #include <asm/mach/arch.h> | 37 | #include <asm/mach/arch.h> |
@@ -42,6 +41,7 @@ | |||
42 | #include <mach/map.h> | 41 | #include <mach/map.h> |
43 | #include <mach/hardware.h> | 42 | #include <mach/hardware.h> |
44 | #include <mach/regs-gpio.h> | 43 | #include <mach/regs-gpio.h> |
44 | #include <mach/gpio-samsung.h> | ||
45 | 45 | ||
46 | #include <plat/cpu.h> | 46 | #include <plat/cpu.h> |
47 | #include <plat/devs.h> | 47 | #include <plat/devs.h> |
diff --git a/arch/arm/mach-s3c64xx/crag6410.h b/arch/arm/mach-s3c64xx/crag6410.h index 9ef20b8fd36f..7bc66682687e 100644 --- a/arch/arm/mach-s3c64xx/crag6410.h +++ b/arch/arm/mach-s3c64xx/crag6410.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #ifndef MACH_CRAG6410_H | 11 | #ifndef MACH_CRAG6410_H |
12 | #define MACH_CRAG6410_H | 12 | #define MACH_CRAG6410_H |
13 | 13 | ||
14 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | 14 | #include <mach/gpio-samsung.h> |
15 | 15 | ||
16 | #define GLENFARCLAS_PMIC_IRQ_BASE IRQ_BOARD_START | 16 | #define GLENFARCLAS_PMIC_IRQ_BASE IRQ_BOARD_START |
17 | 17 | ||
diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c index 6f58c80235dc..ff780a8d8366 100644 --- a/arch/arm/mach-s3c64xx/dev-audio.c +++ b/arch/arm/mach-s3c64xx/dev-audio.c | |||
@@ -21,8 +21,8 @@ | |||
21 | 21 | ||
22 | #include <plat/devs.h> | 22 | #include <plat/devs.h> |
23 | #include <linux/platform_data/asoc-s3c.h> | 23 | #include <linux/platform_data/asoc-s3c.h> |
24 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
25 | #include <plat/gpio-cfg.h> | 24 | #include <plat/gpio-cfg.h> |
25 | #include <mach/gpio-samsung.h> | ||
26 | 26 | ||
27 | static int s3c64xx_i2s_cfg_gpio(struct platform_device *pdev) | 27 | static int s3c64xx_i2s_cfg_gpio(struct platform_device *pdev) |
28 | { | 28 | { |
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h b/arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h new file mode 100644 index 000000000000..9c81fac3b2d5 --- /dev/null +++ b/arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h | |||
@@ -0,0 +1,94 @@ | |||
1 | /* | ||
2 | * Copyright 2008 Openmoko, Inc. | ||
3 | * Copyright 2008 Simtec Electronics | ||
4 | * http://armlinux.simtec.co.uk/ | ||
5 | * Ben Dooks <ben@simtec.co.uk> | ||
6 | * | ||
7 | * S3C6400 - GPIO lib support | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | |||
14 | #ifndef GPIO_SAMSUNG_S3C64XX_H | ||
15 | #define GPIO_SAMSUNG_S3C64XX_H | ||
16 | |||
17 | /* GPIO bank sizes */ | ||
18 | #define S3C64XX_GPIO_A_NR (8) | ||
19 | #define S3C64XX_GPIO_B_NR (7) | ||
20 | #define S3C64XX_GPIO_C_NR (8) | ||
21 | #define S3C64XX_GPIO_D_NR (5) | ||
22 | #define S3C64XX_GPIO_E_NR (5) | ||
23 | #define S3C64XX_GPIO_F_NR (16) | ||
24 | #define S3C64XX_GPIO_G_NR (7) | ||
25 | #define S3C64XX_GPIO_H_NR (10) | ||
26 | #define S3C64XX_GPIO_I_NR (16) | ||
27 | #define S3C64XX_GPIO_J_NR (12) | ||
28 | #define S3C64XX_GPIO_K_NR (16) | ||
29 | #define S3C64XX_GPIO_L_NR (15) | ||
30 | #define S3C64XX_GPIO_M_NR (6) | ||
31 | #define S3C64XX_GPIO_N_NR (16) | ||
32 | #define S3C64XX_GPIO_O_NR (16) | ||
33 | #define S3C64XX_GPIO_P_NR (15) | ||
34 | #define S3C64XX_GPIO_Q_NR (9) | ||
35 | |||
36 | /* GPIO bank numbes */ | ||
37 | |||
38 | /* CONFIG_S3C_GPIO_SPACE allows the user to select extra | ||
39 | * space for debugging purposes so that any accidental | ||
40 | * change from one gpio bank to another can be caught. | ||
41 | */ | ||
42 | |||
43 | #define S3C64XX_GPIO_NEXT(__gpio) \ | ||
44 | ((__gpio##_START) + (__gpio##_NR) + CONFIG_S3C_GPIO_SPACE + 1) | ||
45 | |||
46 | enum s3c_gpio_number { | ||
47 | S3C64XX_GPIO_A_START = 0, | ||
48 | S3C64XX_GPIO_B_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_A), | ||
49 | S3C64XX_GPIO_C_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_B), | ||
50 | S3C64XX_GPIO_D_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_C), | ||
51 | S3C64XX_GPIO_E_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_D), | ||
52 | S3C64XX_GPIO_F_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_E), | ||
53 | S3C64XX_GPIO_G_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_F), | ||
54 | S3C64XX_GPIO_H_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_G), | ||
55 | S3C64XX_GPIO_I_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_H), | ||
56 | S3C64XX_GPIO_J_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_I), | ||
57 | S3C64XX_GPIO_K_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_J), | ||
58 | S3C64XX_GPIO_L_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_K), | ||
59 | S3C64XX_GPIO_M_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_L), | ||
60 | S3C64XX_GPIO_N_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_M), | ||
61 | S3C64XX_GPIO_O_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_N), | ||
62 | S3C64XX_GPIO_P_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_O), | ||
63 | S3C64XX_GPIO_Q_START = S3C64XX_GPIO_NEXT(S3C64XX_GPIO_P), | ||
64 | }; | ||
65 | |||
66 | /* S3C64XX GPIO number definitions. */ | ||
67 | |||
68 | #define S3C64XX_GPA(_nr) (S3C64XX_GPIO_A_START + (_nr)) | ||
69 | #define S3C64XX_GPB(_nr) (S3C64XX_GPIO_B_START + (_nr)) | ||
70 | #define S3C64XX_GPC(_nr) (S3C64XX_GPIO_C_START + (_nr)) | ||
71 | #define S3C64XX_GPD(_nr) (S3C64XX_GPIO_D_START + (_nr)) | ||
72 | #define S3C64XX_GPE(_nr) (S3C64XX_GPIO_E_START + (_nr)) | ||
73 | #define S3C64XX_GPF(_nr) (S3C64XX_GPIO_F_START + (_nr)) | ||
74 | #define S3C64XX_GPG(_nr) (S3C64XX_GPIO_G_START + (_nr)) | ||
75 | #define S3C64XX_GPH(_nr) (S3C64XX_GPIO_H_START + (_nr)) | ||
76 | #define S3C64XX_GPI(_nr) (S3C64XX_GPIO_I_START + (_nr)) | ||
77 | #define S3C64XX_GPJ(_nr) (S3C64XX_GPIO_J_START + (_nr)) | ||
78 | #define S3C64XX_GPK(_nr) (S3C64XX_GPIO_K_START + (_nr)) | ||
79 | #define S3C64XX_GPL(_nr) (S3C64XX_GPIO_L_START + (_nr)) | ||
80 | #define S3C64XX_GPM(_nr) (S3C64XX_GPIO_M_START + (_nr)) | ||
81 | #define S3C64XX_GPN(_nr) (S3C64XX_GPIO_N_START + (_nr)) | ||
82 | #define S3C64XX_GPO(_nr) (S3C64XX_GPIO_O_START + (_nr)) | ||
83 | #define S3C64XX_GPP(_nr) (S3C64XX_GPIO_P_START + (_nr)) | ||
84 | #define S3C64XX_GPQ(_nr) (S3C64XX_GPIO_Q_START + (_nr)) | ||
85 | |||
86 | /* the end of the S3C64XX specific gpios */ | ||
87 | #define S3C64XX_GPIO_END (S3C64XX_GPQ(S3C64XX_GPIO_Q_NR) + 1) | ||
88 | #define S3C_GPIO_END S3C64XX_GPIO_END | ||
89 | |||
90 | /* define the number of gpios we need to the one after the GPQ() range */ | ||
91 | #define GPIO_BOARD_START (S3C64XX_GPQ(S3C64XX_GPIO_Q_NR) + 1) | ||
92 | |||
93 | #endif /* GPIO_SAMSUNG_S3C64XX_H */ | ||
94 | |||
diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c index 546f45b59ea1..ddeb0e51a962 100644 --- a/arch/arm/mach-s3c64xx/mach-anw6410.c +++ b/arch/arm/mach-s3c64xx/mach-anw6410.c | |||
@@ -43,13 +43,13 @@ | |||
43 | 43 | ||
44 | #include <plat/regs-serial.h> | 44 | #include <plat/regs-serial.h> |
45 | #include <linux/platform_data/i2c-s3c2410.h> | 45 | #include <linux/platform_data/i2c-s3c2410.h> |
46 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
47 | #include <plat/fb.h> | 46 | #include <plat/fb.h> |
48 | 47 | ||
49 | #include <plat/clock.h> | 48 | #include <plat/clock.h> |
50 | #include <plat/devs.h> | 49 | #include <plat/devs.h> |
51 | #include <plat/cpu.h> | 50 | #include <plat/cpu.h> |
52 | #include <mach/regs-gpio.h> | 51 | #include <mach/regs-gpio.h> |
52 | #include <mach/gpio-samsung.h> | ||
53 | #include <plat/samsung-time.h> | 53 | #include <plat/samsung-time.h> |
54 | 54 | ||
55 | #include "common.h" | 55 | #include "common.h" |
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index 7b913595e4ee..3df3c372ee1f 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c | |||
@@ -32,7 +32,6 @@ | |||
32 | 32 | ||
33 | #include <linux/platform_data/pca953x.h> | 33 | #include <linux/platform_data/pca953x.h> |
34 | #include <linux/platform_data/s3c-hsotg.h> | 34 | #include <linux/platform_data/s3c-hsotg.h> |
35 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
36 | 35 | ||
37 | #include <video/platform_lcd.h> | 36 | #include <video/platform_lcd.h> |
38 | 37 | ||
@@ -49,8 +48,8 @@ | |||
49 | #include <video/samsung_fimd.h> | 48 | #include <video/samsung_fimd.h> |
50 | #include <mach/hardware.h> | 49 | #include <mach/hardware.h> |
51 | #include <mach/map.h> | 50 | #include <mach/map.h> |
52 | |||
53 | #include <mach/regs-gpio.h> | 51 | #include <mach/regs-gpio.h> |
52 | #include <mach/gpio-samsung.h> | ||
54 | 53 | ||
55 | #include <plat/regs-serial.h> | 54 | #include <plat/regs-serial.h> |
56 | #include <plat/fb.h> | 55 | #include <plat/fb.h> |
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c index 009b19525cbf..0431016925b9 100644 --- a/arch/arm/mach-s3c64xx/mach-hmt.c +++ b/arch/arm/mach-s3c64xx/mach-hmt.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | #include <plat/regs-serial.h> | 36 | #include <plat/regs-serial.h> |
37 | #include <linux/platform_data/i2c-s3c2410.h> | 37 | #include <linux/platform_data/i2c-s3c2410.h> |
38 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | 38 | #include <mach/gpio-samsung.h> |
39 | #include <plat/fb.h> | 39 | #include <plat/fb.h> |
40 | #include <linux/platform_data/mtd-nand-s3c2410.h> | 40 | #include <linux/platform_data/mtd-nand-s3c2410.h> |
41 | 41 | ||
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c index 14c96ee5a3fe..8c84d3448dac 100644 --- a/arch/arm/mach-s3c64xx/mach-mini6410.c +++ b/arch/arm/mach-s3c64xx/mach-mini6410.c | |||
@@ -30,6 +30,7 @@ | |||
30 | 30 | ||
31 | #include <mach/map.h> | 31 | #include <mach/map.h> |
32 | #include <mach/regs-gpio.h> | 32 | #include <mach/regs-gpio.h> |
33 | #include <mach/gpio-samsung.h> | ||
33 | 34 | ||
34 | #include <plat/adc.h> | 35 | #include <plat/adc.h> |
35 | #include <plat/cpu.h> | 36 | #include <plat/cpu.h> |
@@ -38,7 +39,6 @@ | |||
38 | #include <linux/platform_data/mtd-nand-s3c2410.h> | 39 | #include <linux/platform_data/mtd-nand-s3c2410.h> |
39 | #include <plat/regs-serial.h> | 40 | #include <plat/regs-serial.h> |
40 | #include <linux/platform_data/touchscreen-s3c2410.h> | 41 | #include <linux/platform_data/touchscreen-s3c2410.h> |
41 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
42 | 42 | ||
43 | #include <video/platform_lcd.h> | 43 | #include <video/platform_lcd.h> |
44 | #include <video/samsung_fimd.h> | 44 | #include <video/samsung_fimd.h> |
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c index af45149a96b3..5152026f0e19 100644 --- a/arch/arm/mach-s3c64xx/mach-real6410.c +++ b/arch/arm/mach-s3c64xx/mach-real6410.c | |||
@@ -31,6 +31,7 @@ | |||
31 | 31 | ||
32 | #include <mach/map.h> | 32 | #include <mach/map.h> |
33 | #include <mach/regs-gpio.h> | 33 | #include <mach/regs-gpio.h> |
34 | #include <mach/gpio-samsung.h> | ||
34 | 35 | ||
35 | #include <plat/adc.h> | 36 | #include <plat/adc.h> |
36 | #include <plat/cpu.h> | 37 | #include <plat/cpu.h> |
@@ -39,7 +40,6 @@ | |||
39 | #include <linux/platform_data/mtd-nand-s3c2410.h> | 40 | #include <linux/platform_data/mtd-nand-s3c2410.h> |
40 | #include <plat/regs-serial.h> | 41 | #include <plat/regs-serial.h> |
41 | #include <linux/platform_data/touchscreen-s3c2410.h> | 42 | #include <linux/platform_data/touchscreen-s3c2410.h> |
42 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
43 | 43 | ||
44 | #include <video/platform_lcd.h> | 44 | #include <video/platform_lcd.h> |
45 | #include <video/samsung_fimd.h> | 45 | #include <video/samsung_fimd.h> |
diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c index 0271b3a191e5..5629df905fcd 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq.c +++ b/arch/arm/mach-s3c64xx/mach-smartq.c | |||
@@ -25,6 +25,7 @@ | |||
25 | 25 | ||
26 | #include <mach/map.h> | 26 | #include <mach/map.h> |
27 | #include <mach/regs-gpio.h> | 27 | #include <mach/regs-gpio.h> |
28 | #include <mach/gpio-samsung.h> | ||
28 | 29 | ||
29 | #include <plat/clock.h> | 30 | #include <plat/clock.h> |
30 | #include <plat/cpu.h> | 31 | #include <plat/cpu.h> |
@@ -36,7 +37,6 @@ | |||
36 | #include <linux/platform_data/usb-ohci-s3c2410.h> | 37 | #include <linux/platform_data/usb-ohci-s3c2410.h> |
37 | #include <plat/sdhci.h> | 38 | #include <plat/sdhci.h> |
38 | #include <linux/platform_data/touchscreen-s3c2410.h> | 39 | #include <linux/platform_data/touchscreen-s3c2410.h> |
39 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
40 | 40 | ||
41 | #include <video/platform_lcd.h> | 41 | #include <video/platform_lcd.h> |
42 | #include <plat/samsung-time.h> | 42 | #include <plat/samsung-time.h> |
diff --git a/arch/arm/mach-s3c64xx/mach-smartq5.c b/arch/arm/mach-s3c64xx/mach-smartq5.c index 15b6c2f98086..dec4c08e834f 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq5.c +++ b/arch/arm/mach-s3c64xx/mach-smartq5.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/input.h> | 16 | #include <linux/input.h> |
17 | #include <linux/leds.h> | 17 | #include <linux/leds.h> |
18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
19 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
20 | 19 | ||
21 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
22 | #include <asm/mach/arch.h> | 21 | #include <asm/mach/arch.h> |
@@ -24,6 +23,7 @@ | |||
24 | #include <video/samsung_fimd.h> | 23 | #include <video/samsung_fimd.h> |
25 | #include <mach/map.h> | 24 | #include <mach/map.h> |
26 | #include <mach/regs-gpio.h> | 25 | #include <mach/regs-gpio.h> |
26 | #include <mach/gpio-samsung.h> | ||
27 | 27 | ||
28 | #include <plat/cpu.h> | 28 | #include <plat/cpu.h> |
29 | #include <plat/devs.h> | 29 | #include <plat/devs.h> |
diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c index e3b58942ee68..27b322069c7d 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq7.c +++ b/arch/arm/mach-s3c64xx/mach-smartq7.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/input.h> | 16 | #include <linux/input.h> |
17 | #include <linux/leds.h> | 17 | #include <linux/leds.h> |
18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
19 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
20 | 19 | ||
21 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
22 | #include <asm/mach/arch.h> | 21 | #include <asm/mach/arch.h> |
@@ -24,6 +23,7 @@ | |||
24 | #include <video/samsung_fimd.h> | 23 | #include <video/samsung_fimd.h> |
25 | #include <mach/map.h> | 24 | #include <mach/map.h> |
26 | #include <mach/regs-gpio.h> | 25 | #include <mach/regs-gpio.h> |
26 | #include <mach/gpio-samsung.h> | ||
27 | 27 | ||
28 | #include <plat/cpu.h> | 28 | #include <plat/cpu.h> |
29 | #include <plat/devs.h> | 29 | #include <plat/devs.h> |
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c b/arch/arm/mach-s3c64xx/mach-smdk6400.c index bdbbddb803d5..150f55fb9e33 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6400.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6400.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include <plat/devs.h> | 35 | #include <plat/devs.h> |
36 | #include <plat/cpu.h> | 36 | #include <plat/cpu.h> |
37 | #include <linux/platform_data/i2c-s3c2410.h> | 37 | #include <linux/platform_data/i2c-s3c2410.h> |
38 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | 38 | #include <mach/gpio-samsung.h> |
39 | #include <plat/samsung-time.h> | 39 | #include <plat/samsung-time.h> |
40 | 40 | ||
41 | #include "common.h" | 41 | #include "common.h" |
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index a8977da87eb1..43261d24a0a5 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <linux/regulator/machine.h> | 31 | #include <linux/regulator/machine.h> |
32 | #include <linux/pwm_backlight.h> | 32 | #include <linux/pwm_backlight.h> |
33 | #include <linux/platform_data/s3c-hsotg.h> | 33 | #include <linux/platform_data/s3c-hsotg.h> |
34 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
35 | 34 | ||
36 | #ifdef CONFIG_SMDK6410_WM1190_EV1 | 35 | #ifdef CONFIG_SMDK6410_WM1190_EV1 |
37 | #include <linux/mfd/wm8350/core.h> | 36 | #include <linux/mfd/wm8350/core.h> |
@@ -58,6 +57,7 @@ | |||
58 | 57 | ||
59 | #include <plat/regs-serial.h> | 58 | #include <plat/regs-serial.h> |
60 | #include <mach/regs-gpio.h> | 59 | #include <mach/regs-gpio.h> |
60 | #include <mach/gpio-samsung.h> | ||
61 | #include <linux/platform_data/ata-samsung_cf.h> | 61 | #include <linux/platform_data/ata-samsung_cf.h> |
62 | #include <linux/platform_data/i2c-s3c2410.h> | 62 | #include <linux/platform_data/i2c-s3c2410.h> |
63 | #include <plat/fb.h> | 63 | #include <plat/fb.h> |
diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c index 99c778eecab6..b5a66986a529 100644 --- a/arch/arm/mach-s3c64xx/pm.c +++ b/arch/arm/mach-s3c64xx/pm.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
19 | #include <linux/gpio.h> | 19 | #include <linux/gpio.h> |
20 | #include <linux/pm_domain.h> | 20 | #include <linux/pm_domain.h> |
21 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
22 | 21 | ||
23 | #include <mach/map.h> | 22 | #include <mach/map.h> |
24 | #include <mach/irqs.h> | 23 | #include <mach/irqs.h> |
@@ -29,6 +28,7 @@ | |||
29 | 28 | ||
30 | #include <mach/regs-gpio.h> | 29 | #include <mach/regs-gpio.h> |
31 | #include <mach/regs-clock.h> | 30 | #include <mach/regs-clock.h> |
31 | #include <mach/gpio-samsung.h> | ||
32 | 32 | ||
33 | #include "regs-gpio-memport.h" | 33 | #include "regs-gpio-memport.h" |
34 | #include "regs-modem.h" | 34 | #include "regs-modem.h" |
diff --git a/arch/arm/mach-s3c64xx/setup-fb-24bpp.c b/arch/arm/mach-s3c64xx/setup-fb-24bpp.c index 222792691b41..9d17bff12d4d 100644 --- a/arch/arm/mach-s3c64xx/setup-fb-24bpp.c +++ b/arch/arm/mach-s3c64xx/setup-fb-24bpp.c | |||
@@ -16,10 +16,10 @@ | |||
16 | #include <linux/types.h> | 16 | #include <linux/types.h> |
17 | #include <linux/fb.h> | 17 | #include <linux/fb.h> |
18 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
19 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
20 | 19 | ||
21 | #include <plat/fb.h> | 20 | #include <plat/fb.h> |
22 | #include <plat/gpio-cfg.h> | 21 | #include <plat/gpio-cfg.h> |
22 | #include <mach/gpio-samsung.h> | ||
23 | 23 | ||
24 | void s3c64xx_fb_gpio_setup_24bpp(void) | 24 | void s3c64xx_fb_gpio_setup_24bpp(void) |
25 | { | 25 | { |
diff --git a/arch/arm/mach-s3c64xx/setup-i2c0.c b/arch/arm/mach-s3c64xx/setup-i2c0.c index f269dabc9593..4b8c1cfdd1fc 100644 --- a/arch/arm/mach-s3c64xx/setup-i2c0.c +++ b/arch/arm/mach-s3c64xx/setup-i2c0.c | |||
@@ -19,8 +19,8 @@ | |||
19 | struct platform_device; /* don't need the contents */ | 19 | struct platform_device; /* don't need the contents */ |
20 | 20 | ||
21 | #include <linux/platform_data/i2c-s3c2410.h> | 21 | #include <linux/platform_data/i2c-s3c2410.h> |
22 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
23 | #include <plat/gpio-cfg.h> | 22 | #include <plat/gpio-cfg.h> |
23 | #include <mach/gpio-samsung.h> | ||
24 | 24 | ||
25 | void s3c_i2c0_cfg_gpio(struct platform_device *dev) | 25 | void s3c_i2c0_cfg_gpio(struct platform_device *dev) |
26 | { | 26 | { |
diff --git a/arch/arm/mach-s3c64xx/setup-i2c1.c b/arch/arm/mach-s3c64xx/setup-i2c1.c index aa2bfcd5e818..cd1df71ee13b 100644 --- a/arch/arm/mach-s3c64xx/setup-i2c1.c +++ b/arch/arm/mach-s3c64xx/setup-i2c1.c | |||
@@ -19,8 +19,8 @@ | |||
19 | struct platform_device; /* don't need the contents */ | 19 | struct platform_device; /* don't need the contents */ |
20 | 20 | ||
21 | #include <linux/platform_data/i2c-s3c2410.h> | 21 | #include <linux/platform_data/i2c-s3c2410.h> |
22 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
23 | #include <plat/gpio-cfg.h> | 22 | #include <plat/gpio-cfg.h> |
23 | #include <mach/gpio-samsung.h> | ||
24 | 24 | ||
25 | void s3c_i2c1_cfg_gpio(struct platform_device *dev) | 25 | void s3c_i2c1_cfg_gpio(struct platform_device *dev) |
26 | { | 26 | { |
diff --git a/arch/arm/mach-s3c64xx/setup-ide.c b/arch/arm/mach-s3c64xx/setup-ide.c index 81dcebeaeb53..689fb72e715c 100644 --- a/arch/arm/mach-s3c64xx/setup-ide.c +++ b/arch/arm/mach-s3c64xx/setup-ide.c | |||
@@ -17,8 +17,8 @@ | |||
17 | #include <mach/map.h> | 17 | #include <mach/map.h> |
18 | #include <mach/regs-clock.h> | 18 | #include <mach/regs-clock.h> |
19 | #include <plat/gpio-cfg.h> | 19 | #include <plat/gpio-cfg.h> |
20 | #include <mach/gpio-samsung.h> | ||
20 | #include <linux/platform_data/ata-samsung_cf.h> | 21 | #include <linux/platform_data/ata-samsung_cf.h> |
21 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
22 | 22 | ||
23 | void s3c64xx_ide_setup_gpio(void) | 23 | void s3c64xx_ide_setup_gpio(void) |
24 | { | 24 | { |
diff --git a/arch/arm/mach-s3c64xx/setup-keypad.c b/arch/arm/mach-s3c64xx/setup-keypad.c index e236f40c9053..6ad9a89dfddf 100644 --- a/arch/arm/mach-s3c64xx/setup-keypad.c +++ b/arch/arm/mach-s3c64xx/setup-keypad.c | |||
@@ -11,9 +11,9 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/gpio.h> | 13 | #include <linux/gpio.h> |
14 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
15 | #include <plat/gpio-cfg.h> | 14 | #include <plat/gpio-cfg.h> |
16 | #include <plat/keypad.h> | 15 | #include <plat/keypad.h> |
16 | #include <mach/gpio-samsung.h> | ||
17 | 17 | ||
18 | void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols) | 18 | void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols) |
19 | { | 19 | { |
diff --git a/arch/arm/mach-s3c64xx/setup-sdhci-gpio.c b/arch/arm/mach-s3c64xx/setup-sdhci-gpio.c index 79192b7217df..f426b7a16c16 100644 --- a/arch/arm/mach-s3c64xx/setup-sdhci-gpio.c +++ b/arch/arm/mach-s3c64xx/setup-sdhci-gpio.c | |||
@@ -17,10 +17,10 @@ | |||
17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
19 | #include <linux/gpio.h> | 19 | #include <linux/gpio.h> |
20 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
21 | 20 | ||
22 | #include <plat/gpio-cfg.h> | 21 | #include <plat/gpio-cfg.h> |
23 | #include <plat/sdhci.h> | 22 | #include <plat/sdhci.h> |
23 | #include <mach/gpio-samsung.h> | ||
24 | 24 | ||
25 | void s3c64xx_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width) | 25 | void s3c64xx_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width) |
26 | { | 26 | { |
diff --git a/arch/arm/mach-s3c64xx/setup-spi.c b/arch/arm/mach-s3c64xx/setup-spi.c index dad4728ccb52..5fd1a315c901 100644 --- a/arch/arm/mach-s3c64xx/setup-spi.c +++ b/arch/arm/mach-s3c64xx/setup-spi.c | |||
@@ -9,8 +9,8 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/gpio.h> | 11 | #include <linux/gpio.h> |
12 | #include <linux/platform_data/gpio-samsung-s3c64xx.h> | ||
13 | #include <plat/gpio-cfg.h> | 12 | #include <plat/gpio-cfg.h> |
13 | #include <mach/gpio-samsung.h> | ||
14 | 14 | ||
15 | #ifdef CONFIG_S3C64XX_DEV_SPI0 | 15 | #ifdef CONFIG_S3C64XX_DEV_SPI0 |
16 | int s3c64xx_spi0_cfg_gpio(void) | 16 | int s3c64xx_spi0_cfg_gpio(void) |