aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2008-07-27 05:34:45 -0400
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-07-27 07:57:36 -0400
commit3c26e17032e42cfbe606882288223ad6146e4c38 (patch)
tree1c537eb20767ccbf4a7ab85063d2dca8ec03956c /drivers/mmc
parenteda3d8f5604860aae1bb9996bb5efc4213778369 (diff)
avr32: some mmc/sd cleanups
Minor cleanups for the MMC/SD support on avr32: - Make at32_add_device_mci() properly initialize "missing" platform data ... so boards like STK1002 won't try GPIO 0. - Switch over to gpio_is_valid() instead of testing for only one designated value. - Provide STK1002 platform data for the unlikely case that switches are set so first Ethernet controller isn't in use. (That's the only way to get card detect and writeprotect switch sensing on the STK1000.) And get rid of one "unused variable" warning. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/atmel-mci.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 82bbbe998169..992b4beb757c 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -12,6 +12,7 @@
12#include <linux/debugfs.h> 12#include <linux/debugfs.h>
13#include <linux/device.h> 13#include <linux/device.h>
14#include <linux/err.h> 14#include <linux/err.h>
15#include <linux/gpio.h>
15#include <linux/init.h> 16#include <linux/init.h>
16#include <linux/interrupt.h> 17#include <linux/interrupt.h>
17#include <linux/ioport.h> 18#include <linux/ioport.h>
@@ -28,7 +29,6 @@
28#include <asm/unaligned.h> 29#include <asm/unaligned.h>
29 30
30#include <asm/arch/board.h> 31#include <asm/arch/board.h>
31#include <asm/arch/gpio.h>
32 32
33#include "atmel-mci-regs.h" 33#include "atmel-mci-regs.h"
34 34
@@ -574,7 +574,7 @@ static int atmci_get_ro(struct mmc_host *mmc)
574 int read_only = 0; 574 int read_only = 0;
575 struct atmel_mci *host = mmc_priv(mmc); 575 struct atmel_mci *host = mmc_priv(mmc);
576 576
577 if (host->wp_pin >= 0) { 577 if (gpio_is_valid(host->wp_pin)) {
578 read_only = gpio_get_value(host->wp_pin); 578 read_only = gpio_get_value(host->wp_pin);
579 dev_dbg(&mmc->class_dev, "card is %s\n", 579 dev_dbg(&mmc->class_dev, "card is %s\n",
580 read_only ? "read-only" : "read-write"); 580 read_only ? "read-only" : "read-write");
@@ -636,7 +636,7 @@ static void atmci_detect_change(unsigned long data)
636 * been freed. 636 * been freed.
637 */ 637 */
638 smp_rmb(); 638 smp_rmb();
639 if (host->detect_pin < 0) 639 if (!gpio_is_valid(host->detect_pin))
640 return; 640 return;
641 641
642 enable_irq(gpio_to_irq(host->detect_pin)); 642 enable_irq(gpio_to_irq(host->detect_pin));
@@ -1051,7 +1051,7 @@ static int __init atmci_probe(struct platform_device *pdev)
1051 1051
1052 /* Assume card is present if we don't have a detect pin */ 1052 /* Assume card is present if we don't have a detect pin */
1053 host->present = 1; 1053 host->present = 1;
1054 if (host->detect_pin >= 0) { 1054 if (gpio_is_valid(host->detect_pin)) {
1055 if (gpio_request(host->detect_pin, "mmc_detect")) { 1055 if (gpio_request(host->detect_pin, "mmc_detect")) {
1056 dev_dbg(&mmc->class_dev, "no detect pin available\n"); 1056 dev_dbg(&mmc->class_dev, "no detect pin available\n");
1057 host->detect_pin = -1; 1057 host->detect_pin = -1;
@@ -1059,7 +1059,7 @@ static int __init atmci_probe(struct platform_device *pdev)
1059 host->present = !gpio_get_value(host->detect_pin); 1059 host->present = !gpio_get_value(host->detect_pin);
1060 } 1060 }
1061 } 1061 }
1062 if (host->wp_pin >= 0) { 1062 if (gpio_is_valid(host->wp_pin)) {
1063 if (gpio_request(host->wp_pin, "mmc_wp")) { 1063 if (gpio_request(host->wp_pin, "mmc_wp")) {
1064 dev_dbg(&mmc->class_dev, "no WP pin available\n"); 1064 dev_dbg(&mmc->class_dev, "no WP pin available\n");
1065 host->wp_pin = -1; 1065 host->wp_pin = -1;
@@ -1070,7 +1070,7 @@ static int __init atmci_probe(struct platform_device *pdev)
1070 1070
1071 mmc_add_host(mmc); 1071 mmc_add_host(mmc);
1072 1072
1073 if (host->detect_pin >= 0) { 1073 if (gpio_is_valid(host->detect_pin)) {
1074 setup_timer(&host->detect_timer, atmci_detect_change, 1074 setup_timer(&host->detect_timer, atmci_detect_change,
1075 (unsigned long)host); 1075 (unsigned long)host);
1076 1076
@@ -1113,7 +1113,7 @@ static int __exit atmci_remove(struct platform_device *pdev)
1113 if (host) { 1113 if (host) {
1114 /* Debugfs stuff is cleaned up by mmc core */ 1114 /* Debugfs stuff is cleaned up by mmc core */
1115 1115
1116 if (host->detect_pin >= 0) { 1116 if (gpio_is_valid(host->detect_pin)) {
1117 int pin = host->detect_pin; 1117 int pin = host->detect_pin;
1118 1118
1119 /* Make sure the timer doesn't enable the interrupt */ 1119 /* Make sure the timer doesn't enable the interrupt */
@@ -1133,7 +1133,7 @@ static int __exit atmci_remove(struct platform_device *pdev)
1133 mci_readl(host, SR); 1133 mci_readl(host, SR);
1134 clk_disable(host->mck); 1134 clk_disable(host->mck);
1135 1135
1136 if (host->wp_pin >= 0) 1136 if (gpio_is_valid(host->wp_pin))
1137 gpio_free(host->wp_pin); 1137 gpio_free(host->wp_pin);
1138 1138
1139 free_irq(platform_get_irq(pdev, 0), host->mmc); 1139 free_irq(platform_get_irq(pdev, 0), host->mmc);