diff options
| -rw-r--r-- | arch/arm/mach-mx3/mx31moboard-devboard.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx3/mx31moboard-marxbot.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx3/mx31moboard.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx3/pcm037_eet.c | 9 |
4 files changed, 3 insertions, 12 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard-devboard.c b/arch/arm/mach-mx3/mx31moboard-devboard.c index 4704405165a1..b48581e7dedd 100644 --- a/arch/arm/mach-mx3/mx31moboard-devboard.c +++ b/arch/arm/mach-mx3/mx31moboard-devboard.c | |||
| @@ -63,7 +63,7 @@ static struct imxuart_platform_data uart_pdata = { | |||
| 63 | 63 | ||
| 64 | static int devboard_sdhc2_get_ro(struct device *dev) | 64 | static int devboard_sdhc2_get_ro(struct device *dev) |
| 65 | { | 65 | { |
| 66 | return gpio_get_value(SDHC2_WP); | 66 | return !gpio_get_value(SDHC2_WP); |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | static int devboard_sdhc2_init(struct device *dev, irq_handler_t detect_irq, | 69 | static int devboard_sdhc2_init(struct device *dev, irq_handler_t detect_irq, |
diff --git a/arch/arm/mach-mx3/mx31moboard-marxbot.c b/arch/arm/mach-mx3/mx31moboard-marxbot.c index 641c3d6153ae..901fb0166c0e 100644 --- a/arch/arm/mach-mx3/mx31moboard-marxbot.c +++ b/arch/arm/mach-mx3/mx31moboard-marxbot.c | |||
| @@ -67,7 +67,7 @@ static unsigned int marxbot_pins[] = { | |||
| 67 | 67 | ||
| 68 | static int marxbot_sdhc2_get_ro(struct device *dev) | 68 | static int marxbot_sdhc2_get_ro(struct device *dev) |
| 69 | { | 69 | { |
| 70 | return gpio_get_value(SDHC2_WP); | 70 | return !gpio_get_value(SDHC2_WP); |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | static int marxbot_sdhc2_init(struct device *dev, irq_handler_t detect_irq, | 73 | static int marxbot_sdhc2_init(struct device *dev, irq_handler_t detect_irq, |
diff --git a/arch/arm/mach-mx3/mx31moboard.c b/arch/arm/mach-mx3/mx31moboard.c index a17f2e411609..2a2da4739ecf 100644 --- a/arch/arm/mach-mx3/mx31moboard.c +++ b/arch/arm/mach-mx3/mx31moboard.c | |||
| @@ -94,7 +94,7 @@ static struct imxi2c_platform_data moboard_i2c1_pdata = { | |||
| 94 | 94 | ||
| 95 | static int moboard_sdhc1_get_ro(struct device *dev) | 95 | static int moboard_sdhc1_get_ro(struct device *dev) |
| 96 | { | 96 | { |
| 97 | return gpio_get_value(SDHC1_WP); | 97 | return !gpio_get_value(SDHC1_WP); |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | static int moboard_sdhc1_init(struct device *dev, irq_handler_t detect_irq, | 100 | static int moboard_sdhc1_init(struct device *dev, irq_handler_t detect_irq, |
diff --git a/arch/arm/mach-mx3/pcm037_eet.c b/arch/arm/mach-mx3/pcm037_eet.c index fe52fb1bb8b7..8d386000fc40 100644 --- a/arch/arm/mach-mx3/pcm037_eet.c +++ b/arch/arm/mach-mx3/pcm037_eet.c | |||
| @@ -24,15 +24,6 @@ | |||
| 24 | #include "devices.h" | 24 | #include "devices.h" |
| 25 | 25 | ||
| 26 | static unsigned int pcm037_eet_pins[] = { | 26 | static unsigned int pcm037_eet_pins[] = { |
| 27 | /* SPI #1 */ | ||
| 28 | MX31_PIN_CSPI1_MISO__MISO, | ||
| 29 | MX31_PIN_CSPI1_MOSI__MOSI, | ||
| 30 | MX31_PIN_CSPI1_SCLK__SCLK, | ||
| 31 | MX31_PIN_CSPI1_SPI_RDY__SPI_RDY, | ||
| 32 | MX31_PIN_CSPI1_SS0__SS0, | ||
| 33 | MX31_PIN_CSPI1_SS1__SS1, | ||
| 34 | MX31_PIN_CSPI1_SS2__SS2, | ||
| 35 | |||
| 36 | /* Reserve and hardwire GPIO 57 high - S6E63D6 chipselect */ | 27 | /* Reserve and hardwire GPIO 57 high - S6E63D6 chipselect */ |
| 37 | IOMUX_MODE(MX31_PIN_KEY_COL7, IOMUX_CONFIG_GPIO), | 28 | IOMUX_MODE(MX31_PIN_KEY_COL7, IOMUX_CONFIG_GPIO), |
| 38 | /* GPIO keys */ | 29 | /* GPIO keys */ |
