diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-ux500/cpu-u8500.c | 37 | ||||
-rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 37 | ||||
-rw-r--r-- | arch/arm/mach-ux500/include/mach/devices.h | 2 |
3 files changed, 40 insertions, 36 deletions
diff --git a/arch/arm/mach-ux500/cpu-u8500.c b/arch/arm/mach-ux500/cpu-u8500.c index 730d020f0f99..51e9bf2d71e2 100644 --- a/arch/arm/mach-ux500/cpu-u8500.c +++ b/arch/arm/mach-ux500/cpu-u8500.c | |||
@@ -22,42 +22,7 @@ | |||
22 | #include <plat/mtu.h> | 22 | #include <plat/mtu.h> |
23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
24 | #include <mach/setup.h> | 24 | #include <mach/setup.h> |
25 | 25 | #include <mach/devices.h> | |
26 | static struct nmk_gpio_platform_data u8500_gpio_data[] = { | ||
27 | GPIO_DATA("GPIO-0-31", 0), | ||
28 | GPIO_DATA("GPIO-32-63", 32), /* 37..63 not routed to pin */ | ||
29 | GPIO_DATA("GPIO-64-95", 64), | ||
30 | GPIO_DATA("GPIO-96-127", 96), /* 97..127 not routed to pin */ | ||
31 | GPIO_DATA("GPIO-128-159", 128), | ||
32 | GPIO_DATA("GPIO-160-191", 160), /* 172..191 not routed to pin */ | ||
33 | GPIO_DATA("GPIO-192-223", 192), | ||
34 | GPIO_DATA("GPIO-224-255", 224), /* 231..255 not routed to pin */ | ||
35 | GPIO_DATA("GPIO-256-288", 256), /* 258..288 not routed to pin */ | ||
36 | }; | ||
37 | |||
38 | static struct resource u8500_gpio_resources[] = { | ||
39 | GPIO_RESOURCE(0), | ||
40 | GPIO_RESOURCE(1), | ||
41 | GPIO_RESOURCE(2), | ||
42 | GPIO_RESOURCE(3), | ||
43 | GPIO_RESOURCE(4), | ||
44 | GPIO_RESOURCE(5), | ||
45 | GPIO_RESOURCE(6), | ||
46 | GPIO_RESOURCE(7), | ||
47 | GPIO_RESOURCE(8), | ||
48 | }; | ||
49 | |||
50 | static struct platform_device u8500_gpio_devs[] = { | ||
51 | GPIO_DEVICE(0), | ||
52 | GPIO_DEVICE(1), | ||
53 | GPIO_DEVICE(2), | ||
54 | GPIO_DEVICE(3), | ||
55 | GPIO_DEVICE(4), | ||
56 | GPIO_DEVICE(5), | ||
57 | GPIO_DEVICE(6), | ||
58 | GPIO_DEVICE(7), | ||
59 | GPIO_DEVICE(8), | ||
60 | }; | ||
61 | 26 | ||
62 | static struct platform_device *platform_devs[] __initdata = { | 27 | static struct platform_device *platform_devs[] __initdata = { |
63 | &u8500_gpio_devs[0], | 28 | &u8500_gpio_devs[0], |
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index 397f862c9ef4..20334236afce 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c | |||
@@ -9,11 +9,48 @@ | |||
9 | #include <linux/platform_device.h> | 9 | #include <linux/platform_device.h> |
10 | #include <linux/interrupt.h> | 10 | #include <linux/interrupt.h> |
11 | #include <linux/io.h> | 11 | #include <linux/io.h> |
12 | #include <linux/gpio.h> | ||
12 | #include <linux/amba/bus.h> | 13 | #include <linux/amba/bus.h> |
13 | 14 | ||
14 | #include <mach/hardware.h> | 15 | #include <mach/hardware.h> |
15 | #include <mach/setup.h> | 16 | #include <mach/setup.h> |
16 | 17 | ||
18 | static struct nmk_gpio_platform_data u8500_gpio_data[] = { | ||
19 | GPIO_DATA("GPIO-0-31", 0), | ||
20 | GPIO_DATA("GPIO-32-63", 32), /* 37..63 not routed to pin */ | ||
21 | GPIO_DATA("GPIO-64-95", 64), | ||
22 | GPIO_DATA("GPIO-96-127", 96), /* 98..127 not routed to pin */ | ||
23 | GPIO_DATA("GPIO-128-159", 128), | ||
24 | GPIO_DATA("GPIO-160-191", 160), /* 172..191 not routed to pin */ | ||
25 | GPIO_DATA("GPIO-192-223", 192), | ||
26 | GPIO_DATA("GPIO-224-255", 224), /* 231..255 not routed to pin */ | ||
27 | GPIO_DATA("GPIO-256-288", 256), /* 268..288 not routed to pin */ | ||
28 | }; | ||
29 | |||
30 | static struct resource u8500_gpio_resources[] = { | ||
31 | GPIO_RESOURCE(0), | ||
32 | GPIO_RESOURCE(1), | ||
33 | GPIO_RESOURCE(2), | ||
34 | GPIO_RESOURCE(3), | ||
35 | GPIO_RESOURCE(4), | ||
36 | GPIO_RESOURCE(5), | ||
37 | GPIO_RESOURCE(6), | ||
38 | GPIO_RESOURCE(7), | ||
39 | GPIO_RESOURCE(8), | ||
40 | }; | ||
41 | |||
42 | struct platform_device u8500_gpio_devs[] = { | ||
43 | GPIO_DEVICE(0), | ||
44 | GPIO_DEVICE(1), | ||
45 | GPIO_DEVICE(2), | ||
46 | GPIO_DEVICE(3), | ||
47 | GPIO_DEVICE(4), | ||
48 | GPIO_DEVICE(5), | ||
49 | GPIO_DEVICE(6), | ||
50 | GPIO_DEVICE(7), | ||
51 | GPIO_DEVICE(8), | ||
52 | }; | ||
53 | |||
17 | struct amba_device u8500_ssp0_device = { | 54 | struct amba_device u8500_ssp0_device = { |
18 | .dev = { | 55 | .dev = { |
19 | .coherent_dma_mask = ~0, | 56 | .coherent_dma_mask = ~0, |
diff --git a/arch/arm/mach-ux500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h index 251b4eb8694a..76b3569f055e 100644 --- a/arch/arm/mach-ux500/include/mach/devices.h +++ b/arch/arm/mach-ux500/include/mach/devices.h | |||
@@ -10,6 +10,8 @@ | |||
10 | struct platform_device; | 10 | struct platform_device; |
11 | struct amba_device; | 11 | struct amba_device; |
12 | 12 | ||
13 | extern struct platform_device u8500_gpio_devs[]; | ||
14 | |||
13 | extern struct amba_device ux500_pl031_device; | 15 | extern struct amba_device ux500_pl031_device; |
14 | extern struct amba_device u8500_ssp0_device; | 16 | extern struct amba_device u8500_ssp0_device; |
15 | extern struct amba_device ux500_uart0_device; | 17 | extern struct amba_device ux500_uart0_device; |