summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-07-07 20:59:09 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-07-11 11:49:28 +0800
commitdaefb6961cc64745c285b279d938b1854f74f870 (patch)
treef801fbf66988718f9c48d14b11e43012cffa3987
parent6ca44acfc31ad485b18e2fca0428479b7d4f141d (diff)
downloadlinux-daefb6961cc64745c285b279d938b1854f74f870.tar.gz
linux-daefb6961cc64745c285b279d938b1854f74f870.tar.bz2
linux-daefb6961cc64745c285b279d938b1854f74f870.zip
ARM: dts: imx28: move extra gpmi-nand pins into board dts
Only pins GPMI_CE0N and GPMI_READY0 are generally used by other boards. Move GPMI_CE1N and GPMI_READY1 into imx28-evk.dts to make gpmi_pins_a more general, and can be used by other boards. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--arch/arm/boot/dts/imx28-evk.dts14
-rw-r--r--arch/arm/boot/dts/imx28.dtsi2
2 files changed, 13 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
index 0d8739dda1af..0444964dae56 100644
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -24,7 +24,8 @@
apbh@80000000 {
gpmi-nand@8000c000 {
pinctrl-names = "default";
- pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
+ pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg
+ &gpmi_pins_evk>;
status = "okay";
};
@@ -64,6 +65,17 @@
fsl,voltage = <1>;
fsl,pull-up = <0>;
};
+
+ gpmi_pins_evk: gpmi-nand-evk@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <
+ 0x0110 /* MX28_PAD_GPMI_CE1N__GPMI_CE1N */
+ 0x0150 /* MX28_PAD_GPMI_RDY1__GPMI_READY1 */
+ >;
+ fsl,drive-strength = <0>;
+ fsl,voltage = <1>;
+ fsl,pull-up = <0>;
+ };
};
lcdif@80030000 {
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index adb5ffc2ff0d..2874adcafad3 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -198,9 +198,7 @@
0x0060 /* MX28_PAD_GPMI_D06__GPMI_D6 */
0x0070 /* MX28_PAD_GPMI_D07__GPMI_D7 */
0x0100 /* MX28_PAD_GPMI_CE0N__GPMI_CE0N */
- 0x0110 /* MX28_PAD_GPMI_CE1N__GPMI_CE1N */
0x0140 /* MX28_PAD_GPMI_RDY0__GPMI_READY0 */
- 0x0150 /* MX28_PAD_GPMI_RDY1__GPMI_READY1 */
0x0180 /* MX28_PAD_GPMI_RDN__GPMI_RDN */
0x0190 /* MX28_PAD_GPMI_WRN__GPMI_WRN */
0x01a0 /* MX28_PAD_GPMI_ALE__GPMI_ALE */