diff options
author | Valentin Longchamp <valentin.longchamp@epfl.ch> | 2009-04-21 04:24:56 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-05-07 10:17:57 -0400 |
commit | 45b131a78ceeb3bc776db08c8eaa67d4676b6cd7 (patch) | |
tree | 49b6c4894ba2bcb31573099f2ead67d68a6ec9ac /arch/arm/mach-mx3/mx31moboard.c | |
parent | 4ec6ecc77872a57b471b60dce298ed25556944f0 (diff) |
mx31moboard: add sdhc support (v3)
This support both sdhc1 and sdhc2 with WP and CD for the marxbot and
devboard mx31moboard baseboards.
sdhc2 is present on both, but is not directly included in the
mx31moboard file because a third baseboard (not supported yet) without
sdhc2 is planned.
Changes since v1: removed pin initialization from init/exit function and
taken different comments into account
Changes since v2: pin initialiation now is done in another patch for all
current mx31moboard pins
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mx31moboard.c')
-rw-r--r-- | arch/arm/mach-mx3/mx31moboard.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard.c b/arch/arm/mach-mx3/mx31moboard.c index d846527e1a59..2cca3f2e72b9 100644 --- a/arch/arm/mach-mx3/mx31moboard.c +++ b/arch/arm/mach-mx3/mx31moboard.c | |||
@@ -16,7 +16,9 @@ | |||
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <linux/gpio.h> | ||
19 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/interrupt.h> | ||
20 | #include <linux/memory.h> | 22 | #include <linux/memory.h> |
21 | #include <linux/mtd/physmap.h> | 23 | #include <linux/mtd/physmap.h> |
22 | #include <linux/mtd/partitions.h> | 24 | #include <linux/mtd/partitions.h> |
@@ -33,6 +35,7 @@ | |||
33 | #include <mach/imx-uart.h> | 35 | #include <mach/imx-uart.h> |
34 | #include <mach/iomux-mx3.h> | 36 | #include <mach/iomux-mx3.h> |
35 | #include <mach/i2c.h> | 37 | #include <mach/i2c.h> |
38 | #include <mach/mmc.h> | ||
36 | 39 | ||
37 | #include "devices.h" | 40 | #include "devices.h" |
38 | 41 | ||
@@ -98,6 +101,33 @@ static struct imxi2c_platform_data moboard_i2c1_pdata = { | |||
98 | .bitrate = 100000, | 101 | .bitrate = 100000, |
99 | }; | 102 | }; |
100 | 103 | ||
104 | #define SDHC1_CD IOMUX_TO_GPIO(MX31_PIN_ATA_CS0) | ||
105 | #define SDHC1_WP IOMUX_TO_GPIO(MX31_PIN_ATA_CS1) | ||
106 | |||
107 | static int moboard_sdhc1_get_ro(struct device *dev) | ||
108 | { | ||
109 | return gpio_get_value(SDHC1_WP); | ||
110 | } | ||
111 | |||
112 | static int moboard_sdhc1_init(struct device *dev, irq_handler_t detect_irq, | ||
113 | void *data) | ||
114 | { | ||
115 | return request_irq(gpio_to_irq(SDHC1_CD), detect_irq, | ||
116 | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, | ||
117 | "sdhc1-card-detect", data); | ||
118 | } | ||
119 | |||
120 | static void moboard_sdhc1_exit(struct device *dev, void *data) | ||
121 | { | ||
122 | free_irq(gpio_to_irq(SDHC1_CD), data); | ||
123 | } | ||
124 | |||
125 | static struct imxmmc_platform_data sdhc1_pdata = { | ||
126 | .get_ro = moboard_sdhc1_get_ro, | ||
127 | .init = moboard_sdhc1_init, | ||
128 | .exit = moboard_sdhc1_exit, | ||
129 | }; | ||
130 | |||
101 | static struct platform_device *devices[] __initdata = { | 131 | static struct platform_device *devices[] __initdata = { |
102 | &mx31moboard_flash, | 132 | &mx31moboard_flash, |
103 | }; | 133 | }; |
@@ -121,6 +151,8 @@ static void __init mxc_board_init(void) | |||
121 | mxc_register_device(&mxc_i2c_device0, &moboard_i2c0_pdata); | 151 | mxc_register_device(&mxc_i2c_device0, &moboard_i2c0_pdata); |
122 | mxc_register_device(&mxc_i2c_device1, &moboard_i2c1_pdata); | 152 | mxc_register_device(&mxc_i2c_device1, &moboard_i2c1_pdata); |
123 | 153 | ||
154 | mxc_register_device(&mxcsdhc_device0, &sdhc1_pdata); | ||
155 | |||
124 | switch (mx31moboard_baseboard) { | 156 | switch (mx31moboard_baseboard) { |
125 | case MX31NOBOARD: | 157 | case MX31NOBOARD: |
126 | break; | 158 | break; |