Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-2.6-block.git] / drivers / mfd / dm355evm_msp.c

diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
index 5b6e58a3ba46c3934e5ef96bdfcc2479172c20d7..3d4a861976ca9ea60477382e5ad52909734161eb 100644 (file)
--- a/drivers/mfd/dm355evm_msp.c
+++ b/drivers/mfd/dm355evm_msp.c
@@ -107,8 +107,16 @@ static const u8 msp_gpios[] = {
        MSP_GPIO(2, SWITCH1), MSP_GPIO(3, SWITCH1),
        MSP_GPIO(4, SWITCH1),
        /* switches on MMC/SD sockets */
-       MSP_GPIO(1, SDMMC), MSP_GPIO(2, SDMMC), /* mmc0 WP, nCD */
-       MSP_GPIO(3, SDMMC), MSP_GPIO(4, SDMMC), /* mmc1 WP, nCD */
+       /*
+        * Note: EVMDM355_ECP_VA4.pdf suggests that Bit 2 and 4 should be
+        * checked for card detection. However on the EVM bit 1 and 3 gives
+        * this status, for 0 and 1 instance respectively. The pdf also
+        * suggests that Bit 1 and 3 should be checked for write protection.
+        * However on the EVM bit 2 and 4 gives this status,for 0 and 1
+        * instance respectively.
+        */
+       MSP_GPIO(2, SDMMC), MSP_GPIO(1, SDMMC), /* mmc0 WP, nCD */
+       MSP_GPIO(4, SDMMC), MSP_GPIO(3, SDMMC), /* mmc1 WP, nCD */
 };
 
 #define MSP_GPIO_REG(offset)   (msp_gpios[(offset)] >> 3)