Merge branch 'for-next/mmc'

Merge branch 'for-next/misc'

mci: sdhci: Fix swapped argument for sdhci_write32 ...

sdhci_write32 accepts the register as second argument, not third.
Fix this up.

Fixes: 075179763a ("mci: sdhci: add Atmel SDHCI (sama5d2, sam9x60) support")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: reword MCI_STARTUP text ...

With the recent addition of a generic device_detect for MCI devices,
the MCI_STARTUP help text is no longer accurate. Reword it, but leave
the option as-is as some boards may be broken if we drop the option
(e.g. because they still depend on a probe order or call
default_environment_path_set, but don't explicitly detect the device).

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: remove now-duplicate dev->detect implementations in host drivers ...

Previous commit introduced a fall-back MCI hw_dev->detect
implementation. All drivers touched in this commit populate hw_dev, so
lets drop their now-superfluous detect implementations.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: define fall-back hw_dev->detect for all MCIs ...

A barebox environment oftree node may reference its storage by a phandle
to a partition node under a MCI node. barebox will then call the
device's detect method to detect the card if this hasn't happened
before. Out of 17 MCI drivers, 8 host drivers already implement
a detect method, which just calls mci_detect_card.

Provide a generic implementation that does the same.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

treewide: replace commas with semicolons where appropriate ...

Found by searching drivers/ arch/ common/ and lib/ for

 /^\s+[^."/\*\[\s\{\(A-Z][^\[\{\(]*=[^\{\(]+,$/

Because the comma has the lowest precedence in C,
this shouldn't result in any functional change.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/stm32'

Merge branch 'for-next/powerpc'

Merge branch 'for-next/mxs'

Merge branch 'for-next/misc'

mci: stm32_sdmmc2: move command timeout errors to debug level ...

Command timeouts are sometimes a normal operating condition
(for example when probing whether the connected card is SD or MMC),
so we don't want to print an error message for all of them. Move
those messages to the debug level, the MCI core will print some
more meaningful messages on most command errors anyways.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: stm32_sdmmc2: don't retry commands ...

No other MCI does retry failing commands on its own (if at all
this should be done by the MCI core). Remove the retry, as we
don't want to paper over board level issues.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

drivers: mark first batch of compilable drivers for COMPILE_TEST ...

All of these drivers have a runtime dependency on SoC peripherals, but
can nevertheless be compile-tested. Add COMPILE_TEST as an alternate
dependency.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

drivers: explicitly select dependency STMP_DEVICE for i.MX23/28 drivers ...

Some of the i.MXs drivers can be build tested even if building for other
platforms. Support adding a future COMPILE_TEST dependency to some of
these drivers by explicitly having their Kconfig symbol select STMP_DEVICE
if the driver calls stmp_reset_block.

This has not been necessary for the normal build, because the ARCH
symbols for the IMX23 and IMX28 already selected STMP_DEVICE.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: at91: Move mci platform data to include/ ...

To be able to add the Atmel mci driver to COMPILE_TEST move the
definition of struct atmel_mci_platform_data to include/ where it
can be reached from foreign SoCs as well.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mmc: mxs: implement detect callback ...

Needed to automatically detect the SD card when it contains the barebox
environment.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/sdhci' into next

mci: sdhci: add Atmel SDHCI (sama5d2, sam9x60) support ...

We already support Ethernet and QSPI on the SAMA5D2, but MMC was so far
missing. Port over the at91bootstrap driver to barebox. Some parts are
based on the U-Boot and Linux implementations.

To support future use in PBL, the driver model and driver implementation
parts are split into separate files with the latter being compilable for PBL
as well.

Registers, which are found in the common Linux sdhci.h have been added
to the barebox sdhci.h. Registers which appear to be Atmel specific have
been added to atmel-sdhci-common.c instead.

The driver still misses some parts, which will follow later:

  - ADMA is unsupported, PIO only for now
  - Only the SD/MMC controller already enabled by the first stage
    bootloader is supported. Further clocking changes appear
    to be necessary to enable another

Both can be retrofitted later on and don't hold us back from booting
from MMC.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: sdhci: implement sdhci_reset() ...

SDHCI reset is common between many SDHCI variants. Add a library
function, so it can be reused.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: sdhci: provide sdhci_readx_poll_timeout helpers ...

The sdhci_readN accessors don't lend themselves for clean use with
readx_poll_timeout because they accept two arguments. Add
a sdhci-specific helper, so the sdhci drivers can cut down on the
timeout loop boilerplate.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

treewide: remove references to CREDITS ...

The CREDITS file was removed from barebox in 2015 by commit 6570288f2d97
("Remove the CREDITS file"). Remove references to it from several files.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/zynq'

mmc: arasan: fix false bit ...

when accessing the SD card arasan_sdhci_send_cmd checks for the wrong bit

Signed-off-by: Michael Graichen <michael.graichen@hotmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mmc: add MCI_SDHCI dependency to Arasan driver ...

The Arasan driver depends on the SDHCI driver, without it we
will see undefined references while linking arasan-sdhci.c:283: undefined
reference to `sdhci_set_cmd_xfer_mode' arasan-sdhci.c:299: undefined
reference to `sdhci_read_response' arasan-sdhci.c:303: undefined reference to
`sdhci_transfer_data'

Signed-off-by: Michael Graichen <michael.graichen@hotmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: core: use SECTOR_SIZE instead of direct 512 ...

Instead of hardcoding the 512 byte constant, use the symbolic
SECTOR_SIZE.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: imx-esdhc: Add i.MX8mm support ...

Only add the compatible string to let the driver match.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: imx-esdhc-pbl: Add instance 2 for i.MX8MM ...

Unlike the i.MX8MQ the i.MX8MM has three SDHCI controllers. Add support
for picking the base address of the third controller from the instance
number. While at it use the IMX8M_ base addresses rather than the
IMX8MQ_ base addresses.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: i.MX8M: rename functions to be i.MX8M specific ...

imx8_esdhc_load_image() and friends can't be used on the big variants of
the i.MX8, so rename to imx8m_esdhc_load_image()

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/parameter'