aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/platform_data
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-01-14 08:24:24 -0500
committerLinus Walleij <linus.walleij@linaro.org>2014-01-14 09:24:06 -0500
commitb0161caa72b6ff60f82f5531b9b728f3b6d19e1b (patch)
treec995add34bdda3c0b6e9b9fa057b7cedc95fad92 /include/linux/platform_data
parentccb6fbb990202e647523a003018f6edaed17b53d (diff)
ARM: S3C[24|64]xx: move includes back under <mach/> scope
When refactoring and breaking out the includes for the machine-specific GPIO configuration, two files were created in <linux/platform_data/gpio-samsung-s3c[24|64]xx.h>, but as that namespace shall be used for defining data exchanged between machines and drivers, using it for these broad macros and config settings is wrong. Move the headers back into the machine-local <mach/gpio-samsung.h> file and think about the next step. Reported-by: Arnd Bergmann <arnd@arndb.de> Cc: Tomasz Figa <tomasz.figa@gmail.com> Cc: Sylwester Nawrocki <sylvester.nawrocki@gmail.com> Cc: Ben Dooks <ben-linux@fluff.org> Cc: Kukjin Kim <kgene.kim@samsung.com> Cc: linux-samsung-soc@vger.kernel.org Acked-by: Mark Brown <broonie@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include/linux/platform_data')
-rw-r--r--include/linux/platform_data/gpio-samsung-s3c24xx.h106
-rw-r--r--include/linux/platform_data/gpio-samsung-s3c64xx.h94
2 files changed, 0 insertions, 200 deletions
diff --git a/include/linux/platform_data/gpio-samsung-s3c24xx.h b/include/linux/platform_data/gpio-samsung-s3c24xx.h
deleted file mode 100644
index 79b3a0e44955..000000000000
--- a/include/linux/platform_data/gpio-samsung-s3c24xx.h
+++ /dev/null
@@ -1,106 +0,0 @@
1/*
2 * Copyright (c) 2008 Simtec Electronics
3 * http://armlinux.simtec.co.uk/
4 * Ben Dooks <ben@simtec.co.uk>
5 *
6 * S3C2410 - GPIO lib support
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License version 2 as
10 * published by the Free Software Foundation.
11*/
12
13/* some boards require extra gpio capacity to support external
14 * devices that need GPIO.
15 */
16
17#ifndef GPIO_SAMSUNG_S3C24XX_H
18#define GPIO_SAMSUNG_S3C24XX_H
19
20/*
21 * GPIO sizes for various SoCs:
22 *
23 * 2410 2412 2440 2443 2416
24 * 2442
25 * ---- ---- ---- ---- ----
26 * A 23 22 25 16 27
27 * B 11 11 11 11 11
28 * C 16 16 16 16 16
29 * D 16 16 16 16 16
30 * E 16 16 16 16 16
31 * F 8 8 8 8 8
32 * G 16 16 16 16 8
33 * H 11 11 11 15 15
34 * J -- -- 13 16 --
35 * K -- -- -- -- 16
36 * L -- -- -- 15 14
37 * M -- -- -- 2 2
38 */
39
40/* GPIO bank sizes */
41
42#define S3C2410_GPIO_A_NR (32)
43#define S3C2410_GPIO_B_NR (32)
44#define S3C2410_GPIO_C_NR (32)
45#define S3C2410_GPIO_D_NR (32)
46#define S3C2410_GPIO_E_NR (32)
47#define S3C2410_GPIO_F_NR (32)
48#define S3C2410_GPIO_G_NR (32)
49#define S3C2410_GPIO_H_NR (32)
50#define S3C2410_GPIO_J_NR (32) /* technically 16. */
51#define S3C2410_GPIO_K_NR (32) /* technically 16. */
52#define S3C2410_GPIO_L_NR (32) /* technically 15. */
53#define S3C2410_GPIO_M_NR (32) /* technically 2. */
54
55#if CONFIG_S3C_GPIO_SPACE != 0
56#error CONFIG_S3C_GPIO_SPACE cannot be nonzero at the moment
57#endif
58
59#define S3C2410_GPIO_NEXT(__gpio) \
60 ((__gpio##_START) + (__gpio##_NR) + CONFIG_S3C_GPIO_SPACE + 0)
61
62#ifndef __ASSEMBLY__
63
64enum s3c_gpio_number {
65 S3C2410_GPIO_A_START = 0,
66 S3C2410_GPIO_B_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_A),
67 S3C2410_GPIO_C_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_B),
68 S3C2410_GPIO_D_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_C),
69 S3C2410_GPIO_E_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_D),
70 S3C2410_GPIO_F_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_E),
71 S3C2410_GPIO_G_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_F),
72 S3C2410_GPIO_H_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_G),
73 S3C2410_GPIO_J_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_H),
74 S3C2410_GPIO_K_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_J),
75 S3C2410_GPIO_L_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_K),
76 S3C2410_GPIO_M_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_L),
77};
78
79#endif /* __ASSEMBLY__ */
80
81/* S3C2410 GPIO number definitions. */
82
83#define S3C2410_GPA(_nr) (S3C2410_GPIO_A_START + (_nr))
84#define S3C2410_GPB(_nr) (S3C2410_GPIO_B_START + (_nr))
85#define S3C2410_GPC(_nr) (S3C2410_GPIO_C_START + (_nr))
86#define S3C2410_GPD(_nr) (S3C2410_GPIO_D_START + (_nr))
87#define S3C2410_GPE(_nr) (S3C2410_GPIO_E_START + (_nr))
88#define S3C2410_GPF(_nr) (S3C2410_GPIO_F_START + (_nr))
89#define S3C2410_GPG(_nr) (S3C2410_GPIO_G_START + (_nr))
90#define S3C2410_GPH(_nr) (S3C2410_GPIO_H_START + (_nr))
91#define S3C2410_GPJ(_nr) (S3C2410_GPIO_J_START + (_nr))
92#define S3C2410_GPK(_nr) (S3C2410_GPIO_K_START + (_nr))
93#define S3C2410_GPL(_nr) (S3C2410_GPIO_L_START + (_nr))
94#define S3C2410_GPM(_nr) (S3C2410_GPIO_M_START + (_nr))
95
96#include <plat/gpio-cfg.h>
97
98#ifdef CONFIG_CPU_S3C244X
99#define S3C_GPIO_END (S3C2410_GPJ(0) + 32)
100#elif defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2416)
101#define S3C_GPIO_END (S3C2410_GPM(0) + 32)
102#else
103#define S3C_GPIO_END (S3C2410_GPH(0) + 32)
104#endif
105
106#endif /* GPIO_SAMSUNG_S3C24XX_H */
diff --git a/include/linux/platform_data/gpio-samsung-s3c64xx.h b/include/linux/platform_data/gpio-samsung-s3c64xx.h
deleted file mode 100644
index 9c81fac3b2d5..000000000000
--- a/include/linux/platform_data/gpio-samsung-s3c64xx.h
+++ /dev/null
@@ -1,94 +0,0 @@
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
46enum 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
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-24 21:46:21 -0400