git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
mmc
/
host
/
atmel-mci.c
diff --git
a/drivers/mmc/host/atmel-mci.c
b/drivers/mmc/host/atmel-mci.c
index
b68381f
..
917035e
100644
(file)
--- a/
drivers/mmc/host/atmel-mci.c
+++ b/
drivers/mmc/host/atmel-mci.c
@@
-11,6
+11,8
@@
#include <linux/clk.h>
#include <linux/debugfs.h>
#include <linux/device.h>
#include <linux/clk.h>
#include <linux/debugfs.h>
#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/gpio.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
@@
-26,8
+28,7
@@
#include <asm/io.h>
#include <asm/unaligned.h>
#include <asm/io.h>
#include <asm/unaligned.h>
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
#include "atmel-mci-regs.h"
#include "atmel-mci-regs.h"
@@
-194,7
+195,9
@@
static int atmci_regs_show(struct seq_file *s, void *v)
/* Grab a more or less consistent snapshot */
spin_lock_irq(&host->mmc->lock);
/* Grab a more or less consistent snapshot */
spin_lock_irq(&host->mmc->lock);
+ clk_enable(host->mck);
memcpy_fromio(buf, host->regs, MCI_REGS_SIZE);
memcpy_fromio(buf, host->regs, MCI_REGS_SIZE);
+ clk_disable(host->mck);
spin_unlock_irq(&host->mmc->lock);
seq_printf(s, "MR:\t0x%08x%s%s CLKDIV=%u\n",
spin_unlock_irq(&host->mmc->lock);
seq_printf(s, "MR:\t0x%08x%s%s CLKDIV=%u\n",
@@
-215,6
+218,8
@@
static int atmci_regs_show(struct seq_file *s, void *v)
atmci_show_status_reg(s, "SR", buf[MCI_SR / 4]);
atmci_show_status_reg(s, "IMR", buf[MCI_IMR / 4]);
atmci_show_status_reg(s, "SR", buf[MCI_SR / 4]);
atmci_show_status_reg(s, "IMR", buf[MCI_IMR / 4]);
+ kfree(buf);
+
return 0;
}
return 0;
}
@@
-236,7
+241,6
@@
static void atmci_init_debugfs(struct atmel_mci *host)
struct mmc_host *mmc;
struct dentry *root;
struct dentry *node;
struct mmc_host *mmc;
struct dentry *root;
struct dentry *node;
- struct resource *res;
mmc = host->mmc;
root = mmc->debugfs_root;
mmc = host->mmc;
root = mmc->debugfs_root;
@@
-250,9
+254,6
@@
static void atmci_init_debugfs(struct atmel_mci *host)
if (!node)
goto err;
if (!node)
goto err;
- res = platform_get_resource(host->pdev, IORESOURCE_MEM, 0);
- node->d_inode->i_size = res->end - res->start + 1;
-
node = debugfs_create_file("req", S_IRUSR, root, host, &atmci_req_fops);
if (!node)
goto err;
node = debugfs_create_file("req", S_IRUSR, root, host, &atmci_req_fops);
if (!node)
goto err;
@@
-573,7
+574,7
@@
static int atmci_get_ro(struct mmc_host *mmc)
int read_only = 0;
struct atmel_mci *host = mmc_priv(mmc);
int read_only = 0;
struct atmel_mci *host = mmc_priv(mmc);
- if (
host->wp_pin >= 0
) {
+ if (
gpio_is_valid(host->wp_pin)
) {
read_only = gpio_get_value(host->wp_pin);
dev_dbg(&mmc->class_dev, "card is %s\n",
read_only ? "read-only" : "read-write");
read_only = gpio_get_value(host->wp_pin);
dev_dbg(&mmc->class_dev, "card is %s\n",
read_only ? "read-only" : "read-write");
@@
-635,7
+636,7
@@
static void atmci_detect_change(unsigned long data)
* been freed.
*/
smp_rmb();
* been freed.
*/
smp_rmb();
- if (
host->detect_pin < 0
)
+ if (
!gpio_is_valid(host->detect_pin)
)
return;
enable_irq(gpio_to_irq(host->detect_pin));
return;
enable_irq(gpio_to_irq(host->detect_pin));
@@
-1050,7
+1051,7
@@
static int __init atmci_probe(struct platform_device *pdev)
/* Assume card is present if we don't have a detect pin */
host->present = 1;
/* Assume card is present if we don't have a detect pin */
host->present = 1;
- if (
host->detect_pin >= 0
) {
+ if (
gpio_is_valid(host->detect_pin)
) {
if (gpio_request(host->detect_pin, "mmc_detect")) {
dev_dbg(&mmc->class_dev, "no detect pin available\n");
host->detect_pin = -1;
if (gpio_request(host->detect_pin, "mmc_detect")) {
dev_dbg(&mmc->class_dev, "no detect pin available\n");
host->detect_pin = -1;
@@
-1058,7
+1059,11
@@
static int __init atmci_probe(struct platform_device *pdev)
host->present = !gpio_get_value(host->detect_pin);
}
}
host->present = !gpio_get_value(host->detect_pin);
}
}
- if (host->wp_pin >= 0) {
+
+ if (!gpio_is_valid(host->detect_pin))
+ mmc->caps |= MMC_CAP_NEEDS_POLL;
+
+ if (gpio_is_valid(host->wp_pin)) {
if (gpio_request(host->wp_pin, "mmc_wp")) {
dev_dbg(&mmc->class_dev, "no WP pin available\n");
host->wp_pin = -1;
if (gpio_request(host->wp_pin, "mmc_wp")) {
dev_dbg(&mmc->class_dev, "no WP pin available\n");
host->wp_pin = -1;
@@
-1069,7
+1074,7
@@
static int __init atmci_probe(struct platform_device *pdev)
mmc_add_host(mmc);
mmc_add_host(mmc);
- if (
host->detect_pin >= 0
) {
+ if (
gpio_is_valid(host->detect_pin)
) {
setup_timer(&host->detect_timer, atmci_detect_change,
(unsigned long)host);
setup_timer(&host->detect_timer, atmci_detect_change,
(unsigned long)host);
@@
-1112,7
+1117,7
@@
static int __exit atmci_remove(struct platform_device *pdev)
if (host) {
/* Debugfs stuff is cleaned up by mmc core */
if (host) {
/* Debugfs stuff is cleaned up by mmc core */
- if (
host->detect_pin >= 0
) {
+ if (
gpio_is_valid(host->detect_pin)
) {
int pin = host->detect_pin;
/* Make sure the timer doesn't enable the interrupt */
int pin = host->detect_pin;
/* Make sure the timer doesn't enable the interrupt */
@@
-1132,7
+1137,7
@@
static int __exit atmci_remove(struct platform_device *pdev)
mci_readl(host, SR);
clk_disable(host->mck);
mci_readl(host, SR);
clk_disable(host->mck);
- if (
host->wp_pin >= 0
)
+ if (
gpio_is_valid(host->wp_pin)
)
gpio_free(host->wp_pin);
free_irq(platform_get_irq(pdev, 0), host->mmc);
gpio_free(host->wp_pin);
free_irq(platform_get_irq(pdev, 0), host->mmc);