diff options
| author | Huang Shijie <shijie8@gmail.com> | 2012-07-02 05:38:46 +0200 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-07-02 04:19:22 +0200 |
| commit | cf922fa8816c6294507e4d4b04c4c0dfc8f7a16a (patch) | |
| tree | c17e31369738eb43ed2c423abcc800e97ca49d99 /arch/arm/boot/dts/imx6q-arm2.dts | |
| parent | ARM: imx6q: add clock for apbh-dma (diff) | |
| download | linux-cf922fa8816c6294507e4d4b04c4c0dfc8f7a16a.tar.xz linux-cf922fa8816c6294507e4d4b04c4c0dfc8f7a16a.zip | |
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>
Diffstat (limited to 'arch/arm/boot/dts/imx6q-arm2.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6q-arm2.dts | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts index db4c6096c562..d792581672cc 100644 --- a/arch/arm/boot/dts/imx6q-arm2.dts +++ b/arch/arm/boot/dts/imx6q-arm2.dts @@ -22,6 +22,12 @@ }; soc { + gpmi-nand@00112000 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpmi_nand_1>; + status = "disabled"; /* gpmi nand conflicts with SD */ + }; + aips-bus@02100000 { /* AIPS2 */ ethernet@02188000 { phy-mode = "rgmii"; |