linux-stable.git/drivers/mmc/host, branch v4.3.4

mmc: sdhci-of-at91: use SDHCI_QUIRK2_NEED_DELAY_AFTER_INT_CLK_RST quirk

2015-10-08T17:55:05+00:00

The Atmel sdhci device needs the
SDHCI_QUIRK2_NEED_DELAY_AFTER_INT_CLK_RST quirk. Without it, the
internal clock could never stabilised when changing the sd clock
frequency.

Signed-off-by: Ludovic Desroches 
Signed-off-by: Ulf Hansson

mmc: sdhci: add quirk SDHCI_QUIRK2_NEED_DELAY_AFTER_INT_CLK_RST

2015-10-08T17:55:05+00:00

The Atmel sdhci device needs a new quirk. sdhci_set_clock set the Clock
Control Register to 0 before computing the new value and writing it.
It disables the internal clock which causes a reset mecanism. If we
write the new value before this reset mecanism is done, it will prevent
the stabilisation of the internal clock, so a delay is needed. This
delay is about 2-3 cycles of the base clock. To be safe, a 1 ms delay is
used.

Signed-off-by: Ludovic Desroches 
Signed-off-by: Ulf Hansson

mmc: sdhci-pxav3: fix error handling of armada_38x_quirks

2015-10-08T17:24:23+00:00

In case of armada_38x_quirks error, all clocks should be cleaned-up, same
as after mv_conf_mbus_windows failure.

Signed-off-by: Marcin Wojtas 
Cc:  # v4.2
Reviewed-by: Gregory CLEMENT 
Signed-off-by: Ulf Hansson

mmc: sdhci-pxav3: disable clock inversion for HS MMC cards

2015-10-08T17:24:23+00:00

According to 'FE-2946959' erratum the clock inversion option is
needed to support slow frequencies when the card input hold time
requirement is high. This setting is not required for high speed
MMC and might cause timing violation.

Signed-off-by: Nadav Haklai 
Cc:  # v4.2
Reviewed-by: Gregory CLEMENT 
Signed-off-by: Ulf Hansson

mmc: sdhci-pxav3: remove broken clock base quirk for Armada 38x sdhci driver

2015-10-08T17:24:23+00:00

shci-pxav3 driver is enabling by default the
SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN quirk. However this quirk is not
required for Armada 38x and leads to wrong clock setting in the divider.

Signed-off-by: Nadav Haklai 
Signed-off-by: Marcin Wojtas 
Cc:  # v4.2
Reviewed-by: Gregory CLEMENT 
Signed-off-by: Ulf Hansson

mmc: host: omap_hsmmc: Fix MMC for omap3 legacy booting

2015-10-08T07:36:13+00:00

Starting with commit 7d607f917008 ("mmc: host: omap_hsmmc: use
devm_regulator_get_optional() for vmmc") MMC on omap3 stopped working
for legacy booting.

This is because legacy booting sets up some of the resource in the
platform init code, and for optional regulators always seem to
return -EPROBE_DEFER for the legacy booting.

Let's fix the issue by checking for device tree based booting for
now. Then when omap3 boots in device tree only mode, this patch
can be just reverted.

Fixes: 7d607f917008 ("mmc: host: omap_hsmmc: use
devm_regulator_get_optional() for vmmc")
Cc: Felipe Balbi 
Cc: Kishon Vijay Abraham I 
Cc: Nishanth Menon 
Cc: Russell King 
Signed-off-by: Tony Lindgren 
Tested-by: Russell King 
Signed-off-by: Ulf Hansson

Revert "mmc: host: omap_hsmmc: use regulator_is_enabled to find pbias status"

2015-10-08T07:35:31+00:00

This reverts commit c55d7a0553643a7e8f120688b82b594471084d3c.

Without reverting this commit we get "unbalanced disables for pbias_mmc_omap4"
errors on omap4430. It seems that 4430 and 4460 behave in a different way for
the PBIAS regulator registers and until that has been debugged further we
cannot rely on the regulator status registers in hardare on 4430.

Fixes: 7d607f917008 ("mmc: host: omap_hsmmc: use
devm_regulator_get_optional() for vmmc")
Cc: Felipe Balbi 
Cc: Kishon Vijay Abraham I 
Cc: Nishanth Menon 
Cc: Russell King 
Signed-off-by: Tony Lindgren 
Tested-by: Russell King 
Signed-off-by: Ulf Hansson

mmc: pxamci: fix card detect with slot-gpio API

2015-09-29T10:17:05+00:00

Move pxamci to mmc slot-gpio API to fix interrupt request.

It fixes the case where the card detection is on a gpio expander, on I2C
for example on zylonite board. In this case, the card detect netsted
interrupt is called from a threaded interrupt. The request_irq() fails,
because a hard irq cannot be a nested interrupt from a threaded
interrupt (set __setup_irq()).

This was tested on zylonite and mioa701 boards.

Signed-off-by: Robert Jarzmik 
Cc: Petr Cvek 
Signed-off-by: Ulf Hansson

mmc: sunxi: Fix clk-delay settings

2015-09-29T10:17:04+00:00

In recent allwinner kernel sources the mmc clk-delay settings have been
slightly tweaked, and for sun9i they are completely different then what
we are using.

This commit brings us in sync with what allwinner does, fixing problems
accessing sdcards on some A33 devices (and likely others).

For pre sun9i hardware this makes the following changes:
-At 400Khz change the sample delay from 7 to 0 (introduced in A31 sdk)
-At 50 Mhz change the sample delay from 5 to 4 (introduced in A23 sdk)

This also drops the clk-delay calculation for clocks > 50 MHz, we do
not need this as we've: mmc->f_max = 50000000, and the delays in the
old code were not correct (at 100 MHz the delay must be a multiple of 60,
at 200 MHz a multiple of 120).

Signed-off-by: Hans de Goede 
Signed-off-by: Ulf Hansson

mmc: android-goldfish: remove incorrect __iomem annotation

2015-09-01T12:19:11+00:00

Make sparse happy:

drivers/mmc/host/android-goldfish.c:535:56: sparse: incorrect type in
argument 3 (different address spaces)

Signed-off-by: Christoph Hellwig 
Signed-off-by: Ulf Hansson