Re: [GIT PULL] MMC updates for v5.12

[pr-tracker-bot]

The pull request you sent on Mon, 15 Feb 2021 13:37:09 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.12

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/19472481bf58f7c6c939668be885bd300afcb6c6

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

[GIT PULL] MMC updates for v5.12

[Ulf Hansson]

Hi Linus,

Here's the PR with updates for MMC for v5.12 (nothing for MEMSTICK this cycle).
Details about the highlights are as usual found in the signed tag.

Some changes are included for drivers/scsi/ufs/*. These shouldn't cause you any
merge conflicts, I think, but just ping me if you need me to take some actions.

Please pull this in!

Kind regards
Ulf Hansson


The following changes since commit d7fb9c24209556478e65211d7a1f056f2d43cceb:

  mmc: sdhci-pltfm: Fix linking err for sdhci-brcmstb (2021-02-01 11:13:09 
+0100)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.12

for you to fetch changes up to a56f44138a2c57047f1ea94ea121af31c595132b:

  mmc: sdhci-esdhc-imx: fix kernel panic when remove module (2021-02-15 
10:43:23 +0100)


MMC core:
 - Add support for eMMC inline encryption
 - Add a helper function to parse DT properties for clock phases
 - Some improvements and cleanups for the mmc_test module

MMC host:
 - android-goldfish: Remove driver
 - cqhci: Add support for eMMC inline encryption
 - dw_mmc-zx: Remove driver
 - meson-gx: Extend support for scatter-gather to allow SD_IO_RW_EXTENDED
 - mmci: Add support for probing bus voltage level translator
 - mtk-sd: Address race condition for request timeouts
 - sdhci_am654: Add Support for the variant on TI's AM64 SoC
 - sdhci-esdhc-imx: Prevent kernel panic at ->remove()
 - sdhci-iproc: Add ACPI bindings for the RPi to enable SD and WiFi on RPi4
 - sdhci-msm: Add Inline Crypto Engine support
 - sdhci-msm: Use actual_clock to improve timeout calculations
 - sdhci-of-aspeed: Add Andrew Jeffery as maintainer
 - sdhci-of-aspeed: Extend clock support for the AST2600 variant
 - sdhci-pci-gli: Increase idle period for low power state for GL9763E
 - sdhci-pci-o2micro: Make tuning for SDR104 HW more robust
 - sdhci-sirf: Remove driver
 - sdhci-xenon: Add support for the AP807 variant
 - sunxi-mmc: Add support for the A100 variant
 - sunxi-mmc: Ensure host is suspended during system sleep
 - tmio: Add detection of data timeout errors
 - tmio/renesas_sdhi: Extend support for retuning
 - renesas_sdhi_internal_dmac: Add support for the ->pre|post_req() ops


Andrew Jeffery (6):
  mmc: core: Add helper for parsing clock phase properties
  mmc: sdhci-of-aspeed: Expose clock phase controls
  mmc: sdhci-of-aspeed: Add AST2600 bus clock support
  mmc: sdhci-of-aspeed: Add KUnit tests for phase calculations
  MAINTAINERS: Add entry for the ASPEED SD/MMC driver
  mmc: sdhci-of-aspeed: Fix kunit-related build error

Arnd Bergmann (2):
  mmc: remove dw_mmc-zx driver
  mmc: remove sirf prima/atlas driver

Aswath Govindraju (1):
  dt-bindings: mmc: sdhci-am654: Add compatible string for AM64 SoC

ChanWoo Lee (2):
  mmc: core: Exclude unnecessary header file
  mmc: queue: Remove unused define

Chaotian Jing (1):
  mmc: mediatek: fix race condition between msdc_request_timeout and irq

Christophe JAILLET (4):
  mmc: mxs-mmc: Fix a resource leak in an error handling path in 
'mxs_mmc_probe()'
  mmc: owl-mmc: Fix a resource leak in an error handling path and in the 
remove function
  mmc: sdhci-sprd: Fix some resource leaks in the remove function
  mmc: usdhi6rol0: Fix a resource leak in the error handling path of the 
probe

Dmitry Lebed (1):
  mmc: meson-gx: check for scatterlist size alignment in block mode

Douglas Anderson (2):
  mmc: sdhci-msm: Warn about overclocking SD/MMC
  mmc: sdhci-msm: Actually set the actual clock

Emil Renner Berthing (10):
  mmc: atmel-mci: Use new tasklet API
  mmc: au1xmmc: Use new tasklet API
  mmc: dw_mmc: Use new tasklet API
  mmc: omap: Use new tasklet API
  mmc: s3cmci: Use new tasklet API
  mmc: tifm_sd: Use new tasklet API
  mmc: uniphier-sd: Use new tasklet API
  mmc: via-sdmmc: Use new tasklet API
  mmc: wbsd: Use new tasklet API
  mmc: cb710: Use new tasklet API

Eric Biggers (10):
  block/keyslot-manager: introduce devm_blk_ksm_init()
  scsi: ufs: use devm_blk_ksm_init()
  mmc: core: Add basic support for inline encryption
  mmc: cqhci: rename cqhci.c to cqhci-core.c
  mmc: cqhci: initialize upper 64 bits of 128-bit task descriptors
  mmc: cqhci: add support for inline encryption
  mmc: cqhci: add cqhci_host_ops::program_key
  firmware: qcom_scm: update comment for ICE-related functions
  dt-bindings: mmc: sdhci-msm: add ICE registers and clock
  mmc: sdhci-msm: add Inline Crypto Engine support

Faiz Abbas (1):
  mmc: sdhci_am654: Add Support for TI's AM64 SoC

Frank Li (1):
  mmc: sdhci-esdhc-imx: fix kernel panic when remove module

Grygorii Strashko (1):
  dt-bindings: mmc: sdhci-am654: fix compatible for j7200

H. Nikolaus Schaller (2):
  mmc: jz4740: remove unused 

Re: [GIT PULL] MMC updates for v5.10

[pr-tracker-bot]

The pull request you sent on Mon, 12 Oct 2020 12:01:27 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.10

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/647412daeb454b6dad12a6c6961ab90aac9e5d29

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

[GIT PULL] MMC updates for v5.10

[Ulf Hansson]

Hi Linus,

Here's the PR with the updates for MMC for v5.10. Details about the highlights
are as usual found in the signed tag.

Please pull this in!

Kind regards
Ulf Hansson


The following changes since commit 4243219141b67d7c2fdb2d8073c17c539b9263eb:

  mmc: core: don't set limits.discard_granularity as 0 (2020-10-09 08:26:09 
+0200)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.10

for you to fetch changes up to 1e23400f1a7342a2805cc647e6314cd12bfb5526:

  mmc: sdhci_am654: Fix module autoload (2020-10-09 08:58:58 +0200)


MMC core:
 - Export SDIO revision and info strings to userspace
 - Add support for specifying mmc/mmcblk index via mmc aliases in DT

MMC host:
 - Enable support for async probe for all mmc host drivers
 - Enable compile testing of multiple host drivers
 - dw_mmc: Enable the Synopsys DesignWare driver for RISCV and CSKY
 - mtk-sd: Fixup support for CQHCI
 - owl-mmc: Add support for the actions,s700-mmc variant
 - renesas_sdhi: Fix regression (temporary) for re-insertion of SD cards
 - renesas_sdhi: Add support for the r8a774e1 variant
 - renesas_sdhi/tmio: Improvements for tunings
 - renesas_sdhi/tmio: Rework support for reset of controller
 - sdhci-acpi: Fix HS400 tuning for devices with invalid presets on AMDI0040
 - sdhci_am654: Improve support for tunings
 - sdhci_am654: Add support for input tap delays
 - sdhci_am654: Add workaround for card detect debounce timer
 - sdhci-am654: Add support for the TI's J7200 variants
 - sdhci-esdhc-imx: Fix support for manual tuning
 - sdhci-iproc: Enable support for eMMC DDR 3.3V for bcm2711
 - sdhci-msm: Fix stability issues with HS400 for sc7180
 - sdhci-of-sparx5: Add Sparx5 SoC eMMC driver
 - sdhci-of-esdhc: Fixup reference clock source selection
 - sdhci-pci: Add LTR support for some Intel BYT controllers
 - sdhci-pci-gli: Add CQHCI Support for GL9763E


Adrian Hunter (1):
  mmc: sdhci: Add LTR support for some Intel BYT based controllers

Alex Dewar (1):
  mmc: sdhci-msm: enable compile-testing on !ARM

Alexander A. Klimov (1):
  mmc: sdhci_am654: Replace HTTP links with HTTPS ones

Amey Narkhede (1):
  mmc: mediatek: Drop pointer to mmc_host from msdc_host

Amit Singh Tomar (1):
  dt-bindings: mmc: owl: add compatible string actions,s700-mmc

Ben Chuang (1):
  mmc: sdhci-pci-gli: Add CQHCI Support for GL9763E

Chun-Hung Wu (2):
  mmc: cqhci: add new cqhci_host_ops pre_enable() and post_disable()
  mmc: mediatek: add pre_enable() and post_disable() hook function

Colin Ian King (1):
  ms_block: fix spelling mistake "doesn'" -> "doesn't"

Douglas Anderson (7):
  mmc: sdhci-msm: Prefer asynchronous probe
  mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.4
  mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.9
  mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.14
  mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.19
  mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v5.4
  mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that are newer than 5.4

Faiz Abbas (9):
  dt-bindings: mmc: sdhci-am654: Document bindings for the host controllers 
on TI's J7200 devices
  mmc: sdhci_am654: Add workaround for card detect debounce timer
  dt-bindings: mmc: sdhci-am654: Convert sdhci-am654 controller 
documentation to json schema
  dt-bindings: mmc: sdhci-am654: Add documentation for input tap delay
  mmc: sdhci_am654: Fix hard coded otap delay array size
  mmc: sdhci_am654: Add support for input tap delay
  mmc: sdhci_am654: Add support for software tuning
  mmc: sdhci_am654: Enable tuning for SDR50
  mmc: sdhci_am654: Fix module autoload

Guo Ren (1):
  mmc: Kconfig: Add RISCV and CSKY for MMC_DW

Haibo Chen (2):
  mmc: sdhci-esdhc-imx: Reset before sending tuning command for manual 
tuning
  mmc: sdhci-esdhc-imx: remove unused code

Krzysztof Kozlowski (22):
  mmc: s3cmci: remove empty kerneldoc comment
  dt-bindings: mmc: fsl-imx-esdhc: Fix i.MX 8 compatible matching
  dt-bindings: mmc: mmc-pwreq-simple: Accept more than one reset GPIO
  mmc: bcm2835: Simplify with dev_err_probe()
  mmc: davinci: Simplify with dev_err_probe()
  mmc: dw_mmc-zx: Simplify with dev_err_probe()
  mmc: jz4740: Simplify with dev_err_probe()
  mmc: meson: Simplify with dev_err_probe()
  mmc: sdhci-of-arasan: Simplify with dev_err_probe()
  mmc: sdhci-tegra: Simplify with dev_err_probe()
  mmc: dw_mmc: Simplify with dev_err_probe()
  mmc: sdhci-of-sparx5: Use proper printk format for dma_addr_t
  mmc: sdhci-brcmstb: Simplify with optional clock and dev_err_probe()
  mmc: davinci: Fix -Wpointer-to-int-cast on compile test
  mmc: s3cmci: 

Re: [GIT PULL] MMC updates for v5.4 take 2

[pr-tracker-bot]

The pull request you sent on Sun, 29 Sep 2019 21:38:10 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.4-2

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/c710364f78afdef8c2ed07556d0743c5a30ed429

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

[GIT PULL] MMC updates for v5.4 take 2

[Ulf Hansson]

Hi Linus,

Here's a PR with a couple more updates/fixes for MMC fixes intended for v5.4.
No worries if this doesn't get included in rc1.

Details about the highlights are as usual found in the signed tag.

Please pull this in!

Kind regards
Ulf Hansson


The following changes since commit 3c6a6910a81eae3566bb5fef6ea0f624382595e6:

  Merge branch 'linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (2019-09-23 
09:31:42 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.4-2

for you to fetch changes up to e51df6ce668a8f75ce27f83ce0f60103c568c375:

  mmc: host: sdhci-pci: Add Genesys Logic GL975x support (2019-09-27 20:48:20 
+0200)


MMC host:
 - sdhci-pci: Add Genesys Logic GL975x support
 - sdhci-tegra: Recover loss in throughput for DMA
 - sdhci-of-esdhc: Fix DMA bug


Adrian Hunter (1):
  mmc: sdhci: Let drivers define their DMA mask

Ben Chuang (1):
  mmc: host: sdhci-pci: Add Genesys Logic GL975x support

Nicolin Chen (1):
  mmc: tegra: Implement ->set_dma_mask()

Russell King (2):
  mmc: sdhci: improve ADMA error reporting
  mmc: sdhci-of-esdhc: set DMA snooping based on DMA coherence

 drivers/mmc/host/Kconfig  |   1 +
 drivers/mmc/host/Makefile |   2 +-
 drivers/mmc/host/sdhci-of-esdhc.c |   7 +-
 drivers/mmc/host/sdhci-pci-core.c |   2 +
 drivers/mmc/host/sdhci-pci-gli.c  | 352 ++
 drivers/mmc/host/sdhci-pci.h  |   5 +
 drivers/mmc/host/sdhci-tegra.c|  48 +++---
 drivers/mmc/host/sdhci.c  |  27 +--
 drivers/mmc/host/sdhci.h  |   1 +
 9 files changed, 410 insertions(+), 35 deletions(-)
 create mode 100644 drivers/mmc/host/sdhci-pci-gli.c

Re: [GIT PULL] MMC updates for v5.1

[pr-tracker-bot]

The pull request you sent on Mon,  4 Mar 2019 14:02:22 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/42eaf1851ea2394d1cacf79de075170300d170c3

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

[GIT PULL] MMC updates for v5.1

[Ulf Hansson]

Hi Linus,

Here's the PR with MMC updates for v5.1. Details about the highlights are as
usual found in the signed tag.

Please pull this in!

Kind regards
Ulf Hansson


The following changes since commit e30be063d6dbcc0f18b1eb25fa709fdef89201fb:

  mmc: sdhci-esdhc-imx: correct the fix of ERR004536 (2019-02-28 12:18:31 +0100)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.1

for you to fetch changes up to d4721339dcca7def04909a8e60da43c19a24d8bf:

  mmc:fix a bug when max_discard is 0 (2019-03-01 09:50:10 +0100)


MMC core:
 - mmc: core: Fixup max_discard/trim calculations
 - mmc: core: Announce SD specs greater than 4.0
 - mmc: core: Add discard support for SD cards
 - mmc: core: Don't do retries for CMD6 (SWITCH command)
 - mmc: core: Various cleanups and re-structuring

MMC host:
 - cqhci: Add maintainers for eMMC CQHCI driver
 - sdhci: Consolidate WP GPIO code
 - sdhci: Add ADMA3 DMA support for V4 enabled host
 - sdhci-pci-o2micro: Fixup card detect support
 - sdhci-tegra: Add support for CMDQ
 - sdhci-tegra: Support SDMMC pads auto-calibration
 - sdhci-esdhc-imx: Add DCMD support and CMDQ support
 - sdhci-esdhc-imx: Add support for i.MX6ULL variant
 - sdhci-esdhc-imx: Fixup HS400 timing issue
 - sdhci-esdhc-imx: Add HS400_ES support for i.MX8QXP
 - renesas_sdhi: Avoid CRC errors by adjusting settings to speed mode
 - renesas_sdhi: Fixup card initialization for high speed mode
 - omap: Fixup timeout settings
 - atmel-mci: Enable 8 bits bus-width support
 - jz4740: Convert some legacy code to use modern APIs
 - mmci: Send a CMD12 to clear DPSM at errors for STM32 sdmmc


Aaro Koskinen (1):
  mmc: omap: fix the maximum timeout setting

Andrey Smirnov (1):
  mmc: sdhci-esdhc-imx: Constify driver data

Avri Altman (4):
  mmc: core: Calculate the discard arg only once
  mmc: core: Indicate SD specs higher than 4.0
  mmc: core: Add discard support to sd
  mmc: core: Add sd discard timeout

BOUGH CHEN (13):
  mmc: sdhci-esdhc-imx: clear ESDHC_STD_TUNING_EN for manual tuning method
  mmc: sdhci: usdhc: do not do tuning for DDR50 mode.
  mmc: sdhci-esdhc-imx: fix HS400 timing issue
  dt-bindings: mmc: fsl-imx-esdhc: add imx6ull compatible string
  mmc: sdhci-esdhc-imx: add SD clock limitation for imx6ull
  mmc: sdhci-esdhc-imx: add delay between tuning cycles
  mmc: sdhci: add delay after the last tuning command
  mmc: sdhci-esdhc-imx: remove the 100MHz limitation for Strobe DLL
  mmc: sdhci-esdhc-imx: add HS400_ES support for i.MX8QXP
  mmc: sdhci: correct the maximum timeout when enable CMDQ
  mmc: sdhci-esdhc-imx: add CMDQ support
  mmc: sdhci-esdhc-imx: add DCMD support for CMDQ
  mmc: sdhci-esdhc-imx: clear the HALT bit when enable CQE

Chaotian Jing (1):
  mmc: core: do not retry CMD6 in __mmc_switch()

Colin Ian King (1):
  mmc: cb710: fix indentation issue in if block

Ernest Zhang(WH) (3):
  mmc: sdhci: Moving sdhci_o2 into sdhci-pci-o2micro.c
  mmc: sdhci: Fix O2 Host PLL and card detect issue
  mmc: sdhci: Remove unneeded quirk2 flag of O2 SD host controller

Gustavo A. R. Silva (1):
  mmc: sdhci-xenon: Fixup already marked switch fall-through

Jiong Wu (1):
  mmc:fix a bug when max_discard is 0

Linus Walleij (7):
  mmc: slot-gpio: Remove override_active_level on WP
  mmc: mxcmmc: Drop unused includes
  mmc: mxs-mmc: Drop unused includes
  mmc: sdhci-bcm-kona: Drop unused includes
  mmc: sdhci-pxav2: Drop unused include
  mmc: sunxi-mmc: Drop unused includes
  mmc: wmt-sdmmc: Drop unused include

Lukas Wunner (3):
  mmc: bcm2835: Drop DMA channel error pointer check
  mmc: bcm2835: Drop pointer to mmc_host from bcm2835_host
  mmc: bcm2835: Deduplicate reset of driver data on remove

Mathieu Malaterre (2):
  mmc: core: annotate implicit fall through
  mmc: jz4740: Annotate implicit fall through

Mike Maslenkin (1):
  mmc: dt-bindings: omap: Remove duplicate documentation paragraphs

Nicolas Ferre (1):
  mmc: atmel-mci: enable 8 bits buswidth support

Niklas Söderlund (2):
  mmc: tmio: fix typo in tmio_mmc_init_ocr()
  mmc: tmio: undo PM autosuspend when removing the host

Paul Cercueil (1):
  mmc: jz4740: Remove platform data and use standard APIs

Sowjanya Komatineni (5):
  dt-bindings: mmc: tegra: Add pinctrl for SDMMC drive strengths
  mmc: tegra: SDMMC pads auto-calibration
  dt-bindings: mmc: Add supports-cqe property
  mmc: sdhci: Add ADMA3 DMA support for V4 enabled host
  mmc: tegra: HW Command Queue Support for Tegra SDMMC

Stefan Wahren (1):
  mmc: sdhci-brcmstb: handle mmc_of_parse() errors during probe

Takeshi Saito (2):
  mmc: renesas_sdhi: Fix card initialization failure in high speed mode
  

Re: [GIT PULL] MMC updates for v4.21

[pr-tracker-bot]

The pull request you sent on Thu, 27 Dec 2018 15:31:52 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v4.21

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/00d59fde8532b2d42e80909d2e58678755e04da9

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

[GIT PULL] MMC updates for v4.21

[Ulf Hansson]

Hi Linus,

Here's the PR with MMC updates for v4.21. Details about the highlights are as
usual found in the signed tag. Please pull this in!

This time, the PR contains changes crossing subsystems/archs/platforms, which
is mainly because of a bigger modernization of moving from legacy GPIO to GPIO
descriptors for MMC (by Linus Walleij). Additionally, again, I am funneling
changes to drivers/misc/cardreader/* and drivers/memstick/*, through my MMC
tree, mostly due to that we lack a maintainer for these. Perhaps, I should
simply volunteer and make that the formal process, let's see.

Happy holidays!

Kind regards
Ulf Hansson


The following changes since commit e3ae3401aa19432ee4943eb0bbc2ec704d07d793:

  mmc: core: Use a minimum 1600ms timeout when enabling CACHE ctrl (2018-12-17 
08:59:42 +0100)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v4.21

for you to fetch changes up to 5215b2e952f3f94d74cac1a59494eb8ac647e216:

  mmc: mediatek: Add MMC_CAP_SDIO_IRQ support (2018-12-19 10:16:15 +0100)


MMC core:
 - Cleanup BKOPS support
 - Introduce MMC_CAP_SYNC_RUNTIME_PM
 - slot-gpio: Delete legacy slot GPIO handling

MMC host:
 - alcor: Add new mmc host driver for Alcor Micro PCI based cardreader
 - bcm2835: Several improvements to better recover from errors
 - jz4740: Rework and fixup pre|post_req support
 - mediatek: Add support for SDIO IRQs
 - meson-gx: Improve clock phase management
 - meson-gx: Stop descriptor on errors
 - mmci: Complete the sbc error path by sending a stop command
 - renesas_sdhi/tmio: Fixup reset/resume operations
 - renesas_sdhi: Add support for r8a774c0 and R7S9210
 - renesas_sdhi: Whitelist R8A77990 SDHI
 - renesas_sdhi: Fixup eMMC HS400 compatibility issues for H3 and M3-W
 - rtsx_usb_sdmmc: Re-work card detection/removal support
 - rtsx_usb_sdmmc: Re-work runtime PM support
 - sdhci: Fix timeout loops for some variant drivers
 - sdhci: Improve support for error handling due to failing commands
 - sdhci-acpi/pci: Disable LED control for Intel BYT-based controllers
 - sdhci_am654: Add new SDHCI variant driver to support TI's AM654 SOCs
 - sdhci-of-esdhc: Add support for eMMC HS400 mode
 - sdhci-omap: Fixup reset support
 - sdhci-omap: Workaround errata regarding SDR104/HS200 tuning failures
 - sdhci-msm: Fixup sporadic write transfers issues for SDR104/HS200
 - sdhci-msm: Fixup dynamical clock gating issues
 - various: Complete converting all hosts into using slot GPIO descriptors

Other:
 - Move GPIO mmc platform data for mips/sh/arm to GPIO descriptors
 - Add new Alcor Micro cardreader PCI driver
 - Support runtime power management for memstick rtsx_usb_ms driver
 - Use USB remote wakeups for card detection for rtsx_usb misc driver


A.s. Dong (1):
  dt-bindings: mmc: fsl-imx-esdhc: add imx8qxp compatible string

Adrian Hunter (10):
  mmc: sdhci: Fix data command CRC error handling
  mmc: sdhci: Rename SDHCI_ACMD12_ERR and SDHCI_INT_ACMD12ERR
  mmc: sdhci: Handle auto-command errors
  mmc: sdhci-pci: Add max-frequency device property for Intel controllers
  mmc: sdhci-of-esdhc: Fix timeout checks
  mmc: sdhci-omap: Fix timeout checks
  mmc: sdhci-xenon: Fix timeout checks
  mmc: sdhci: Add quirk to disable LED control
  mmc: sdhci-pci: Disable LED control for Intel BYT-based controllers
  mmc: sdhci-acpi: Disable LED control for Intel BYT-based controllers

Arnd Bergmann (1):
  mmc: sdhci-msm: avoid unused function warning

Biju Das (1):
  mmc: renesas_sdhi_internal_dmac: Whitelist r8a774c0

Chris Brandt (2):
  mmc: renesas_sdhi_internal_dmac: Add R7S9210 support
  dt-bindings: mmc: tmio_mmc: Document Renesas R7S9210

Chunyan Zhang (1):
  mmc: sdhci: Convert sdhci_allocate_bounce_buffer() to return void

Colin Ian King (2):
  mmc: sdhci-of-esdhc: fix spelling mistake "upsupported" -> "unsupported"
  misc: alcor_pci: fix spelling mistake "invailid" -> "invalid"

Evan Green (1):
  dt-bindings: mmc: sdhci-msm: Clarify register requirements

Ezequiel Garcia (1):
  mmc: jz4740: rework pre_req/post_req implementation

Fabrizio Castro (1):
  dt-bindings: mmc: renesas_sdhi: Add r8a774c0 support

Faiz Abbas (7):
  mmc: sdhci-omap: Add platform specific reset callback
  mmc: sdhci-omap: Remove redundant structure assignments
  dt-bindings: mmc: sdhci-am654: Document bindings for the host controllers 
on TI's AM654 SOCs
  dt-bindings: mmc: sdhci-of-arasan: Add deprecated message for AM65
  mmc: sdhci_am654: Add Initial Support for AM654 SDHCI driver
  dt-bindings: sdhci-omap: Add note for cpu_thermal
  mmc: sdhci-omap: Workaround errata regarding SDR104/HS200 tuning failures 
(i929)

Jerome Brunet (4):
  mmc: meson-gx: make sure the descriptor is stopped on errors
  mmc: meson-gx: rem

[GIT PULL] MMC updates for v4.20

[Ulf Hansson]

Hi Greg,

Here's a PR with the MMC updates for v4.20. Details about the highlights are as
usual found in the signed tag.

Please pull this in!

Kind regards
Ulf Hansson


The following changes since commit 4f75cdff0b986195413215eb062b7da6586f:

  libertas: call into generic suspend code before turning off power (2018-10-10 
14:01:50 +0200)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v4.20

for you to fetch changes up to fd82cc3020a024fc97fbc0a5242c26d06bb5e203:

  mmc: mediatek: drop too much code of tuning method (2018-10-15 15:00:29 +0200)


MMC core:
 - Introduce a host helper function to share re-tuning progress

MMC host:
 - sdhci: Add support for v4 host mode
 - sdhci-of-arasan: Add Support for AM654 MMC and PHY
 - sdhci-sprd: Add support for Spreadtrum's host controller
 - sdhci-tegra: Add support for HS400 enhanced strobe
 - sdhci-tegra: Enable UHS/HS200 modes for Tegra186/210
 - sdhci-tegra: Add support for HS400 delay line calibration
 - sdhci-tegra: Add support for pad calibration
 - sdhci-of-dwcmshc: Address 128MB DMA boundary limitation
 - sdhci-of-esdhc: Add support for tuning erratum A008171
 - sdhci-iproc: Add ACPI support
 - mediatek: Add support for MT8183
 - mediatek: Improve the support for tuning
 - mediatek: Add bus clock control for MT2712
 - jz4740: Add support for the JZ4725B
 - mmci: Add support for the stm32 sdmmc variant
 - mmci: Add support for an optional reset control
 - mmci: Add some new variant specific properties/callbacks
 - mmci: Re-structure DMA code to prepare for new variants
 - renesas_sdhi: Add support for r8a77470, r8a7744 and r8a774a1
 - renesas_sdhi_internal_dmac: Whitelist r8a77970 and r8a774a1
 - tmio/uniphier-sd: Add new UniPhier SD/eMMC controller driver
 - tmio/renesas_sdhi: Deal properly with SCC detection during re-tune
 - tmio/renesas_sdhi: Refactor/consolidate clock management
 - omap_hsmmc: Drop cover detection and some unused platform data
 - dw_mmc-exynos: Enable tuning for more speed modes
 - sunxi: Clarify the new timing mode and enable it for the A64 controller
 - various: Convert to slot GPIO descriptors


Aapo Vienamo (26):
  mmc: sdhci: Export sdhci_request()
  dt-bindings: mmc: tegra: Add pad voltage control properties
  dt-bindings: Add Tegra SDHCI pad pdpu offset bindings
  dt-bindings: mmc: Add Tegra SDHCI sampling trimmer values
  mmc: tegra: Reconfigure pad voltages during voltage switching
  mmc: tegra: Poll for calibration completion
  mmc: tegra: Set calibration pad voltage reference
  mmc: tegra: Power on the calibration pad
  mmc: tegra: Disable card clock during pad calibration
  mmc: tegra: Program pad autocal offsets from dt
  mmc: tegra: Perform pad calibration after voltage switch
  mmc: tegra: Enable pad calibration on Tegra210 and Tegra186
  mmc: tegra: Add a workaround for tap value change glitch
  mmc: tegra: Parse default trim and tap from dt
  mmc: tegra: Configure default tap values
  mmc: tegra: Configure default trim value on reset
  mmc: tegra: Use standard SDHCI tuning on Tegra210 and Tegra186
  mmc: tegra: Remove tegra_sdhci_writew() from tegra210_sdhci_ops
  mmc: tegra: Disable card clock during tuning cmd on Tegra210
  mmc: tegra: Enable UHS and HS200 modes for Tegra210
  mmc: tegra: Enable UHS and HS200 modes for Tegra186
  dt-bindings: mmc: Add DQS trim value to Tegra SDHCI
  mmc: tegra: Parse and program DQS trim value
  mmc: tegra: Implement HS400 enhanced strobe
  mmc: tegra: Implement HS400 delay line calibration
  mmc: tegra: Implement periodic pad calibration

Adrian Hunter (1):
  mmc: sdhci-pltfm: Convert DT properties to generic device properties

Anand Moon (1):
  mmc: dw_mmc-exynos: Add tuning for sdr and ddr timing for USH-I mode

Biju Das (2):
  dt-bindings: mmc: renesas_sdhi: Add r8a7744 support
  dt-bindings: mmc: sh_mmcif: Document r8a7744 DT bindings

Chaotian Jing (8):
  mmc: dt-bindings: add "bus-clk" for MT2712
  mmc: mediatek: add bus_clk control
  mmc: dt-bindings: add support for MT8183 SoC
  mmc: mediatek: fill the actual clock for mmc debugfs
  mmc: mediatek: fix cannot receive new request when msdc_cmd_is_ready fail
  mmc: mediatek: tune CMD/DATA together
  mmc: mediatek: add MT8183 MMC driver support
  mmc: mediatek: drop too much code of tuning method

Chen-Yu Tsai (2):
  mmc: sunxi: Clarify new timing mode usage and implementation
  mmc: sunxi: Use new timing mode for A64 eMMC controller

Chunyan Zhang (9):
  mmc: sdhci: Add version V4 definition
  mmc: sdhci: Add sd host v4 mode
  mmc: sdhci: Change SDMA address register for v4 mode
  mmc: sdhci: Add ADMA2 64-bit addressing support for V4 mode
  mmc: sdhci: Add 

[GIT PULL] MMC updates for v4.19

[Ulf Hansson]

Hi Linus,

Here's a PR with the updates for MMC for v4.19. Details about the highlights are
as usual found in the signed tag.

Note, this time I have also merged an immutable branch/tag for switching the
pxa platforms to DMA slave maps, by Robert Jarzmik. This was needed due to
dependency for additional changes of the pxamci mmc driver.

Please pull this in!

Kind regards
Ulf Hansson


The following changes since commit 3b1074bf9817bf43d4da375aa5f4b6c88f1d953e:

  mmc: mxcmmc: Fix missing parentheses and brace (2018-07-16 11:45:44 +0200)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v4.19

for you to fetch changes up to 7f38abf220e2c800a2c451372e9f07ed5fd0ea49:

  mmc: core: improve reasonableness of bus width setting for HS400es 
(2018-08-01 14:15:28 +0200)


MMC core:
 - Add some fine-grained hooks to further support HS400 tuning
 - Improve error path for bus width setting for HS400es
 - Use a common method when checking R1 status

MMC host:
 - renesas_sdhi: Add r8a77990 support
 - renesas_sdhi: Add eMMC HS400 mode support
 - tmio/renesas_sdhi: Improve tuning/clock management
 - tmio: Add eMMC HS400 mode support
 - sunxi: Add support for 3.3V eMMC DDR mode
 - mmci: Initial support to manage variant specific callbacks
 - sdhci: Don't try 3.3V I/O voltage if not supported
 - sdhci-pci-dwc-mshc: Add driver to support Synopsys dwc mshc SDHCI PCI
 - sdhci-of-dwcmshc: Add driver to support Synopsys DWC MSHC SDHCI
 - sdhci-msm: Add support for new version sdcc V5
 - sdhci-pci-o2micro: Add support for O2 eMMC HS200 mode
 - sdhci-pci-o2micro: Add support for O2 hardware tuning
 - sdhci-pci-o2micro: Add MSI interrupt support for O2 SD host
 - sdhci-pci: Add support for Intel ICP
 - sdhci-tegra: Prevent ACMD23 and HS200 mode on Tegra 3
 - sdhci-tegra: Fix eMMC DDR52 mode
 - sdhci-tegra: Improve clock management
 - dw_mmc-rockchip: Document compatible string for px30
 - sdhci-esdhc-imx: Add support for 3.3V eMMC DDR mode
 - sdhci-of-esdhc: Set proper DMA mask for ls104x chips
 - sdhci-of-esdhc: Improve clock management
 - sdhci-of-arasan: Add a quirk to manage unstable clocks
 - dw_mmc-exynos: Address potential external abort during system resume
 - pxamci: Add support for common MMC DT bindings
 - pxamci: Several cleanups and improvements
 - pxamci: Merge immutable branch for pxa to switch to DMA slave maps


Aapo Vienamo (3):
  mmc: tegra: Use sdhci_pltfm_clk_get_max_clock
  mmc: tegra: Add and use tegra_sdhci_get_max_clock()
  mmc: tegra: Force correct divider calculation on DDR50/52

Adrian Hunter (1):
  mmc: sdhci-pci: Add support for Intel ICP

Andre Przywara (1):
  mmc: sunxi: remove output of virtual base address

Daniel Mack (9):
  mmc: pxamci: remove irq from private context
  mmc: pxamci: remove dma resources from private context
  mmc: pxamci: remove dead code from pxamci_remove()
  mmc: pxamci: fix indenting
  mmc: pxamci: call mmc_of_parse()
  mmc: pxamci: remove pxa-mmc, gpio-power from devicetree bindings
  mmc: pxamci: let mmc core handle regulators
  mmc: pxamci: make GPIO lookups from pdata optional
  mmc: pxamci: provide a short-hand for &pdev->dev

Fabio Estevam (1):
  mmc: sdhci-esdhc-imx: Switch to SPDX identifier

Gustavo A. R. Silva (1):
  mmc: sdhci-xenon: mark expected switch fall-through

Helmut Grohne (2):
  dt-bindings: mmc: broken clock stable indicator on arasan controllers
  mmc: sdhci-of-arasan: Add quirk for unstable clocks

Hongjie Fang (1):
  mmc: core: improve reasonableness of bus width setting for HS400es

Icenowy Zheng (1):
  mmc: sunxi: allow 3.3V DDR when DDR is available

Jisheng Zhang (2):
  dt: bindings: Add bindings for SDHCI Synopsys DWC MSHC
  mmc: sdhci-of-dwcmshc: add SDHCI OF Synopsys DWC MSHC driver

Laurentiu Tudor (1):
  mmc: sdhci-of-esdhc: set proper dma mask for ls104x chips

Liang Chen (1):
  dt-bindings: mmc: rockchip-dw-mshc: add description for px30

Marek Szyprowski (1):
  mmc: dw_mmc-exynos: fix potential external abort in resume_noirq()

Masaharu Hayakawa (3):
  mmc: tmio: add eMMC HS400 mode support
  mmc: renesas_sdhi: add eMMC HS400 mode support
  mmc: tmio: Fix tuning flow

Masahiro Yamada (1):
  mmc: tmio: remove unneeded variable in tmio_mmc_start_command()

Niklas S??derlund (1):
  mmc: renesas_sdhi: Fix sampling clock position selecting

Prabu Thangamuthu (1):
  mmc: sdhci-pci-dwc-mshc: synopsys dwc mshc support

Robert Jarzmik (10):
  dmaengine: pxa: use a dma slave map
  ARM: pxa: add dma slave map
  dmaengine: pxa: add a default requestor policy
  mmc: pxamci: remove the dmaengine compat need
  media: pxa_camera: remove the dmaengine compat need
  mtd: rawnand: marvell: remove the dmaengine compat need
   

Re: [GIT PULL] MMC updates for 3.16-rc1

[Chris Ball]

Hi,

On Thu, Jun 12 2014, Lee Jones wrote:
>> And I'm not sure why the sunxi driver (by David Lanzendörfer) and the
>> Realtek driver (by Roger Tseng) got merged in two different trees.
>> It's clearly the same patches and drivers, but I got them first
>> through the MFD tree (Realtek) and the clock tree (sunxi) trees and
>> now the MMC tree.
>> 
>> Don't you guys talk to each other? The Realtek driver is even marked
>> as Acked-by Chris Ball in the MFD tree.
>
> Yes, we do talk to each other.  Branch ib-mfd-mmc-memstick-3.16 was
> created as a result.  Based on no facts at all, I'm guessing that the
> shared (immutable) branch wasn't applied correctly in the MMC tree.

Yes, our fault -- I gave my Ack, but then Ulf sent me the driver in his
PR and I pulled it.  Sorry for all the trouble, it was the first cycle
with Ulf and I co-maintaining, and a larger set of commits than usual.
We'll make sure to do better.

Thanks,

- Chris.
-- 
Chris Ball   
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates for 3.16-rc1

[Lee Jones]

On Tue, 10 Jun 2014, Linus Torvalds wrote:

> On Tue, Jun 10, 2014 at 12:51 PM, Chris Ball  wrote:
> >
> >  These patches have been tested in
> > linux-next, and there are three minor conflicts which I've resolved on
> > my mmc-updates-for-3.16-rc1-merged branch.
> 
> Your merged branch is incorrect as far as I can tell, and dropped
> commit a8246fedacad ("dmaengine: omap: hide filter_fn for built-in
> drivers").
> 
> And I'm not sure why the sunxi driver (by David Lanzendörfer) and the
> Realtek driver (by Roger Tseng) got merged in two different trees.
> It's clearly the same patches and drivers, but I got them first
> through the MFD tree (Realtek) and the clock tree (sunxi) trees and
> now the MMC tree.
> 
> Don't you guys talk to each other? The Realtek driver is even marked
> as Acked-by Chris Ball in the MFD tree.

Yes, we do talk to each other.  Branch ib-mfd-mmc-memstick-3.16 was
created as a result.  Based on no facts at all, I'm guessing that the
shared (immutable) branch wasn't applied correctly in the MMC tree.

> Also, that new drivers/mmc/host/usdhi6rol0.c driver is one f*cking
> noisy compile, and knisr certainly has never been tested in a 64-bit
> environment. Please either fix it, or make it depend on BROKEN.
> 
> Grr.
> 
> Anyway, pulled, merged correctly, and pushed out..
> 
> Linus

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates for 3.16-rc1

[Ulf Hansson]

On 12 June 2014 07:25, Guennadi Liakhovetski  wrote:
> Hi Linus,
>
> On Wed, 11 Jun 2014, Linus Torvalds wrote:
>
>> On Tue, Jun 10, 2014 at 2:50 PM, Linus Torvalds
>>  wrote:
>> >
>> > Also, that new drivers/mmc/host/usdhi6rol0.c driver is one f*cking
>> > noisy compile, and knisr certainly has never been tested in a 64-bit
>> > environment. Please either fix it, or make it depend on BROKEN.
>>
>> Guys? Seriously, if that driver isn't fixed, I'm going to mark it
>> broken myself. It pretty much generates as many lines of warnings as
>> the rest of my "allmodconfig" build combined.
>>
>> It's extremely annoying, and the crazy warnings are likely to hide
>> potential real problems elsewhere, so right now that driver has
>> negative value. I do a lot of allmodconfig builds during the merge
>> window, and I am not going to look at that warning much longer.
>>
>> Fix it promptly, or it gets disabled.
>
> I sent a patch a few hours ago:
> https://patchwork.kernel.org/patch/4338531/ Since it's only changing print
> format strings, it should be a trivial one to review, so, just waiting for
> Chris to pick it up and push it to you. Sorry about the trouble.

I pick it up, and likely together with few other fixes and send a PR
to Linus in a few hours.

Kind regards
Ulf Hansson


>
> Thanks
> Guennadi
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates for 3.16-rc1

[Guennadi Liakhovetski]

Hi Linus,

On Wed, 11 Jun 2014, Linus Torvalds wrote:

> On Tue, Jun 10, 2014 at 2:50 PM, Linus Torvalds
>  wrote:
> >
> > Also, that new drivers/mmc/host/usdhi6rol0.c driver is one f*cking
> > noisy compile, and knisr certainly has never been tested in a 64-bit
> > environment. Please either fix it, or make it depend on BROKEN.
> 
> Guys? Seriously, if that driver isn't fixed, I'm going to mark it
> broken myself. It pretty much generates as many lines of warnings as
> the rest of my "allmodconfig" build combined.
> 
> It's extremely annoying, and the crazy warnings are likely to hide
> potential real problems elsewhere, so right now that driver has
> negative value. I do a lot of allmodconfig builds during the merge
> window, and I am not going to look at that warning much longer.
> 
> Fix it promptly, or it gets disabled.

I sent a patch a few hours ago: 
https://patchwork.kernel.org/patch/4338531/ Since it's only changing print 
format strings, it should be a trivial one to review, so, just waiting for 
Chris to pick it up and push it to you. Sorry about the trouble.

Thanks
Guennadi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates for 3.16-rc1

[Linus Torvalds]

On Tue, Jun 10, 2014 at 2:50 PM, Linus Torvalds
 wrote:
>
> Also, that new drivers/mmc/host/usdhi6rol0.c driver is one f*cking
> noisy compile, and knisr certainly has never been tested in a 64-bit
> environment. Please either fix it, or make it depend on BROKEN.

Guys? Seriously, if that driver isn't fixed, I'm going to mark it
broken myself. It pretty much generates as many lines of warnings as
the rest of my "allmodconfig" build combined.

It's extremely annoying, and the crazy warnings are likely to hide
potential real problems elsewhere, so right now that driver has
negative value. I do a lot of allmodconfig builds during the merge
window, and I am not going to look at that warning much longer.

Fix it promptly, or it gets disabled.

Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates for 3.16-rc1

[Mike Turquette]

Quoting Linus Torvalds (2014-06-10 14:50:59)
> On Tue, Jun 10, 2014 at 12:51 PM, Chris Ball  wrote:
> >
> >  These patches have been tested in
> > linux-next, and there are three minor conflicts which I've resolved on
> > my mmc-updates-for-3.16-rc1-merged branch.
> 
> Your merged branch is incorrect as far as I can tell, and dropped
> commit a8246fedacad ("dmaengine: omap: hide filter_fn for built-in
> drivers").
> 
> And I'm not sure why the sunxi driver (by David Lanzendörfer) and the
> Realtek driver (by Roger Tseng) got merged in two different trees.
> It's clearly the same patches and drivers, but I got them first
> through the MFD tree (Realtek) and the clock tree (sunxi) trees and
> now the MMC tree.

Bummer. The sunxi mmc driver came through the clock tree to handle a
linux-next merge issue. Pics or it didn't happen:

https://lkml.org/lkml/2014/6/2/696

Regards,
Mike

> 
> Don't you guys talk to each other? The Realtek driver is even marked
> as Acked-by Chris Ball in the MFD tree.
> 
> Also, that new drivers/mmc/host/usdhi6rol0.c driver is one f*cking
> noisy compile, and knisr certainly has never been tested in a 64-bit
> environment. Please either fix it, or make it depend on BROKEN.
> 
> Grr.
> 
> Anyway, pulled, merged correctly, and pushed out..
> 
> Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates for 3.16-rc1

[Linus Torvalds]

On Tue, Jun 10, 2014 at 12:51 PM, Chris Ball  wrote:
>
>  These patches have been tested in
> linux-next, and there are three minor conflicts which I've resolved on
> my mmc-updates-for-3.16-rc1-merged branch.

Your merged branch is incorrect as far as I can tell, and dropped
commit a8246fedacad ("dmaengine: omap: hide filter_fn for built-in
drivers").

And I'm not sure why the sunxi driver (by David Lanzendörfer) and the
Realtek driver (by Roger Tseng) got merged in two different trees.
It's clearly the same patches and drivers, but I got them first
through the MFD tree (Realtek) and the clock tree (sunxi) trees and
now the MMC tree.

Don't you guys talk to each other? The Realtek driver is even marked
as Acked-by Chris Ball in the MFD tree.

Also, that new drivers/mmc/host/usdhi6rol0.c driver is one f*cking
noisy compile, and knisr certainly has never been tested in a 64-bit
environment. Please either fix it, or make it depend on BROKEN.

Grr.

Anyway, pulled, merged correctly, and pushed out..

Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates for 3.16-rc1

[Chris Ball]

Hi Linus,

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.16-rc1

to receive the MMC merge for 3.16.  These patches have been tested in
linux-next, and there are three minor conflicts which I've resolved on
my mmc-updates-for-3.16-rc1-merged branch.  Thanks.


The following changes since commit a798c10faf62a505d24e5f6213fbaf904a39623f:

  Linux 3.15-rc2 (2014-04-20 11:08:50 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.16-rc1

for you to fetch changes up to 11bc9381b277a65ea4b3fe994e658f4a78512139:

  mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet (2014-06-04 
18:59:12 -0400)


MMC highlights for 3.16:

Core:
 - support HS400 mode of eMMC 5.0, via DT bindings mmc-hs400-1_{2,8}v
 - if card init at 3.3v doesn't work, try 1.8v and 1.2v too

Drivers:
 - moxart: New driver for MOXA ART SoCs
 - rtsx_usb_sdmmc: New driver for Realtek USB card readers
 - sdhci: Large rework around IRQ/regulator handling, remove card_tasklet
 - sdhci-pci-o2micro: Add SeaBird SeaEagle SD3 support
 - sunxi: New driver for Allwinner sunxi SoCs
 - usdhi6rol0: New driver for Renesas SD/SDIO controller


Aisheng Dong (1):
  mmc: sdhci-esdhc-imx: fix mmc ddr mode regression issue

Al Cooper (1):
  mmc: sdhci: SD tuning is broken for some controllers

Alex Smith (1):
  mmc: jz4740: don't wait for PRG_DONE after stop command with R1 response

Alexander Shiyan (3):
  mmc: mxcmmc: Convert to devm-* API
  mmc: mxcmmc: Convert to SIMPLE_DEV_PM_OPS
  mmc: mxcmmc: Use mmc_regulator_get_supply() API

Alexandre Belloni (1):
  mmc: atmel: don't test host->data

Andrew Bresticker (2):
  mmc: tegra: disable UHS modes
  mmc: tegra: fix reporting of base clock frequency

Arnd Bergmann (1):
  mmc: rtsx: fix possible linking error if built-in

Axel Lin (4):
  mmc: Convert to use ATTRIBUTE_GROUPS
  mmc: sdhci-s3c: Remove unused define for NUM_GPIOS
  mmc: omap: Use DIV_ROUND_UP instead of open coded
  mmc: wmt-sdmmc: Use GFP_KERNEL instead of hard-coded value

Balaji T K (6):
  mmc: omap_hsmmc: use devm_clk_get
  mmc: omap_hsmmc: use devm_request_irq
  mmc: omap_hsmmc: use devm_request_threaded_irq
  mmc: omap_hsmmc: use devm_ioremap_resource
  mmc: omap_hsmmc: fix cmd23 multiblock read/write
  mmc: omap_hsmmc: split omap-dma header file

Daniel Willmann (1):
  mmc: mxs: fix card detection function for broken card detect

David Lanzendörfer (1):
  mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi SoCs

Doug Anderson (1):
  mmc: dw_mmc: Don't print data errors

Fabio Estevam (1):
  mmc: card.h: Use NULL instead of 0 for END_FIXUP

Guennadi Liakhovetski (1):
  mmc: add a driver for the Renesas usdhi6rol0 SD/SDIO host controller

Jaehoon Chung (8):
  mmc: dw_mmc: use the mmc_of_parse() instead of local parser
  mmc: dw_mmc: replace the bus_hz checking point
  mmc: dw_mmc: remove unused member variable.
  mmc: dw_mmc: fix minor coding style.
  mmc: dw_mmc: remove unnecessary function.
  mmc: dw_mmc: remove dw_mci_of_cd_gpio/wp_gpio()
  mmc: dw_mmc: restore the card-present checking point
  mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet

Jonas Jensen (1):
  mmc: moxart: Add MOXA ART SD/MMC driver

Markus Mayer (1):
  mmc: Delay the card_event callback into the mmc_rescan worker

Micky Ching (1):
  mmc: rtsx: add R1-no-CRC mmc command type handle

Nick Sanders (1):
  mmc: sdhci: remove mdelay in eMMC tuning

Peter Guo (1):
  mmc: sdhci-pci-o2micro: Add SeaBird SeaEagle SD3 support

Roger Tseng (1):
  mmc: Add realtek USB sdmmc host driver

Russell King (31):
  mmc: sdio_irq: rework sdio irq handling
  mmc: sdhci: clean up interrupt handling
  mmc: sdhci: clean up sdio interrupt enable handling
  mmc: sdhci: convert to new SDIO IRQ handling
  mmc: sdhci: push card_tasklet into threaded irq handler
  mmc: sdhci: allow sdio interrupts while sdhci runtime suspended
  mmc: sdhci: more efficient interrupt enable register handling
  mmc: sdhci: plug hole in disabling card detection interrupts
  mmc: sdhci: convert generic bus width setup to library function
  mmc: sdhci: convert reset into a library function
  mmc: sdhci: move FSL ESDHC reset handling quirk into esdhc code
  mmc: sdhci: avoid sync'ing the SG if there's no misalignment
  mmc: sdhci: convert ADMA descriptors to a coherent allocation
  mmc: sdhci: clean up sdhci_update_clock()/sdhci_set_clock()
  mmc: sdhci: move setting host->clock into sdhci_do_set_ios()
  mmc: sdhci: move setting mmc->actual_clock into set_clock handlers
  mmc: sdhci: convert sdhci_set_clock() into a library

[GIT PULL] MMC updates for 3.15-rc1

[Chris Ball]

Hi Linus,

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.15-rc1

to receive the MMC merge for 3.15.  These patches have been tested in
linux-next, and there are currently no conflicts.  There's a MAINTAINERS
update to add Ulf Hansson as MMC co-maintainer.  Thanks.
  
The following changes since commit b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed:

  Linux 3.14-rc2 (2014-02-09 18:15:47 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.15-rc1

for you to fetch changes up to c67480173f72e883235dd0ad09d90156c8f87600:

  mmc: sdhci-acpi: Intel SDIO has broken card detect (2014-04-07 21:27:14 -0400)


MMC highlights for 3.15:

Core:
 - CONFIG_MMC_UNSAFE_RESUME=y is now default behavior.
 - DT bindings for SDHCI UHS, eMMC HS200, high-speed DDR, at 1.8/1.2V.
 - Add GPIO descriptor based slot-gpio card detect API.

Drivers:
 - dw_mmc: Refactor SOCFPGA support as a variant inside dw_mmc-pltfm.c.
 - mmci: Support HW busy detection on ux500.
 - omap: Support MMC_ERASE.
 - omap_hsmmc: Support MMC_PM_KEEP_POWER, MMC_PM_WAKE_SDIO_IRQ, (a)cmd23.
 - rtsx: Support pre-req/post-req async.
 - sdhci: Add support for Realtek RTS5250 controllers.
 - sdhci-acpi: Add support for 80860F16, fix 80860F14/SDIO card detect.
 - sdhci-msm: Add new driver for Qualcomm SDHCI chipset support.
 - sdhci-pxav3: Add support for Marvell Armada 380 and 385 SoCs.


Adrian Hunter (7):
  mmc: slot-gpio: Record GPIO descriptors instead of GPIO numbers
  mmc: slot-gpio: Split out CD IRQ request into a separate function
  mmc: slot-gpio: Add GPIO descriptor based CD GPIO API
  mmc: sdhci-acpi: Fix broken card detect for ACPI HID 80860F14
  mmc: sdhci-acpi: Add device id 80860F16
  mmc: sdhci: Allow for irq being shared
  mmc: sdhci-acpi: Intel SDIO has broken card detect

Arend van Spriel (1):
  sdhci: only reprogram retuning timer when flag is set

Balaji T K (14):
  mmc: omap_hsmmc: use devm_regulator API
  mmc: omap_hsmmc: handle vcc and vcc_aux independently
  regulator: add pbias regulator support
  mmc: omap_hsmmc: adapt hsmmc to use pbias regulator
  ARM: dts: add pbias dt node
  ARM: OMAP: enable SYSCON and REGULATOR_PBIAS in omap2plus_defconfig
  mmc: omap_hsmmc: remove pbias workaround
  mmc: omap_hsmmc: fix return error code for of_get_hsmmc_pdata
  mmc: omap_hsmmc: remove redundant reset done
  mmc: omap_hsmmc: save clock rate to use in interrupt context
  mmc: omap_hsmmc: fix request done for sbc error case
  mmc: omap_hsmmc: split dma setup
  mmc: omap_hsmmc: add cmd23 support
  mmc: omap_hsmmc: add autocmd23 support

Chris Ball (1):
  Revert "dts: socfpga: Add support for SD/MMC on the SOCFPGA platform"

Christian Daudt (1):
  mmc: rename ARCH_BCM to ARCH_BCM_MOBILE

Dan Carpenter (1):
  mmc: omap_hsmmc: remove a duplicative test

Daniel Mack (1):
  mmc: omap_hsmmc: support more DT properties

Dinh Nguyen (3):
  mmc: dw_mmc-socfpga: Remove the SOCFPGA specific platform for dw_mmc
  mmc: dw_mmc: Add support for SOCFPGA's platform specific implementation
  dts: socfpga: Add support for SD/MMC on the SOCFPGA platform

Felipe Balbi (1):
  mmc: dw_mmc: fix possible build error

Georgi Djakov (3):
  mmc: sdhci-msm: Qualcomm SDHCI binding documentation
  mmc: sdhci-msm: Initial support for Qualcomm chipsets
  mmc: sdhci-msm: Add platform_execute_tuning implementation

Jaehoon Chung (1):
  mmc: core: Add DT bindings for eMMC HS200 1.8/1.2V

Jarkko Nikula (7):
  mmc: omap: Fix NULL pointer dereference due uninitialized cover_tasklet
  mmc: omap: Convert to devm_kzalloc
  mmc: omap: Remove duplicate host->irq assignment
  mmc: omap: Remove mem_res field from struct mmc_omap_host
  mmc: omap: Convert to devm_ioremap_resource
  mmc: omap: Remove always set use_dma flag from struct mmc_omap_host
  mmc: omap: Add erase capability

Kuninori Morimoto (5):
  mmc: sdhi: tidyup sh_mobile_sdhi_of_match position
  mmc: sdhi: update sh_mobile_sdhi_of_data for r8a7778
  mmc: sdhi: update sh_mobile_sdhi_of_data for r8a7779
  mmc: sdhi: update sh_mobile_sdhi_of_data for r8a7790
  mmc: sdhi: update sh_mobile_sdhi_of_data for r8a7791

Marcin Wojtas (1):
  mmc: sdhci-pxav3: add support for the Armada 38x SDHCI controller

Micky Ching (4):
  mmc: sdhci: add support for realtek rts5250
  mmc: rtsx: fix card poweroff bug
  mmc: rtsx: modify phase searching method for tuning
  mmc: rtsx: add support for pre_req and post_req

Nishanth Menon (2):
  mmc: omap_hsmmc: Add support for quirky omap3 hsmmc controller
  ARM: dts: omap3-ldp: fix mmc configuration

Russell King (6):
  mmc: sdhci-bcm-kona: fix 

[GIT PULL] MMC updates for 3.14-rc1

[Chris Ball]

Hi Linus,

This is a new email address for me, but you still have a signed path
to it.  (This pull request updates MAINTAINERS with the new address.)

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.14-rc1

to receive the MMC merge for 3.14.  These patches have been tested in
linux-next, and there's a trivial MAINTAINERS conflict with the
resolution below.  Thanks.

diff --cc MAINTAINERS
index 1912139,518bf71..000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1406,9 -1371,7 +1406,10 @@@ T: git git://git.xilinx.com/linux-xlnx.
  S:Supported
  F:arch/arm/mach-zynq/
  F:drivers/cpuidle/cpuidle-zynq.c
 +N:zynq
 +N:xilinx
 +F:drivers/clocksource/cadence_ttc_timer.c
+ F:drivers/mmc/host/sdhci-of-arasan.c
  
  ARM SMMU DRIVER
  M:Will Deacon 


The following changes since commit 0e4b0743bbe5807535ba1b0389281f9a4c1b2bb7:

  Merge tag 'fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (2013-11-26 11:18:37 
-0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.14-rc1

for you to fetch changes up to 945be38caa287b177b8c17ffaae7754cab6a658f:

  mmc: sdhci-pci: Fix possibility of chip->fixes being null (2014-01-23 
10:52:53 -0500)


MMC highlights for 3.14:

Core:
 - Avoid get_cd() on cards marked nonremovable.

Drivers:
 - arasan: New driver for controllers found in e.g. Xilinx Zynq SoC.
 - dwmmc: Support Hisilicon K3 SoC controllers.
 - esdhc-imx: Support for HS200 mode, DDR modes on MX6, runtime PM.
 - sdhci-pci: Support O2Micro/BayHubTech controllers used in laptops
   like Lenovo ThinkPad W540, Dell Latitude E5440, Dell Latitude E6540.
 - tegra: Support Tegra124 SoCs.


Adam Lee (2):
  mmc: sdhci-pci: break out definitions to header file
  mmc: sdhci-pci: add support of O2Micro/BayHubTech SD hosts

Adrian Hunter (3):
  mmc: sdhci: Allow for long command timeouts
  mmc: sdhci-pci: Fix BYT sd card getting stuck in runtime suspend
  mmc: sdhci-pci: Fix possibility of chip->fixes being null

Aisheng Dong (1):
  mmc: sdhci: fix lockdep error in tuning routine

Alexandre Belloni (1):
  mmc: atmel-mci: add vmmc-supply support

Bing Zhao (1):
  mmc: sdio: add a quirk for broken SDIO_CCCR_INTx polling

Chris Ball (1):
  MAINTAINERS: mmc: Update Chris Ball's email address.

Chuansheng Liu (1):
  mmc: sdhci: Setting the host->mrq to NULL before executing tuning

David Cohen (2):
  mmc: sdhci: add quirk for broken HS200 support
  mmc: sdhci-pci: add broken HS200 quirk for Intel Merrifield

Dong Aisheng (13):
  mmc: sdhci: clear auto cmd setting bits for no data cmds
  mmc: sdhci-esdhc-imx: add SDHCI_TRANSFER_MODE read function
  mmc: sdhci-esdhc-imx: fix cpas over write issue
  mmc: sdhci-esdhc-imx: add MMC_CAP_1_8V_DDR for mx6
  mmc: core: mmc DDR mode should not depend on UHS_DDR50
  mmc: sdhci-esdhc-imx: add eMMC HS200 mode support
  mmc: sdhci-pltfm: export pltfm suspend/resume api
  mmc: sdhci-esdhc-imx: tuning bits should not be cleared during reset
  mmc: esdhc-imx: clearing SDHCI_CTRL_EXEC_TUNING should not affect other 
bits
  mmc: sdhci-esdhc-imx: fix runtime pm unbalance issue
  mmc: sdhci-esdhc-imx: add runtime pm support
  mmc: sdhci-esdhc-imx: fix access hardirq-unsafe lock in atomic context
  mmc: sdhci-esdhc-imx: fix warning during module remove function

Fabio Estevam (1):
  mmc: sdhci-esdhc-imx: Use NULL instead of zero

Guennadi Liakhovetski (1):
  mmc: tmio: remove myself as a maintainer

Kuninori Morimoto (6):
  mmc: tmio: don't overwrite caps2
  mmc: tmio: use -EPROBE_DEFER if driver can't find regulator
  mmc: tmio: bus_shift become tmio_mmc_data member
  mmc: tmio: add new TMIO_MMC_HAVE_HIGH_REG flags
  mmc: SDHI: add SoC specific workaround via HW version
  mmc: tmio: fixup compile error

Laurent Pinchart (5):
  mmc: sh_mobile_sdhi: Convert to clk_prepare/unprepare
  mmc: sh_mmcif: Factorize DMA channel request and configuration code
  mmc: sh_mmcif: Fix compilation warning on 64-bit platforms
  mmc: sdhi: Enable driver compilation with COMPILE_TEST
  mmc: sh_mmcif: Enable driver compilation with COMPILE_TEST

Ludovic Desroches (1):
  mmc: atmel-mci: fix timeout errors in SDIO mode when using DMA

Mika Westerberg (1):
  mmc: sdhci-acpi: add new ACPI ID

Ray Jui (1):
  mmc: fix host release issue after discard operation

Sascha Hauer (6):
  mmc: Do not call get_cd for non removable cards
  mmc: mxs: use standard flag for non-removable status
  mmc: mxs: use standard flag for broken card detection
  mmc: mxs: use standard flag for cd inverted
  mmc: mxs: use mmc_gpio_get_ro for detecting read-only statu

[GIT PULL] MMC updates for 3.13-rc1

[Chris Ball]

Hi Linus,

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.13-rc1

to receive the MMC merge for 3.13.  These patches have been tested in
linux-next, and there's a conflict with the resolution below.  Thanks.


diff --cc drivers/mmc/host/mvsdio.c
index deecee0,22ba4d3..000
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@@ -872,10 -845,7 +845,8 @@@ static const struct of_device_id mvsdio
  MODULE_DEVICE_TABLE(of, mvsdio_dt_ids);
  
  static struct platform_driver mvsd_driver = {
 -  .remove = __exit_p(mvsd_remove),
 +  .probe  = mvsd_probe,
 +  .remove = mvsd_remove,
-   .suspend= mvsd_suspend,
-   .resume = mvsd_resume,
.driver = {
.name   = DRIVER_NAME,
.of_match_table = mvsdio_dt_ids,

  
The following changes since commit 4b97280675f45c1650ee4e388bd711ecbb18c4b4:

  Merge tag 'stable/for-linus-3.12-rc2-tag' of 
git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip (2013-09-25 15:50:53 
-0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.13-rc1

for you to fetch changes up to e395c4387c746b4cc7aace4c44baecd7e69a3249:

  mmc: wbsd: Silence compiler warning (2013-11-08 14:32:03 -0500)


MMC highlights for 3.13:
Core:
 - Improve runtime PM support, remove mmc_{suspend,resume}_host().
 - Add MMC_CAP_RUNTIME_RESUME, for delaying MMC resume until we're
   outside of the resume sequence (in runtime_resume) to decrease
   system resume time.

Drivers:
 - dw_mmc: Support HS200 mode.
 - sdhci-eshdc-imx: Support SD3.0 SDR clock tuning, DDR on IMX6.
 - sdhci-pci: Add support for Intel Clovertrail and Merrifield.


Alexey Neyman (1):
  mmc: sdhci: Avoid needless loop while handling SDIO interrupts in 
sdhci_irq

Axel Lin (3):
  mmc: sdhci-bcm-kona: Use sdhci_pltfm_unregister instead of open coded
  mmc: sdhci-bcm2835: Use sdhci_pltfm_unregister instead of open coded
  mmc: wmt-sdmmc: Simplify wmt_set_sd_power implementation

Balaji T K (3):
  mmc: omap_hsmmc: Fix pbias_disable for omap4
  mmc: omap_hsmmc: correct max value of clkd
  mmc: omap_hsmmc: remove unused no_off

David Cohen (1):
  mmc: sdhci-pci: add Intel Merrifield support

Dong Aisheng (16):
  mmc: sdhci: add hooks for platform specific tuning
  mmc: sdhci: allow platform access of sdhci_send_command
  mmc: sdhci-esdhc: move common esdhc_set_clock to platform driver
  mmc: sdhci-esdhc-imx: support real clock on and off for imx6q
  mmc: sdhci-esdhc-imx: add sd3.0 SDR clock tuning support
  mmc: sdhci-esdhc-imx: change pinctrl state according to uhs mode
  mmc: sdhci-esdhc-imx: correct pre_div for imx6q
  mmc: sdhci-esdhc-imx: set actual_clock in clock setting
  mmc: sdhci-esdhc-imx: add std tuning support for mx6sl
  mmc: sdhci-esdhc-imx: fix reading cap_1 register value for mx6sl
  mmc: sdhci: report error once the maximum tuning loops exhausted or 
timeout
  mmc: sdhci-esdhc-imx: add DDR mode support for mx6
  mmc: sdhci-esdhc-imx: add delay line setting support
  mmc: sdhci-esdhc-imx: enable SDR50 tuning for imx6q/dl
  mmc: sdhci-esdhc-imx: add preset value quirk for mx6
  mmc: sdhci: remove unneeded call when have preset value quirk

Doug Anderson (4):
  mmc: dw_mmc: don't queue up a card detect at slot startup
  mmc: dw_mmc: Add exynos resume_noirq callback to clear WAKEUP_INT
  mmc: dw_mmc: Honor requests to set the clock to 0
  mmc: dw_mmc: Set timeout to max upon resume

Eric Ernst (1):
  mmc: sdhci-pci: Add SDIO/MMC device ID support for Intel Clovertrail

Grant Grundler (1):
  mmc: core: remove dead function mmc_try_claim_host

Jackey Shen (1):
  mmc: core: clean up duplicate macros

Jianpeng Ma (1):
  mmc: omap_hsmmc: fix timeout for cmd and data soft reset

Kuninori Morimoto (1):
  sh: ecovec: fixup compile error on sdhi

Ludovic Desroches (1):
  mmc: atmel-mci: abort transfer on timeout error

Rodolfo Giometti (1):
  mmc: atmel-mci: fix oops in atmci_tasklet_func

Sachin Kamat (3):
  mmc: mvsdio: Convert to devm_ioremap_resource
  mmc: dw_mmc-socfpga: Remove redundant of_match_ptr
  mmc: dw_mmc-socfpga: Staticize dw_mci_socfpga_probe

Seungwon Jeon (15):
  mmc: dw_mmc: add support tuning scheme
  mmc: dw_mmc: exynos: add variable delay tuning sequence
  mmc: dw_mmc: exynos: adjust the clock rate with speed mode
  mmc: dw_mmc: add the capability to support hs200 mode
  mmc: dw_mmc: move supports-highspeed of quirks to caps
  mmc: dw_mmc: set the supported max/min frequency
  mmc: dw_mmc: adjust the fifoth with block size
  mmc: dw_mmc: control card read threshold
  mmc: dw_m

[GIT PULL] MMC updates for 3.12-rc1

[Chris Ball]

Hi Linus,

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.12-rc1

to receive the MMC merge for 3.12.  There are currently no conflicts,
and these patches have been tested in linux-next.  Thanks.


The following changes since commit bfffbea1aaeeb1eb6500c83ff9653416daa5b490:

  Merge tag 'mmc-updates-for-3.11-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc (2013-07-10 11:16:00 
-0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.12-rc1

for you to fetch changes up to 9d731e7539713acc0ec7b67a5a91357c455d2334:

  Revert "mmc: tmio-mmc: Remove .set_pwr() callback from platform data" 
(2013-09-06 07:29:05 -0400)


MMC highlights for 3.12:
Core:
 - Support Allocation Units 8MB-64MB in SD3.0, previous max was 4MB.
 - The slot-gpio helper can now handle GPIO debouncing card-detect.
 - Read supported voltages from DT "voltage-ranges" property.

Drivers:
 - dw_mmc: Add support for ARC architecture, and support exynos5420.
 - mmc_spi: Support CD/RO GPIOs.
 - sh_mobile_sdhi: Add compatibility for more Renesas SoCs.
 - sh_mmcif: Add DT support for DMA channels.


Amarinder Bindra (1):
  mmc: omap_hsmmc: use the generic config for omap2plus devices

Andy Shevchenko (2):
  mmc: dw_mmc-pci: get resources from a proper BAR
  mmc: dw_mmc-pci: enable bus-mastering mode

Boris BREZILLON (1):
  mmc: atmel-mci: prepare clk before calling enable

Chris Ball (1):
  Revert "mmc: tmio-mmc: Remove .set_pwr() callback from platform data"

Doug Anderson (1):
  mmc: dw_mmc: Handle DW_MCI_QUIRK_IDMAC_DTO properly

Fabio Estevam (2):
  mmc: mxs-mmc: Use devm_clk_get()
  mmc: mxs-mmc: Check the return value from stmp_reset_block()

Felipe Balbi (1):
  mmc: omap_hsmmc: fix dependency on indirect header inclusion

Francesco Lavra (1):
  mmc: omap_hsmmc: clear status flags before starting a new command

Franck Jullien (1):
  mmc: fix null pointer use in mmc_blk_remove_req

Guennadi Liakhovetski (6):
  mmc: tmio: fix compiler warning
  mmc: SDHI: add DT compatibility strings for further SoCs
  mmc: sh_mmcif: move header include from header into .c
  mmc: sh_mmcif: add support for Device Tree DMA bindings
  mmc: sh_mmcif: revision-specific Command Completion Signal handling
  mmc: sh_mmcif: revision-specific CLK_CTRL2 handling

Haijun Zhang (3):
  mmc: core: parse voltage from device-tree
  mmc: sdhci: get voltage from sdhc host
  mmc: esdhc: add support to get voltage from device-tree

Jaehoon Chung (3):
  mmc: sd: fix the maximum au_size for SD3.0
  mmc: sdhci-s3c: fix the wrong register value, when clock is disabled
  mmc: sdhci-s3c: initialize host->quirks2 for using quirks2

Jingoo Han (3):
  mmc: mmc_test: replace strict_strtol() with kstrtol_from_user()
  mmc: dw_mmc: add missing MFD_SYSCON dependency for SOCFPGA
  mmc: dw_mmc-pltfm: include 'dw_mmc-pltfm.h'

KOBAYASHI Yoshitake (1):
  mmc: block: fix a bug of error handling in MMC driver

Laurent Pinchart (13):
  mmc: slot-gpio: Add debouncing capability to mmc_gpio_request_cd()
  mmc: mmc_spi: Support CD/RO GPIOs
  ARM: ep93xx: vision_ep9307: Use MMC CD and RO GPIO
  sh: ecovec24: Use MMC/SDHI CD and RO GPIO
  sh: ecovec24: Remove mmcif .down_pwr() callback
  sh: ecovec24: Remove MMCIF and SDHI .set_pwr() callbacks
  mmc: mmc_spi: Remove platform data .get_cd() and .get_ro() callbacks
  mmc: sh_mmcif: Remove .down_pwr() callback from platform data
  mmc: sh_mmcif: Remove .set_pwr() callback from platform data
  mmc: sh_mobile_sdhi: Remove .get_cd() callback from platform data
  mmc: sh_mobile_sdhi: Remove .set_pwr() callback from platform data
  mmc: tmio-mmc: Remove .get_cd() callback from platform data
  mmc: tmio-mmc: Remove .set_pwr() callback from platform data

Minjian Wu (1):
  mmc: core: Set data timeout for mmc bus test commands (CMD14 and CMD19).

Mischa Jonker (1):
  mmc: dw_mmc: Add support for ARC

Sachin Kamat (2):
  mmc: sdhci-bcm2835: Staticize bcm2835_sdhci_get_min_clock
  mmc: vub300: Staticize vub300_init_card

Sergei Shtylyov (1):
  mmc: tmio_mmc_dma: fix PIO fallback on SDHI

Shawn Guo (1):
  mmc: sdhci: request irq after sdhci_init() is called

Wei WANG (2):
  mmc: host: Remove a duplicate line in Makefile
  mmc: core: free mmc_card if cmd 3,9,7 fails in mmc_sd_init_card

Wei Yongjun (1):
  mmc: jz4740: fix return value check in jz4740_mmc_probe()

Yuvaraj Kumar C D (1):
  mmc: dw_mmc: exynos: Add a new compatible string for exynos5420

 .../devicetree/bindings/mmc/fsl-esdhc.txt  |  4 +
 arch/arm/mach-ep93xx/vision_ep9307.c   | 57 ++
 arch/sh/boards/mach-ecovec2

[GIT PULL] MMC updates for 3.11-rc1

[Chris Ball]

Hi Linus,

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.11-rc1

to receive the MMC merge for 3.11.  There are currently no conflicts,
and these patches have been tested in linux-next.  Thanks.


The following changes since commit 4a29b5591faf2fdf2b717594d50f70c15066:

  mmc: omap_hsmmc: Skip platform_get_resource_byname() for dt case (2013-05-26 
14:23:11 -0400)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.11-rc1

for you to fetch changes up to 01ebea1b411aafc8eab440bf1d2037f01bbed99b:

  mmc: bcm281xx SDHCI driver (2013-07-05 13:00:31 -0400)


MMC highlights for 3.11:

Core:
 - Add support for eMMC 5.1 devices.
 - Add MMC_CAP_AGGRESSIVE_PM capability for aggressive power management
   of eMMC/SD between requests, using runtime PM.
 - Add an ioctl to perform the eMMC 4.5 Sanitize command; sample code at:
   git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git

Drivers:
 - dw_mmc: Add support for Rockchip's Cortex-A9 SoCs.
 - dw_mmc: Add support for Altera SoCFPGAs.
 - sdhci-esdhc-imx: Add support for 8-bit bus width, non-removable cards.
 - sdhci-bcm-kona: New driver for Broadcom Kona (281xx) SoCs.
 - sdhi/tmio: Add DT DMA support.


Adrian Hunter (6):
  mmc: sdhci: add ability to stay runtime-resumed if the card is powered up
  mmc: sdhci-acpi: support runtime PM for ACPI HID 80860F14 SD cards
  mmc: sdhci-pci: support runtime PM for BYT SD cards
  mmc: sdhci-pci: add support for eMMC hardware reset for BYT eMMC.
  mmc: sdhci-acpi: add support for eMMC hardware reset for HID 80860F14
  mmc: sdhci-pci: add another device id

Al Cooper (1):
  mmc: sdhci-pltfm: Allow drivers to set quirks2 from platform data

Andy Shevchenko (3):
  mmc: dw_mmc-pltfm: don't check resource with devm_ioremap_resource
  mmc: dw_mmc: eliminate useless usage of ret
  mmc: dw_mmc-pci: convert to use pcim_* and devm_*

Arnd Bergmann (1):
  mmc: sirf: fix sdhci_pltfm_init sequence

Barry Song (1):
  mmc: sdhci-sirf: let device core setup the default pin configuration

Christian Daudt (3):
  mmc: sdhci: Add size for caller in init+register
  mmc: sdhci: add card_event callback to sdhci
  mmc: bcm281xx SDHCI driver

Daniel Drake (1):
  sdhci-pxav3: Fix runtime PM initialization

Dinh Nguyen (1):
  mmc: dw_mmc: Add support DW SD/MMC driver on SOCFPGA

Doug Anderson (2):
  mmc: dw_mmc: Handle late vmmc regulators with EPROBE_DEFER
  mmc: dw_mmc: Add the ability to set the ciu clock frequency

Fabio Estevam (1):
  mmc: mxs-mmc: Let device core handle pinctrl

Fredrik Soderstedt (2):
  mmc: core: Only execute tuning for SDR50 and SDR104
  mmc: core: Fix select power class after resume

Giuseppe CAVALLARO (2):
  mmc: sdhci: fix caps2 for HS200
  mmc: sdhci: fix ctrl_2 on super-speed selection

Guennadi Liakhovetski (7):
  mmc: sdhi/tmio: make DMA filter implementation specific
  mmc: sdhi/tmio: switch to using dmaengine_slave_config()
  mmc: sdhi/tmio: add DT DMA support
  mmc: tmio: postpone controller reset during resume
  mmc: sh_mmcif: don't clear masked interrupts
  mmc: tmio: fix unbalanced power-on calls with clock-gating enabled
  mmc: tmio: reset the controller after power-up

Heiko Stübner (3):
  mmc: dw_mmc-pltfm: remove static from dw_mci_pltfm_remove
  mmc: dw_mmc-pltfm: move probe and remove below dt match table
  mmc: dw_mmc-pltfm: add Rockchip variant

Jaehoon Chung (1):
  mmc: dw_mmc: change the macro name from DTO to DRTO

Jingoo Han (3):
  mmc: atmel-mci: add CONFIG_PM_SLEEP to suspend/resume functions
  mmc: remove unnecessary platform_set_drvdata()
  mmc: host: use platform_{get,set}_drvdata()

Joonyoung Shim (1):
  mmc: dw_mmc: clear IDSTS register when initialize IDMAC

Lars-Peter Clausen (4):
  mmc: jz4740: Use clk_prepare_enable/clk_disable_unprepare
  mmc: jz4740: Use SIMPLE_DEV_PM_OPS
  mmc: jz4740: Use slot-gpio helpers
  mmc: jz4740: Use managed resources

Lucas Stach (2):
  mmc: sdhci-esdhc: calculate sdclk divider from controller clock
  mmc: esdhc-imx: parse max-frequency from devicetree

Luciano Coelho (1):
  mmc: omap: remove unnecessary #if 0's

Maya Erez (1):
  mmc: card: Adding support for sanitize in eMMC 4.5

Nicolas Ferre (1):
  mmc: atmel-mci: remove include 

Oded Gabbay (2):
  mmc: esdhc: Add support for 8-bit bus width and non-removable card
  mmc: esdhc: Fix bug when writing to SDHCI_HOST_CONTROL register

Paul Cercueil (2):
  mmc: jz4740: Remove duplicated code.
  mmc: jz4740: Fix handling of read errors.

Paul Taysom (1):
  mmc: reordered shutdown sequence in mmc_bld_remove_req

Romain Izard (1):
  mmc: co

[GIT PULL] MMC updates for 3.10-rc1

[Chris Ball]

Hi Linus,

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.10-rc1

to receive the MMC merge for 3.10.  There are currently no conflicts,
and these patches have been tested in linux-next.  Thanks.


  The following changes since commit 908ab9368866e6edf0edebdd546adefd5f3128f9:

  ARM: dts: tegra: fix the activate polarity of cd-gpio in mmc host (2013-03-11 
14:25:10 -0600)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.10-rc1

for you to fetch changes up to e4404fab2e0b70287a471a1e760c9338ce683fde:

  mmc: sdhci-tegra: fix MODULE_DEVICE_TABLE (2013-04-23 15:05:57 -0400)


MMC highlights for 3.10:

Core:
 - Introduce MMC_CAP2_NO_PRESCAN_POWERUP to allow skipping mmc_power_up()
   at boot/initialization time if it's already happened, for performance
   (faster boot time) reasons.
 - Fix a bit width test failure that resulted in old eMMC cards being put
   into 1-bit mode when 4-bit mode was available.
 - Expose fwrev/hwrev for MMCv4 parts.
 - Improve card removal logic in the case where the card's removed slowly;
   we were missing card removal events if the card retained contact with
   the slot pads for long enough to reply to a CMD13 while being removed.

Drivers:
 - davinci_mmc: Support using PIO instead of DMA.
 - dw_mmc: Add support for Exynos4412.
 - mxcmmc: DT support, use slot-gpio API.
 - mxs-mmc: Add broken-cd/cd-inverted/non-removable DT property support.
 - sdhci-sirf: New sdhci-pltfm driver for CSR SiRF SoCs:
SiRFprimaII: unicore ARM Cortex-A9
SiRFatlas6: unicore ARM Cortex-A9
SiRFmarco: dual core ARM Cortex-A9 SMP
 - sdhci-tegra: Add support for Tegra114 platforms, use mmc_of_parse().


Aaron Lu (1):
  mmc: sdio: bind acpi with sdio function device

Adrian Hunter (3):
  Revert "mmc: core: wait while adding MMC host to ensure root mounts 
successfully"
  mmc: core: fix performance regression initializing MMC host controllers
  mmc: core: fix init controller performance regression, updated patch

Alexander Shiyan (1):
  mmc: mxcmmc: Fix bug when card is present during boot

Alexandru Gheorghiu (1):
  mmc: wmt-sdmmc: Use resource_size()

Anatolij Gustschin (5):
  mmc: mxcmmc: fix race conditions for host->req and host->data access
  mmc: mxcmmc: add mpc512x SDHC support
  mmc: mxcmmc: use slot-gpio API for write-protect detection
  mmc: mxcmmc: constify mxcmci_devtype
  mmc: mxcmmc: enable DMA support on mpc512x

Arnd Bergmann (1):
  mmc: sdhci-tegra: fix MODULE_DEVICE_TABLE

Barry Song (1):
  mmc: sdhci-sirf: add mmc host sdhci-pltfm based driver for SiRF SoCs

Bernie Thompson (1):
  mmc: core: Add in support to expose PRV for v4 MMCs

Chris Ball (2):
  Merge tag 'tegra-for-3.10-fixes-for-mmc' of 
git://git.kernel.org/.../swarren/linux-tegra into mmc-next
  mmc: sdhci: Don't ignore regulator_enable() return value

Chunhe Lan (1):
  mmc: sdhci-pltfm: Fix timeout on t4240's sdhci controller

Dongjin Kim (1):
  mmc: dw_mmc: Add MSHC compatible for Exynos4412

Hector Palacios (1):
  mmc: mxs-mmc: add broken-cd property

Hyeonsu Kim (1):
  mmc: dw_mmc: fixed a wrong UHS_REG 16 bit clear

Jaehoon Chung (2):
  mmc: dw_mmc: return the result of mmc_add_host()
  mmc: dw_mmc: control the power-enable register

James Hogan (2):
  mmc: dw_mmc: setpower on MMC_POWER_{UP,OFF}
  mmc: dw_mmc: move host->data_offset init earlier

Jan Luebbe (1):
  mmc: omap_hsmmc: support deferred probing for GPIOs

Jingoo Han (4):
  mmc: sdhci-s3c: Use devm_clk_get()
  mmc: davinci_mmc: use module_platform_driver_probe()
  mmc: mvsdio: use module_platform_driver_probe()
  mmc: sdhci-spear: add CONFIG_PM_SLEEP to suspend/resume functions

Johan Hovold (1):
  mmc: at91/avr32/atmel-mci: fix DMA-channel leak on module unload

Joseph Lo (1):
  mmc: tegra: use mmc_of_parse to get the support of standard MMC DT 
bindings

Kevin Liu (6):
  mmc: core: enhance card removal judgement for slow removal
  mmc: sdhci: add get_cd() implementation
  mmc: sdhci-pxav3: transfer sdhci_pltfm_data as args to sdhci_pltfm_init
  mmc: sdhci-pxav3: remove cd-broken quirk for permanently present card
  mmc: sdhci-pxav3: enhance device tree parser code
  mmc: sdhci-pxav3: controller should use SDCLK for timeout calculation

Kyoungil Kim (1):
  mmc: dw_mmc: empty FIFO after data transfer over interrupt in pio mode

Lars-Peter Clausen (3):
  mmc: sdhci_pltfm: Constify sdhci_pltfm_data
  mmc: sdhci-pltfm: Constify the ops field of sdhci_pltfm_data struct
  mmc: sdhci: Constify sdhci_ops structs where possible

Li Fei (1):
  mmc: core: call pm_runtime_put_noidle in pm_runtime_get_sync failed case

Manjunathappa, Prakash (1):
 

[GIT PULL] MMC updates for 3.9-rc1

[Chris Ball]

Hi Linus,

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.9-rc1

to receive the MMC merge for 3.9.  There are currently no conflicts,
and these patches have been tested in linux-next.  Thanks.


The following changes since commit 7810cc1e7721220f1ed2a23ca95113d6434f6dcd:

  digsig: Fix memory leakage in digsig_verify_rsa() (2013-02-01 15:59:33 +1100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.9-rc1

for you to fetch changes up to 0e786102949d7461859c6ce9f39c2c8d28e42db3:

  mmc: tegra: assume CONFIG_OF, remove platform data (2013-02-24 14:37:26 -0500)


MMC highlights for 3.9:

Core:
 - Support for packed commands in eMMC 4.5.  (This requires a host
   capability to be turned on.  It increases write throughput by 20%+,
   but may also increase average write latency; more testing needed.)
 - Add DT bindings for capability flags.
 - Add mmc_of_parse() for shared DT parsing between drivers.

Drivers:
 - android-goldfish: New MMC driver for the Android Goldfish emulator.
 - mvsdio: Add DT bindings, pinctrl, use slot-gpio for card detection.
 - omap_hsmmc: Fix boot hangs with RPMB partitions.
 - sdhci-bcm2835: New driver for controller used by Raspberry Pi.
 - sdhci-esdhc-imx: Add 8-bit data, auto CMD23 support, use slot-gpio.
 - sh_mmcif: Add support for eMMC DDR, bundled MMCIF IRQs.
 - tmio_mmc: Add DT bindings, support for vccq regulator.


Andy Shevchenko (1):
  mmc: sdhci: introduce sdhci_update_clock helper to re-enable clock

Balaji T K (2):
  mmc: core: expose RPMB partition only for CMD23 capable hosts
  mmc: MAINTAINERS update for omap_hsmmc

Doug Anderson (5):
  mmc: dw_mmc: Add "disable-wp" device tree property
  ARM: dts: Add disable-wp for sd card slot on smdk5250
  mmc: dw_mmc: exynos: Remove code for wp-gpios
  mmc: dw_mmc: Handle wp-gpios from device tree
  mmc: dw_mmc: Remove DW_MCI_QUIRK_NO_WRITE_PROTECT

Fabio Estevam (4):
  mmc: mxs-mmc: Add MODULE_ALIAS()
  mmc: mxs-mmc: Fix warning due to incorrect type
  mmc: sdhci-esdhc-imx: Remove unused variables
  mmc: sdhci: Fix parameter of sdhci_do_start_signal_voltage_switch()

Guennadi Liakhovetski (20):
  mmc: sh_mmcif: fix missing and consolidate IO completion timeouts
  mmc: sh_mmcif: (cosmetic) simplify boolean return blocks
  mmc: sh_mmcif: fix a race, causing an Oops on SMP
  mmc: sh_mmcif: reset error code for any opcode
  mmc: sh_mmcif: reset DMA completion immediately before starting DMA
  mmc: sh_mmcif: fix I/O errors
  mmc: sh_mmcif: simplify IRQ processing
  mmc: fix DT binding documentation SDHCI left-over
  mmc: sdhi, tmio: only check flags in tmio-mmc driver proper
  mmc: detailed definition of CD and WP MMC line polarities in DT
  mmc: provide a standard MMC device-tree binding parser centrally
  mmc: (cosmetic) remove "extern" from function declarations
  mmc: sh_mmcif: use mmc_of_parse() to parse standard MMC DT bindings
  mmc: tmio-mmc: define device-tree bindings
  mmc: tmio-mmc: parse device-tree bindings
  mmc: sh_mobile_sdhi: remove unused .pdata field
  mmc: sh_mobile_sdhi: use managed resource allocations
  mmc: tmio: remove unused and deprecated symbols
  mmc: tmio: add support for the VccQ regulator
  mmc: add DT bindings for more MMC capability flags

Jaehoon Chung (1):
  mmc: core: fix indentation

Johan Rudholm (5):
  mmc: sd: Simplify by using mmc_host_uhs
  mmc: core: Add mmc_power_cycle
  mmc: core: Add card_busy to host_ops
  mmc: core: Break out start_signal_voltage_switch
  mmc: core: Fixup signal voltage switch

Kevin Liu (6):
  mmc: sdhci: disable interrupt before free_irq
  mmc: sdhci: add IRQ wake up support
  mmc: sdhci-pxav3: add IRQ wake up support
  mmc: sdhci: update signal voltage switch code
  mmc: sdhci: enhance preset value function
  mmc: sdhci-pxav3: add pm runtime support

Konstantin Dorfman (1):
  mmc: fix async request mechanism for sequential read scenarios

Lars-Peter Clausen (1):
  mmc: sdhci-pltfm: Add a common clk API implementation of get_timeout_clock

Marek Szyprowski (2):
  mmc: use regulator_can_change_voltage() instead of 
regulator_count_voltages
  mmc: sdhci: check voltage range only on regulators aware of voltage value

Maya Erez (1):
  mmc: core: move the cache disabling operation to mmc_suspend

Mike Lockwood (1):
  mmc: goldfish: emulated MMC device

Roger Tseng (1):
  mmc: rtsx: remove driving adjustment

Roland Stigge (1):
  mmc: mmc_spi: Fix return value evaluation of irq_of_parse_and_map()

Sascha Hauer (2):
  mmc: sdhci: rename platform_8bit_width to platform_bus_width
  mmc: sdhci-esdhc-imx: supp

[GIT PULL] MMC updates for 3.8-rc1

[Chris Ball]

Hi Linus,

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.8-rc1

to receive the MMC merge for 3.8.  There are currently no conflicts,
and these patches have been tested in linux-next.  Thanks.


The following changes since commit 91ab252ac5a5c3461dd6910797611e9172626aed:

  mmc: sh-mmcif: avoid oops on spurious interrupts (second try) (2012-12-06 
13:54:35 -0500)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-updates-for-3.8-rc1

for you to fetch changes up to 71e69211eac889898dec5a21270347591eb2d001:

  mmc: sdhci: implement the .card_event() method (2012-12-07 13:56:03 -0500)


MMC highlights for 3.8:
Core:
 - Expose access to the eMMC RPMB ("Replay Protected Memory Block") area
   by extending the existing mmc_block ioctl.
 - Add SDIO powered-suspend DT properties to the core MMC DT binding.
 - Add no-1-8-v DT flag for boards where the SD controller reports that it
   supports 1.8V but the board itself has no way to switch to 1.8V.
 - More work on switching to 1.8V UHS support using a vqmmc regulator.
 - Fix up a case where the slot-gpio helper may fail to reset the host
   controller properly if a card was removed during a transfer.
 - Fix several cases where a broken device could cause an infinite loop
   while we wait for a register to update.

Drivers:
 - at91-mci: Remove obsolete driver, atmel-mci handles these devices now.
 - sdhci-dove: Allow using GPIOs for card-detect notifications.
 - sdhci-esdhc: Fix for recovering from ADMA errors on broken silicon.
 - sdhci-s3c: Add pinctrl support.
 - wmt-sdmmc: New driver for WonderMedia SD/MMC controllers.


Abhilash Kesavan (4):
  mmc: dt: Fix typo in filename
  mmc: dt: Add optional pm properties to core binding
  mmc: sdhci-pltfm: Support optional pm properties
  mmc: dw_mmc: Add sdio power bindings

Al Cooper (1):
  mmc: Limit MMC speed to 52MHz if not HS200

Andy Shevchenko (2):
  mmc: dw_mmc: use __devexit_p macro for .remove()
  mmc: dw_mmc: use helper macro module_platform_driver()

Arnd Bergmann (1):
  mmc: dw_mmc: fix more const pointer warnings

Balaji T K (4):
  mmc: omap_hsmmc: remove warning message for debounce clock
  mmc: omap_hsmmc: Fix Oops in case of data errors
  mmc: omap_hsmmc: No reset of cmd state machine for DCRC
  mmc: omap_hsmmc: Update error code for response_busy cmd

Daniel Drake (2):
  mmc: sdhci: add quirk for lack of 1.8v support
  mmc: dt: add no-1-8-v device tree flag

Daniel Mack (2):
  mmc: omap_hsmmc: claim pinctrl at probe time
  mmc: omap_hsmmc: add DT property for max bus frequency

Fabio Estevam (1):
  mmc: mxs-mmc: Remove platform data

Felipe Balbi (1):
  mmc: omap_hsmmc: Introduce omap_hsmmc_prepare/complete

Guennadi Liakhovetski (6):
  mmc: sh_mobile_sdhi: fix clock frequency printing
  mmc: sh_mobile_sdhi: remove unneeded clock connection ID
  mmc: sh_mmcif: remove unneeded clock connection ID
  mmc: add a card-event host operation
  mmc: extend the slot-gpio card-detection to use host's .card_event() 
method
  mmc: sdhci: implement the .card_event() method

Haijun Zhang (1):
  mmc: eSDHC: Recover from ADMA errors

Hebbar, Gururaja (1):
  mmc: omap_hsmmc: Enable HSPE bit for high speed cards

Jaehoon Chung (2):
  mmc: dw_mmc: relocate where dw_mci_setup_bus() is called from
  mmc: dw_mmc: remove duplicated buswidth code

Javier Martin (1):
  mmc: mxcmmc: fix SD cards not being detected sometimes.

Jerry Huang (1):
  mmc: sdhci-of-esdhc: support commands with busy response expecting TC

Johan Rudholm (1):
  mmc: core: debugfs: Add signal_voltage to ios dump

Kevin Liu (5):
  mmc: sdhci: Balance vmmc regulator_enable(), and always enable vqmmc
  mmc: sdhci-pxav3: Add base clock quirk
  mmc: host: Make UHS timing values fully unique
  mmc: sdhci: Use regulator min/max voltage range according to spec
  mmc: sdhci-pxav3: add quirks2

Kyoungil Kim (1):
  mmc: sdio: Use multiple scatter/gather list

Lee Jones (1):
  mmc: Standardise capability type

Loic Pallardy (5):
  mmc: core: Expose access to RPMB partition
  mmc: card: Do not scan RPMB partitions
  mmc: core: Extend sysfs to ext_csd parameters for RPMB support
  mmc: core: Add mmc_set_blockcount feature
  mmc: card: Add RPMB support in IOCTL interface

Ludovic Desroches (1):
  mmc: at91-mci: remove obsolete driver

Madhvapathi Sriram (1):
  mmc: sdhci-pci: Enable SDHCI_CAN_DO_HISPD for Ricoh SDHCI controller

Marina Makienko (1):
  mmc: vub300: add missing usb_put_dev

Rafael J. Wysocki (1):
  mmc: sdio: Add empty bus-level suspend/resume callbacks

Russell King (3):
  mmc: sdhci-dove: use devm_clk_get()
  mmc: sdhci-dov

Re: [GIT PULL] MMC updates for 3.7-rc1

[Vinod Koul]

On Mon, 2012-10-08 at 23:36 -0400, Chris Ball wrote:
> Hi Linus,
> 
> On Mon, Oct 08 2012, Chris Ball wrote:
> > Please pull from:
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
> > tags/mmc-merge-for-3.7-rc1
> >
> > to receive the MMC merge for 3.7.  There are currently two conflicts
> > due to header renames for the ARM single zImage work; they should be
> > resolved by taking the changes already in your tree.  Thanks.
> 
> Sorry, the merge isn't so one-sided -- here's my resolution for you to
> compare with:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
> tags/mmc-merge-for-3.7-rc1-merged
> 
> davinci_mmc.c now uses  which is provided by a commit
> in the slave-dmaengine tree, which hasn't sent in a pull request yet.
> Vinod, please can you do that soon?
...just finished sending the request.
> 
> Let me know if I should do anything else.  Thanks,
> 
> - Chris.


-- 
~Vinod

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates for 3.7-rc1

[Chris Ball]

Hi Linus,

On Mon, Oct 08 2012, Chris Ball wrote:
> Please pull from:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
> tags/mmc-merge-for-3.7-rc1
>
> to receive the MMC merge for 3.7.  There are currently two conflicts
> due to header renames for the ARM single zImage work; they should be
> resolved by taking the changes already in your tree.  Thanks.

Sorry, the merge isn't so one-sided -- here's my resolution for you to
compare with:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-merge-for-3.7-rc1-merged

davinci_mmc.c now uses  which is provided by a commit
in the slave-dmaengine tree, which hasn't sent in a pull request yet.
Vinod, please can you do that soon?

Let me know if I should do anything else.  Thanks,

- Chris.
-- 
Chris Ball  
One Laptop Per Child
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates for 3.7-rc1

[Chris Ball]

Hi Linus,

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-merge-for-3.7-rc1

to receive the MMC merge for 3.7.  There are currently two conflicts
due to header renames for the ARM single zImage work; they should be
resolved by taking the changes already in your tree.  Thanks.


The following changes since commit 75b53aee2f4fe6375c6007226bf68d75b5c4a929:

  mmc: omap: fix broken PIO mode (2012-09-04 13:58:11 -0400)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-merge-for-3.7-rc1

for you to fetch changes up to e6c085863f97f0a8f009753e1baaf83e4aac7b42:

  mmc: core: Fixup broken suspend and eMMC4.5 power off notify (2012-10-07 
17:41:45 -0400)


MMC highlights for 3.7:

Core:
 - Add DT properties for card detection (broken-cd, cd-gpios, non-removable)
 - Don't poll non-removable devices
 - Fixup/rework eMMC sleep mode/"power off notify" feature
 - Support eMMC background operations (BKOPS).  To set the one-time
   programmable fuse that enables bkops on an eMMC that doesn't already
   have it set, you can use the "mmc bkops enable" command in:
 git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git

Drivers:
 - atmel-mci, dw_mmc, pxa-mci, dove, s3c, spear: Add device tree support
 - bfin_sdh: Add support for the controller in bf60x
 - dw_mmc: Support Samsung Exynos SoCs
 - eSDHC: Add ADMA support
 - sdhci: Support testing a cd-gpio (from slot-gpio) instead of presence bit
 - sdhci-pltfm: Support broken-cd DT property
 - tegra: Convert to only supporting DT (mach-tegra has gone DT-only)


Chander Kashyap (3):
  mmc: sdhci-s3c: Enable only required bus clock
  mmc: sdhci-s3c: Fix crash on module insertion for second time
  mmc: sdhci-s3c: Add clk_(enable/disable) in runtime suspend/resume

Chao Xie (1):
  mmc: sdhci-pxav2, sdhci-pxav3: use clk_prepare/unprepare APIs

Chris Ball (6):
  mmc: dt: Add card-detection properties to core binding.
  mmc: slot-gpio: Fix missing assignment to ctx->ro_gpio
  mmc: sdhci-pxav3: dt: Support "cd-gpios" property
  mmc: dt: Support "broken-cd" property in sdhci-pltfm
  mmc: sdhci-pxav3: Use sdhci_get_of_property for parsing DT quirks
  mmc: core: Replace MMC_CAP2_BROKEN_VOLTAGE with test for fixed regulator

Daniel Mack (1):
  mmc: pxa-mci: add DT bindings

Guennadi Liakhovetski (3):
  mmc: sdhci: Test cd-gpio instead of SDHCI presence when probing
  mmc: sh-mmcif: properly handle MMC_WRITE_MULTIPLE_BLOCK completion IRQ
  mmc: sh-mmcif: avoid oops on spurious interrupts

Hein_Tibosch (2):
  mmc: atmel-mci: DMA can be used with other controllers
  mmc: atmel-mci: AP700x PDC is not connected to MCI

Jaehoon Chung (3):
  mmc: dw_mmc: fixed a section mismatch in dw_mci_init_slot
  mmc: support BKOPS feature for eMMC
  mmc: sdhci-s3c: fix the wrong number of max bus clocks

Javier Martin (1):
  mmc: mxcmmc: fix bug that may block a data transfer forever

Jerry Huang (1):
  mmc: eSDHC: Add ADMA mode support

Jingoo Han (1):
  mmc: sdhci-s3c: fix checkpatch error and warnings

Johan Rudholm (1):
  mmc: core: Do not rescan non-removable devices

Joseph Lo (1):
  mmc: tegra: convert to device tree support only

Julia Lawall (2):
  mmc: vub300: add missing usb_free_urb
  mmc: mmci: use clk_prepare_enable and clk_disable_unprepare

Kyungsik Lee (1):
  mmc: core: Remove bounce buffer in mmc_send_cxd_data()

Ludovic Desroches (1):
  mmc: atmel-mci: add device tree support

Matt Porter (1):
  mmc: davinci_mmc: convert to DMA engine API

NeilBrown (1):
  mmc: omap_hsmmc: Handle failure of regulator_get better.

Philip Rakity (2):
  mmc: sdhci: Add regulator support for vccq (voltage regualor)
  mmc: sdhci: vmmc regulator should be explicitly enabled/disabled

Sachin Kamat (4):
  mmc: mmc_spi: Use module_spi_driver
  mmc: sdhci-pci: Use module_pci_driver
  mmc: dw_mmc-pci: Use module_pci_driver
  mmc: via-sdmmc: Use module_pci_driver

Sebastian Hesselbarth (1):
  mmc: sdhci-dove: DT support for sdhci-dove

Seungwon Jeon (1):
  mmc: Revert "mmc: dw_mmc: Add check for IDMAC configuration"

Sonic Zhang (5):
  mmc: bfin_sdh: Update blackfin sd driver email in MAINTAINERS.
  mmc: bfin_sdh: limit mmc DMA segment len to 1 for bf518.
  mmc: bfin_sdh: Add support for new RSI controller in bf60x
  mmc: bfin_sdh: Remove redundant suspend and resume setting.
  mmc: bfin_sdh: Reset SD controller when resume from power saving mode.

Thierry Reding (1):
  mmc: sdio: Fix PM_SLEEP related build warnings

Thomas Abraham (10):
  mmc: dw_mmc: convert copy of struct device in struct dw_mci to a reference
  mmc: dw_mmc: Use devm_* functions in dw_mmc platform driver
  mmc: dw_mmc: allow

[GIT PULL] MMC updates for 3.6-rc1

[Chris Ball]

Hi Linus,

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-merge-for-3.6-rc1

to receive the MMC merge for 3.6.  The patches have been tested in
linux-next, and there are currently no merge conflicts.  Thanks.


The following changes since commit 623b51fc8642fd3c795fa9903be3adaa537ad9c5:

  mmc: cd-gpio: pass IRQF_ONESHOT to request_threaded_irq() (2012-07-10 
23:03:57 -0400)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
tags/mmc-merge-for-3.6-rc1

for you to fetch changes up to 30b87c60e9cbfcdfce22aa652fc1e5d061fcb733:

  mmc: sdhci-dove: Prepare for common clock framework (2012-07-22 16:42:48 
-0400)


MMC highlights for 3.6:

Core:
 - Rename cd-gpio to slot-gpio and extend it to support more
   slot GPIO functions, such as write-protect.
 - Add a function to get regulators (Vdd and Vccq) for a host.

Drivers:
 - sdhci-pxav2, sdhci-pxav3: Add device tree support.
 - sdhi: Add device tree support.
 - sh_mmcif: Add support for regulators, device tree, slot-gpio.
 - tmio: Add regulator support, use slot-gpio.


Aaron Lu (6):
  mmc: sdhci: fix incorrect command used in tuning
  mmc: sdhci: restore host settings when card is removed
  mmc: core: Simplify and fix for SD switch processing
  mmc: sdhci: Introduce new flag SDHCI_USING_RETUNING_TIMER
  mmc: sd: Fix sd current limit setting
  mmc: core: reset signal voltage on power up

Alan Cox (1):
  mmc: core: correct invalid error checking

Chris Ball (4):
  mmc: core: Export regulator_* functions as GPL
  mmc: dt: Deduplicate binding docs by referencing mmc.txt
  mmc: dt: Add reg/interrupts to mmc.txt for clarity.
  mmc: sdhci-pxa: Add device tree support

Daniel Drake (2):
  mmc: sdhci-pci: CaFe has broken card detection
  mmc: sdhci: poll for card even when card is logically unremovable

Girish K S (1):
  mmc: dw_mmc: Add check for IDMAC configuration

Guennadi Liakhovetski (26):
  mmc: tmio: use MMC opcode defines instead of numbers
  mmc: extend and rename cd-gpio helpers to handle more slot GPIO functions
  mmc: add a function to get regulators, supplying card's power
  mmc: tmio: don't needlessly enable interrupts during probing
  mmc: tmio: add callbacks to enable-update and disable the interface clock
  mmc: sdhi: implement tmio-mmc clock enable-update and disable callbacks
  mmc: tmio: add regulator support
  mmc: sdhi: do not install dummy callbacks
  mmc: tmio: remove a duplicated comment line
  mmc: sh_mmcif: simplify and use meaningful label names in error-handling
  mmc: sh_mmcif: fix clock management
  mmc: sh_mmcif: re-read the clock frequency every time it is turned on
  mmc: sh_mmcif: remove redundant .down_pwr() callback
  mmc: sh_mmcif: add regulator support
  mmc: core: use a more generic name for slot function types and fields
  mmc: add two capability flags for CD and WP signal polarity
  mmc: add CD GPIO polling support to slot functions
  mmc: core: convert slot functions to managed allocation
  mmc: core: add WP pin handler to slot functions
  mmc: tmio: support caps2 flags
  mmc: sh_mobile_sdhi: support caps2 flags
  mmc: tmio: use generic GPIO CD and WP handlers
  mmc: sdhi: add OF support, make platform data optional
  mmc: sh-mmcif: add OF support, make platform data optional
  mmc: prohibit card detection when host is not ready
  mmc: sh_mmcif: support generic card-detection

Jonathan Kliegman (1):
  mmc: dw_mmc: Fix null dma_ops access when use_dma is false

Kevin Hilman (1):
  mmc: omap_hsmmc: ensure probe returns error upon resource failure

Laurent Pinchart (2):
  mmc: sh_mmcif: Support MMC_SLEEP_AWAKE command
  mmc: tmio: Don't access hardware registers after stopping clocks

Liu Chuansheng (1):
  mmc: sdio: Change pr_warning to pr_warn_ratelimited

Marek Vasut (1):
  mmc: mxs-mmc: Add wp-inverted property

Mark Brown (1):
  mmc: sdhci: Report failure reasons for all cases in sdhci_add_host()

Nicolas Ferre (2):
  mmc: atmel-mci: fix incorrect setting of host->data to NULL
  mmc: atmel-mci: modify CLKDIV displaying in debugfs

Philip Rakity (5):
  mmc: sdhci: if MAX_CURRENT is 0, try getting current from regulator
  mmc: sdhci: only set 200mA support for 1.8v if 200mA is available
  mmc: only support voltage (vdd) that regulator agrees with
  mmc: sdhci: Allow caps[1] to be set via SDHCI_QUIRK_MISSING_CAPS
  mmc: sdhci: When a UHS switch fails, cycle power if regulator is used

Rajendra Nayak (1):
  mmc: omap_hsmmc: add clk_prepare and clk_unprepare

Sebastian Hesselbarth (2):
  mmc: sdhci-dove: Add SDHCI_QUIRK_NO_HISPD_BIT
  mmc: sdhci-dove: Prepare for common clock framework

S

[GIT PULL] MMC updates

[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:

 MAINTAINERS  |3 -
 drivers/mmc/host/Kconfig |8 +-
 drivers/mmc/host/at91_mci.c  |  114 +-
 drivers/mmc/host/ricoh_mmc.c |  162 ++---
 drivers/mmc/host/sdhci.c |   13 +++-
 drivers/mmc/host/sdhci.h |1 +
 6 files changed, 231 insertions(+), 70 deletions(-)

David Brownell (1):
  at91_mci: use generic GPIO calls

Feng Tang (1):
  sdhci: add num index for multi controllers case

Frank Seidel (1):
  mmc: extend ricoh_mmc to support Ricoh RL5c476

Philip Langdale (1):
  mmc: Handle suspend/resume in Ricoh MMC disabler

Pierre Ossman (2):
  mmc: remove sdhci and mmc_spi experimental markers
  MAINTAINERS: remove non-existant URLs



-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

On Wed, 12 Dec 2007 20:12:47 +0100
Pierre Ossman <[EMAIL PROTECTED]> wrote:

> Linus, please pull from
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus
> 

*ping*

-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[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 |   63 ++---
 drivers/mmc/host/sdhci.h |3 +-
 include/linux/mmc/host.h |4 ---
 include/linux/pci_ids.h  |1 +
 4 files changed, 61 insertions(+), 10 deletions(-)

Nicolas Pitre (1):
  mmc: remove unused 'mode' from the mmc_host structure

Pierre Ossman (4):
  sdhci: describe quirks
  sdhci: don't warn about sdhci 2.0 controllers
  sdhci: use PIO when DMA can't satisfy the request
  sdhci: support JMicron JMB38x chips

-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[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/block.c   |   22 +-
 drivers/mmc/host/tifm_sd.c |   18 +++---
 2 files changed, 20 insertions(+), 20 deletions(-)

Alex Dubov (1):
  tifm_sd: handle non-power-of-2 block sizes

David Woodhouse (1):
  mmc: Avoid re-using minor numbers before the original device is closed.

Pierre Ossman (1):
  mmc_block: check card state after write


-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Dan Williams]

On Wed, 2007-10-17 at 22:44 +0200, Pierre Ossman wrote:
> Linus, please pull from
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus
> 
> The set includes one rare memory leak and some cleanup. It also includes a 
> new frontend for the libertas driver. It is going via my tree because of 
> interdependencies between my tree and the libertas/netdev tree.
> 
>  drivers/mmc/core/mmc.c  |3 +-
>  drivers/mmc/host/at91_mci.c |4 +-
>  drivers/net/wireless/Kconfig|6 +
>  drivers/net/wireless/libertas/Makefile  |2 +
>  drivers/net/wireless/libertas/defs.h|2 +
>  drivers/net/wireless/libertas/if_sdio.c | 1072 
> +++
>  drivers/net/wireless/libertas/if_sdio.h |   45 ++

Libertas bits:

Acked-by: Dan Williams <[EMAIL PROTECTED]>

>  include/linux/mmc/sdio_ids.h|6 +
>  8 files changed, 1136 insertions(+), 4 deletions(-)
> 
> Andrew Victor (1):
>   mmc: at91_mci: cleanup: use MCI_ERRORS
> 
> Florin Malita (1):
>   mmc: possible leak in mmc_read_ext_csd
> 
> Pierre Ossman (1):
>   net: libertas sdio driver
> 
> Rgds
> 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[Pierre Ossman]

Linus, please pull from

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

The set includes one rare memory leak and some cleanup. It also includes a new 
frontend for the libertas driver. It is going via my tree because of 
interdependencies between my tree and the libertas/netdev tree.

 drivers/mmc/core/mmc.c  |3 +-
 drivers/mmc/host/at91_mci.c |4 +-
 drivers/net/wireless/Kconfig|6 +
 drivers/net/wireless/libertas/Makefile  |2 +
 drivers/net/wireless/libertas/defs.h|2 +
 drivers/net/wireless/libertas/if_sdio.c | 1072 +++
 drivers/net/wireless/libertas/if_sdio.h |   45 ++
 include/linux/mmc/sdio_ids.h|6 +
 8 files changed, 1136 insertions(+), 4 deletions(-)

Andrew Victor (1):
  mmc: at91_mci: cleanup: use MCI_ERRORS

Florin Malita (1):
  mmc: possible leak in mmc_read_ext_csd

Pierre Ossman (1):
  net: libertas sdio driver

Rgds

-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

On Fri, 12 Oct 2007 22:29:29 -0700
Randy Dunlap <[EMAIL PROTECTED]> wrote:

> 
> Patch doesn't apply cleanly due to spaces instead of tabs.
> Copy-and-paste ?
> 

Yeah, gnome-terminal damage. But you need to git it from the repo to
get the full commit info anyway.

Rgds
-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Randy Dunlap]

On Fri, 12 Oct 2007 23:00:27 +0200 Pierre Ossman wrote:

> Ok, let's see if we can finally sort this out.
> 
> Please pull/cherry-pick from:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus
> 
> to receive the following update:
> 
>  drivers/mmc/core/host.c |2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> Pierre Ossman (1):
>   mmc: use correct unregister function for led trigger
> 
> diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
> index 64fbc97..c65d203 100644
> --- a/drivers/mmc/core/host.c
> +++ b/drivers/mmc/core/host.c
> @@ -143,7 +143,7 @@ void mmc_remove_host(struct mmc_host *host)
>  
> device_del(&host->class_dev);
>  
> -   led_trigger_unregister(host->led);
> +   led_trigger_unregister_simple(host->led);
>  
> spin_lock(&mmc_host_lock);
> idr_remove(&mmc_host_idr, host->index);

Patch doesn't apply cleanly due to spaces instead of tabs.
Copy-and-paste ?

---
~Randy
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

Ok, let's see if we can finally sort this out.

Please pull/cherry-pick from:

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

to receive the following update:

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

Pierre Ossman (1):
  mmc: use correct unregister function for led trigger

diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 64fbc97..c65d203 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -143,7 +143,7 @@ void mmc_remove_host(struct mmc_host *host)
 
device_del(&host->class_dev);
 
-   led_trigger_unregister(host->led);
+   led_trigger_unregister_simple(host->led);
 
spin_lock(&mmc_host_lock);
idr_remove(&mmc_host_idr, host->index);

Rgds
-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

On Fri, 12 Oct 2007 16:05:38 -0400 (EDT)
Nicolas Pitre <[EMAIL PROTECTED]> wrote:

> 
> It is too late for a repull.  Linus' main branch already contains
> your previous incarnation, so you must publish a fix separately to go
> on top.
> 

*gnnn*


-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Nicolas Pitre]

On Fri, 12 Oct 2007, Pierre Ossman wrote:

> On Thu, 11 Oct 2007 22:30:41 -0700 (PDT)
> Linus Torvalds <[EMAIL PROTECTED]> wrote:
> 
> > 
> > There seems to be some breakage here:
> > 
> 
> Breakage repaired (and some new git voodoo learned. woot!). I even
> threw in a few randconfig for good measure. So repull and things should
> be peachy.

It is too late for a repull.  Linus' main branch already contains your 
previous incarnation, so you must publish a fix separately to go on top.


Nicolas
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

On Thu, 11 Oct 2007 22:30:41 -0700 (PDT)
Linus Torvalds <[EMAIL PROTECTED]> wrote:

> 
> There seems to be some breakage here:
> 

Breakage repaired (and some new git voodoo learned. woot!). I even
threw in a few randconfig for good measure. So repull and things should
be peachy.

-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

On Fri, 12 Oct 2007 14:18:26 +0200
"Kay Sievers" <[EMAIL PROTECTED]> wrote:

> 
> I see the same here. MMC needs a dependency on LEDS_TRIGGERS, I guess.
> 

I'd rather not, and I thought I avoided it. I must have missed
ifdef:ing some references.

-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Kay Sievers]

On 10/12/07, Pierre Ossman <[EMAIL PROTECTED]> wrote:
> On Thu, 11 Oct 2007 22:30:41 -0700 (PDT)
> Linus Torvalds <[EMAIL PROTECTED]> wrote:
>
> >
> > There seems to be some breakage here:
> >
> >   drivers/mmc/core/host.c: In function 'mmc_remove_host':
> >   drivers/mmc/core/host.c:146: error: implicit declaration of
> > function 'led_trigger_unregister' drivers/mmc/core/host.c:146: error:
> > 'struct mmc_host' has no member named 'led'
> >
> > this was after doing a few "make randconfig" runs, a habit I'm trying
> > to encourage (and do myself occasionally too).
> >
>
> How embarrassing. I'll have a look at it and reping you when I've
> solved it.

I see the same here. MMC needs a dependency on LEDS_TRIGGERS, I guess.

Kay
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

On Thu, 11 Oct 2007 22:30:41 -0700 (PDT)
Linus Torvalds <[EMAIL PROTECTED]> wrote:

> 
> There seems to be some breakage here:
> 
>   drivers/mmc/core/host.c: In function ‘mmc_remove_host’:
>   drivers/mmc/core/host.c:146: error: implicit declaration of
> function ‘led_trigger_unregister’ drivers/mmc/core/host.c:146: error:
> ‘struct mmc_host’ has no member named ‘led’
> 
> this was after doing a few "make randconfig" runs, a habit I'm trying
> to encourage (and do myself occasionally too).
> 

How embarrassing. I'll have a look at it and reping you when I've
solved it.

Rgds
-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Linus Torvalds]

On Wed, 10 Oct 2007, Pierre Ossman wrote:
>
> Linus, please pull from
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus
> 
> Lot's of changes in here.

There seems to be some breakage here:

drivers/mmc/core/host.c: In function ‘mmc_remove_host’:
drivers/mmc/core/host.c:146: error: implicit declaration of function 
‘led_trigger_unregister’
drivers/mmc/core/host.c:146: error: ‘struct mmc_host’ has no member 
named ‘led’

this was after doing a few "make randconfig" runs, a habit I'm trying to 
encourage (and do myself occasionally too).

Linus
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[Pierre Ossman]

Linus, please pull from

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

Lot's of changes in here. Mostly it is SDIO and SPI support, although there are 
things like removal of MMC layer specific error codes.

diffstat:

 MAINTAINERS |8 +-
 arch/arm/mach-imx/mx1ads.c  |2 +-
 drivers/mmc/card/Kconfig|7 +
 drivers/mmc/card/Makefile   |2 +
 drivers/mmc/card/block.c|   30 +-
 drivers/mmc/card/sdio_uart.c| 1158 
 drivers/mmc/core/Makefile   |4 +-
 drivers/mmc/core/bus.c  |   67 ++-
 drivers/mmc/core/core.c |  167 --
 drivers/mmc/core/core.h |2 +
 drivers/mmc/core/host.c |8 +
 drivers/mmc/core/mmc.c  |  134 +++--
 drivers/mmc/core/mmc_ops.c  |  200 +--
 drivers/mmc/core/mmc_ops.h  |3 +
 drivers/mmc/core/sd.c   |  126 +++--
 drivers/mmc/core/sd_ops.c   |  107 ++-
 drivers/mmc/core/sdio.c |  395 +++
 drivers/mmc/core/sdio_bus.c |  270 
 drivers/mmc/core/sdio_bus.h |   22 +
 drivers/mmc/core/sdio_cis.c |  346 ++
 drivers/mmc/core/sdio_cis.h |   23 +
 drivers/mmc/core/sdio_io.c  |  548 +++
 drivers/mmc/core/sdio_irq.c |  267 
 drivers/mmc/core/sdio_ops.c |  176 +
 drivers/mmc/core/sdio_ops.h |   22 +
 drivers/mmc/host/Kconfig|   30 +
 drivers/mmc/host/Makefile   |2 +
 drivers/mmc/host/at91_mci.c |   25 +-
 drivers/mmc/host/au1xmmc.c  |   58 +-
 drivers/mmc/host/imxmmc.c   |   32 +-
 drivers/mmc/host/mmc_spi.c  | 1408 +++
 drivers/mmc/host/mmci.c |   20 +-
 drivers/mmc/host/omap.c |   12 +-
 drivers/mmc/host/pxamci.c   |   71 ++-
 drivers/mmc/host/pxamci.h   |2 +
 drivers/mmc/host/ricoh_mmc.c|  151 +
 drivers/mmc/host/sdhci.c|  127 +++--
 drivers/mmc/host/sdhci.h|2 +-
 drivers/mmc/host/tifm_sd.c  |   31 +-
 drivers/mmc/host/wbsd.c |   43 +-
 include/asm-arm/arch-imx/mmc.h  |5 +-
 include/linux/mmc/card.h|   32 +
 include/linux/mmc/core.h|   63 ++-
 include/linux/mmc/host.h|   39 +-
 include/linux/mmc/mmc.h |   39 +-
 include/linux/mmc/sdio.h|  159 +
 include/linux/mmc/sdio_func.h   |  153 +
 include/linux/mmc/sdio_ids.h|   23 +
 include/linux/mod_devicetable.h |   11 +
 include/linux/pci_ids.h |2 +
 include/linux/spi/mmc_spi.h |   33 +
 scripts/mod/file2alias.c|   20 +
 52 files changed, 6257 insertions(+), 430 deletions(-)

Adrian Bunk (1):
  make struct sdio_dev_attrs[] static

Bridge Wu (3):
  mmc: pxamci: better pending IRQ determination
  mmc: pxamci: set proper buswidth capabilities according to PXA flavor
  mmc: pxamci: add SDIO card interrupt reporting capability

David Brownell (4):
  MMC headers learn about SPI
  MMC/SD card driver learns SPI
  MMC core learns about SPI
  mmc_spi host driver

David Vrabel (4):
  sdio: add SDIO_FBR_BASE(f) macro
  sdio: set the functions' block size
  sdio: extend sdio_readsb() and friends to handle any length of buffer
  sdio: add sdio_f0_readb() and sdio_f0_writeb()

Feng Tang (2):
  sdhci: remove DMA capability check from controller's PCI Class reg
  sdhci: add SDHCI_QUIRK_BROKEN_DMA quirk

Marc Pignat (1):
  mmc: at91_mci: disable handling of blocks with size not multiple of 4 
bytes

Mariusz Kozlowski (1):
  sdio: kmalloc + memset conversion to kzalloc

Nicolas Pitre (16):
  sdio: initial CIS parsing code
  sdio: link unknown CIS tuples to the sdio_func structure
  mmc: initialize mmc subsystem with subsys_initcall()
  sdio: defines for some standard interface types
  sdio: allow for mmc_claim_host to be aborted
  sdio: core support for SDIO function interrupt
  sdio: UART/GPS driver
  sdio: add /proc interface to sdio_uart driver
  sdio: add interface for host side SDIO interrupt reporting
  sdio: add default c_ispeed/c_ospeed values to sdio_uart driver
  sdio: fix recursion issues between sdio-uart driver and tty layer
  mmc: pxamci: set proper block capabilities according to PXA flavor
  sdhci: fix a typo
  sdio: fix IRQ diagnostic message
  sdio: make the IRQ thread more resilient in the presence of bad states
  pxamci: support arbitrary block size

Pavel Pisa (1):
  arm: i.MX/MX1 SDHC implements SD cards read-only switch read-back

Philip Langdale (1):
  mmc: Disabler for Ricoh MMC controller

Pierre Ossman (32):
  mmc: remove custom error codes
  mmc: improve error code feedback
  mmc: read ext_csd version number
  mmc: mmc_set_data_timeout() parameter write is redundant
  mmc: remove BYTEBLOCK capability
  mmc: remove confusing flag
  mmc: add missing printk levels
  mmc: detect SDIO card

[GIT PULL] MMC updates

[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/at91_mci.c |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Anti Sullin (1):
  bug in AT91 MCI suspend routines

diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index bfebd2f..955ea60 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -941,7 +941,7 @@ static int __exit at91_mci_remove(struct platform_device 
*pdev)
 
host = mmc_priv(mmc);
 
-   if (host->present != -1) {
+   if (host->board->det_pin) {
device_init_wakeup(&pdev->dev, 0);
free_irq(host->board->det_pin, host);
cancel_delayed_work(&host->mmc->detect);
@@ -972,7 +972,7 @@ static int at91_mci_suspend(struct platform_device *pdev, 
pm_message_t state)
struct at91mci_host *host = mmc_priv(mmc);
int ret = 0;
 
-   if (device_may_wakeup(&pdev->dev))
+   if (host->board->det_pin && device_may_wakeup(&pdev->dev))
enable_irq_wake(host->board->det_pin);
 
if (mmc)
@@ -987,7 +987,7 @@ static int at91_mci_resume(struct platform_device *pdev)
struct at91mci_host *host = mmc_priv(mmc);
int ret = 0;
 
-   if (device_may_wakeup(&pdev->dev))
+   if (host->board->det_pin && device_may_wakeup(&pdev->dev))
disable_irq_wake(host->board->det_pin);
 
if (mmc)


-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[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/core/bus.c   |4 +--
 drivers/mmc/core/host.c  |4 +--
 drivers/mmc/host/sdhci.c |   53 -
 drivers/mmc/host/sdhci.h |1 +
 4 files changed, 36 insertions(+), 26 deletions(-)

David Vrabel (1):
  mmc: ignore bad max block size in sdhci

Mariusz Kozlowski (2):
  drivers/mmc/core/bus.c: kmalloc + memset conversion to kzalloc
  drivers/mmc/core/host.c: kmalloc + memset conversion to kzalloc

Pierre Ossman (3):
  sdhci: be more cautious about block count register
  sdhci: handle data interrupts during command
  sdhci: tell which spurious interrupt we got

Rgds
-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[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/queue.c|   14 +++---
 drivers/mmc/host/at91_mci.c |8 
 drivers/mmc/host/wbsd.c |   10 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

Gabriel C (1):
  wbsd: fix section mismatch warnings

Nicolas Ferre (1):
  mmc: at91_mci: remove whitespace at the end of lines

Pierre Ossman (1):
  mmc: reorganize bounce buffer init

-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[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/queue.c|2 +-
 drivers/mmc/core/bus.c  |   23 +++
 drivers/mmc/core/core.c |  144 ++-
 drivers/mmc/core/core.h |   22 ---
 drivers/mmc/core/host.c |7 ++-
 drivers/mmc/core/mmc.c  |   26 +---
 drivers/mmc/core/mmc_ops.c  |2 +-
 drivers/mmc/core/mmc_ops.h  |2 +-
 drivers/mmc/core/sd.c   |   36 ++-
 drivers/mmc/core/sd_ops.c   |   62 +-
 drivers/mmc/core/sd_ops.h   |3 +-
 drivers/mmc/host/at91_mci.c |2 +-
 drivers/mmc/host/au1xmmc.c  |2 +-
 drivers/mmc/host/imxmmc.c   |2 +-
 drivers/mmc/host/mmci.c |2 +-
 drivers/mmc/host/mmci.h |2 +-
 drivers/mmc/host/omap.c |2 +-
 drivers/mmc/host/pxamci.c   |2 +-
 drivers/mmc/host/sdhci.c|   63 +++
 drivers/mmc/host/sdhci.h|2 +-
 drivers/mmc/host/wbsd.c |   15 +
 drivers/mmc/host/wbsd.h |2 +-
 include/linux/mmc/core.h|2 +-
 include/linux/pci_ids.h |2 +
 24 files changed, 253 insertions(+), 176 deletions(-)

Adrian Bunk (1):
  drivers/mmc/core/: make 3 functions static

Leandro Dorileo (1):
  sdhci: add support to ENE-CB714

Pierre Ossman (9):
  mmc: check error bits before command completion
  mmc: update header file paths
  mmc: update kerneldoc
  mmc: add a might_sleep() to mmc_claim_host()
  mmc: Don't hold lock when releasing an added card
  mmc: be more verbose about card insertions/removal
  mmc: proper debugging output in core
  mmc: remove redundant debug information from sdhci and wbsd
  mmc: add missing printk levels

-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[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:

 MAINTAINERS |7 ++-
 drivers/mmc/host/at91_mci.c |   13 -
 drivers/mmc/host/sdhci.c|2 ++
 drivers/mmc/host/sdhci.h|1 +
 4 files changed, 21 insertions(+), 2 deletions(-)

Marc Pignat (1):
  mmc: at91_mci: wakeup on card insertion (or removal)

Pierre Ossman (2):
  mmc: add maintainer for at91
  sdhci: make sure to clear the error interrupt

diff --git a/MAINTAINERS b/MAINTAINERS
index fbe0dca..c9fab2b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -645,7 +645,12 @@ W: http://linux-atm.sourceforge.net
 S: Maintained
 
 ATMEL AT91 MCI DRIVER
-S: Orphan
+P: Nicolas Ferre
+M: [EMAIL PROTECTED]
+L: [EMAIL PROTECTED] (subscribers-only)
+W: http://www.atmel.com/products/AT91/
+W: http://www.at91.com/
+S: Maintained
 
 ATMEL MACB ETHERNET DRIVER
 P: Haavard Skinnemoen
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index 28c8818..15aab37 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -903,8 +903,10 @@ static int __init at91_mci_probe(struct platform_device 
*pdev)
/*
 * Add host to MMC layer
 */
-   if (host->board->det_pin)
+   if (host->board->det_pin) {
host->present = !at91_get_gpio_value(host->board->det_pin);
+   device_init_wakeup(&pdev->dev, 1);
+   }
else
host->present = -1;
 
@@ -940,6 +942,7 @@ static int __exit at91_mci_remove(struct platform_device 
*pdev)
host = mmc_priv(mmc);
 
if (host->present != -1) {
+   device_init_wakeup(&pdev->dev, 0);
free_irq(host->board->det_pin, host);
cancel_delayed_work(&host->mmc->detect);
}
@@ -966,8 +969,12 @@ static int __exit at91_mci_remove(struct platform_device 
*pdev)
 static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state)
 {
struct mmc_host *mmc = platform_get_drvdata(pdev);
+   struct at91mci_host *host = mmc_priv(mmc);
int ret = 0;
 
+   if (device_may_wakeup(&pdev->dev))
+   enable_irq_wake(host->board->det_pin);
+
if (mmc)
ret = mmc_suspend_host(mmc, state);
 
@@ -977,8 +984,12 @@ static int at91_mci_suspend(struct platform_device *pdev, 
pm_message_t state)
 static int at91_mci_resume(struct platform_device *pdev)
 {
struct mmc_host *mmc = platform_get_drvdata(pdev);
+   struct at91mci_host *host = mmc_priv(mmc);
int ret = 0;
 
+   if (device_may_wakeup(&pdev->dev))
+   disable_irq_wake(host->board->det_pin);
+
if (mmc)
ret = mmc_resume_host(mmc);
 
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 10d15c3..4a24db0 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1024,6 +1024,8 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
 
intmask &= ~(SDHCI_INT_CMD_MASK | SDHCI_INT_DATA_MASK);
 
+   intmask &= ~SDHCI_INT_ERROR;
+
if (intmask & SDHCI_INT_BUS_POWER) {
printk(KERN_ERR "%s: Card is consuming too much power!\n",
mmc_hostname(host->mmc));
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 7400f4b..a6c8704 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -107,6 +107,7 @@
 #define  SDHCI_INT_CARD_INSERT 0x0040
 #define  SDHCI_INT_CARD_REMOVE 0x0080
 #define  SDHCI_INT_CARD_INT0x0100
+#define  SDHCI_INT_ERROR   0x8000
 #define  SDHCI_INT_TIMEOUT 0x0001
 #define  SDHCI_INT_CRC 0x0002
 #define  SDHCI_INT_END_BIT 0x0004


-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[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/Kconfig|   18 +++
 drivers/mmc/card/block.c|7 +-
 drivers/mmc/card/queue.c|  191 ++--
 drivers/mmc/card/queue.h|7 +
 drivers/mmc/core/Makefile   |3 +-
 drivers/mmc/core/bus.c  |  253 +++
 drivers/mmc/core/bus.h  |   22 +++
 drivers/mmc/core/core.c |  147 +++
 drivers/mmc/core/core.h |8 +-
 drivers/mmc/core/host.c |  156 +++
 drivers/mmc/core/host.h |   18 +++
 drivers/mmc/core/mmc.c  |   65 +++-
 drivers/mmc/core/sd.c   |   63 +++-
 drivers/mmc/core/sysfs.c|  347 ++-
 drivers/mmc/core/sysfs.h|   19 +--
 drivers/mmc/host/at91_mci.c |  217 +++-
 drivers/mmc/host/sdhci.c|   10 +-
 include/linux/pci_ids.h |1 +
 18 files changed, 980 insertions(+), 572 deletions(-)

Milko Krachounov (1):
  sdhci: add ene controller id

Nicolas Ferre (2):
  mmc: at91_mci typo
  mmc: at91_mci: fix hanging and rework to match flowcharts

Pierre Ossman (5):
  mmc: bounce requests for simple hosts
  mmc: refactor bus operations
  mmc: refactor host class handling
  mmc: move layer init and workqueue to core file
  mmc: fix silly copy-and-paste error

Rolf Eike Beer (1):
  sdhci: Fix "Unexpected interrupt" handling

Rgds
-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[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/core/sd.c   |   15 +++
 drivers/mmc/host/omap.c |   24 +++-
 2 files changed, 18 insertions(+), 21 deletions(-)

Pierre Ossman (1):
  mmc: get back read-only switch function

Ragner Magalhaes (1):
  mmc-omap: fix sd response type 6 vs. 1

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 41bfb5d..918477c 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -427,6 +427,21 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
mmc_set_bus_width(host, MMC_BUS_WIDTH_4);
}

+   /*
+* Check if read-only switch is active.
+*/
+   if (!oldcard) {
+   if (!host->ops->get_ro) {
+   printk(KERN_WARNING "%s: host does not "
+   "support reading read-only "
+   "switch. assuming write-enable.\n",
+   mmc_hostname(host));
+   } else {
+   if (host->ops->get_ro(host))
+   mmc_card_set_readonly(card);
+   }
+   }
+
if (!oldcard)
host->card = card;

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 1914e65..b0824a3 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -522,28 +522,10 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
}

if (status & OMAP_MMC_STAT_CARD_ERR) {
-   if (host->cmd && host->cmd->opcode ==
MMC_STOP_TRANSMISSION) {
-   u32 response = OMAP_MMC_READ(host, RSP6)
-   | (OMAP_MMC_READ(host, RSP7) << 16);
-   /* STOP sometimes sets must-ignore bits */
-   if (!(response & (R1_CC_ERROR
-   | 
R1_ILLEGAL_COMMAND
-   |
R1_COM_CRC_ERROR))) {
-   end_command = 1;
-   continue;
-   }
-   }
-
-   dev_dbg(mmc_dev(host->mmc), "card status error 
(CMD%d)\n",
+   dev_dbg(mmc_dev(host->mmc),
+   "ignoring card status error (CMD%d)\n",
host->cmd->opcode);
-   if (host->cmd) {
-   host->cmd->error = MMC_ERR_FAILED;
-   end_command = 1;
-   }
-   if (host->data) {
-   host->data->error = MMC_ERR_FAILED;
-   transfer_error = 1;
-   }
+   end_command = 1;
}

/*

-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[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/core/sd.c   |   26 +-
 drivers/mmc/host/at91_mci.c |5 ++---
 drivers/mmc/host/au1xmmc.c  |3 +--
 3 files changed, 24 insertions(+), 10 deletions(-)

Marc Pignat (1):
  mmc-atmel: remove linux/mmc/protocol.h dependencies

Pierre Ossman (2):
  mmc: fix broken if clause
  mmc: don't call switch on old cards

Robert P. J. Day (1):
  au1xmmc: Replace C code with call to ARRAY_SIZE() macro.


-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[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:

 MAINTAINERS  |   29 +
 drivers/mmc/card/block.c |   18 --
 drivers/mmc/card/queue.c |   35 ---
 drivers/mmc/card/queue.h |8 
 4 files changed, 37 insertions(+), 53 deletions(-)

Pavel Pisa (1):
  mmc: add maintainer for iMX MMC interface

Pierre Ossman (2):
  mmc: clean up unused parts of block driver
  mmc: mark unmaintained drivers

Russell King (1):
  mmc: add maintainer for ARM Primecell controller

Syed Khasim (1):
  mmc: Add maintainers for TI OMAP MMC interface


-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[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/block.c   |   17 -
 drivers/mmc/host/au1xmmc.c |   35 ++-
 drivers/mmc/host/pxamci.c  |   18 ++
 drivers/mmc/host/sdhci.c   |9 +
 include/linux/major.h  |2 ++
 5 files changed, 35 insertions(+), 46 deletions(-)

Nicolas Pitre (1):
  pxamci: fix PXA27x MMC workaround for bad CRC with 136 bit response

Pierre Ossman (2):
  sdhci: handle dma boundary interrupts
  mmc: use assigned major for block device

Yoichi Yuasa (1):
  mmc: au1xmmc command types check from data flags


-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Nicolas Pitre]

On Sat, 12 May 2007, Russell King wrote:

> First submitted on 22 November 2004 by Nicolas.  Went through a couple
> of revisions until 2271/3 which was committed on 27 November 2004.  No
> indication that the code was done by anyone other than Nicolas, though
> maybe Nico didn't add appropriate creditation to the real authors.
> Slap Wrist if we're missing the proper creditation!

Whatever happened, I certainly knew nothing about MMC back then, and I 
did a less than appropriate job at reviewing the patch.

I'm getting far more involved with MMC/SD/SDIO now so this issue will 
get properly resolved.


Nicolas
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Russell King]

On Sat, May 12, 2007 at 06:12:27PM +0200, Pierre Ossman wrote:
> Nicolas Pitre wrote:
> > Actually, I'm not the author of this workaround.  And looking at it 
> > closer, the current workaround is utterly buggy as it completely inhibit 
> > CRC error reporting for everything but the listed commands when the MSB 
> > of the response is a zero.
> >
> >   
> 
> Your name popped up on the commit for this, but as that was during the
> bk days the information was severely lacking.

That's not correct.  Just as today, it's entirely trackable.  We've had
the sign-off thing for quite a long time, and we've also had the ARM
patch system for ages.  That's what the "2271/3" number means.

http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=2271%2F1
http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=2271%2F3

First submitted on 22 November 2004 by Nicolas.  Went through a couple
of revisions until 2271/3 which was committed on 27 November 2004.  No
indication that the code was done by anyone other than Nicolas, though
maybe Nico didn't add appropriate creditation to the real authors.
Slap Wrist if we're missing the proper creditation!

-- 
Russell King
 Linux kernel2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

Nicolas Pitre wrote:
> Actually, I'm not the author of this workaround.  And looking at it 
> closer, the current workaround is utterly buggy as it completely inhibit 
> CRC error reporting for everything but the listed commands when the MSB 
> of the response is a zero.
>
>   

Your name popped up on the commit for this, but as that was during the
bk days the information was severely lacking.

> Please apply the following patch.  It is compile tested only as I don't 
> have PXA27x hardware with MMC at the moment, but it just cannot be worse 
> than the current code even when it was compiling.
>
>   

I would think that it would be better to look at just MMC_RSP_136 and
MMC_RSP_CRC in case we get future variations.

Rgds

-- 
 -- Pierre Ossman

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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Nicolas Pitre]

On Thu, 10 May 2007, Nicolas Pitre wrote:

> On Thu, 10 May 2007, Pierre Ossman wrote:
> 
> > You seem to be the source of this workaround, and also the maintainer of
> > PXA.
> 
> Well... I used to.

Actually, I'm not the author of this workaround.  And looking at it 
closer, the current workaround is utterly buggy as it completely inhibit 
CRC error reporting for everything but the listed commands when the MSB 
of the response is a zero.

> But the only MMC capable PXA hardware in working conditions I have 
> access to at the moment is PXA255 based which doesn't suffer from this 
> erratum.
> 
> > Pierre Ossman wrote:
> > > I've read through the erratum, and to me it seems like the bug affects
> > > all long replies, not just these codes. So I think the code should be
> > > fixed to look at the response flag, not the opcode.

Indeed.

Please apply the following patch.  It is compile tested only as I don't 
have PXA27x hardware with MMC at the moment, but it just cannot be worse 
than the current code even when it was compiling.

- >8
Subject: fix PXA27x MMC workaround for bad CRC on R2 response erratum

... and make it depend on the response flag rather than the command type.

Signed-off-by: Nicolas Pitre <[EMAIL PROTECTED]>
---
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index d97d386..8240609 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -232,20 +232,15 @@ static int pxamci_cmd_done(struct pxamci_host *host, 
unsigned int stat)
/*
 * workaround for erratum #42:
 * Intel PXA27x Family Processor Specification Update Rev 001
+* A bogus CRC error can appear if the msb of a R2 response
+* is a one.
 */
-   if (cmd->opcode == MMC_ALL_SEND_CID ||
-   cmd->opcode == MMC_SEND_CSD ||
-   cmd->opcode == MMC_SEND_CID) {
-   /* a bogus CRC error can appear if the msb of
-  the 15 byte response is a one */
-   if ((cmd->resp[0] & 0x8000) == 0)
-   cmd->error = MMC_ERR_BADCRC;
-   } else {
-   pr_debug("ignoring CRC from command %d - 
*risky*\n",cmd->opcode);
-   }
-#else
-   cmd->error = MMC_ERR_BADCRC;
+   if (RSP_TYPE(mmc_resp_type(cmd)) == RSP_TYPE(MMC_RSP_R2) &&
+   (cmd->resp[0] & 0x8000)) {
+   pr_debug("ignoring CRC from command %d - *risky*\n", 
cmd->opcode);
+   } else
 #endif
+   cmd->error = MMC_ERR_BADCRC;
}
 
pxamci_disable_irq(host, END_CMD_RES);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Nicolas Pitre]

On Thu, 10 May 2007, Pierre Ossman wrote:

> You seem to be the source of this workaround, and also the maintainer of
> PXA.

Well... I used to.

But the only MMC capable PXA hardware in working conditions I have 
access to at the moment is PXA255 based which doesn't suffer from this 
erratum.

> Pierre Ossman wrote:
> > Russell King wrote:
> >   
> >> See the comments immediately above and below its use.
> >>
> >> Welcome to buggy hardware.
> >>
> >>   
> >> 
> >
> > I've read through the erratum, and to me it seems like the bug affects
> > all long replies, not just these codes. So I think the code should be
> > fixed to look at the response flag, not the opcode.
> >
> > Do you have hardware so that you can test such a change?
> >
> >   
> 
> I guess the same question goes to you. :)

People in better position than I currently do to test a fix are most 
likely to be found on lak.


Nicolas
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

Hi Nicolas,

You seem to be the source of this workaround, and also the maintainer of
PXA. So I guess this falls into your lap either way. Highlights from my
discussion with Russell:

Pierre Ossman wrote:
> Russell King wrote:
>   
>> > Dug out from the ARM kautobuild...
>> >
>> > drivers/mmc/host/pxamci.c: In function 'pxamci_cmd_done':
>> > drivers/mmc/host/pxamci.c:236: error: 'MMC_ALL_SEND_CID' undeclared (first 
>> > use in this function)
>> > drivers/mmc/host/pxamci.c:236: error: (Each undeclared identifier is 
>> > reported only once
>> > drivers/mmc/host/pxamci.c:236: error: for each function it appears in.)
>> > drivers/mmc/host/pxamci.c:237: error: 'MMC_SEND_CSD' undeclared (first use 
>> > in this function)
>> > drivers/mmc/host/pxamci.c:238: error: 'MMC_SEND_CID' undeclared (first use 
>> > in this function)
>> >
>> >   
>> 
>
> What are opcode defines doing in the driver?

Pierre Ossman wrote:
> Russell King wrote:
>   
>> See the comments immediately above and below its use.
>>
>> Welcome to buggy hardware.
>>
>>   
>> 
>
> I've read through the erratum, and to me it seems like the bug affects
> all long replies, not just these codes. So I think the code should be
> fixed to look at the response flag, not the opcode.
>
> Do you have hardware so that you can test such a change?
>
>   

I guess the same question goes to you. :)

Rgds

-- 
 -- Pierre Ossman

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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Russell King]

On Thu, May 10, 2007 at 07:44:02AM +0200, Pierre Ossman wrote:
> Russell King wrote:
> > See the comments immediately above and below its use.
> >
> > Welcome to buggy hardware.
> 
> I've read through the erratum, and to me it seems like the bug affects
> all long replies, not just these codes. So I think the code should be
> fixed to look at the response flag, not the opcode.
> 
> Do you have hardware so that you can test such a change?

Nope.  Suggest checking the git logs and contacting those who authored
the change.

-- 
Russell King
 Linux kernel2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

Russell King wrote:
> See the comments immediately above and below its use.
>
> Welcome to buggy hardware.
>
>   

I've read through the erratum, and to me it seems like the bug affects
all long replies, not just these codes. So I think the code should be
fixed to look at the response flag, not the opcode.

Do you have hardware so that you can test such a change?

-- 
 -- Pierre Ossman

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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Russell King]

On Wed, May 09, 2007 at 09:06:29PM +0200, Pierre Ossman wrote:
> Russell King wrote:
> > Dug out from the ARM kautobuild...
> >
> > drivers/mmc/host/pxamci.c: In function 'pxamci_cmd_done':
> > drivers/mmc/host/pxamci.c:236: error: 'MMC_ALL_SEND_CID' undeclared (first 
> > use in this function)
> > drivers/mmc/host/pxamci.c:236: error: (Each undeclared identifier is 
> > reported only once
> > drivers/mmc/host/pxamci.c:236: error: for each function it appears in.)
> > drivers/mmc/host/pxamci.c:237: error: 'MMC_SEND_CSD' undeclared (first use 
> > in this function)
> > drivers/mmc/host/pxamci.c:238: error: 'MMC_SEND_CID' undeclared (first use 
> > in this function)
> >
> >   
> 
> What are opcode defines doing in the driver?

See the comments immediately above and below its use.

Welcome to buggy hardware.

-- 
Russell King
 Linux kernel2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

Russell King wrote:
> Dug out from the ARM kautobuild...
>
> drivers/mmc/host/pxamci.c: In function 'pxamci_cmd_done':
> drivers/mmc/host/pxamci.c:236: error: 'MMC_ALL_SEND_CID' undeclared (first 
> use in this function)
> drivers/mmc/host/pxamci.c:236: error: (Each undeclared identifier is reported 
> only once
> drivers/mmc/host/pxamci.c:236: error: for each function it appears in.)
> drivers/mmc/host/pxamci.c:237: error: 'MMC_SEND_CSD' undeclared (first use in 
> this function)
> drivers/mmc/host/pxamci.c:238: error: 'MMC_SEND_CID' undeclared (first use in 
> this function)
>
>   

What are opcode defines doing in the driver?

-- 
 -- Pierre Ossman

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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Russell King]

On Tue, May 01, 2007 at 05:22:00PM +0200, Pierre Ossman wrote:
> Linus, please pull from
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus
> 
> to receive the following updates:

Dug out from the ARM kautobuild...

drivers/mmc/host/pxamci.c: In function 'pxamci_cmd_done':
drivers/mmc/host/pxamci.c:236: error: 'MMC_ALL_SEND_CID' undeclared (first use 
in this function)
drivers/mmc/host/pxamci.c:236: error: (Each undeclared identifier is reported 
only once
drivers/mmc/host/pxamci.c:236: error: for each function it appears in.)
drivers/mmc/host/pxamci.c:237: error: 'MMC_SEND_CSD' undeclared (first use in 
this function)
drivers/mmc/host/pxamci.c:238: error: 'MMC_SEND_CID' undeclared (first use in 
this function)

-- 
Russell King
 Linux kernel2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

Stefan Richter wrote:
> Sounds to me like either struct xyz_host { atomic_t removed; } would do
> the job, or that actually wider regions of mmc_host_remove() and
> mmc_detect_change() need to be serialized.
>   

AFAIK, an atomic_t doesn't guarantee any ordering, just atomicity. So an
atomic_t with a barrier would be sufficient. But barriers are mostly
voodoo that few people understand ;)

-- 
 -- Pierre Ossman

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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Stefan Richter]

Pierre Ossman wrote:
> The host->removed member is only used for this simple test. It is set in
> mmc_host_remove() to indicate that the removal process has begun. At
> this point it is invalid to call mmc_detect_change() (the place this
> patch fixes). So the spinlocks are mostly there so that things are
> properly ordered when we go SMP. Some creative barriers would probably
> work as well, but I find spinlocks more "normal" and hence more readable.

Sounds to me like either struct xyz_host { atomic_t removed; } would do
the job, or that actually wider regions of mmc_host_remove() and
mmc_detect_change() need to be serialized.
-- 
Stefan Richter
-=-=-=== -=-= -=--=
http://arcgraph.de/sr/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Nick Piggin]

Pierre Ossman wrote:

Nick Piggin wrote:


If you want to ensure you always only modify host->removed from under
the spinlock, it would be enforcable by introducing an accessor function
and doing a BUG_ON(!spin_is_locked()) in there.

If you just want to ensure that host->removed is 0 at this point, you
shouldn't need any spinlocks AFAIKS... that way you can probably afford
to move it out from CONFIG_MMC_DEBUG and get wider testing.




The host->removed member is only used for this simple test. It is set in
mmc_host_remove() to indicate that the removal process has begun. At
this point it is invalid to call mmc_detect_change() (the place this
patch fixes). So the spinlocks are mostly there so that things are
properly ordered when we go SMP. Some creative barriers would probably
work as well, but I find spinlocks more "normal" and hence more readable.


Fair enough. No big deal :)

--
SUSE Labs, Novell Inc.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

Nick Piggin wrote:
>
> If you want to ensure you always only modify host->removed from under
> the spinlock, it would be enforcable by introducing an accessor function
> and doing a BUG_ON(!spin_is_locked()) in there.
>
> If you just want to ensure that host->removed is 0 at this point, you
> shouldn't need any spinlocks AFAIKS... that way you can probably afford
> to move it out from CONFIG_MMC_DEBUG and get wider testing.
>

The host->removed member is only used for this simple test. It is set in
mmc_host_remove() to indicate that the removal process has begun. At
this point it is invalid to call mmc_detect_change() (the place this
patch fixes). So the spinlocks are mostly there so that things are
properly ordered when we go SMP. Some creative barriers would probably
work as well, but I find spinlocks more "normal" and hence more readable.

Rgds

-- 
 -- Pierre Ossman

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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Nick Piggin]

Pierre Ossman wrote:

Nick Piggin wrote:


@@ -501,9 +501,9 @@ void mmc_detect_change(struct mmc_host *host,
unsigned long delay)
{
#ifdef CONFIG_MMC_DEBUG
unsigned long flags;
-spin_lock_irqsave(host->lock, flags);
+spin_lock_irqsave(&host->lock, flags);
BUG_ON(host->removed);
-spin_unlock_irqrestore(host->lock, flags);
+spin_unlock_irqrestore(&host->lock, flags);
#endif


Do you actually need the lock there at all? What is it protecting?




It makes sure we don't have any race when it comes to modifying
host->removed.


If you want to ensure you always only modify host->removed from under
the spinlock, it would be enforcable by introducing an accessor function
and doing a BUG_ON(!spin_is_locked()) in there.

If you just want to ensure that host->removed is 0 at this point, you
shouldn't need any spinlocks AFAIKS... that way you can probably afford
to move it out from CONFIG_MMC_DEBUG and get wider testing.

--
SUSE Labs, Novell Inc.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

Nick Piggin wrote:
>> @@ -501,9 +501,9 @@ void mmc_detect_change(struct mmc_host *host,
>> unsigned long delay)
>>  {
>>  #ifdef CONFIG_MMC_DEBUG
>>  unsigned long flags;
>> -spin_lock_irqsave(host->lock, flags);
>> +spin_lock_irqsave(&host->lock, flags);
>>  BUG_ON(host->removed);
>> -spin_unlock_irqrestore(host->lock, flags);
>> +spin_unlock_irqrestore(&host->lock, flags);
>>  #endif
>
> Do you actually need the lock there at all? What is it protecting?
>

It makes sure we don't have any race when it comes to modifying
host->removed. We had some problems where controllers reported card
insertion events even after they'd signaled to be removed, causing all
kind of odd problems. This check was added to easier spot it should it
arise again.

Rgds

-- 
 -- Pierre Ossman

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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Nick Piggin]

Pierre Ossman wrote:

Pierre Ossman wrote:


Linus, please pull from

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




fsck! I pushed the wrong branch :/

This fix should have been in the last commit.

Sorry,




commit 3b9a6d78eb439016728c598a1373b50328f5e9fe
Author: Pierre Ossman <[EMAIL PROTECTED]>
Date:   Wed May 9 07:53:28 2007 +0200

mmc: fix wrong call to spinlock

Fix silly typo in spinlock calls.

Signed-off-by: Pierre Ossman <[EMAIL PROTECTED]>


diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index b6c1670..7385acf 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -501,9 +501,9 @@ void mmc_detect_change(struct mmc_host *host, unsigned long 
delay)
 {
 #ifdef CONFIG_MMC_DEBUG
unsigned long flags;
-   spin_lock_irqsave(host->lock, flags);
+   spin_lock_irqsave(&host->lock, flags);
BUG_ON(host->removed);
-   spin_unlock_irqrestore(host->lock, flags);
+   spin_unlock_irqrestore(&host->lock, flags);
 #endif


Do you actually need the lock there at all? What is it protecting?

--
SUSE Labs, Novell Inc.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

Pierre Ossman wrote:
> Linus, please pull from
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus
> 

fsck! I pushed the wrong branch :/

This fix should have been in the last commit.

Sorry,
-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
commit 3b9a6d78eb439016728c598a1373b50328f5e9fe
Author: Pierre Ossman <[EMAIL PROTECTED]>
Date:   Wed May 9 07:53:28 2007 +0200

mmc: fix wrong call to spinlock

Fix silly typo in spinlock calls.

Signed-off-by: Pierre Ossman <[EMAIL PROTECTED]>

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index b6c1670..7385acf 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -501,9 +501,9 @@ void mmc_detect_change(struct mmc_host *host, unsigned long delay)
 {
 #ifdef CONFIG_MMC_DEBUG
 	unsigned long flags;
-	spin_lock_irqsave(host->lock, flags);
+	spin_lock_irqsave(&host->lock, flags);
 	BUG_ON(host->removed);
-	spin_unlock_irqrestore(host->lock, flags);
+	spin_unlock_irqrestore(&host->lock, flags);
 #endif
 
 	mmc_schedule_delayed_work(&host->detect, delay);

[GIT PULL] MMC updates

[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/misc/tifm_7xx1.c   |   27 ---
 drivers/mmc/Kconfig|   10 +-
 drivers/mmc/card/Kconfig   |3 +--
 drivers/mmc/core/Kconfig   |1 -
 drivers/mmc/core/core.c|   10 ++
 drivers/mmc/host/Kconfig   |   19 +--
 drivers/mmc/host/tifm_sd.c |   13 +
 include/linux/tifm.h   |1 +
 8 files changed, 47 insertions(+), 37 deletions(-)

Alex Dubov (1):
  disable socket power in adapter driver instead of media one

Jan Engelhardt (1):
  mmc: Use menuconfig objects

Pierre Ossman (1):
  mmc: use lock instead of claim in debug check




signature.asc
Description: OpenPGP digital signature

Re: [GIT PULL] MMC updates

[Linus Torvalds]

On Sat, 5 May 2007, Pierre Ossman wrote:

> Pierre Ossman wrote:
> > Linus, please pull from
> > 
> > git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git 
> > for-linus
> > 
> 
> *ping*

*pong*.

Thanks for reminding me. I was away for a couple of days, missed some 
emails, just pulled and pushed out.

Linus
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

Pierre Ossman wrote:
> Linus, please pull from
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus
> 

*ping*

-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[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/misc/tifm_7xx1.c  |  332 +++
 drivers/misc/tifm_core.c  |  305 +++--
 drivers/mmc/Kconfig   |  106 +--
 drivers/mmc/Makefile  |   33 +-
 drivers/mmc/card/Kconfig  |   17 +
 drivers/mmc/card/Makefile |   11 +
 drivers/mmc/{mmc_block.c => card/block.c} |   55 +-
 drivers/mmc/{mmc_queue.c => card/queue.c} |   12 +-
 drivers/mmc/{mmc_queue.h => card/queue.h} |0
 drivers/mmc/core/Kconfig  |   17 +
 drivers/mmc/core/Makefile |   11 +
 drivers/mmc/core/core.c   |  727 
 drivers/mmc/core/core.h   |   70 ++
 drivers/mmc/core/mmc.c|  537 +
 drivers/mmc/core/mmc_ops.c|  276 +
 drivers/mmc/core/mmc_ops.h|   27 +
 drivers/mmc/core/sd.c |  587 ++
 drivers/mmc/core/sd_ops.c |  316 ++
 drivers/mmc/core/sd_ops.h |   25 +
 drivers/mmc/{mmc_sysfs.c => core/sysfs.c} |   11 +-
 drivers/mmc/{mmc.h => core/sysfs.h}   |   10 +-
 drivers/mmc/host/Kconfig  |  103 ++
 drivers/mmc/host/Makefile |   18 +
 drivers/mmc/{ => host}/at91_mci.c |1 -
 drivers/mmc/{ => host}/au1xmmc.c  |1 -
 drivers/mmc/{ => host}/au1xmmc.h  |0
 drivers/mmc/{ => host}/imxmmc.c   |1 -
 drivers/mmc/{ => host}/imxmmc.h   |0
 drivers/mmc/{ => host}/mmci.c |1 -
 drivers/mmc/{ => host}/mmci.h |0
 drivers/mmc/{ => host}/omap.c |   56 +-
 drivers/mmc/{ => host}/pxamci.c   |1 -
 drivers/mmc/{ => host}/pxamci.h   |0
 drivers/mmc/{ => host}/sdhci.c|   43 +-
 drivers/mmc/{ => host}/sdhci.h|4 +-
 drivers/mmc/host/tifm_sd.c| 1102 ++
 drivers/mmc/{ => host}/wbsd.c |  205 +---
 drivers/mmc/{ => host}/wbsd.h |9 +-
 drivers/mmc/mmc.c | 1724 -
 drivers/mmc/tifm_sd.c |  987 -
 include/asm-arm/arch-imx/mmc.h|2 +-
 include/asm-arm/arch-pxa/mmc.h|2 +-
 include/asm-arm/mach/mmc.h|2 +-
 include/linux/mmc/card.h  |   32 +-
 include/linux/mmc/core.h  |  112 ++
 include/linux/mmc/host.h  |   59 +-
 include/linux/mmc/mmc.h   |  322 --
 include/linux/mmc/protocol.h  |  327 --
 include/linux/mmc/sd.h|   83 ++
 include/linux/tifm.h  |  117 +-
 50 files changed, 4858 insertions(+), 3941 deletions(-)

Adrian Bunk (1):
  mmc: make tifm_sd_set_dma_data() static

Alex Dubov (18):
  mmc: cull sg list to match mmc request size
  tifm: hide details of interrupt processing from socket drivers
  tifm: use bus methods to handle probe/remove instead of driver ones.
  tifm: simplify bus match and uevent handlers
  tifm: replace per-adapter kthread with freezeable workqueue
  tifm_7xx1: improve card detection routine
  tifm: move common adapter management tasks from tifm_7xx1 to tifm_core
  tifm: move common device management tasks from tifm_7xx1 to tifm_core
  tifm_7xx1: fix adapter resume function
  tifm: add sysfs attribute for tifm devices
  tifm_sd: remove tifm_sd_terminate function
  tifm_sd: remove wait for power off on remove
  tifm_sd: separate command flags, socket flags and register bit masks
  tifm_sd: merge dma and pio request processing paths
  tifm_sd: replace command completion state machine with full checking
  tifm_sd: fix resume handler
  tifm_sd: implement software scatter-gather
  tifm: layout fixes, small changes to comments and printfs

Andrew Morton (1):
  tifm: add missing include for DMA_32BIT_MASK

Arnaud Patard (1):
  mmc-omap: add missing '\n'

Philip Langdale (2):
  MMC: Consolidate voltage definitions
  MMC: Fix handling of low-voltage cards

Pierre Ossman (21):
  mmc: enforce correct sg list
  wbsd: remove block crc test
  mmc: use right timing mode constant
  mmc: MMC sector based cards
  mmc: add type field to cards
  mmc: Move OCR bit defines
  mmc: Move "present" marking
  mmc: Move queue functions to mmc_block
  mmc: Move host and card drivers to subdirs
  mmc: Flush pending detects on host removal
  mmc: allow suspended block driver to be removed
  mmc: remove card upon suspend
  mmc: deprecate mmc bus topology
  mmc: Move core functions to subdir
  mmc: Separate out protocol ops
  wbsd: check for data opcode earlier
  mmc: add bus handler
  mm

[GIT PULL] MMC updates

[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/sdhci.c   |   40 
 drivers/mmc/tifm_sd.c |   11 ---
 drivers/mmc/wbsd.c|6 +-
 3 files changed, 17 insertions(+), 40 deletions(-)

Alex Dubov (1):
  tifm_sd: treat "status error" as normal command completion

Pierre Ossman (4):
  mmc: wbsd: Remove driver version
  mmc: sdhci: Remove driver version
  mmc: sdhci: Stop asking for mail
  mmc: wbsd: Remove stray kunmap_atomic()

-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[Pierre Ossman]

Yay! First post!

Linus, please pull from

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

to receive the following updates:

 MAINTAINERS  |2 +-
 drivers/misc/tifm_7xx1.c |  402 ++
 drivers/misc/tifm_core.c |   65 +--
 drivers/mmc/at91_mci.c   |3 +
 drivers/mmc/au1xmmc.c|   13 +-
 drivers/mmc/imxmmc.c |4 +-
 drivers/mmc/mmc.c|  182 
 drivers/mmc/mmc_block.c  |   15 +-
 drivers/mmc/mmc_queue.c  |2 +-
 drivers/mmc/mmc_sysfs.c  |2 +-
 drivers/mmc/mmci.c   |   15 +-
 drivers/mmc/omap.c   |6 +-
 drivers/mmc/pxamci.c |   10 +
 drivers/mmc/sdhci.c  |   91 +
 drivers/mmc/sdhci.h  |2 -
 drivers/mmc/tifm_sd.c|  487 +++---
 drivers/mmc/wbsd.c   |  102 ++---
 drivers/mmc/wbsd.h   |1 -
 include/linux/mmc/card.h |3 +
 include/linux/mmc/host.h |   10 +-
 include/linux/mmc/mmc.h  |1 +
 include/linux/mmc/protocol.h |   13 +-
 include/linux/pci_ids.h  |4 +
 include/linux/tifm.h |   35 ++--
 24 files changed, 891 insertions(+), 579 deletions(-)

Alex Dubov (15):
  tifm_sd: alter order of the states in the command handler
  tifm_sd: use kmap_atomic instead of kmap for PIO data buffer
  tifm_sd: Switch software timeout handler from work_struct to timer
  tifm_sd: fix hardware timeout setup
  tifm_sd: restructure initialization, removal and command handling
  tifm_sd: prettify
  Remove unused return value from signal_irq callback
  Add dummy_signal_irq function to save check in ISR
  tifm_7xx1: simplify eject function
  tifm_7xx1: Merge media insert and media remove functions
  tifm_7xx1: switch from workqueue to kthread
  tifm_7xx1: recognize device 0xac8f as supported
  tifm_7xx1: prettify
  tifm_core: add suspend/resume infrastructure for tifm devices
  tifm_sd: add suspend and resume functionality

Darren Salt (1):
  mmc: Power quirk for ENE controllers

Manuel Lauss (2):
  mmc: au1xmmc: implement proper ro switch detection
  mmc: au1xmmc: return errors for unknown response types

Philip Langdale (1):
  mmc: Add support for SDHC cards

Pierre Ossman (13):
  mmc: replace host->card_busy
  mmc: let host be parent of cards
  mmc: Allow host drivers to specify a max block size
  mmc: Allow host drivers to specify max block count
  mmc: Handle wbsd's stupid command list
  mmc: Graceful fallback for fancy features
  mmc: change wbsd mailing list
  mmc: Proper unclaim in mmc_block
  mmc: handle pci_enable_device() return value in sdhci
  mmc: wbsd: replace kmap with page_address
  mmc: sdhci: replace kmap with page_address
  mmc: sdhci: fix voltage ocr
  mmc: tifm: replace kmap with page_address

-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[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/imxmmc.c|3 ---
 drivers/mmc/omap.c  |   15 +--
 drivers/mmc/pxamci.c|2 +-
 drivers/mmc/tifm_sd.c   |3 ---
 include/linux/mmc/mmc.h |2 +-
 5 files changed, 11 insertions(+), 14 deletions(-)

Carlos Eduardo Aguiar (1):
  omap: Update MMC response types

Philip Langdale (1):
  mmc: Correct definition of R6

diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/imxmmc.c
index 06e7fcd..bfb9ff6 100644
--- a/drivers/mmc/imxmmc.c
+++ b/drivers/mmc/imxmmc.c
@@ -351,9 +351,6 @@ static void imxmci_start_cmd(struct imxmci_host
*host, struct mmc_command *cmd,
case MMC_RSP_R3: /* short */
cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R3;
break;
-   case MMC_RSP_R6: /* short CRC */
-   cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R6;
-   break;
default:
break;
}
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c
index 9488408..d30540b 100644
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/omap.c
@@ -91,7 +91,6 @@


 #define DRIVER_NAME "mmci-omap"
-#define RSP_TYPE(x)((x) & ~(MMC_RSP_BUSY|MMC_RSP_OPCODE))

 /* Specifies how often in millisecs to poll for card status changes
  * when the cover switch is open */
@@ -204,18 +203,22 @@ mmc_omap_start_command(struct mmc_omap_host *host,
struct mmc_command *cmd)
cmdtype = 0;

/* Our hardware needs to know exact type */
-   switch (RSP_TYPE(mmc_resp_type(cmd))) {
-   case RSP_TYPE(MMC_RSP_R1):
-   /* resp 1, resp 1b */
+   switch (mmc_resp_type(cmd)) {
+   case MMC_RSP_NONE:
+   break;
+   case MMC_RSP_R1:
+   case MMC_RSP_R1B:
+   /* resp 1, 1b, 6, 7 */
resptype = 1;
break;
-   case RSP_TYPE(MMC_RSP_R2):
+   case MMC_RSP_R2:
resptype = 2;
break;
-   case RSP_TYPE(MMC_RSP_R3):
+   case MMC_RSP_R3:
resptype = 3;
break;
default:
+   dev_err(mmc_dev(host->mmc), "Invalid response type:
%04x\n", mmc_resp_type(cmd));
break;
}

diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index 45a9283..6073d99 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -171,7 +171,7 @@ static void pxamci_start_cmd(struct pxamci_host
*host, struct mmc_command *cmd,

 #define RSP_TYPE(x)((x) & ~(MMC_RSP_BUSY|MMC_RSP_OPCODE))
switch (RSP_TYPE(mmc_resp_type(cmd))) {
-   case RSP_TYPE(MMC_RSP_R1): /* r1, r1b, r6 */
+   case RSP_TYPE(MMC_RSP_R1): /* r1, r1b, r6, r7 */
cmdat |= CMDAT_RESP_SHORT;
break;
case RSP_TYPE(MMC_RSP_R3):
diff --git a/drivers/mmc/tifm_sd.c b/drivers/mmc/tifm_sd.c
index f18ad99..fa4a528 100644
--- a/drivers/mmc/tifm_sd.c
+++ b/drivers/mmc/tifm_sd.c
@@ -173,9 +173,6 @@ static unsigned int tifm_sd_op_flags(struct
mmc_command *cmd)
case MMC_RSP_R3:
rc |= TIFM_MMCSD_RSP_R3;
break;
-   case MMC_RSP_R6:
-   rc |= TIFM_MMCSD_RSP_R6;
-   break;
default:
BUG();
}
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index a3594df..bcf2490 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -42,7 +42,7 @@ struct mmc_command {
 #define MMC_RSP_R1B
(MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY)
 #define MMC_RSP_R2 (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC)
 #define MMC_RSP_R3 (MMC_RSP_PRESENT)
-#define MMC_RSP_R6 (MMC_RSP_PRESENT|MMC_RSP_CRC)
+#define MMC_RSP_R6 (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)

 #define mmc_resp_type(cmd) ((cmd)->flags &
(MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE))


-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] MMC updates

[Pierre Ossman]

Ping!

Pierre Ossman wrote:
> 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/at91_mci.c |   11 +--
>  drivers/mmc/omap.c |6 +++---
>  2 files changed, 8 insertions(+), 9 deletions(-)
> 
> David Brownell (1):
>   MMC: at91 mmc linkage updates
> 
> Kyungmin Park (1):
>   ARM: OMAP: fix MMC workqueue changes
> 

-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[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/at91_mci.c |   11 +--
 drivers/mmc/omap.c |6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

David Brownell (1):
  MMC: at91 mmc linkage updates

Kyungmin Park (1):
  ARM: OMAP: fix MMC workqueue changes

diff --git a/drivers/mmc/at91_mci.c b/drivers/mmc/at91_mci.c
index 08a33c3..aa152f3 100644
--- a/drivers/mmc/at91_mci.c
+++ b/drivers/mmc/at91_mci.c
@@ -768,7 +768,7 @@ static irqreturn_t at91_mmc_det_irq(int irq, void *_host)
return IRQ_HANDLED;
 }

-int at91_mci_get_ro(struct mmc_host *mmc)
+static int at91_mci_get_ro(struct mmc_host *mmc)
 {
int read_only = 0;
struct at91mci_host *host = mmc_priv(mmc);
@@ -794,7 +794,7 @@ static const struct mmc_host_ops at91_mci_ops = {
 /*
  * Probe for the device
  */
-static int at91_mci_probe(struct platform_device *pdev)
+static int __init at91_mci_probe(struct platform_device *pdev)
 {
struct mmc_host *mmc;
struct at91mci_host *host;
@@ -910,7 +910,7 @@ static int at91_mci_probe(struct platform_device *pdev)
 /*
  * Remove a device
  */
-static int at91_mci_remove(struct platform_device *pdev)
+static int __exit at91_mci_remove(struct platform_device *pdev)
 {
struct mmc_host *mmc = platform_get_drvdata(pdev);
struct at91mci_host *host;
@@ -972,8 +972,7 @@ static int at91_mci_resume(struct platform_device *pdev)
 #endif

 static struct platform_driver at91_mci_driver = {
-   .probe  = at91_mci_probe,
-   .remove = at91_mci_remove,
+   .remove = __exit_p(at91_mci_remove),
.suspend= at91_mci_suspend,
.resume = at91_mci_resume,
.driver = {
@@ -984,7 +983,7 @@ static struct platform_driver at91_mci_driver = {

 static int __init at91_mci_init(void)
 {
-   return platform_driver_register(&at91_mci_driver);
+   return platform_driver_probe(&at91_mci_driver, at91_mci_probe);
 }

 static void __exit at91_mci_exit(void)
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c
index 435d331..9488408 100644
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/omap.c
@@ -581,9 +581,9 @@ static void mmc_omap_switch_timer(unsigned long arg)
schedule_work(&host->switch_work);
 }

-static void mmc_omap_switch_handler(void *data)
+static void mmc_omap_switch_handler(struct work_struct *work)
 {
-   struct mmc_omap_host *host = (struct mmc_omap_host *) data;
+   struct mmc_omap_host *host = container_of(work, struct mmc_omap_host, 
switch_work);
struct mmc_card *card;
static int complained = 0;
int cards = 0, cover_open;
@@ -1116,7 +1116,7 @@ static int __init mmc_omap_probe(struct platform_device 
*pdev)
platform_set_drvdata(pdev, host);

if (host->switch_pin >= 0) {
-   INIT_WORK(&host->switch_work, mmc_omap_switch_handler, host);
+   INIT_WORK(&host->switch_work, mmc_omap_switch_handler);
init_timer(&host->switch_timer);
host->switch_timer.function = mmc_omap_switch_timer;
host->switch_timer.data = (unsigned long) host;

-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] MMC updates

[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/at91_mci.c  |  346 +--
 drivers/mmc/mmc_queue.c |4 -
 drivers/mmc/sdhci.c |4 -
 3 files changed, 190 insertions(+), 164 deletions(-)

Andrew Victor:
  AT91 MMC 1: Pass host structure.
  AT91 MMC 2 : Use platform resources
  AT91 MMC 3 : Move global mci_clk variable
  AT91 MMC 4 : Interrupt handler cleanup
  AT91 MMC 5 : Minor cleanups
  AT91 MMC update for 2.6.19

Pierre Ossman:
  mmc: Change SDHCI iomem error to a warning

Vitaly Wool:
  mmc: fix "prev->state: 2 != TASK_RUNNING??" problem on SD/MMC  card 
removal


-- 
 -- Pierre Ossman

  Linux kernel, MMC maintainerhttp://www.kernel.org
  PulseAudio, core developer  http://pulseaudio.org
  rdesktop, core developer  http://www.rdesktop.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/