Merge branch 'for-next/mips' ...

Conflicts:
	include/of.h

Merge branch 'for-next/mci' ...

Conflicts:
	include/driver.h

Merge branch 'for-next/imx-oftree' ...

Conflicts:
	arch/arm/boards/freescale-mx51-pdk/board.c

Merge branch 'for-next/block'

Merge branch 'for-next/misc'

Enables to build bootm command on generic_x86. ...

I'm not sure but I guess we don't need defined(__I386__) check.
I kept it for now.

Signed-off-by: Masaki Muranaka <monaka@monami-ya.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mci: Add devicetree helper function ...

This adds helper code to parse the bus-width and max-frequency
property from devicetree.

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

mci: implement detect driver callback ...

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

devices: add detect mechanism ...

We often encounter the situation where slow devices should not be
probed during startup since probing is slow and maybe unnecessary
for unused devices. With MMC we have the 'probe' device parameter,
for ata we have the same, for USB we have the 'usb' command. Overall
this is not very consistent.
With MMC there is the additional problem that the probe parameter
is attached to the logical device when we often have the information
which physical device we want to probe.
This patch adds a 'detect' callback for devices and adds a command
to detect devices and to list the devices which are actually detecable.

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

block: implement block_read/block_write functions ...

Some drivers use blk->ops->read/write. This bypasses the caching block
layer and was never intended like this. The upper API to the block layer
is the cdev layer. This patch adds block_read and block_write functions
and uses them where appropriate.

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

block: remove unused read_start and read_done ops ...

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

treewide include/: Add missing includes ...

This adds several missing includes to files under include/ which
we relied on being included implicitly.

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

of: Add of_alias_get function ...

This is used to retrieve the name of the alias for a given
devicenode.

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

mci: embed mci device into struct mci ...

To safe a separate allocation and to make the code simpler.

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

driver: Attach info callback to device, not to driver ...

Since the info is device specific and not driver specific, attach
the callback to the device. This makes it possible to have a info
callback for a device which does not have a driver attached.

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

mci: Add support for MMC boot partitions ...

Some MMC cards support boot partitions. These are special regions
on the MMC card intended to put a bootloader on.

This patch adds support for these partitions, they are accessible
as /dev/diskx.boot[0|1].

Additionally the partitions can be configured bootable using a
device parameter. This can be used to mark the user area or one
of the boot partitions as bootable.

Since this feature is mostly seen on eMMC cards it is made optional
to lower the size impact for boards which do not have eMMC.

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

ARM: OMAP MCI: Move TWL6030 power initialization into OMAP directory ...

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

param: Add helpers to provide an enum parameter ...

We recently gained helper functions for different types of
device parameters. One thing missing was a helper for an
enum type parameter. This patch adds this.

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

param: Add info function ...

Some parameters may wish to provide some information about their
meaning or possible values. Provide an info callback for parameters.

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

of: provide NULL of_get_root_node for \!CONFIG_OFTREE ...

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

Merge branch 'for-next/of-misc' into for-next/imx-oftree

treewide: Fix typo seperate -> separate ...

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

net: Add of_register_ethaddr ...

We already have a possibility to register a MAC address provider
based on a ethernet device id. This adds a similar functionality
for devices probed from devicetree. Code can register itself to
be a MAC address provider for a certain devicetree node.

This helps on i.MX to let the IIM unit provide a MAC address for
the FEC.

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

of: Add of_match_node function ...

To match a of_device_id arrays against a device_node. Same functionality
as in the kernel.

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

nand_base: sync flash detection functions with linux 3.9's code ...

this fix the problems introduced when detecting non ONFI flashes in
commit 4c2bdc8
"nand_base: detect more ONFI flash"

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

of: separate out "generic" memory bank adding ...

This patch separates out the "generic" memory
segment registration function (of_add_memory_bank())
from of_add_memory().
The MIPS architecture has different view on memory
resources than the ARM and PPC architectures
so the "generic" of_add_memory_bank() is
unusable for the MIPS architecture.
We can add MIPS-specific of_add_memory_bank()
into arch/mips code.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

gpio: fix typos ...

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/param' ...

Conflicts:
	drivers/mci/mci-core.c

Merge branch 'for-next/of' ...

Conflicts:
	arch/arm/mach-imx/Makefile

Merge branch 'for-next/mtd'