[GIT PULL] MMC update

[GIT PULL] MMC update

[Pierre Ossman]

Linus, please pull from

        git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus

to receive the following updates:

 drivers/mmc/au1xmmc.c |    2 +-
 drivers/mmc/pxamci.c  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Sascha Hauer:
      mmc: pxamci compilation fix

Yoichi Yuasa:
      mmc: fix au1xmmc build error

diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/au1xmmc.c
index 447fba5..800527c 100644
--- a/drivers/mmc/au1xmmc.c
+++ b/drivers/mmc/au1xmmc.c
@@ -875,7 +875,7 @@ static void au1xmmc_init_dma(struct au1x
        host->rx_chan = rxchan;
 }

-struct const mmc_host_ops au1xmmc_ops = {
+static const struct mmc_host_ops au1xmmc_ops = {
        .request        = au1xmmc_request,
        .set_ios        = au1xmmc_set_ios,
 };
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index 471e9f4..45a9283 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -355,7 +355,7 @@ static int pxamci_get_ro(struct mmc_host
        struct pxamci_host *host = mmc_priv(mmc);

        if (host->pdata && host->pdata->get_ro)
-               return host->pdata->get_ro(mmc->dev);
+               return host->pdata->get_ro(mmc_dev(mmc));
        /* Host doesn't support read only detection so assume writeable */
        return 0;
 }
@@ -383,7 +383,7 @@ static void pxamci_set_ios(struct mmc_ho
                host->power_mode = ios->power_mode;

                if (host->pdata && host->pdata->setpower)
-                       host->pdata->setpower(mmc->dev, ios->vdd);
+                       host->pdata->setpower(mmc_dev(mmc), ios->vdd);

                if (ios->power_mode == MMC_POWER_ON)
                        host->cmdat |= CMDAT_INIT;

-- 
     -- Pierre Ossman

  Linux kernel, MMC maintainer        http://www.kernel.org
  PulseAudio, core developer          http://pulseaudio.org
  rdesktop, core developer          http://www.rdesktop.org

[GIT PULL] MMC update

[Pierre Ossman]

Linus, please pull from

        git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus

to receive the following updates:

 drivers/mmc/card/sdio_uart.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Andre Haupt (1):
      sdio_uart: fix sign of paramter status in sdio_uart_receive_chars()

diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index d552de6..eeea84c 100644
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -386,7 +386,7 @@ static void sdio_uart_stop_rx(struct sdio_uart_port *port)
        sdio_out(port, UART_IER, port->ier);
 }
 
-static void sdio_uart_receive_chars(struct sdio_uart_port *port, int *status)
+static void sdio_uart_receive_chars(struct sdio_uart_port *port, unsigned int *status)
 {
        struct tty_struct *tty = port->tty;
        unsigned int ch, flag;



-- 
     -- Pierre Ossman

  Linux kernel, MMC maintainer        http://www.kernel.org
  PulseAudio, core developer          http://pulseaudio.org
  rdesktop, core developer          http://www.rdesktop.org

[GIT PULL] MMC update

[Pierre Ossman]

Linus, please pull from

        git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus

to receive the following updates:

 drivers/mmc/host/sdhci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Rolf Eike Beer (1):
      Add missing "\n" to log message

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 6b80bf7..ff59d2e 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1301,7 +1301,7 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)
 
        if ((chip->quirks & SDHCI_QUIRK_BROKEN_DMA) &&
                (host->flags & SDHCI_USE_DMA)) {
-               DBG("Disabling DMA as it is marked broken");
+               DBG("Disabling DMA as it is marked broken\n");
                host->flags &= ~SDHCI_USE_DMA;
        }
 



-- 
     -- Pierre Ossman

  Linux kernel, MMC maintainer        http://www.kernel.org
  PulseAudio, core developer          http://pulseaudio.org
  rdesktop, core developer          http://www.rdesktop.org

[GIT PULL] MMC update

[Pierre Ossman]

Linus, please pull from

        git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus

to receive the following updates:

 drivers/mmc/Kconfig          |    2
 drivers/mmc/at91_mci.c       |    2
 drivers/mmc/au1xmmc.c        |    2
 drivers/mmc/imxmmc.c         |    2
 drivers/mmc/mmc.c            |  294 +++++++++++++++++++++++++++++++++++++++---
 drivers/mmc/mmc_block.c      |   15 +-
 drivers/mmc/mmc_queue.c      |   63 +++++----
 drivers/mmc/mmc_queue.h      |    3
 drivers/mmc/mmci.c           |    2
 drivers/mmc/omap.c           |  272 ++++++++++++++++++++++++---------------
 drivers/mmc/omap.h           |   55 --------
 drivers/mmc/pxamci.c         |    2
 drivers/mmc/sdhci.c          |   17 ++
 drivers/mmc/sdhci.h          |    2
 drivers/mmc/wbsd.c           |    2
 include/linux/mmc/card.h     |   13 ++
 include/linux/mmc/protocol.h |   74 ++++++++++-
 17 files changed, 593 insertions(+), 229 deletions(-)

Christoph Hellwig:
      mmc: remove kernel_thread()

David Brownell:
      mmc: constify mmc_host_ops vectors

Juha Yrjola juha.yrjola:
      Replace base with virt_base and phys_base
      Change OMAP_MMC_{READ,WRITE} macros to use the host pointer
      Move register definitions away from the header file
      Platform device error handling cleanup
      Make general code cleanups

Marcin Juszkiewicz:
      trivial change for mmc/Kconfig: MMC_PXA does not mean only PXA255

Philip Langdale:
      mmc: Add support for mmc v4 high speed mode
      mmc: Add support for mmc v4 wide-bus modes

Pierre Ossman:
      mmc: Fix mmc_delay() function
      mmc: Support for high speed SD cards
      mmc: sdhci high speed support
      mmc: Flush block queue when removing card
      mmc: correct request error handling

Tony Lindgren tony:
      Add MMC_CAP_{MULTIWRITE,BYTEBLOCK} flags


-- 
     -- Pierre Ossman

  Linux kernel, MMC maintainer        http://www.kernel.org
  PulseAudio, core developer          http://pulseaudio.org
  rdesktop, core developer          http://www.rdesktop.org

Re: [GIT PULL] MMC update

[Linus Torvalds]

On Fri, 1 Dec 2006, Pierre Ossman wrote:
> 
>         git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus

I get

	Already up-to-date.

did you forget to push? Or is mirroring just really slow again?

		Linus

Re: [GIT PULL] MMC update

[Pierre Ossman]

Linus Torvalds wrote:
> On Fri, 1 Dec 2006, Pierre Ossman wrote:
>   
>>         git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus
>>     
>
> I get
>
> 	Already up-to-date.
>
> did you forget to push? Or is mirroring just really slow again?
>
>   

Seems mirroring is slow as hell. It's still not updated, but on
master.kernel.org, head is 8b7feff881b7e9f065ddd718a6841121207c3c19.

I don't suppose there's a status page somewhere that tells you what the
mirroring is up to?

Rgds

-- 
     -- Pierre Ossman

  Linux kernel, MMC maintainer        http://www.kernel.org
  PulseAudio, core developer          http://pulseaudio.org
  rdesktop, core developer          http://www.rdesktop.org

[GIT PULL] MMC update

[Pierre Ossman]

Linus, please pull from

        git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git
for-linus

to receive the following updates:

 drivers/mmc/mmc.c |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

Timo Teras:
      MMC: Poll card status after rescanning cards
      MMC: Do not set unsupported bits in OCR response

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index ee8863c..766bc54 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -475,7 +475,7 @@ static u32 mmc_select_voltage(struct mmc
        if (bit) {
                bit -= 1;

-               ocr = 3 << bit;
+               ocr &= 3 << bit;

                host->ios.vdd = bit;
                mmc_set_ios(host);
@@ -1178,14 +1178,29 @@ static void mmc_rescan(void *data)
 {
        struct mmc_host *host = data;
        struct list_head *l, *n;
+       unsigned char power_mode;

        mmc_claim_host(host);

-       if (host->ios.power_mode == MMC_POWER_ON)
+       /*
+        * Check for removed cards and newly inserted ones. We check for
+        * removed cards first so we can intelligently re-select the VDD.
+        */
+       power_mode = host->ios.power_mode;
+       if (power_mode == MMC_POWER_ON)
                mmc_check_cards(host);

        mmc_setup(host);

+       /*
+        * Some broken cards process CMD1 even in stand-by state. There is
+        * no reply, but an ILLEGAL_COMMAND error is cached and returned
+        * after next command. We poll for card status here to clear any
+        * possibly pending error.
+        */
+       if (power_mode == MMC_POWER_ON)
+               mmc_check_cards(host);
+
        if (!list_empty(&host->cards)) {
                /*
                 * (Re-)calculate the fastest clock rate which the

-- 
     -- Pierre Ossman

  Linux kernel, MMC maintainer        http://www.kernel.org
  PulseAudio, core developer          http://pulseaudio.org
  rdesktop, core developer          http://www.rdesktop.org