diff options
author | Huang Shijie <b32955@freescale.com> | 2014-03-21 03:53:00 -0400 |
---|---|---|
committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-16 09:58:05 -0400 |
commit | 864da433b1086a9f843818b67951c998c8dcdb07 (patch) | |
tree | 4332c9b5463c307d72391034527f8a5cb1aaa343 /arch/arm/boot | |
parent | 6ad20aa4af951f6ea9dc6b1d9b08caf507c7333d (diff) |
ENGR00304574-6 ARM: dts: imx6sx-17x17: add the gpmi DT node
Add the gpmi DT node.
Since it has pin conflict with qspi, we disable it by default.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/imx6sx-17x17-arm2.dts | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts index 7ccaaf906789..446d42424677 100644 --- a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts +++ b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts | |||
@@ -168,6 +168,12 @@ | |||
168 | fsl,wdog-reset = <1>; /* watchdog select of reset source */ | 168 | fsl,wdog-reset = <1>; /* watchdog select of reset source */ |
169 | }; | 169 | }; |
170 | 170 | ||
171 | &gpmi { | ||
172 | pinctrl-names = "default"; | ||
173 | pinctrl-0 = <&pinctrl_gpmi_nand_1>; | ||
174 | status = "disabled"; /* pin conflict with qspi*/ | ||
175 | }; | ||
176 | |||
171 | &i2c1 { | 177 | &i2c1 { |
172 | clock-frequency = <100000>; | 178 | clock-frequency = <100000>; |
173 | pinctrl-names = "default"; | 179 | pinctrl-names = "default"; |