diff options
author | Linus Walleij <linus.walleij@stericsson.com> | 2009-09-22 09:29:36 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 15:49:04 -0400 |
commit | 6ef297f86b62f187c59475784208f75c2ed8ccd8 (patch) | |
tree | 333ea36bfdf0b7382fd810b33e24f58b63fd0707 /arch/arm | |
parent | 4321532cec25e1747961d83fb4f78ec24ea92966 (diff) |
ARM: 5720/1: Move MMCI header to amba include dir
This moves the mmci platform data definition struct away from
arch/arm/include/asm/mach/mmc.h into the more proper place among
the other primecells in include/linux/amba/mmci.h and at the same
time renames it to "mmci.h", and also the struct in this file
confusingly named mmc_platform_data has been renamed
mmci_platform_data for clarity.
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/include/asm/mach/mmc.h | 18 | ||||
-rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-realview/core.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-realview/core.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_eb.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pb1176.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pb11mp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pba8.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pbx.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-u300/mmc.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-versatile/core.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-versatile/versatile_pb.c | 4 |
12 files changed, 18 insertions, 36 deletions
diff --git a/arch/arm/include/asm/mach/mmc.h b/arch/arm/include/asm/mach/mmc.h deleted file mode 100644 index 27bec555ee16..000000000000 --- a/arch/arm/include/asm/mach/mmc.h +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/include/asm/mach/mmc.h | ||
3 | */ | ||
4 | #ifndef ASMARM_MACH_MMC_H | ||
5 | #define ASMARM_MACH_MMC_H | ||
6 | |||
7 | #include <linux/mmc/host.h> | ||
8 | |||
9 | struct mmc_platform_data { | ||
10 | unsigned int ocr_mask; /* available voltages */ | ||
11 | u32 (*translate_vdd)(struct device *, unsigned int); | ||
12 | unsigned int (*status)(struct device *); | ||
13 | int gpio_wp; | ||
14 | int gpio_cd; | ||
15 | unsigned long capabilities; | ||
16 | }; | ||
17 | |||
18 | #endif | ||
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 2a318eba1b07..3f35293d457a 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/amba/bus.h> | 19 | #include <linux/amba/bus.h> |
20 | #include <linux/amba/kmi.h> | 20 | #include <linux/amba/kmi.h> |
21 | #include <linux/amba/clcd.h> | 21 | #include <linux/amba/clcd.h> |
22 | #include <linux/amba/mmci.h> | ||
22 | #include <linux/io.h> | 23 | #include <linux/io.h> |
23 | 24 | ||
24 | #include <asm/clkdev.h> | 25 | #include <asm/clkdev.h> |
@@ -35,7 +36,6 @@ | |||
35 | #include <asm/mach/arch.h> | 36 | #include <asm/mach/arch.h> |
36 | #include <asm/mach/flash.h> | 37 | #include <asm/mach/flash.h> |
37 | #include <asm/mach/irq.h> | 38 | #include <asm/mach/irq.h> |
38 | #include <asm/mach/mmc.h> | ||
39 | #include <asm/mach/map.h> | 39 | #include <asm/mach/map.h> |
40 | #include <asm/mach/time.h> | 40 | #include <asm/mach/time.h> |
41 | 41 | ||
@@ -400,7 +400,7 @@ static unsigned int mmc_status(struct device *dev) | |||
400 | return status & 8; | 400 | return status & 8; |
401 | } | 401 | } |
402 | 402 | ||
403 | static struct mmc_platform_data mmc_data = { | 403 | static struct mmci_platform_data mmc_data = { |
404 | .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, | 404 | .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, |
405 | .status = mmc_status, | 405 | .status = mmc_status, |
406 | .gpio_wp = -1, | 406 | .gpio_wp = -1, |
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index 5a5e1f72461e..a2083b60e3fb 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
31 | #include <linux/smsc911x.h> | 31 | #include <linux/smsc911x.h> |
32 | #include <linux/ata_platform.h> | 32 | #include <linux/ata_platform.h> |
33 | #include <linux/amba/mmci.h> | ||
33 | 34 | ||
34 | #include <asm/clkdev.h> | 35 | #include <asm/clkdev.h> |
35 | #include <asm/system.h> | 36 | #include <asm/system.h> |
@@ -44,7 +45,6 @@ | |||
44 | #include <asm/mach/flash.h> | 45 | #include <asm/mach/flash.h> |
45 | #include <asm/mach/irq.h> | 46 | #include <asm/mach/irq.h> |
46 | #include <asm/mach/map.h> | 47 | #include <asm/mach/map.h> |
47 | #include <asm/mach/mmc.h> | ||
48 | 48 | ||
49 | #include <asm/hardware/gic.h> | 49 | #include <asm/hardware/gic.h> |
50 | 50 | ||
@@ -237,14 +237,14 @@ static unsigned int realview_mmc_status(struct device *dev) | |||
237 | return readl(REALVIEW_SYSMCI) & mask; | 237 | return readl(REALVIEW_SYSMCI) & mask; |
238 | } | 238 | } |
239 | 239 | ||
240 | struct mmc_platform_data realview_mmc0_plat_data = { | 240 | struct mmci_platform_data realview_mmc0_plat_data = { |
241 | .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, | 241 | .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, |
242 | .status = realview_mmc_status, | 242 | .status = realview_mmc_status, |
243 | .gpio_wp = 17, | 243 | .gpio_wp = 17, |
244 | .gpio_cd = 16, | 244 | .gpio_cd = 16, |
245 | }; | 245 | }; |
246 | 246 | ||
247 | struct mmc_platform_data realview_mmc1_plat_data = { | 247 | struct mmci_platform_data realview_mmc1_plat_data = { |
248 | .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, | 248 | .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, |
249 | .status = realview_mmc_status, | 249 | .status = realview_mmc_status, |
250 | .gpio_wp = 19, | 250 | .gpio_wp = 19, |
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h index 59a337ba4be7..46cd6acb4d40 100644 --- a/arch/arm/mach-realview/core.h +++ b/arch/arm/mach-realview/core.h | |||
@@ -47,8 +47,8 @@ static struct amba_device name##_device = { \ | |||
47 | extern struct platform_device realview_flash_device; | 47 | extern struct platform_device realview_flash_device; |
48 | extern struct platform_device realview_cf_device; | 48 | extern struct platform_device realview_cf_device; |
49 | extern struct platform_device realview_i2c_device; | 49 | extern struct platform_device realview_i2c_device; |
50 | extern struct mmc_platform_data realview_mmc0_plat_data; | 50 | extern struct mmci_platform_data realview_mmc0_plat_data; |
51 | extern struct mmc_platform_data realview_mmc1_plat_data; | 51 | extern struct mmci_platform_data realview_mmc1_plat_data; |
52 | extern struct clcd_board clcd_plat_data; | 52 | extern struct clcd_board clcd_plat_data; |
53 | extern void __iomem *gic_cpu_base_addr; | 53 | extern void __iomem *gic_cpu_base_addr; |
54 | extern void __iomem *timer0_va_base; | 54 | extern void __iomem *timer0_va_base; |
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index c0795ea3b3a7..1d65e64ae571 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/sysdev.h> | 24 | #include <linux/sysdev.h> |
25 | #include <linux/amba/bus.h> | 25 | #include <linux/amba/bus.h> |
26 | #include <linux/amba/pl061.h> | 26 | #include <linux/amba/pl061.h> |
27 | #include <linux/amba/mmci.h> | ||
27 | #include <linux/io.h> | 28 | #include <linux/io.h> |
28 | 29 | ||
29 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
@@ -37,7 +38,6 @@ | |||
37 | 38 | ||
38 | #include <asm/mach/arch.h> | 39 | #include <asm/mach/arch.h> |
39 | #include <asm/mach/map.h> | 40 | #include <asm/mach/map.h> |
40 | #include <asm/mach/mmc.h> | ||
41 | #include <asm/mach/time.h> | 41 | #include <asm/mach/time.h> |
42 | 42 | ||
43 | #include <mach/board-eb.h> | 43 | #include <mach/board-eb.h> |
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c index 395dc18070b4..2817fe099319 100644 --- a/arch/arm/mach-realview/realview_pb1176.c +++ b/arch/arm/mach-realview/realview_pb1176.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/sysdev.h> | 24 | #include <linux/sysdev.h> |
25 | #include <linux/amba/bus.h> | 25 | #include <linux/amba/bus.h> |
26 | #include <linux/amba/pl061.h> | 26 | #include <linux/amba/pl061.h> |
27 | #include <linux/amba/mmci.h> | ||
27 | #include <linux/io.h> | 28 | #include <linux/io.h> |
28 | 29 | ||
29 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
@@ -37,7 +38,6 @@ | |||
37 | #include <asm/mach/arch.h> | 38 | #include <asm/mach/arch.h> |
38 | #include <asm/mach/flash.h> | 39 | #include <asm/mach/flash.h> |
39 | #include <asm/mach/map.h> | 40 | #include <asm/mach/map.h> |
40 | #include <asm/mach/mmc.h> | ||
41 | #include <asm/mach/time.h> | 41 | #include <asm/mach/time.h> |
42 | 42 | ||
43 | #include <mach/board-pb1176.h> | 43 | #include <mach/board-pb1176.h> |
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c index c0c9e35e6e38..94680fcf726d 100644 --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/sysdev.h> | 24 | #include <linux/sysdev.h> |
25 | #include <linux/amba/bus.h> | 25 | #include <linux/amba/bus.h> |
26 | #include <linux/amba/pl061.h> | 26 | #include <linux/amba/pl061.h> |
27 | #include <linux/amba/mmci.h> | ||
27 | #include <linux/io.h> | 28 | #include <linux/io.h> |
28 | 29 | ||
29 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
@@ -38,7 +39,6 @@ | |||
38 | #include <asm/mach/arch.h> | 39 | #include <asm/mach/arch.h> |
39 | #include <asm/mach/flash.h> | 40 | #include <asm/mach/flash.h> |
40 | #include <asm/mach/map.h> | 41 | #include <asm/mach/map.h> |
41 | #include <asm/mach/mmc.h> | ||
42 | #include <asm/mach/time.h> | 42 | #include <asm/mach/time.h> |
43 | 43 | ||
44 | #include <mach/board-pb11mp.h> | 44 | #include <mach/board-pb11mp.h> |
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c index 4fc64e146c32..941beb2b9709 100644 --- a/arch/arm/mach-realview/realview_pba8.c +++ b/arch/arm/mach-realview/realview_pba8.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/sysdev.h> | 24 | #include <linux/sysdev.h> |
25 | #include <linux/amba/bus.h> | 25 | #include <linux/amba/bus.h> |
26 | #include <linux/amba/pl061.h> | 26 | #include <linux/amba/pl061.h> |
27 | #include <linux/amba/mmci.h> | ||
27 | #include <linux/io.h> | 28 | #include <linux/io.h> |
28 | 29 | ||
29 | #include <asm/irq.h> | 30 | #include <asm/irq.h> |
@@ -34,7 +35,6 @@ | |||
34 | 35 | ||
35 | #include <asm/mach/arch.h> | 36 | #include <asm/mach/arch.h> |
36 | #include <asm/mach/map.h> | 37 | #include <asm/mach/map.h> |
37 | #include <asm/mach/mmc.h> | ||
38 | #include <asm/mach/time.h> | 38 | #include <asm/mach/time.h> |
39 | 39 | ||
40 | #include <mach/hardware.h> | 40 | #include <mach/hardware.h> |
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c index cf68b5426061..7e4bc6cdca52 100644 --- a/arch/arm/mach-realview/realview_pbx.c +++ b/arch/arm/mach-realview/realview_pbx.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/sysdev.h> | 23 | #include <linux/sysdev.h> |
24 | #include <linux/amba/bus.h> | 24 | #include <linux/amba/bus.h> |
25 | #include <linux/amba/pl061.h> | 25 | #include <linux/amba/pl061.h> |
26 | #include <linux/amba/mmci.h> | ||
26 | #include <linux/io.h> | 27 | #include <linux/io.h> |
27 | 28 | ||
28 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
@@ -34,7 +35,6 @@ | |||
34 | 35 | ||
35 | #include <asm/mach/arch.h> | 36 | #include <asm/mach/arch.h> |
36 | #include <asm/mach/map.h> | 37 | #include <asm/mach/map.h> |
37 | #include <asm/mach/mmc.h> | ||
38 | #include <asm/mach/time.h> | 38 | #include <asm/mach/time.h> |
39 | 39 | ||
40 | #include <mach/hardware.h> | 40 | #include <mach/hardware.h> |
diff --git a/arch/arm/mach-u300/mmc.c b/arch/arm/mach-u300/mmc.c index 82af247760e6..7b6b016786bb 100644 --- a/arch/arm/mach-u300/mmc.c +++ b/arch/arm/mach-u300/mmc.c | |||
@@ -19,8 +19,8 @@ | |||
19 | #include <linux/regulator/consumer.h> | 19 | #include <linux/regulator/consumer.h> |
20 | #include <linux/regulator/machine.h> | 20 | #include <linux/regulator/machine.h> |
21 | #include <linux/gpio.h> | 21 | #include <linux/gpio.h> |
22 | #include <linux/amba/mmci.h> | ||
22 | 23 | ||
23 | #include <asm/mach/mmc.h> | ||
24 | #include "mmc.h" | 24 | #include "mmc.h" |
25 | #include "padmux.h" | 25 | #include "padmux.h" |
26 | 26 | ||
@@ -28,7 +28,7 @@ struct mmci_card_event { | |||
28 | struct input_dev *mmc_input; | 28 | struct input_dev *mmc_input; |
29 | int mmc_inserted; | 29 | int mmc_inserted; |
30 | struct work_struct workq; | 30 | struct work_struct workq; |
31 | struct mmc_platform_data mmc0_plat_data; | 31 | struct mmci_platform_data mmc0_plat_data; |
32 | }; | 32 | }; |
33 | 33 | ||
34 | static unsigned int mmc_status(struct device *dev) | 34 | static unsigned int mmc_status(struct device *dev) |
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 975eae41ee66..e13be7c444ca 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/amba/bus.h> | 27 | #include <linux/amba/bus.h> |
28 | #include <linux/amba/clcd.h> | 28 | #include <linux/amba/clcd.h> |
29 | #include <linux/amba/pl061.h> | 29 | #include <linux/amba/pl061.h> |
30 | #include <linux/amba/mmci.h> | ||
30 | #include <linux/clocksource.h> | 31 | #include <linux/clocksource.h> |
31 | #include <linux/clockchips.h> | 32 | #include <linux/clockchips.h> |
32 | #include <linux/cnt32_to_63.h> | 33 | #include <linux/cnt32_to_63.h> |
@@ -47,7 +48,6 @@ | |||
47 | #include <asm/mach/irq.h> | 48 | #include <asm/mach/irq.h> |
48 | #include <asm/mach/time.h> | 49 | #include <asm/mach/time.h> |
49 | #include <asm/mach/map.h> | 50 | #include <asm/mach/map.h> |
50 | #include <asm/mach/mmc.h> | ||
51 | 51 | ||
52 | #include "core.h" | 52 | #include "core.h" |
53 | #include "clock.h" | 53 | #include "clock.h" |
@@ -369,7 +369,7 @@ unsigned int mmc_status(struct device *dev) | |||
369 | return readl(VERSATILE_SYSMCI) & mask; | 369 | return readl(VERSATILE_SYSMCI) & mask; |
370 | } | 370 | } |
371 | 371 | ||
372 | static struct mmc_platform_data mmc0_plat_data = { | 372 | static struct mmci_platform_data mmc0_plat_data = { |
373 | .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, | 373 | .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, |
374 | .status = mmc_status, | 374 | .status = mmc_status, |
375 | .gpio_wp = -1, | 375 | .gpio_wp = -1, |
diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c index 9af8d8154df5..239cd30fc4f5 100644 --- a/arch/arm/mach-versatile/versatile_pb.c +++ b/arch/arm/mach-versatile/versatile_pb.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/sysdev.h> | 24 | #include <linux/sysdev.h> |
25 | #include <linux/amba/bus.h> | 25 | #include <linux/amba/bus.h> |
26 | #include <linux/amba/pl061.h> | 26 | #include <linux/amba/pl061.h> |
27 | #include <linux/amba/mmci.h> | ||
27 | #include <linux/io.h> | 28 | #include <linux/io.h> |
28 | 29 | ||
29 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
@@ -31,7 +32,6 @@ | |||
31 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
32 | 33 | ||
33 | #include <asm/mach/arch.h> | 34 | #include <asm/mach/arch.h> |
34 | #include <asm/mach/mmc.h> | ||
35 | 35 | ||
36 | #include "core.h" | 36 | #include "core.h" |
37 | 37 | ||
@@ -41,7 +41,7 @@ | |||
41 | #define IRQ_MMCI1A IRQ_SIC_MMCI1A | 41 | #define IRQ_MMCI1A IRQ_SIC_MMCI1A |
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | static struct mmc_platform_data mmc1_plat_data = { | 44 | static struct mmci_platform_data mmc1_plat_data = { |
45 | .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, | 45 | .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, |
46 | .status = mmc_status, | 46 | .status = mmc_status, |
47 | .gpio_wp = -1, | 47 | .gpio_wp = -1, |