Merge branch 'for-next/rpi'

mci: imx-esdhc: Add layerscape support ...

This adds support for the esdhc controller found on Layerscape SoCs.
This means adding the compatible and a driver data to access the
controller in bigendian mode.

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

mci: imx-esdhc: Add bigendian register access support ...

Layerscape will need bigendian io accessors. Add support for them.

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

mci: imx-esdhc: implement static inline io wrappers ...

Layerscape will need accesses in big endian mode. To make this
possible create static inline wrappers for the io accessors.

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

mci: imx-esdhc: remove unnecessary include ...

Drop inclusion of unnecessary include from mach-imx/include/mach.

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

mci: imx-esdhc: make clkidx configurable ...

Other architectures using this driver may need a different clk_id to
find its clock. Make this configurable as a preparation for layerscape
support.

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

mci: imx-esdhc: move platform_data ...

move platform_data from mach-imx/include/mach/ to include/platform_data
where it's available for other architectures aswell.

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

mci: imx-esdhc: use dev_id ...

Avoid using cpu_is_* macros and use a dev_id instead. This will make it
easier to integrate the driver into another architecture.

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

mci: imx-esdhc: Do not reset twice ...

The esdhc controller is resetted once during probe by calling
esdhc_reset() and once open coded in esdhc_init(). Resetting it once is
enough, so drop the open coded reset from esdhc_init() and call
esdhc_reset() there. With this we can remove the call to esdhc_reset()
during probe.

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

mci: bcm2835: make locally used functions static ...

The mci-bcm2835 driver registers itself as an MCI driver on probing, and
is thereby used through the MCI interface, so these functions are not
meant to act as a public interface and only used internally in this
compilation unit.

This fixes the following build warnings:

    .../drivers/mci/mci-bcm2835.c:56:6: warning: no previous prototype for 'bcm2835_mci_write' [-Wmissing-prototypes]
     void bcm2835_mci_write(struct bcm2835_mci_host *host, u32 reg, u32 val)
          ^~~~~~~~~~~~~~~~~
    .../drivers/mci/mci-bcm2835.c:74:5: warning: no previous prototype for 'bcm2835_mci_read' [-Wmissing-prototypes]
     u32 bcm2835_mci_read(struct bcm2835_mci_host *host, u32 reg)
         ^~~~~~~~~~~~~~~~
    .../drivers/mci/mci-bcm2835.c:83:6: warning: no previous prototype for 'bcm2835_mci_write_data' [-Wmissing-prototypes]
     void bcm2835_mci_write_data(struct bcm2835_mci_host *host, u32 *p)
          ^~~~~~~~~~~~~~~~~~~~~~
    .../drivers/mci/mci-bcm2835.c:89:6: warning: no previous prototype for 'bcm2835_mci_read_data' [-Wmissing-prototypes]
     void bcm2835_mci_read_data(struct bcm2835_mci_host *host, u32 *p)
          ^~~~~~~~~~~~~~~~~~~~~
      CC      common/date.o
    .../drivers/mci/mci-bcm2835.c:419:5: warning: no previous prototype for 'bcm2835_mci_reset' [-Wmissing-prototypes]
     int bcm2835_mci_reset(struct mci_host *mci, struct device_d *mci_dev)

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

Merge branch 'for-next/mmc'

Merge branch 'for-next/misc'

mci: skip of_partitions_register_fixup for boot partitions ...

The bootN-partitions binding is barebox-specific, so it shouldn't
be fixed up into the kernel device tree.

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

mci: Rely on NULL being a dummy regulator ...

Since NULL, is a dummy regulator, we can drop a bit of error checking
logic and simplify the code if we assing host->supply to NULL in case
we can't find an appropriate regulator during probing.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: omap: use IS_ENABLED() rather than #ifdef ...

While touching it propagate the errors from read/write functions instead
of silently ignoring them.

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

mci: omap: Improve error handling ...

Return proper error code from read/write functions rather than '1'. Also
add messages printing the status register to give a glue what went
wrong.

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

mci: mxs: Drop explicit devname setup code ...

Drop explicit devname setup code. Same setup will be done by
mci_of_parse().

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: imx-esdhc: Drop explicit devname setup code ...

Drop explicit devname setup code. Same setup will be done by
mci_of_parse().

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: omap_hsmmc: Drop explicit devname setup code ...

Drop explicit devname setup code. Same setup will be done by
mci_of_parse().

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: dw_mmc: Drop explicit devname setup code ...

Drop explicit devname setup code. Same setup will be done by
mci_of_parse().

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: tegra-sdmmc: Drop explicit devname setup code ...

Drop explicit devname setup code. Same setup will be done by
mci_of_parse().

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: core: Use alias as a devname by default ...

This idiom is repeatead by almost every mci driver, so move it to
mci_of_parse() in order to reduce amount of duplicated code.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

drivers: Introduce dev_set_name() ...

Introduce dev_set_name() in order to hide implementation details of
setting device's name so it'd be easier to change it.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: imx-esdhc: Return EFAULT when DMA mapping fails ...

EFAULT seems to be much more appropriate error code for DMA mapping
failure

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: imx-esdhc: Specify that DMA is 32-bit only ...

ESDHC can only do a DMA transfer to 32-bit address space, so mark it
as such.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/socfpga'

Merge branch 'for-next/misc'

mci: imx-esdhc: send required clock pulses to card on init ...

MMC cards need at least 74 clock pulses before any bus communication
can occur. The i.MX SDHC controller auto-gates the clock when inactive,
so if the SD enumeration is skipped for slots where we know that only a
MMC card can be present (which is possible since
b5289b742a89 "mmc: allow skipping SD card initialization") those
inititialization clock pulses won't be sent out, resulting in command
timeouts when trying to enumerate the card.

Luckily the eSDHC controller has a hardware feature to send out 80
clock pulses. This has been validated to be available by checking the
reference manual back to i.MX25.

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

mci: s3c: fix providing info callback ...

There is no symbol iCONFIG_MCI_INFO, CONFIG_MCI_INFO makes sense here
and matches what was added in the same commit to other drivers.

Fixes: 73b0d228e5b0 ("driver: Attach info callback to device, not to driver")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: dw: move defines to headerfile ...

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