linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 1/2] ARM: dts: imx27-pdk: Add NAND support
@ 2014-04-17 18:23 Fabio Estevam
  2014-04-17 18:23 ` [PATCH v2 2/2] ARM: dts: imx27-pdk: Add keypad support Fabio Estevam
  2014-04-19  5:11 ` [PATCH v2 1/2] ARM: dts: imx27-pdk: Add NAND support Shawn Guo
  0 siblings, 2 replies; 3+ messages in thread
From: Fabio Estevam @ 2014-04-17 18:23 UTC (permalink / raw)
  To: linux-arm-kernel

From: Fabio Estevam <fabio.estevam@freescale.com>

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Add NAND pins

 arch/arm/boot/dts/imx27-pdk.dts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/arch/arm/boot/dts/imx27-pdk.dts b/arch/arm/boot/dts/imx27-pdk.dts
index 971961f..042d7ff 100644
--- a/arch/arm/boot/dts/imx27-pdk.dts
+++ b/arch/arm/boot/dts/imx27-pdk.dts
@@ -84,6 +84,14 @@
 	status = "okay";
 };
 
+&nfc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_nand>;
+	nand-ecc-mode = "hw";
+	nand-on-flash-bbt;
+	status = "okay";
+};
+
 &uart1 {
 	fsl,uart-has-rtscts;
 	pinctrl-names = "default";
@@ -135,6 +143,18 @@
 			>;
 		};
 
+		pinctrl_nand: nandgrp {
+			fsl,pins = <
+				MX27_PAD_NFRB__NFRB	0x0
+				MX27_PAD_NFCLE__NFCLE	0x0
+				MX27_PAD_NFWP_B__NFWP_B	0x0
+				MX27_PAD_NFCE_B__NFCE_B	0x0
+				MX27_PAD_NFALE__NFALE	0x0
+				MX27_PAD_NFRE_B__NFRE_B	0x0
+				MX27_PAD_NFWE_B__NFWE_B	0x0
+			>;
+		};
+
 		pinctrl_uart1: uart1grp {
 			fsl,pins = <
 				MX27_PAD_UART1_TXD__UART1_TXD 0x0
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH v2 2/2] ARM: dts: imx27-pdk: Add keypad support
  2014-04-17 18:23 [PATCH v2 1/2] ARM: dts: imx27-pdk: Add NAND support Fabio Estevam
@ 2014-04-17 18:23 ` Fabio Estevam
  2014-04-19  5:11 ` [PATCH v2 1/2] ARM: dts: imx27-pdk: Add NAND support Shawn Guo
  1 sibling, 0 replies; 3+ messages in thread
From: Fabio Estevam @ 2014-04-17 18:23 UTC (permalink / raw)
  To: linux-arm-kernel

From: Fabio Estevam <fabio.estevam@freescale.com>

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Add the input header into imx27.dtsi

 arch/arm/boot/dts/imx27-pdk.dts | 15 +++++++++++++++
 arch/arm/boot/dts/imx27.dtsi    |  1 +
 2 files changed, 16 insertions(+)

diff --git a/arch/arm/boot/dts/imx27-pdk.dts b/arch/arm/boot/dts/imx27-pdk.dts
index 042d7ff..764cf79 100644
--- a/arch/arm/boot/dts/imx27-pdk.dts
+++ b/arch/arm/boot/dts/imx27-pdk.dts
@@ -84,6 +84,21 @@
 	status = "okay";
 };
 
+&kpp {
+	linux,keymap = <
+		MATRIX_KEY(0, 0, KEY_UP)
+		MATRIX_KEY(0, 1, KEY_DOWN)
+		MATRIX_KEY(1, 0, KEY_RIGHT)
+		MATRIX_KEY(1, 1, KEY_LEFT)
+		MATRIX_KEY(1, 2, KEY_ENTER)
+		MATRIX_KEY(2, 0, KEY_F6)
+		MATRIX_KEY(2, 1, KEY_F8)
+		MATRIX_KEY(2, 2, KEY_F9)
+		MATRIX_KEY(2, 3, KEY_F10)
+	>;
+	status = "okay";
+};
+
 &nfc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_nand>;
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index b2c103e..a75555c 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -11,6 +11,7 @@
 
 #include "skeleton.dtsi"
 #include "imx27-pinfunc.h"
+#include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
 
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH v2 1/2] ARM: dts: imx27-pdk: Add NAND support
  2014-04-17 18:23 [PATCH v2 1/2] ARM: dts: imx27-pdk: Add NAND support Fabio Estevam
  2014-04-17 18:23 ` [PATCH v2 2/2] ARM: dts: imx27-pdk: Add keypad support Fabio Estevam
@ 2014-04-19  5:11 ` Shawn Guo
  1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2014-04-19  5:11 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Apr 17, 2014 at 03:23:30PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes since v1:
> - Add NAND pins

Applied both, thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-04-19  5:11 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-17 18:23 [PATCH v2 1/2] ARM: dts: imx27-pdk: Add NAND support Fabio Estevam
2014-04-17 18:23 ` [PATCH v2 2/2] ARM: dts: imx27-pdk: Add keypad support Fabio Estevam
2014-04-19  5:11 ` [PATCH v2 1/2] ARM: dts: imx27-pdk: Add NAND support Shawn Guo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).