Commit Graph

9 Commits

Author SHA1 Message Date
Huang Shijie cf922fa881 ARM: imx6q: add DT node for gpmi nand
Add the DT node for gpmi nand.
Add the pinmux support for gpmi nand.

The gpmi nand may conflicts with other modules, such as MMC.
So we do not enable the gpmi nand for mx6q-arm2 board, just add the
node for the board.

Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: Huang Shijie <shijie8@gmail.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-07-02 10:19:22 +08:00
Arnd Bergmann deb88cc3c6 Merge branch 'drivers/mmc' into next/dt2
Changes in the dt2 branch move stuff around that gets changed
in the drivers/mmc branch. I chose a non-obvious resolution by
adding the new bus-width property into all the tegra sdhci device
nodes.

Conflicts:
	arch/arm/boot/dts/tegra-cardhu.dts
	arch/arm/boot/dts/tegra-harmony.dts
	arch/arm/boot/dts/tegra-ventana.dts

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-15 13:44:11 +02:00
Arnd Bergmann 7f217794ff mmc: dt: Consolidate DT bindings
This patch unifies the current DT MMC bindings documentation and code,
adds generic MMC DT bindings documentation, and updates .dts files for
consistency.

[cjb: typo fixes, addition of max-frequency property]
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-15 13:29:42 +02:00
Dong Aisheng 551fd208f2 ARM: dts: imx6q-arm2: add pinctrl state for usdhc
Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11 15:17:58 +08:00
Fabio Estevam 4e692101ab ARM: imx6q-arm2: Remove hardcoded mac address
Do not hardcode the local mac address.

Let bootloader retrieve it.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11 15:08:30 +08:00
Shawn Guo 0c456cfa7e ARM: imx: rename uart and fec device tree nodes
It has been pointed out by device tree maintainer for several times
that the generic names 'serial' and 'ethernet' should be used for
those devices per ePAPR.  Renames imx uart and fec device tree nodes
to stop them being bad examples.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-05-11 15:08:24 +08:00
Fabio Estevam 4592a96591 ARM: dts: imx: Remove bootargs field
Remove bootargs field as this information is retrieved from the bootloader.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11 15:08:19 +08:00
Shawn Guo 648162ac18 ARM: dts: imx6q-arm2: add vmmc-supply for usdhc
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-02-27 17:13:27 +08:00
Dirk Behme 752baf5647 arm/imx6q: Rename Sabreauto to Armadillo2
The Sabreauto board was renamed to Armadillo2 recently. To avoid
confusion, rename Sabreauto to Armadillo2/arm2.

Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2011-12-14 21:25:46 +08:00