HACK: ARM: OMAP2+: pdata-quirks: Add am437x-gp-evm NAND/eMMC selection

Some boards e.g. am437x-gp-evm, need a GPIO to enable the
right buffer for either NAND or eMMC operation. This falls out
of scope of both the drivers and hence must be done at the board
driver level.

Add the relevant quirk for am437x-gp-evm. The GPIO will
be configured depending on presence/abscense of gpmc node.

Signed-off-by: Roger Quadros <rogerq@ti.com>
ARM: dts: am437x-gp-evm: Make eMMC/NAND selection work

Enable GPIO2 node so all GPIO nodes are enabled else gpio
numbering is not contigious.

Move pinmux for spi2_cs0.gpio3_25 (SEL_eMMCorNANDn) out of
NAND node so it is initialized irrespective of NAND node
presence.

Signed-off-by: Roger Quadros <rogerq@ti.com>
ARM: dts: am437x-gp-evm: Add eMMC support

Add eMMC pinmux and mmc2 related bits. We keep the mmc2
controller disabled as it conflits with gpmc/NAND.

To enable emmc, simply set mmc2 controller node to "okay"
and set the gpmc node to "disabled".

Signed-off-by: Roger Quadros <rogerq@ti.com>
ARM: dts: dra7: Add clocks for DRA7x cpsw and cpts

Add clocks and clock names for DRA7x cpsw and cpts.

Signed-off-by: George Cherian <george.cherian@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
usb: musb: dsps: kill OTG timer on suspend

if we don't make sure to kill the timer, it could
expire after we have already gated our clocks.

That will trigger a Data Abort exception because
we would try to access register while clock is gated.

Fix that bug.

Fixes 869c597 (usb: musb: dsps: add support for suspend and resume)

Cc: <stable@vger.kernel.org> # v3.14+
Tested-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
ARM: dts: dra7-evm: remove mcspi1 pins

HDMI HPD pin can be muxed to be used for mcspi1. The current
dra7-evm.dts file contains muxing for both HDMI and MCSPI, which gives
an error.

Remove the mcspi1 pinmuxing and mcspi1 node, as it is not used on
dra7-evm.

Fixes 6e58b8f (ARM: dts: DRA7: Add the dts files
        for dra7 SoC and dra7-evm board)

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Merge branch 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel into ti-linux-3.14.y

TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.14.y

* 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
  ARM: dts: dra7-evm: remove mcspi1 pins
  usb: musb: dsps: kill OTG timer on suspend
  ARM: dts: dra7: Add clocks for DRA7x cpsw and cpts
  ARM: dts: am437x-gp-evm: Add eMMC support
  ARM: dts: am437x-gp-evm: Make eMMC/NAND selection work
  HACK: ARM: OMAP2+: pdata-quirks: Add am437x-gp-evm NAND/eMMC selection

Signed-off-by: Dan Murphy <DMurphy@ti.com>