diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2011-08-22 03:33:30 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-22 04:12:53 -0400 |
commit | 0f33286190634eeb3ec7638045980c39c98380f4 (patch) | |
tree | 385dfce25280fc464598fe080a56a434f711982d | |
parent | 8f3c4537bb08001c4772d66ad3fcfcf24d8d180d (diff) |
ARM: 7032/1: plat-nomadik: break out GPIO driver specifics
The <[plat|mach]/gpio.h> file is included from upper directories
and deal with generic GPIO and gpiolib stuff. Break out the
platform and driver specific defines and functions into its own
header file.
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Alessandro Rubini <rubini@unipv.it>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-nomadik/board-nhk8815.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-nomadik/cpu-8815.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-nomadik/i2c-8815nhk.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/board-mop500-pins.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-ux500/board-u5500-sdi.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/board-u5500.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/cpu-db5500.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/devices-common.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | 85 | ||||
-rw-r--r-- | arch/arm/plat-nomadik/include/plat/gpio.h | 69 | ||||
-rw-r--r-- | drivers/gpio/gpio-nomadik.c | 1 |
13 files changed, 96 insertions, 77 deletions
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index 139930350d93..97d7186484ca 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <asm/mach/irq.h> | 27 | #include <asm/mach/irq.h> |
28 | #include <asm/mach/flash.h> | 28 | #include <asm/mach/flash.h> |
29 | 29 | ||
30 | #include <plat/gpio-nomadik.h> | ||
30 | #include <plat/mtu.h> | 31 | #include <plat/mtu.h> |
31 | 32 | ||
32 | #include <mach/setup.h> | 33 | #include <mach/setup.h> |
diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index ac58e3b03b1a..dc67717db6f0 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c | |||
@@ -21,8 +21,8 @@ | |||
21 | #include <linux/device.h> | 21 | #include <linux/device.h> |
22 | #include <linux/amba/bus.h> | 22 | #include <linux/amba/bus.h> |
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | #include <linux/gpio.h> | ||
25 | 24 | ||
25 | #include <plat/gpio-nomadik.h> | ||
26 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
27 | #include <mach/irqs.h> | 27 | #include <mach/irqs.h> |
28 | #include <asm/mach/map.h> | 28 | #include <asm/mach/map.h> |
diff --git a/arch/arm/mach-nomadik/i2c-8815nhk.c b/arch/arm/mach-nomadik/i2c-8815nhk.c index abfe25a08d6b..0fc2f6f1cc97 100644 --- a/arch/arm/mach-nomadik/i2c-8815nhk.c +++ b/arch/arm/mach-nomadik/i2c-8815nhk.c | |||
@@ -3,8 +3,8 @@ | |||
3 | #include <linux/i2c.h> | 3 | #include <linux/i2c.h> |
4 | #include <linux/i2c-algo-bit.h> | 4 | #include <linux/i2c-algo-bit.h> |
5 | #include <linux/i2c-gpio.h> | 5 | #include <linux/i2c-gpio.h> |
6 | #include <linux/gpio.h> | ||
7 | #include <linux/platform_device.h> | 6 | #include <linux/platform_device.h> |
7 | #include <plat/gpio-nomadik.h> | ||
8 | 8 | ||
9 | /* | 9 | /* |
10 | * There are two busses in the 8815NHK. | 10 | * There are two busses in the 8815NHK. |
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index f26fd76f72b4..15b23e4bd488 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c | |||
@@ -6,10 +6,10 @@ | |||
6 | 6 | ||
7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
8 | #include <linux/init.h> | 8 | #include <linux/init.h> |
9 | #include <linux/gpio.h> | ||
10 | 9 | ||
11 | #include <asm/mach-types.h> | 10 | #include <asm/mach-types.h> |
12 | #include <plat/pincfg.h> | 11 | #include <plat/pincfg.h> |
12 | #include <plat/gpio-nomadik.h> | ||
13 | #include <mach/hardware.h> | 13 | #include <mach/hardware.h> |
14 | 14 | ||
15 | #include "pins-db8500.h" | 15 | #include "pins-db8500.h" |
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index cd54abaccd96..537ab63c1dc9 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <plat/i2c.h> | 37 | #include <plat/i2c.h> |
38 | #include <plat/ste_dma40.h> | 38 | #include <plat/ste_dma40.h> |
39 | #include <plat/pincfg.h> | 39 | #include <plat/pincfg.h> |
40 | #include <plat/gpio-nomadik.h> | ||
40 | 41 | ||
41 | #include <mach/hardware.h> | 42 | #include <mach/hardware.h> |
42 | #include <mach/setup.h> | 43 | #include <mach/setup.h> |
diff --git a/arch/arm/mach-ux500/board-u5500-sdi.c b/arch/arm/mach-ux500/board-u5500-sdi.c index 739fb4c5b160..63c3f8058ffc 100644 --- a/arch/arm/mach-ux500/board-u5500-sdi.c +++ b/arch/arm/mach-ux500/board-u5500-sdi.c | |||
@@ -7,9 +7,9 @@ | |||
7 | 7 | ||
8 | #include <linux/amba/mmci.h> | 8 | #include <linux/amba/mmci.h> |
9 | #include <linux/mmc/host.h> | 9 | #include <linux/mmc/host.h> |
10 | #include <linux/gpio.h> | ||
11 | 10 | ||
12 | #include <plat/pincfg.h> | 11 | #include <plat/pincfg.h> |
12 | #include <plat/gpio-nomadik.h> | ||
13 | #include <mach/db5500-regs.h> | 13 | #include <mach/db5500-regs.h> |
14 | #include <plat/ste_dma40.h> | 14 | #include <plat/ste_dma40.h> |
15 | 15 | ||
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c index e58f0f562426..2d9e191bd30a 100644 --- a/arch/arm/mach-ux500/board-u5500.c +++ b/arch/arm/mach-ux500/board-u5500.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <linux/init.h> | 8 | #include <linux/init.h> |
9 | #include <linux/platform_device.h> | 9 | #include <linux/platform_device.h> |
10 | #include <linux/amba/bus.h> | 10 | #include <linux/amba/bus.h> |
11 | #include <linux/gpio.h> | ||
12 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
13 | #include <linux/i2c.h> | 12 | #include <linux/i2c.h> |
14 | 13 | ||
@@ -17,6 +16,7 @@ | |||
17 | 16 | ||
18 | #include <plat/pincfg.h> | 17 | #include <plat/pincfg.h> |
19 | #include <plat/i2c.h> | 18 | #include <plat/i2c.h> |
19 | #include <plat/gpio-nomadik.h> | ||
20 | 20 | ||
21 | #include <mach/hardware.h> | 21 | #include <mach/hardware.h> |
22 | #include <mach/devices.h> | 22 | #include <mach/devices.h> |
diff --git a/arch/arm/mach-ux500/cpu-db5500.c b/arch/arm/mach-ux500/cpu-db5500.c index 22705d246fc7..9de1af008094 100644 --- a/arch/arm/mach-ux500/cpu-db5500.c +++ b/arch/arm/mach-ux500/cpu-db5500.c | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <asm/mach/map.h> | 13 | #include <asm/mach/map.h> |
14 | #include <asm/pmu.h> | 14 | #include <asm/pmu.h> |
15 | 15 | ||
16 | #include <plat/gpio.h> | 16 | #include <plat/gpio-nomadik.h> |
17 | 17 | ||
18 | #include <mach/hardware.h> | 18 | #include <mach/hardware.h> |
19 | #include <mach/devices.h> | 19 | #include <mach/devices.h> |
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 4598b06c8c55..13e8890a8b8a 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c | |||
@@ -14,12 +14,12 @@ | |||
14 | #include <linux/amba/bus.h> | 14 | #include <linux/amba/bus.h> |
15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
16 | #include <linux/irq.h> | 16 | #include <linux/irq.h> |
17 | #include <linux/gpio.h> | ||
18 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
19 | #include <linux/io.h> | 18 | #include <linux/io.h> |
20 | 19 | ||
21 | #include <asm/mach/map.h> | 20 | #include <asm/mach/map.h> |
22 | #include <asm/pmu.h> | 21 | #include <asm/pmu.h> |
22 | #include <plat/gpio-nomadik.h> | ||
23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
24 | #include <mach/setup.h> | 24 | #include <mach/setup.h> |
25 | #include <mach/devices.h> | 25 | #include <mach/devices.h> |
diff --git a/arch/arm/mach-ux500/devices-common.c b/arch/arm/mach-ux500/devices-common.c index 13a4ce046ae5..c563e5418d80 100644 --- a/arch/arm/mach-ux500/devices-common.c +++ b/arch/arm/mach-ux500/devices-common.c | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
14 | #include <linux/amba/bus.h> | 14 | #include <linux/amba/bus.h> |
15 | 15 | ||
16 | #include <plat/gpio.h> | 16 | #include <plat/gpio-nomadik.h> |
17 | 17 | ||
18 | #include <mach/hardware.h> | 18 | #include <mach/hardware.h> |
19 | 19 | ||
diff --git a/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h b/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h new file mode 100644 index 000000000000..3ba4d8f8073b --- /dev/null +++ b/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | |||
@@ -0,0 +1,85 @@ | |||
1 | /* | ||
2 | * Structures and registers for GPIO access in the Nomadik SoC | ||
3 | * | ||
4 | * Copyright (C) 2008 STMicroelectronics | ||
5 | * Author: Prafulla WADASKAR <prafulla.wadaskar@st.com> | ||
6 | * Copyright (C) 2009 Alessandro Rubini <rubini@unipv.it> | ||
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 | #ifndef __PLAT_NOMADIK_GPIO | ||
14 | #define __PLAT_NOMADIK_GPIO | ||
15 | |||
16 | /* | ||
17 | * "nmk_gpio" and "NMK_GPIO" stand for "Nomadik GPIO", leaving | ||
18 | * the "gpio" namespace for generic and cross-machine functions | ||
19 | */ | ||
20 | |||
21 | /* Register in the logic block */ | ||
22 | #define NMK_GPIO_DAT 0x00 | ||
23 | #define NMK_GPIO_DATS 0x04 | ||
24 | #define NMK_GPIO_DATC 0x08 | ||
25 | #define NMK_GPIO_PDIS 0x0c | ||
26 | #define NMK_GPIO_DIR 0x10 | ||
27 | #define NMK_GPIO_DIRS 0x14 | ||
28 | #define NMK_GPIO_DIRC 0x18 | ||
29 | #define NMK_GPIO_SLPC 0x1c | ||
30 | #define NMK_GPIO_AFSLA 0x20 | ||
31 | #define NMK_GPIO_AFSLB 0x24 | ||
32 | |||
33 | #define NMK_GPIO_RIMSC 0x40 | ||
34 | #define NMK_GPIO_FIMSC 0x44 | ||
35 | #define NMK_GPIO_IS 0x48 | ||
36 | #define NMK_GPIO_IC 0x4c | ||
37 | #define NMK_GPIO_RWIMSC 0x50 | ||
38 | #define NMK_GPIO_FWIMSC 0x54 | ||
39 | #define NMK_GPIO_WKS 0x58 | ||
40 | |||
41 | /* Alternate functions: function C is set in hw by setting both A and B */ | ||
42 | #define NMK_GPIO_ALT_GPIO 0 | ||
43 | #define NMK_GPIO_ALT_A 1 | ||
44 | #define NMK_GPIO_ALT_B 2 | ||
45 | #define NMK_GPIO_ALT_C (NMK_GPIO_ALT_A | NMK_GPIO_ALT_B) | ||
46 | |||
47 | /* Pull up/down values */ | ||
48 | enum nmk_gpio_pull { | ||
49 | NMK_GPIO_PULL_NONE, | ||
50 | NMK_GPIO_PULL_UP, | ||
51 | NMK_GPIO_PULL_DOWN, | ||
52 | }; | ||
53 | |||
54 | /* Sleep mode */ | ||
55 | enum nmk_gpio_slpm { | ||
56 | NMK_GPIO_SLPM_INPUT, | ||
57 | NMK_GPIO_SLPM_WAKEUP_ENABLE = NMK_GPIO_SLPM_INPUT, | ||
58 | NMK_GPIO_SLPM_NOCHANGE, | ||
59 | NMK_GPIO_SLPM_WAKEUP_DISABLE = NMK_GPIO_SLPM_NOCHANGE, | ||
60 | }; | ||
61 | |||
62 | extern int nmk_gpio_set_slpm(int gpio, enum nmk_gpio_slpm mode); | ||
63 | extern int nmk_gpio_set_pull(int gpio, enum nmk_gpio_pull pull); | ||
64 | extern int nmk_gpio_set_mode(int gpio, int gpio_mode); | ||
65 | extern int nmk_gpio_get_mode(int gpio); | ||
66 | |||
67 | extern void nmk_gpio_wakeups_suspend(void); | ||
68 | extern void nmk_gpio_wakeups_resume(void); | ||
69 | |||
70 | extern void nmk_gpio_read_pull(int gpio_bank, u32 *pull_up); | ||
71 | |||
72 | /* | ||
73 | * Platform data to register a block: only the initial gpio/irq number. | ||
74 | */ | ||
75 | struct nmk_gpio_platform_data { | ||
76 | char *name; | ||
77 | int first_gpio; | ||
78 | int first_irq; | ||
79 | int num_gpio; | ||
80 | u32 (*get_secondary_status)(unsigned int bank); | ||
81 | void (*set_ioforce)(bool enable); | ||
82 | bool supports_sleepmode; | ||
83 | }; | ||
84 | |||
85 | #endif /* __PLAT_NOMADIK_GPIO */ | ||
diff --git a/arch/arm/plat-nomadik/include/plat/gpio.h b/arch/arm/plat-nomadik/include/plat/gpio.h index b894a531f324..78c0c0fbadb7 100644 --- a/arch/arm/plat-nomadik/include/plat/gpio.h +++ b/arch/arm/plat-nomadik/include/plat/gpio.h | |||
@@ -14,73 +14,4 @@ | |||
14 | 14 | ||
15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
16 | 16 | ||
17 | /* | ||
18 | * "nmk_gpio" and "NMK_GPIO" stand for "Nomadik GPIO", leaving | ||
19 | * the "gpio" namespace for generic and cross-machine functions | ||
20 | */ | ||
21 | |||
22 | /* Register in the logic block */ | ||
23 | #define NMK_GPIO_DAT 0x00 | ||
24 | #define NMK_GPIO_DATS 0x04 | ||
25 | #define NMK_GPIO_DATC 0x08 | ||
26 | #define NMK_GPIO_PDIS 0x0c | ||
27 | #define NMK_GPIO_DIR 0x10 | ||
28 | #define NMK_GPIO_DIRS 0x14 | ||
29 | #define NMK_GPIO_DIRC 0x18 | ||
30 | #define NMK_GPIO_SLPC 0x1c | ||
31 | #define NMK_GPIO_AFSLA 0x20 | ||
32 | #define NMK_GPIO_AFSLB 0x24 | ||
33 | |||
34 | #define NMK_GPIO_RIMSC 0x40 | ||
35 | #define NMK_GPIO_FIMSC 0x44 | ||
36 | #define NMK_GPIO_IS 0x48 | ||
37 | #define NMK_GPIO_IC 0x4c | ||
38 | #define NMK_GPIO_RWIMSC 0x50 | ||
39 | #define NMK_GPIO_FWIMSC 0x54 | ||
40 | #define NMK_GPIO_WKS 0x58 | ||
41 | |||
42 | /* Alternate functions: function C is set in hw by setting both A and B */ | ||
43 | #define NMK_GPIO_ALT_GPIO 0 | ||
44 | #define NMK_GPIO_ALT_A 1 | ||
45 | #define NMK_GPIO_ALT_B 2 | ||
46 | #define NMK_GPIO_ALT_C (NMK_GPIO_ALT_A | NMK_GPIO_ALT_B) | ||
47 | |||
48 | /* Pull up/down values */ | ||
49 | enum nmk_gpio_pull { | ||
50 | NMK_GPIO_PULL_NONE, | ||
51 | NMK_GPIO_PULL_UP, | ||
52 | NMK_GPIO_PULL_DOWN, | ||
53 | }; | ||
54 | |||
55 | /* Sleep mode */ | ||
56 | enum nmk_gpio_slpm { | ||
57 | NMK_GPIO_SLPM_INPUT, | ||
58 | NMK_GPIO_SLPM_WAKEUP_ENABLE = NMK_GPIO_SLPM_INPUT, | ||
59 | NMK_GPIO_SLPM_NOCHANGE, | ||
60 | NMK_GPIO_SLPM_WAKEUP_DISABLE = NMK_GPIO_SLPM_NOCHANGE, | ||
61 | }; | ||
62 | |||
63 | extern int nmk_gpio_set_slpm(int gpio, enum nmk_gpio_slpm mode); | ||
64 | extern int nmk_gpio_set_pull(int gpio, enum nmk_gpio_pull pull); | ||
65 | extern int nmk_gpio_set_mode(int gpio, int gpio_mode); | ||
66 | extern int nmk_gpio_get_mode(int gpio); | ||
67 | |||
68 | extern void nmk_gpio_wakeups_suspend(void); | ||
69 | extern void nmk_gpio_wakeups_resume(void); | ||
70 | |||
71 | extern void nmk_gpio_read_pull(int gpio_bank, u32 *pull_up); | ||
72 | |||
73 | /* | ||
74 | * Platform data to register a block: only the initial gpio/irq number. | ||
75 | */ | ||
76 | struct nmk_gpio_platform_data { | ||
77 | char *name; | ||
78 | int first_gpio; | ||
79 | int first_irq; | ||
80 | int num_gpio; | ||
81 | u32 (*get_secondary_status)(unsigned int bank); | ||
82 | void (*set_ioforce)(bool enable); | ||
83 | bool supports_sleepmode; | ||
84 | }; | ||
85 | |||
86 | #endif /* __ASM_PLAT_GPIO_H */ | 17 | #endif /* __ASM_PLAT_GPIO_H */ |
diff --git a/drivers/gpio/gpio-nomadik.c b/drivers/gpio/gpio-nomadik.c index f7f0406ed880..740caed2b278 100644 --- a/drivers/gpio/gpio-nomadik.c +++ b/drivers/gpio/gpio-nomadik.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <asm/mach/irq.h> | 27 | #include <asm/mach/irq.h> |
28 | 28 | ||
29 | #include <plat/pincfg.h> | 29 | #include <plat/pincfg.h> |
30 | #include <plat/gpio-nomadik.h> | ||
30 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
31 | #include <asm/gpio.h> | 32 | #include <asm/gpio.h> |
32 | 33 | ||