Merge branch 'for-next/mmc'

esdhc-xload: invalidate icache before jumping to image ...

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

mci: imx-esdhc-pbl: ls1046a: Set better divider values ...

MMC Frequency was set to something like 55MHz. This doesn't work for all
SD cards. Set to 25MHz which is supported by all SD cards.

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

mci: add driver for BCM283x sdhost core ...

The sdhost is a simple MMC controller found on the Broadcom
BCM283x line of SoCs. The driver code was ported from U-Boot
and then simplified a bit, by dropping a lot of the state
tracking.

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

Merge branch 'for-next/layerscape'

mci: imx-esdhc: resolve conflicting flags ...

With commit 3354adee3920 ("mci: imx-esdhc: Add bigendian register access
support") and commit 15b64fd520c2 ("mci: imx-esdhc: Add layerscape support")
two ESDHC_FLAGs got assigned to already existing values. This conflict made
the imx6sl usdhc appear to be big endian.
Resolve this conflict by assign the new flags to the next vacant values.

Signed-off-by: Alexander Kurz <akurz@blala.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: imx-esdhc-pbl: initialize is_be ...

Initialize is_be, otherwise the value of is_be is undefined.
So it is possible that the i.MX8 will not boot because the bigendian
functions are used.

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

esdhc-xload: Add support for Layerscape ...

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

mci: imx-esdhc: Actually enable cache snooping ...

15b64fd520 introduced the ESDHC_FLAG_CACHE_SNOOPING for layerscape
support, but didn't actually set it for layerscape. Add the new
flag to the layerscape SoC data.

Fixes: 15b64fd520 ("mci: imx-esdhc: Add layerscape support")

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

Merge branch 'for-next/spd'

Merge branch 'for-next/rpi'

esdhc-xload: check for PRSSTAT_BREN only after each block ...

The BREN bit tells us a watermark level sized buffer is ready for read.
Instead of testing it before each FIFO read we must only check it once
and then read a watermark level sized buffer. This is at least necessary
on Layerscape, otherwise timeouts occur while reading the buffer.

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

esdhc-xload: Add bigendian support ...

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

esdhc-xload: Use static inline io wrappers ...

We'll need big endian support for Layerscape, so put the io accessors
into static inline wrappers.

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

esdhc-xload: move some register defines to header file ...

To make them usable for the PBL driver aswell.

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

esdhc-xload: Move to drivers/mci ...

The esdhc-xload code will be used by upcoming Layerscape support aswell,
so move it from architecture code to drivers/mci/.

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

crc: import crc_itu_t() from kernel ...

Our cyc_crc16() function is the same function as crc_itu_t() in the
Linux kernel. Import and use crc_itu_t() from the Kernel for
consistency.

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

mci: bcm2835: parse other device tree properties. ...

The driver was missing a call to mci_of_parse() which fills in properties such
as "bus-width", "no-sd" into the mci_host struct.

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

mci: bcm2835: use device_initcall(), not coredev. ...

pinctrl driver needs to be initialized before mci driver on Raspberry Pi.
Otherwise the pinctrl device tree properties in the mci node are ignored.
pinctrl is initialized by coredevice_initcall(), so moving mci-bcm2835 to
device_initcall() ensures that it is initialized later.

There is no reason for mci-bcm2835 to use coredevice_initcall(). Other mci
drivers already use device_initcall().

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

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'