[PATCH 0/2] Add device tree support for omap4 keypad

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH 0/2] Add device tree support for omap4 keypad
@ 2012-04-04 13:30 ` Sourav Poddar
  0 siblings, 0 replies; 18+ messages in thread
From: Sourav Poddar @ 2012-04-04 13:30 UTC (permalink / raw)
  To: devicetree-discuss
  Cc: linux-arm-kernel, linux-kernel, linux-input, Sourav Poddar,
	Rob Herring, Grant Likely, Felipe Balbi

This series adds device tree support for omap4
onchip keypad.

Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Felipe Balbi <balbi@ti.com>

Sourav Poddar (2):
  arm/dts: omap4-sdp: Add keypad data
  drivers: input: keypad: Add device tree support

Test Info:
-Tested on Omap4430 sdp with 3.4-rc1

 .../devicetree/bindings/input/omap-keypad.txt      |   52 ++++
 arch/arm/boot/dts/omap4-sdp.dts                    |  291 ++++++++++++++++++++
 arch/arm/boot/dts/omap4.dtsi                       |    5 +
 drivers/input/keyboard/omap4-keypad.c              |  114 ++++++--
 4 files changed, 439 insertions(+), 23 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/omap-keypad.txt


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

* [PATCH 0/2] Add device tree support for omap4 keypad
@ 2012-04-04 13:30 ` Sourav Poddar
  0 siblings, 0 replies; 18+ messages in thread
From: Sourav Poddar @ 2012-04-04 13:30 UTC (permalink / raw)
  To: devicetree-discuss
  Cc: linux-arm-kernel, linux-kernel, linux-input, Sourav Poddar,
	Rob Herring, Grant Likely, Felipe Balbi

This series adds device tree support for omap4
onchip keypad.

Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Felipe Balbi <balbi@ti.com>

Sourav Poddar (2):
  arm/dts: omap4-sdp: Add keypad data
  drivers: input: keypad: Add device tree support

Test Info:
-Tested on Omap4430 sdp with 3.4-rc1

 .../devicetree/bindings/input/omap-keypad.txt      |   52 ++++
 arch/arm/boot/dts/omap4-sdp.dts                    |  291 ++++++++++++++++++++
 arch/arm/boot/dts/omap4.dtsi                       |    5 +
 drivers/input/keyboard/omap4-keypad.c              |  114 ++++++--
 4 files changed, 439 insertions(+), 23 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/omap-keypad.txt


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

* [PATCH 0/2] Add device tree support for omap4 keypad
@ 2012-04-04 13:30 ` Sourav Poddar
  0 siblings, 0 replies; 18+ messages in thread
From: Sourav Poddar @ 2012-04-04 13:30 UTC (permalink / raw)
  To: linux-arm-kernel

This series adds device tree support for omap4
onchip keypad.

Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Felipe Balbi <balbi@ti.com>

Sourav Poddar (2):
  arm/dts: omap4-sdp: Add keypad data
  drivers: input: keypad: Add device tree support

Test Info:
-Tested on Omap4430 sdp with 3.4-rc1

 .../devicetree/bindings/input/omap-keypad.txt      |   52 ++++
 arch/arm/boot/dts/omap4-sdp.dts                    |  291 ++++++++++++++++++++
 arch/arm/boot/dts/omap4.dtsi                       |    5 +
 drivers/input/keyboard/omap4-keypad.c              |  114 ++++++--
 4 files changed, 439 insertions(+), 23 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/omap-keypad.txt

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

* [PATCH 1/2] arm/dts: omap4-sdp: Add keypad data
  2012-04-04 13:30 ` Sourav Poddar
  (?)
@ 2012-04-04 13:30   ` Sourav Poddar
  -1 siblings, 0 replies; 18+ messages in thread
From: Sourav Poddar @ 2012-04-04 13:30 UTC (permalink / raw)
  To: devicetree-discuss
  Cc: linux-arm-kernel, linux-kernel, linux-input, Sourav Poddar,
	Benoit Cousson, Rob Herring, Grant Likely, Felipe Balbi

This patch add keypad data node in omap4 device tree
file.

Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
---
 arch/arm/boot/dts/omap4-sdp.dts |  291 +++++++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/omap4.dtsi    |    5 +
 2 files changed, 296 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 63c6b2b..ac855b8 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -17,4 +17,295 @@
 		device_type = "memory";
 		reg = <0x80000000 0x40000000>; /* 1 GB */
 	};
+
+	keypad@4ae1c000 {
+		keypad,num-rows = <8>;
+		keypad,num-columns = <8>;
+
+		key_E {
+			keypad,row = <0>;
+			keypad,column = <0>;
+			linux,code = <18>;
+		};
+		key_R {
+			keypad,row = <0>;
+			keypad,column = <1>;
+			linux,code = <19>;
+		};
+		key_T {
+			keypad,row = <0>;
+			keypad,column = <2>;
+			linux,code = <20>;
+		};
+		key_HOME {
+			keypad,row = <0>;
+			keypad,column = <3>;
+			linux,code = <102>;
+		};
+		key_F5 {
+			keypad,row = <0>;
+			keypad,column = <4>;
+			linux,code = <63>;
+		};
+		key_I {
+			keypad,row = <0>;
+			keypad,column = <6>;
+			linux,code = <23>;
+		};
+		key_LEFTSHIFT {
+			keypad,row = <0>;
+			keypad,column = <7>;
+			linux,code = <42>;
+		};
+		key_D {
+			keypad,row = <1>;
+			keypad,column = <0>;
+			linux,code = <32>;
+		};
+		key_F {
+			keypad,row = <1>;
+			keypad,column = <1>;
+			linux,code = <33>;
+		};
+		key_G {
+			keypad,row = <1>;
+			keypad,column = <2>;
+			linux,code = <34>;
+		};
+		key_SEND {
+			keypad,row = <1>;
+			keypad,column = <3>;
+			linux,code = <84>;
+		};
+		key_F6 {
+			keypad,row = <1>;
+			keypad,column = <4>;
+			linux,code = <64>;
+		};
+		key_K {
+			keypad,row = <1>;
+			keypad,column = <6>;
+			linux,code = <37>;
+		};
+		key_ENTER {
+			keypad,row = <1>;
+			keypad,column = <7>;
+			linux,code = <28>;
+		};
+		key_X {
+			keypad,row = <2>;
+			keypad,column = <0>;
+			linux,code = <45>;
+		};
+		key_C {
+			keypad,row = <2>;
+			keypad,column = <1>;
+			linux,code = <46>;
+		};
+		key_V {
+			keypad,row = <2>;
+			keypad,column = <2>;
+			linux,code = <47>;
+		};
+		key_END {
+			keypad,row = <2>;
+			keypad,column = <3>;
+			linux,code = <107>;
+		};
+		key_F7 {
+			keypad,row = <2>;
+			keypad,column = <4>;
+			linux,code = <65>;
+		};
+		key_DOT {
+			keypad,row = <2>;
+			keypad,column = <6>;
+			linux,code = <52>;
+		};
+		key_CAPSLOCK {
+                        keypad,row = <2>;
+                        keypad,column = <7>;
+                        linux,code = <58>;
+                };
+		key_Z {
+			keypad,row = <3>;
+			keypad,column = <0>;
+			linux,code = <44>;
+		};
+		key_KPLUS {
+			keypad,row = <3>;
+			keypad,column = <1>;
+			linux,code = <78>;
+		};
+		key_B {
+			keypad,row = <3>;
+			keypad,column = <2>;
+			linux,code = <48>;
+		};
+		key_F1 {
+			keypad,row = <3>;
+			keypad,column = <3>;
+			linux,code = <59>;
+		};
+		key_F8 {
+			keypad,row = <3>;
+			keypad,column = <4>;
+			linux,code = <66>;
+		};
+		key_O {
+			keypad,row = <3>;
+			keypad,column = <6>;
+			linux,code = <24>;
+                };
+		key_SPACE {
+			keypad,row = <3>;
+			keypad,column = <7>;
+			linux,code = <57>;
+                };
+		key_W {
+			keypad,row = <4>;
+			keypad,column = <0>;
+			linux,code = <17>;
+                };
+		key_Y {
+			keypad,row = <4>;
+			keypad,column = <1>;
+			linux,code = <21>;
+		};
+		key_U {
+			keypad,row = <4>;
+			keypad,column = <2>;
+			linux,code = <22>;
+		};
+		key_F2 {
+			keypad,row = <4>;
+			keypad,column = <3>;
+			linux,code = <60>;
+		};
+		key_VOLUMEUP {
+			keypad,row = <4>;
+			keypad,column = <4>;
+			linux,code = <115>;
+		};
+		key_L {
+			keypad,row = <4>;
+			keypad,column = <6>;
+			linux,code = <38>;
+		};
+		key_LEFT {
+			keypad,row = <4>;
+			keypad,column = <7>;
+			linux,code = <105>;
+		};
+		key_S {
+			keypad,row = <5>;
+			keypad,column = <0>;
+			linux,code = <31>;
+		};
+		key_H {
+			keypad,row = <5>;
+			keypad,column = <1>;
+			linux,code = <35>;
+		};
+		key_J {
+			keypad,row = <5>;
+			keypad,column = <2>;
+			linux,code = <36>;
+		};
+		key_F3 {
+			keypad,row = <5>;
+			keypad,column = <3>;
+			linux,code = <61>;
+		};
+		key_F9 {
+			keypad,row = <5>;
+			keypad,column = <4>;
+			linux,code = <67>;
+		};
+		key_VOLUMEDOWN {
+			keypad,row = <5>;
+			keypad,column = <5>;
+			linux,code = <114>;
+		};
+		key_M {
+			keypad,row = <5>;
+			keypad,column = <6>;
+			linux,code = <50>;
+		};
+		key_RIGHT {
+			keypad,row = <5>;
+			keypad,column = <7>;
+			linux,code = <106>;
+		};
+		key_Q {
+			keypad,row = <6>;
+			keypad,column = <0>;
+			linux,code = <16>;
+		};
+		key_A {
+			keypad,row = <6>;
+			keypad,column = <1>;
+			linux,code = <30>;
+                };
+		key_N {
+			keypad,row = <6>;
+			keypad,column = <2>;
+			linux,code = <49>;
+                };
+		key_BACK {
+			keypad,row = <6>;
+			keypad,column = <3>;
+			linux,code = <92>;
+                };
+		key_BACKSPACE {
+			keypad,row = <6>;
+			keypad,column = <4>;
+			linux,code = <14>;
+		};
+		key_P {
+			keypad,row = <6>;
+			keypad,column = <6>;
+			linux,code = <25>;
+		};
+		key_UP {
+			keypad,row = <6>;
+			keypad,column = <7>;
+			linux,code = <103>;
+		};
+		key_PROG1 {
+			keypad,row = <7>;
+			keypad,column = <0>;
+			linux,code = <148>;
+		};
+		key_PROG2 {
+			keypad,row = <7>;
+			keypad,column = <1>;
+			linux,code = <149>;
+		};
+		key_PROG3 {
+			keypad,row = <7>;
+			keypad,column = <2>;
+			linux,code = <202>;
+                };
+		key_PROG4 {
+			keypad,row = <7>;
+			keypad,column = <3>;
+			linux,code = <203>;
+		};
+		key_F4 {
+			keypad,row = <7>;
+			keypad,column = <4>;
+			linux,code = <62>;
+		};
+		key_Ok {
+			keypad,row = <7>;
+			keypad,column = <6>;
+			linux,code = <352>;
+		};
+		key_DOWN {
+			keypad,row = <7>;
+			keypad,column = <7>;
+			linux,code = <108>;
+		};
+	};
 };
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 3d35559..e0f678a 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -156,4 +156,9 @@
 			ti,hwmods = "i2c4";
 		};
 	};
+
+	keypad@4ae1c000 {
+		compatible = "ti,omap4-keypad";
+		ti,hwmods = "kbd";
+	};
 };
-- 
1.7.1

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

* [PATCH 1/2] arm/dts: omap4-sdp: Add keypad data
@ 2012-04-04 13:30   ` Sourav Poddar
  0 siblings, 0 replies; 18+ messages in thread
From: Sourav Poddar @ 2012-04-04 13:30 UTC (permalink / raw)
  To: devicetree-discuss
  Cc: linux-arm-kernel, linux-kernel, linux-input, Sourav Poddar,
	Benoit Cousson, Rob Herring, Grant Likely, Felipe Balbi

This patch add keypad data node in omap4 device tree
file.

Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
---
 arch/arm/boot/dts/omap4-sdp.dts |  291 +++++++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/omap4.dtsi    |    5 +
 2 files changed, 296 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 63c6b2b..ac855b8 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -17,4 +17,295 @@
 		device_type = "memory";
 		reg = <0x80000000 0x40000000>; /* 1 GB */
 	};
+
+	keypad@4ae1c000 {
+		keypad,num-rows = <8>;
+		keypad,num-columns = <8>;
+
+		key_E {
+			keypad,row = <0>;
+			keypad,column = <0>;
+			linux,code = <18>;
+		};
+		key_R {
+			keypad,row = <0>;
+			keypad,column = <1>;
+			linux,code = <19>;
+		};
+		key_T {
+			keypad,row = <0>;
+			keypad,column = <2>;
+			linux,code = <20>;
+		};
+		key_HOME {
+			keypad,row = <0>;
+			keypad,column = <3>;
+			linux,code = <102>;
+		};
+		key_F5 {
+			keypad,row = <0>;
+			keypad,column = <4>;
+			linux,code = <63>;
+		};
+		key_I {
+			keypad,row = <0>;
+			keypad,column = <6>;
+			linux,code = <23>;
+		};
+		key_LEFTSHIFT {
+			keypad,row = <0>;
+			keypad,column = <7>;
+			linux,code = <42>;
+		};
+		key_D {
+			keypad,row = <1>;
+			keypad,column = <0>;
+			linux,code = <32>;
+		};
+		key_F {
+			keypad,row = <1>;
+			keypad,column = <1>;
+			linux,code = <33>;
+		};
+		key_G {
+			keypad,row = <1>;
+			keypad,column = <2>;
+			linux,code = <34>;
+		};
+		key_SEND {
+			keypad,row = <1>;
+			keypad,column = <3>;
+			linux,code = <84>;
+		};
+		key_F6 {
+			keypad,row = <1>;
+			keypad,column = <4>;
+			linux,code = <64>;
+		};
+		key_K {
+			keypad,row = <1>;
+			keypad,column = <6>;
+			linux,code = <37>;
+		};
+		key_ENTER {
+			keypad,row = <1>;
+			keypad,column = <7>;
+			linux,code = <28>;
+		};
+		key_X {
+			keypad,row = <2>;
+			keypad,column = <0>;
+			linux,code = <45>;
+		};
+		key_C {
+			keypad,row = <2>;
+			keypad,column = <1>;
+			linux,code = <46>;
+		};
+		key_V {
+			keypad,row = <2>;
+			keypad,column = <2>;
+			linux,code = <47>;
+		};
+		key_END {
+			keypad,row = <2>;
+			keypad,column = <3>;
+			linux,code = <107>;
+		};
+		key_F7 {
+			keypad,row = <2>;
+			keypad,column = <4>;
+			linux,code = <65>;
+		};
+		key_DOT {
+			keypad,row = <2>;
+			keypad,column = <6>;
+			linux,code = <52>;
+		};
+		key_CAPSLOCK {
+                        keypad,row = <2>;
+                        keypad,column = <7>;
+                        linux,code = <58>;
+                };
+		key_Z {
+			keypad,row = <3>;
+			keypad,column = <0>;
+			linux,code = <44>;
+		};
+		key_KPLUS {
+			keypad,row = <3>;
+			keypad,column = <1>;
+			linux,code = <78>;
+		};
+		key_B {
+			keypad,row = <3>;
+			keypad,column = <2>;
+			linux,code = <48>;
+		};
+		key_F1 {
+			keypad,row = <3>;
+			keypad,column = <3>;
+			linux,code = <59>;
+		};
+		key_F8 {
+			keypad,row = <3>;
+			keypad,column = <4>;
+			linux,code = <66>;
+		};
+		key_O {
+			keypad,row = <3>;
+			keypad,column = <6>;
+			linux,code = <24>;
+                };
+		key_SPACE {
+			keypad,row = <3>;
+			keypad,column = <7>;
+			linux,code = <57>;
+                };
+		key_W {
+			keypad,row = <4>;
+			keypad,column = <0>;
+			linux,code = <17>;
+                };
+		key_Y {
+			keypad,row = <4>;
+			keypad,column = <1>;
+			linux,code = <21>;
+		};
+		key_U {
+			keypad,row = <4>;
+			keypad,column = <2>;
+			linux,code = <22>;
+		};
+		key_F2 {
+			keypad,row = <4>;
+			keypad,column = <3>;
+			linux,code = <60>;
+		};
+		key_VOLUMEUP {
+			keypad,row = <4>;
+			keypad,column = <4>;
+			linux,code = <115>;
+		};
+		key_L {
+			keypad,row = <4>;
+			keypad,column = <6>;
+			linux,code = <38>;
+		};
+		key_LEFT {
+			keypad,row = <4>;
+			keypad,column = <7>;
+			linux,code = <105>;
+		};
+		key_S {
+			keypad,row = <5>;
+			keypad,column = <0>;
+			linux,code = <31>;
+		};
+		key_H {
+			keypad,row = <5>;
+			keypad,column = <1>;
+			linux,code = <35>;
+		};
+		key_J {
+			keypad,row = <5>;
+			keypad,column = <2>;
+			linux,code = <36>;
+		};
+		key_F3 {
+			keypad,row = <5>;
+			keypad,column = <3>;
+			linux,code = <61>;
+		};
+		key_F9 {
+			keypad,row = <5>;
+			keypad,column = <4>;
+			linux,code = <67>;
+		};
+		key_VOLUMEDOWN {
+			keypad,row = <5>;
+			keypad,column = <5>;
+			linux,code = <114>;
+		};
+		key_M {
+			keypad,row = <5>;
+			keypad,column = <6>;
+			linux,code = <50>;
+		};
+		key_RIGHT {
+			keypad,row = <5>;
+			keypad,column = <7>;
+			linux,code = <106>;
+		};
+		key_Q {
+			keypad,row = <6>;
+			keypad,column = <0>;
+			linux,code = <16>;
+		};
+		key_A {
+			keypad,row = <6>;
+			keypad,column = <1>;
+			linux,code = <30>;
+                };
+		key_N {
+			keypad,row = <6>;
+			keypad,column = <2>;
+			linux,code = <49>;
+                };
+		key_BACK {
+			keypad,row = <6>;
+			keypad,column = <3>;
+			linux,code = <92>;
+                };
+		key_BACKSPACE {
+			keypad,row = <6>;
+			keypad,column = <4>;
+			linux,code = <14>;
+		};
+		key_P {
+			keypad,row = <6>;
+			keypad,column = <6>;
+			linux,code = <25>;
+		};
+		key_UP {
+			keypad,row = <6>;
+			keypad,column = <7>;
+			linux,code = <103>;
+		};
+		key_PROG1 {
+			keypad,row = <7>;
+			keypad,column = <0>;
+			linux,code = <148>;
+		};
+		key_PROG2 {
+			keypad,row = <7>;
+			keypad,column = <1>;
+			linux,code = <149>;
+		};
+		key_PROG3 {
+			keypad,row = <7>;
+			keypad,column = <2>;
+			linux,code = <202>;
+                };
+		key_PROG4 {
+			keypad,row = <7>;
+			keypad,column = <3>;
+			linux,code = <203>;
+		};
+		key_F4 {
+			keypad,row = <7>;
+			keypad,column = <4>;
+			linux,code = <62>;
+		};
+		key_Ok {
+			keypad,row = <7>;
+			keypad,column = <6>;
+			linux,code = <352>;
+		};
+		key_DOWN {
+			keypad,row = <7>;
+			keypad,column = <7>;
+			linux,code = <108>;
+		};
+	};
 };
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 3d35559..e0f678a 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -156,4 +156,9 @@
 			ti,hwmods = "i2c4";
 		};
 	};
+
+	keypad@4ae1c000 {
+		compatible = "ti,omap4-keypad";
+		ti,hwmods = "kbd";
+	};
 };
-- 
1.7.1


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

* [PATCH 1/2] arm/dts: omap4-sdp: Add keypad data
@ 2012-04-04 13:30   ` Sourav Poddar
  0 siblings, 0 replies; 18+ messages in thread
From: Sourav Poddar @ 2012-04-04 13:30 UTC (permalink / raw)
  To: linux-arm-kernel

This patch add keypad data node in omap4 device tree
file.

Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
---
 arch/arm/boot/dts/omap4-sdp.dts |  291 +++++++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/omap4.dtsi    |    5 +
 2 files changed, 296 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 63c6b2b..ac855b8 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -17,4 +17,295 @@
 		device_type = "memory";
 		reg = <0x80000000 0x40000000>; /* 1 GB */
 	};
+
+	keypad at 4ae1c000 {
+		keypad,num-rows = <8>;
+		keypad,num-columns = <8>;
+
+		key_E {
+			keypad,row = <0>;
+			keypad,column = <0>;
+			linux,code = <18>;
+		};
+		key_R {
+			keypad,row = <0>;
+			keypad,column = <1>;
+			linux,code = <19>;
+		};
+		key_T {
+			keypad,row = <0>;
+			keypad,column = <2>;
+			linux,code = <20>;
+		};
+		key_HOME {
+			keypad,row = <0>;
+			keypad,column = <3>;
+			linux,code = <102>;
+		};
+		key_F5 {
+			keypad,row = <0>;
+			keypad,column = <4>;
+			linux,code = <63>;
+		};
+		key_I {
+			keypad,row = <0>;
+			keypad,column = <6>;
+			linux,code = <23>;
+		};
+		key_LEFTSHIFT {
+			keypad,row = <0>;
+			keypad,column = <7>;
+			linux,code = <42>;
+		};
+		key_D {
+			keypad,row = <1>;
+			keypad,column = <0>;
+			linux,code = <32>;
+		};
+		key_F {
+			keypad,row = <1>;
+			keypad,column = <1>;
+			linux,code = <33>;
+		};
+		key_G {
+			keypad,row = <1>;
+			keypad,column = <2>;
+			linux,code = <34>;
+		};
+		key_SEND {
+			keypad,row = <1>;
+			keypad,column = <3>;
+			linux,code = <84>;
+		};
+		key_F6 {
+			keypad,row = <1>;
+			keypad,column = <4>;
+			linux,code = <64>;
+		};
+		key_K {
+			keypad,row = <1>;
+			keypad,column = <6>;
+			linux,code = <37>;
+		};
+		key_ENTER {
+			keypad,row = <1>;
+			keypad,column = <7>;
+			linux,code = <28>;
+		};
+		key_X {
+			keypad,row = <2>;
+			keypad,column = <0>;
+			linux,code = <45>;
+		};
+		key_C {
+			keypad,row = <2>;
+			keypad,column = <1>;
+			linux,code = <46>;
+		};
+		key_V {
+			keypad,row = <2>;
+			keypad,column = <2>;
+			linux,code = <47>;
+		};
+		key_END {
+			keypad,row = <2>;
+			keypad,column = <3>;
+			linux,code = <107>;
+		};
+		key_F7 {
+			keypad,row = <2>;
+			keypad,column = <4>;
+			linux,code = <65>;
+		};
+		key_DOT {
+			keypad,row = <2>;
+			keypad,column = <6>;
+			linux,code = <52>;
+		};
+		key_CAPSLOCK {
+                        keypad,row = <2>;
+                        keypad,column = <7>;
+                        linux,code = <58>;
+                };
+		key_Z {
+			keypad,row = <3>;
+			keypad,column = <0>;
+			linux,code = <44>;
+		};
+		key_KPLUS {
+			keypad,row = <3>;
+			keypad,column = <1>;
+			linux,code = <78>;
+		};
+		key_B {
+			keypad,row = <3>;
+			keypad,column = <2>;
+			linux,code = <48>;
+		};
+		key_F1 {
+			keypad,row = <3>;
+			keypad,column = <3>;
+			linux,code = <59>;
+		};
+		key_F8 {
+			keypad,row = <3>;
+			keypad,column = <4>;
+			linux,code = <66>;
+		};
+		key_O {
+			keypad,row = <3>;
+			keypad,column = <6>;
+			linux,code = <24>;
+                };
+		key_SPACE {
+			keypad,row = <3>;
+			keypad,column = <7>;
+			linux,code = <57>;
+                };
+		key_W {
+			keypad,row = <4>;
+			keypad,column = <0>;
+			linux,code = <17>;
+                };
+		key_Y {
+			keypad,row = <4>;
+			keypad,column = <1>;
+			linux,code = <21>;
+		};
+		key_U {
+			keypad,row = <4>;
+			keypad,column = <2>;
+			linux,code = <22>;
+		};
+		key_F2 {
+			keypad,row = <4>;
+			keypad,column = <3>;
+			linux,code = <60>;
+		};
+		key_VOLUMEUP {
+			keypad,row = <4>;
+			keypad,column = <4>;
+			linux,code = <115>;
+		};
+		key_L {
+			keypad,row = <4>;
+			keypad,column = <6>;
+			linux,code = <38>;
+		};
+		key_LEFT {
+			keypad,row = <4>;
+			keypad,column = <7>;
+			linux,code = <105>;
+		};
+		key_S {
+			keypad,row = <5>;
+			keypad,column = <0>;
+			linux,code = <31>;
+		};
+		key_H {
+			keypad,row = <5>;
+			keypad,column = <1>;
+			linux,code = <35>;
+		};
+		key_J {
+			keypad,row = <5>;
+			keypad,column = <2>;
+			linux,code = <36>;
+		};
+		key_F3 {
+			keypad,row = <5>;
+			keypad,column = <3>;
+			linux,code = <61>;
+		};
+		key_F9 {
+			keypad,row = <5>;
+			keypad,column = <4>;
+			linux,code = <67>;
+		};
+		key_VOLUMEDOWN {
+			keypad,row = <5>;
+			keypad,column = <5>;
+			linux,code = <114>;
+		};
+		key_M {
+			keypad,row = <5>;
+			keypad,column = <6>;
+			linux,code = <50>;
+		};
+		key_RIGHT {
+			keypad,row = <5>;
+			keypad,column = <7>;
+			linux,code = <106>;
+		};
+		key_Q {
+			keypad,row = <6>;
+			keypad,column = <0>;
+			linux,code = <16>;
+		};
+		key_A {
+			keypad,row = <6>;
+			keypad,column = <1>;
+			linux,code = <30>;
+                };
+		key_N {
+			keypad,row = <6>;
+			keypad,column = <2>;
+			linux,code = <49>;
+                };
+		key_BACK {
+			keypad,row = <6>;
+			keypad,column = <3>;
+			linux,code = <92>;
+                };
+		key_BACKSPACE {
+			keypad,row = <6>;
+			keypad,column = <4>;
+			linux,code = <14>;
+		};
+		key_P {
+			keypad,row = <6>;
+			keypad,column = <6>;
+			linux,code = <25>;
+		};
+		key_UP {
+			keypad,row = <6>;
+			keypad,column = <7>;
+			linux,code = <103>;
+		};
+		key_PROG1 {
+			keypad,row = <7>;
+			keypad,column = <0>;
+			linux,code = <148>;
+		};
+		key_PROG2 {
+			keypad,row = <7>;
+			keypad,column = <1>;
+			linux,code = <149>;
+		};
+		key_PROG3 {
+			keypad,row = <7>;
+			keypad,column = <2>;
+			linux,code = <202>;
+                };
+		key_PROG4 {
+			keypad,row = <7>;
+			keypad,column = <3>;
+			linux,code = <203>;
+		};
+		key_F4 {
+			keypad,row = <7>;
+			keypad,column = <4>;
+			linux,code = <62>;
+		};
+		key_Ok {
+			keypad,row = <7>;
+			keypad,column = <6>;
+			linux,code = <352>;
+		};
+		key_DOWN {
+			keypad,row = <7>;
+			keypad,column = <7>;
+			linux,code = <108>;
+		};
+	};
 };
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 3d35559..e0f678a 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -156,4 +156,9 @@
 			ti,hwmods = "i2c4";
 		};
 	};
+
+	keypad at 4ae1c000 {
+		compatible = "ti,omap4-keypad";
+		ti,hwmods = "kbd";
+	};
 };
-- 
1.7.1

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

* Re: [PATCH 1/2] arm/dts: omap4-sdp: Add keypad data
  2012-04-04 13:30   ` Sourav Poddar
  (?)
@ 2012-04-04 13:48     ` Cousson, Benoit
  -1 siblings, 0 replies; 18+ messages in thread
From: Cousson, Benoit @ 2012-04-04 13:48 UTC (permalink / raw)
  To: Sourav Poddar
  Cc: devicetree-discuss, linux-kernel, Rob Herring, Grant Likely,
	Felipe Balbi, linux-input, linux-arm-kernel

Hi Sourav,

On 4/4/2012 3:30 PM, Sourav Poddar wrote:
> This patch add keypad data node in omap4 device tree
> file.

Nit: You should adapt first the driver to DT and document the binding 
before using it.

So this patch should be the second one.

Regards,
Benoit

>
> Cc: Benoit Cousson<b-cousson@ti.com>
> Cc: Rob Herring<rob.herring@calxeda.com>
> Cc: Grant Likely<grant.likely@secretlab.ca>
> Cc: Felipe Balbi<balbi@ti.com>
> Signed-off-by: Sourav Poddar<sourav.poddar@ti.com>
> ---
>   arch/arm/boot/dts/omap4-sdp.dts |  291 +++++++++++++++++++++++++++++++++++++++
>   arch/arm/boot/dts/omap4.dtsi    |    5 +
>   2 files changed, 296 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
> index 63c6b2b..ac855b8 100644
> --- a/arch/arm/boot/dts/omap4-sdp.dts
> +++ b/arch/arm/boot/dts/omap4-sdp.dts
> @@ -17,4 +17,295 @@
>   		device_type = "memory";
>   		reg =<0x80000000 0x40000000>; /* 1 GB */
>   	};
> +
> +	keypad@4ae1c000 {
> +		keypad,num-rows =<8>;
> +		keypad,num-columns =<8>;
> +
> +		key_E {
> +			keypad,row =<0>;
> +			keypad,column =<0>;
> +			linux,code =<18>;
> +		};
> +		key_R {
> +			keypad,row =<0>;
> +			keypad,column =<1>;
> +			linux,code =<19>;
> +		};
> +		key_T {
> +			keypad,row =<0>;
> +			keypad,column =<2>;
> +			linux,code =<20>;
> +		};
> +		key_HOME {
> +			keypad,row =<0>;
> +			keypad,column =<3>;
> +			linux,code =<102>;
> +		};
> +		key_F5 {
> +			keypad,row =<0>;
> +			keypad,column =<4>;
> +			linux,code =<63>;
> +		};
> +		key_I {
> +			keypad,row =<0>;
> +			keypad,column =<6>;
> +			linux,code =<23>;
> +		};
> +		key_LEFTSHIFT {
> +			keypad,row =<0>;
> +			keypad,column =<7>;
> +			linux,code =<42>;
> +		};
> +		key_D {
> +			keypad,row =<1>;
> +			keypad,column =<0>;
> +			linux,code =<32>;
> +		};
> +		key_F {
> +			keypad,row =<1>;
> +			keypad,column =<1>;
> +			linux,code =<33>;
> +		};
> +		key_G {
> +			keypad,row =<1>;
> +			keypad,column =<2>;
> +			linux,code =<34>;
> +		};
> +		key_SEND {
> +			keypad,row =<1>;
> +			keypad,column =<3>;
> +			linux,code =<84>;
> +		};
> +		key_F6 {
> +			keypad,row =<1>;
> +			keypad,column =<4>;
> +			linux,code =<64>;
> +		};
> +		key_K {
> +			keypad,row =<1>;
> +			keypad,column =<6>;
> +			linux,code =<37>;
> +		};
> +		key_ENTER {
> +			keypad,row =<1>;
> +			keypad,column =<7>;
> +			linux,code =<28>;
> +		};
> +		key_X {
> +			keypad,row =<2>;
> +			keypad,column =<0>;
> +			linux,code =<45>;
> +		};
> +		key_C {
> +			keypad,row =<2>;
> +			keypad,column =<1>;
> +			linux,code =<46>;
> +		};
> +		key_V {
> +			keypad,row =<2>;
> +			keypad,column =<2>;
> +			linux,code =<47>;
> +		};
> +		key_END {
> +			keypad,row =<2>;
> +			keypad,column =<3>;
> +			linux,code =<107>;
> +		};
> +		key_F7 {
> +			keypad,row =<2>;
> +			keypad,column =<4>;
> +			linux,code =<65>;
> +		};
> +		key_DOT {
> +			keypad,row =<2>;
> +			keypad,column =<6>;
> +			linux,code =<52>;
> +		};
> +		key_CAPSLOCK {
> +                        keypad,row =<2>;
> +                        keypad,column =<7>;
> +                        linux,code =<58>;
> +                };
> +		key_Z {
> +			keypad,row =<3>;
> +			keypad,column =<0>;
> +			linux,code =<44>;
> +		};
> +		key_KPLUS {
> +			keypad,row =<3>;
> +			keypad,column =<1>;
> +			linux,code =<78>;
> +		};
> +		key_B {
> +			keypad,row =<3>;
> +			keypad,column =<2>;
> +			linux,code =<48>;
> +		};
> +		key_F1 {
> +			keypad,row =<3>;
> +			keypad,column =<3>;
> +			linux,code =<59>;
> +		};
> +		key_F8 {
> +			keypad,row =<3>;
> +			keypad,column =<4>;
> +			linux,code =<66>;
> +		};
> +		key_O {
> +			keypad,row =<3>;
> +			keypad,column =<6>;
> +			linux,code =<24>;
> +                };
> +		key_SPACE {
> +			keypad,row =<3>;
> +			keypad,column =<7>;
> +			linux,code =<57>;
> +                };
> +		key_W {
> +			keypad,row =<4>;
> +			keypad,column =<0>;
> +			linux,code =<17>;
> +                };
> +		key_Y {
> +			keypad,row =<4>;
> +			keypad,column =<1>;
> +			linux,code =<21>;
> +		};
> +		key_U {
> +			keypad,row =<4>;
> +			keypad,column =<2>;
> +			linux,code =<22>;
> +		};
> +		key_F2 {
> +			keypad,row =<4>;
> +			keypad,column =<3>;
> +			linux,code =<60>;
> +		};
> +		key_VOLUMEUP {
> +			keypad,row =<4>;
> +			keypad,column =<4>;
> +			linux,code =<115>;
> +		};
> +		key_L {
> +			keypad,row =<4>;
> +			keypad,column =<6>;
> +			linux,code =<38>;
> +		};
> +		key_LEFT {
> +			keypad,row =<4>;
> +			keypad,column =<7>;
> +			linux,code =<105>;
> +		};
> +		key_S {
> +			keypad,row =<5>;
> +			keypad,column =<0>;
> +			linux,code =<31>;
> +		};
> +		key_H {
> +			keypad,row =<5>;
> +			keypad,column =<1>;
> +			linux,code =<35>;
> +		};
> +		key_J {
> +			keypad,row =<5>;
> +			keypad,column =<2>;
> +			linux,code =<36>;
> +		};
> +		key_F3 {
> +			keypad,row =<5>;
> +			keypad,column =<3>;
> +			linux,code =<61>;
> +		};
> +		key_F9 {
> +			keypad,row =<5>;
> +			keypad,column =<4>;
> +			linux,code =<67>;
> +		};
> +		key_VOLUMEDOWN {
> +			keypad,row =<5>;
> +			keypad,column =<5>;
> +			linux,code =<114>;
> +		};
> +		key_M {
> +			keypad,row =<5>;
> +			keypad,column =<6>;
> +			linux,code =<50>;
> +		};
> +		key_RIGHT {
> +			keypad,row =<5>;
> +			keypad,column =<7>;
> +			linux,code =<106>;
> +		};
> +		key_Q {
> +			keypad,row =<6>;
> +			keypad,column =<0>;
> +			linux,code =<16>;
> +		};
> +		key_A {
> +			keypad,row =<6>;
> +			keypad,column =<1>;
> +			linux,code =<30>;
> +                };
> +		key_N {
> +			keypad,row =<6>;
> +			keypad,column =<2>;
> +			linux,code =<49>;
> +                };
> +		key_BACK {
> +			keypad,row =<6>;
> +			keypad,column =<3>;
> +			linux,code =<92>;
> +                };
> +		key_BACKSPACE {
> +			keypad,row =<6>;
> +			keypad,column =<4>;
> +			linux,code =<14>;
> +		};
> +		key_P {
> +			keypad,row =<6>;
> +			keypad,column =<6>;
> +			linux,code =<25>;
> +		};
> +		key_UP {
> +			keypad,row =<6>;
> +			keypad,column =<7>;
> +			linux,code =<103>;
> +		};
> +		key_PROG1 {
> +			keypad,row =<7>;
> +			keypad,column =<0>;
> +			linux,code =<148>;
> +		};
> +		key_PROG2 {
> +			keypad,row =<7>;
> +			keypad,column =<1>;
> +			linux,code =<149>;
> +		};
> +		key_PROG3 {
> +			keypad,row =<7>;
> +			keypad,column =<2>;
> +			linux,code =<202>;
> +                };
> +		key_PROG4 {
> +			keypad,row =<7>;
> +			keypad,column =<3>;
> +			linux,code =<203>;
> +		};
> +		key_F4 {
> +			keypad,row =<7>;
> +			keypad,column =<4>;
> +			linux,code =<62>;
> +		};
> +		key_Ok {
> +			keypad,row =<7>;
> +			keypad,column =<6>;
> +			linux,code =<352>;
> +		};
> +		key_DOWN {
> +			keypad,row =<7>;
> +			keypad,column =<7>;
> +			linux,code =<108>;
> +		};
> +	};
>   };
> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> index 3d35559..e0f678a 100644
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -156,4 +156,9 @@
>   			ti,hwmods = "i2c4";
>   		};
>   	};
> +
> +	keypad@4ae1c000 {
> +		compatible = "ti,omap4-keypad";
> +		ti,hwmods = "kbd";
> +	};
>   };

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

* Re: [PATCH 1/2] arm/dts: omap4-sdp: Add keypad data
@ 2012-04-04 13:48     ` Cousson, Benoit
  0 siblings, 0 replies; 18+ messages in thread
From: Cousson, Benoit @ 2012-04-04 13:48 UTC (permalink / raw)
  To: Sourav Poddar
  Cc: devicetree-discuss, linux-arm-kernel, linux-kernel, linux-input,
	Rob Herring, Grant Likely, Felipe Balbi

Hi Sourav,

On 4/4/2012 3:30 PM, Sourav Poddar wrote:
> This patch add keypad data node in omap4 device tree
> file.

Nit: You should adapt first the driver to DT and document the binding 
before using it.

So this patch should be the second one.

Regards,
Benoit

>
> Cc: Benoit Cousson<b-cousson@ti.com>
> Cc: Rob Herring<rob.herring@calxeda.com>
> Cc: Grant Likely<grant.likely@secretlab.ca>
> Cc: Felipe Balbi<balbi@ti.com>
> Signed-off-by: Sourav Poddar<sourav.poddar@ti.com>
> ---
>   arch/arm/boot/dts/omap4-sdp.dts |  291 +++++++++++++++++++++++++++++++++++++++
>   arch/arm/boot/dts/omap4.dtsi    |    5 +
>   2 files changed, 296 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
> index 63c6b2b..ac855b8 100644
> --- a/arch/arm/boot/dts/omap4-sdp.dts
> +++ b/arch/arm/boot/dts/omap4-sdp.dts
> @@ -17,4 +17,295 @@
>   		device_type = "memory";
>   		reg =<0x80000000 0x40000000>; /* 1 GB */
>   	};
> +
> +	keypad@4ae1c000 {
> +		keypad,num-rows =<8>;
> +		keypad,num-columns =<8>;
> +
> +		key_E {
> +			keypad,row =<0>;
> +			keypad,column =<0>;
> +			linux,code =<18>;
> +		};
> +		key_R {
> +			keypad,row =<0>;
> +			keypad,column =<1>;
> +			linux,code =<19>;
> +		};
> +		key_T {
> +			keypad,row =<0>;
> +			keypad,column =<2>;
> +			linux,code =<20>;
> +		};
> +		key_HOME {
> +			keypad,row =<0>;
> +			keypad,column =<3>;
> +			linux,code =<102>;
> +		};
> +		key_F5 {
> +			keypad,row =<0>;
> +			keypad,column =<4>;
> +			linux,code =<63>;
> +		};
> +		key_I {
> +			keypad,row =<0>;
> +			keypad,column =<6>;
> +			linux,code =<23>;
> +		};
> +		key_LEFTSHIFT {
> +			keypad,row =<0>;
> +			keypad,column =<7>;
> +			linux,code =<42>;
> +		};
> +		key_D {
> +			keypad,row =<1>;
> +			keypad,column =<0>;
> +			linux,code =<32>;
> +		};
> +		key_F {
> +			keypad,row =<1>;
> +			keypad,column =<1>;
> +			linux,code =<33>;
> +		};
> +		key_G {
> +			keypad,row =<1>;
> +			keypad,column =<2>;
> +			linux,code =<34>;
> +		};
> +		key_SEND {
> +			keypad,row =<1>;
> +			keypad,column =<3>;
> +			linux,code =<84>;
> +		};
> +		key_F6 {
> +			keypad,row =<1>;
> +			keypad,column =<4>;
> +			linux,code =<64>;
> +		};
> +		key_K {
> +			keypad,row =<1>;
> +			keypad,column =<6>;
> +			linux,code =<37>;
> +		};
> +		key_ENTER {
> +			keypad,row =<1>;
> +			keypad,column =<7>;
> +			linux,code =<28>;
> +		};
> +		key_X {
> +			keypad,row =<2>;
> +			keypad,column =<0>;
> +			linux,code =<45>;
> +		};
> +		key_C {
> +			keypad,row =<2>;
> +			keypad,column =<1>;
> +			linux,code =<46>;
> +		};
> +		key_V {
> +			keypad,row =<2>;
> +			keypad,column =<2>;
> +			linux,code =<47>;
> +		};
> +		key_END {
> +			keypad,row =<2>;
> +			keypad,column =<3>;
> +			linux,code =<107>;
> +		};
> +		key_F7 {
> +			keypad,row =<2>;
> +			keypad,column =<4>;
> +			linux,code =<65>;
> +		};
> +		key_DOT {
> +			keypad,row =<2>;
> +			keypad,column =<6>;
> +			linux,code =<52>;
> +		};
> +		key_CAPSLOCK {
> +                        keypad,row =<2>;
> +                        keypad,column =<7>;
> +                        linux,code =<58>;
> +                };
> +		key_Z {
> +			keypad,row =<3>;
> +			keypad,column =<0>;
> +			linux,code =<44>;
> +		};
> +		key_KPLUS {
> +			keypad,row =<3>;
> +			keypad,column =<1>;
> +			linux,code =<78>;
> +		};
> +		key_B {
> +			keypad,row =<3>;
> +			keypad,column =<2>;
> +			linux,code =<48>;
> +		};
> +		key_F1 {
> +			keypad,row =<3>;
> +			keypad,column =<3>;
> +			linux,code =<59>;
> +		};
> +		key_F8 {
> +			keypad,row =<3>;
> +			keypad,column =<4>;
> +			linux,code =<66>;
> +		};
> +		key_O {
> +			keypad,row =<3>;
> +			keypad,column =<6>;
> +			linux,code =<24>;
> +                };
> +		key_SPACE {
> +			keypad,row =<3>;
> +			keypad,column =<7>;
> +			linux,code =<57>;
> +                };
> +		key_W {
> +			keypad,row =<4>;
> +			keypad,column =<0>;
> +			linux,code =<17>;
> +                };
> +		key_Y {
> +			keypad,row =<4>;
> +			keypad,column =<1>;
> +			linux,code =<21>;
> +		};
> +		key_U {
> +			keypad,row =<4>;
> +			keypad,column =<2>;
> +			linux,code =<22>;
> +		};
> +		key_F2 {
> +			keypad,row =<4>;
> +			keypad,column =<3>;
> +			linux,code =<60>;
> +		};
> +		key_VOLUMEUP {
> +			keypad,row =<4>;
> +			keypad,column =<4>;
> +			linux,code =<115>;
> +		};
> +		key_L {
> +			keypad,row =<4>;
> +			keypad,column =<6>;
> +			linux,code =<38>;
> +		};
> +		key_LEFT {
> +			keypad,row =<4>;
> +			keypad,column =<7>;
> +			linux,code =<105>;
> +		};
> +		key_S {
> +			keypad,row =<5>;
> +			keypad,column =<0>;
> +			linux,code =<31>;
> +		};
> +		key_H {
> +			keypad,row =<5>;
> +			keypad,column =<1>;
> +			linux,code =<35>;
> +		};
> +		key_J {
> +			keypad,row =<5>;
> +			keypad,column =<2>;
> +			linux,code =<36>;
> +		};
> +		key_F3 {
> +			keypad,row =<5>;
> +			keypad,column =<3>;
> +			linux,code =<61>;
> +		};
> +		key_F9 {
> +			keypad,row =<5>;
> +			keypad,column =<4>;
> +			linux,code =<67>;
> +		};
> +		key_VOLUMEDOWN {
> +			keypad,row =<5>;
> +			keypad,column =<5>;
> +			linux,code =<114>;
> +		};
> +		key_M {
> +			keypad,row =<5>;
> +			keypad,column =<6>;
> +			linux,code =<50>;
> +		};
> +		key_RIGHT {
> +			keypad,row =<5>;
> +			keypad,column =<7>;
> +			linux,code =<106>;
> +		};
> +		key_Q {
> +			keypad,row =<6>;
> +			keypad,column =<0>;
> +			linux,code =<16>;
> +		};
> +		key_A {
> +			keypad,row =<6>;
> +			keypad,column =<1>;
> +			linux,code =<30>;
> +                };
> +		key_N {
> +			keypad,row =<6>;
> +			keypad,column =<2>;
> +			linux,code =<49>;
> +                };
> +		key_BACK {
> +			keypad,row =<6>;
> +			keypad,column =<3>;
> +			linux,code =<92>;
> +                };
> +		key_BACKSPACE {
> +			keypad,row =<6>;
> +			keypad,column =<4>;
> +			linux,code =<14>;
> +		};
> +		key_P {
> +			keypad,row =<6>;
> +			keypad,column =<6>;
> +			linux,code =<25>;
> +		};
> +		key_UP {
> +			keypad,row =<6>;
> +			keypad,column =<7>;
> +			linux,code =<103>;
> +		};
> +		key_PROG1 {
> +			keypad,row =<7>;
> +			keypad,column =<0>;
> +			linux,code =<148>;
> +		};
> +		key_PROG2 {
> +			keypad,row =<7>;
> +			keypad,column =<1>;
> +			linux,code =<149>;
> +		};
> +		key_PROG3 {
> +			keypad,row =<7>;
> +			keypad,column =<2>;
> +			linux,code =<202>;
> +                };
> +		key_PROG4 {
> +			keypad,row =<7>;
> +			keypad,column =<3>;
> +			linux,code =<203>;
> +		};
> +		key_F4 {
> +			keypad,row =<7>;
> +			keypad,column =<4>;
> +			linux,code =<62>;
> +		};
> +		key_Ok {
> +			keypad,row =<7>;
> +			keypad,column =<6>;
> +			linux,code =<352>;
> +		};
> +		key_DOWN {
> +			keypad,row =<7>;
> +			keypad,column =<7>;
> +			linux,code =<108>;
> +		};
> +	};
>   };
> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> index 3d35559..e0f678a 100644
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -156,4 +156,9 @@
>   			ti,hwmods = "i2c4";
>   		};
>   	};
> +
> +	keypad@4ae1c000 {
> +		compatible = "ti,omap4-keypad";
> +		ti,hwmods = "kbd";
> +	};
>   };


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

* [PATCH 1/2] arm/dts: omap4-sdp: Add keypad data
@ 2012-04-04 13:48     ` Cousson, Benoit
  0 siblings, 0 replies; 18+ messages in thread
From: Cousson, Benoit @ 2012-04-04 13:48 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Sourav,

On 4/4/2012 3:30 PM, Sourav Poddar wrote:
> This patch add keypad data node in omap4 device tree
> file.

Nit: You should adapt first the driver to DT and document the binding 
before using it.

So this patch should be the second one.

Regards,
Benoit

>
> Cc: Benoit Cousson<b-cousson@ti.com>
> Cc: Rob Herring<rob.herring@calxeda.com>
> Cc: Grant Likely<grant.likely@secretlab.ca>
> Cc: Felipe Balbi<balbi@ti.com>
> Signed-off-by: Sourav Poddar<sourav.poddar@ti.com>
> ---
>   arch/arm/boot/dts/omap4-sdp.dts |  291 +++++++++++++++++++++++++++++++++++++++
>   arch/arm/boot/dts/omap4.dtsi    |    5 +
>   2 files changed, 296 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
> index 63c6b2b..ac855b8 100644
> --- a/arch/arm/boot/dts/omap4-sdp.dts
> +++ b/arch/arm/boot/dts/omap4-sdp.dts
> @@ -17,4 +17,295 @@
>   		device_type = "memory";
>   		reg =<0x80000000 0x40000000>; /* 1 GB */
>   	};
> +
> +	keypad at 4ae1c000 {
> +		keypad,num-rows =<8>;
> +		keypad,num-columns =<8>;
> +
> +		key_E {
> +			keypad,row =<0>;
> +			keypad,column =<0>;
> +			linux,code =<18>;
> +		};
> +		key_R {
> +			keypad,row =<0>;
> +			keypad,column =<1>;
> +			linux,code =<19>;
> +		};
> +		key_T {
> +			keypad,row =<0>;
> +			keypad,column =<2>;
> +			linux,code =<20>;
> +		};
> +		key_HOME {
> +			keypad,row =<0>;
> +			keypad,column =<3>;
> +			linux,code =<102>;
> +		};
> +		key_F5 {
> +			keypad,row =<0>;
> +			keypad,column =<4>;
> +			linux,code =<63>;
> +		};
> +		key_I {
> +			keypad,row =<0>;
> +			keypad,column =<6>;
> +			linux,code =<23>;
> +		};
> +		key_LEFTSHIFT {
> +			keypad,row =<0>;
> +			keypad,column =<7>;
> +			linux,code =<42>;
> +		};
> +		key_D {
> +			keypad,row =<1>;
> +			keypad,column =<0>;
> +			linux,code =<32>;
> +		};
> +		key_F {
> +			keypad,row =<1>;
> +			keypad,column =<1>;
> +			linux,code =<33>;
> +		};
> +		key_G {
> +			keypad,row =<1>;
> +			keypad,column =<2>;
> +			linux,code =<34>;
> +		};
> +		key_SEND {
> +			keypad,row =<1>;
> +			keypad,column =<3>;
> +			linux,code =<84>;
> +		};
> +		key_F6 {
> +			keypad,row =<1>;
> +			keypad,column =<4>;
> +			linux,code =<64>;
> +		};
> +		key_K {
> +			keypad,row =<1>;
> +			keypad,column =<6>;
> +			linux,code =<37>;
> +		};
> +		key_ENTER {
> +			keypad,row =<1>;
> +			keypad,column =<7>;
> +			linux,code =<28>;
> +		};
> +		key_X {
> +			keypad,row =<2>;
> +			keypad,column =<0>;
> +			linux,code =<45>;
> +		};
> +		key_C {
> +			keypad,row =<2>;
> +			keypad,column =<1>;
> +			linux,code =<46>;
> +		};
> +		key_V {
> +			keypad,row =<2>;
> +			keypad,column =<2>;
> +			linux,code =<47>;
> +		};
> +		key_END {
> +			keypad,row =<2>;
> +			keypad,column =<3>;
> +			linux,code =<107>;
> +		};
> +		key_F7 {
> +			keypad,row =<2>;
> +			keypad,column =<4>;
> +			linux,code =<65>;
> +		};
> +		key_DOT {
> +			keypad,row =<2>;
> +			keypad,column =<6>;
> +			linux,code =<52>;
> +		};
> +		key_CAPSLOCK {
> +                        keypad,row =<2>;
> +                        keypad,column =<7>;
> +                        linux,code =<58>;
> +                };
> +		key_Z {
> +			keypad,row =<3>;
> +			keypad,column =<0>;
> +			linux,code =<44>;
> +		};
> +		key_KPLUS {
> +			keypad,row =<3>;
> +			keypad,column =<1>;
> +			linux,code =<78>;
> +		};
> +		key_B {
> +			keypad,row =<3>;
> +			keypad,column =<2>;
> +			linux,code =<48>;
> +		};
> +		key_F1 {
> +			keypad,row =<3>;
> +			keypad,column =<3>;
> +			linux,code =<59>;
> +		};
> +		key_F8 {
> +			keypad,row =<3>;
> +			keypad,column =<4>;
> +			linux,code =<66>;
> +		};
> +		key_O {
> +			keypad,row =<3>;
> +			keypad,column =<6>;
> +			linux,code =<24>;
> +                };
> +		key_SPACE {
> +			keypad,row =<3>;
> +			keypad,column =<7>;
> +			linux,code =<57>;
> +                };
> +		key_W {
> +			keypad,row =<4>;
> +			keypad,column =<0>;
> +			linux,code =<17>;
> +                };
> +		key_Y {
> +			keypad,row =<4>;
> +			keypad,column =<1>;
> +			linux,code =<21>;
> +		};
> +		key_U {
> +			keypad,row =<4>;
> +			keypad,column =<2>;
> +			linux,code =<22>;
> +		};
> +		key_F2 {
> +			keypad,row =<4>;
> +			keypad,column =<3>;
> +			linux,code =<60>;
> +		};
> +		key_VOLUMEUP {
> +			keypad,row =<4>;
> +			keypad,column =<4>;
> +			linux,code =<115>;
> +		};
> +		key_L {
> +			keypad,row =<4>;
> +			keypad,column =<6>;
> +			linux,code =<38>;
> +		};
> +		key_LEFT {
> +			keypad,row =<4>;
> +			keypad,column =<7>;
> +			linux,code =<105>;
> +		};
> +		key_S {
> +			keypad,row =<5>;
> +			keypad,column =<0>;
> +			linux,code =<31>;
> +		};
> +		key_H {
> +			keypad,row =<5>;
> +			keypad,column =<1>;
> +			linux,code =<35>;
> +		};
> +		key_J {
> +			keypad,row =<5>;
> +			keypad,column =<2>;
> +			linux,code =<36>;
> +		};
> +		key_F3 {
> +			keypad,row =<5>;
> +			keypad,column =<3>;
> +			linux,code =<61>;
> +		};
> +		key_F9 {
> +			keypad,row =<5>;
> +			keypad,column =<4>;
> +			linux,code =<67>;
> +		};
> +		key_VOLUMEDOWN {
> +			keypad,row =<5>;
> +			keypad,column =<5>;
> +			linux,code =<114>;
> +		};
> +		key_M {
> +			keypad,row =<5>;
> +			keypad,column =<6>;
> +			linux,code =<50>;
> +		};
> +		key_RIGHT {
> +			keypad,row =<5>;
> +			keypad,column =<7>;
> +			linux,code =<106>;
> +		};
> +		key_Q {
> +			keypad,row =<6>;
> +			keypad,column =<0>;
> +			linux,code =<16>;
> +		};
> +		key_A {
> +			keypad,row =<6>;
> +			keypad,column =<1>;
> +			linux,code =<30>;
> +                };
> +		key_N {
> +			keypad,row =<6>;
> +			keypad,column =<2>;
> +			linux,code =<49>;
> +                };
> +		key_BACK {
> +			keypad,row =<6>;
> +			keypad,column =<3>;
> +			linux,code =<92>;
> +                };
> +		key_BACKSPACE {
> +			keypad,row =<6>;
> +			keypad,column =<4>;
> +			linux,code =<14>;
> +		};
> +		key_P {
> +			keypad,row =<6>;
> +			keypad,column =<6>;
> +			linux,code =<25>;
> +		};
> +		key_UP {
> +			keypad,row =<6>;
> +			keypad,column =<7>;
> +			linux,code =<103>;
> +		};
> +		key_PROG1 {
> +			keypad,row =<7>;
> +			keypad,column =<0>;
> +			linux,code =<148>;
> +		};
> +		key_PROG2 {
> +			keypad,row =<7>;
> +			keypad,column =<1>;
> +			linux,code =<149>;
> +		};
> +		key_PROG3 {
> +			keypad,row =<7>;
> +			keypad,column =<2>;
> +			linux,code =<202>;
> +                };
> +		key_PROG4 {
> +			keypad,row =<7>;
> +			keypad,column =<3>;
> +			linux,code =<203>;
> +		};
> +		key_F4 {
> +			keypad,row =<7>;
> +			keypad,column =<4>;
> +			linux,code =<62>;
> +		};
> +		key_Ok {
> +			keypad,row =<7>;
> +			keypad,column =<6>;
> +			linux,code =<352>;
> +		};
> +		key_DOWN {
> +			keypad,row =<7>;
> +			keypad,column =<7>;
> +			linux,code =<108>;
> +		};
> +	};
>   };
> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> index 3d35559..e0f678a 100644
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -156,4 +156,9 @@
>   			ti,hwmods = "i2c4";
>   		};
>   	};
> +
> +	keypad at 4ae1c000 {
> +		compatible = "ti,omap4-keypad";
> +		ti,hwmods = "kbd";
> +	};
>   };

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

* Re: [PATCH 1/2] arm/dts: omap4-sdp: Add keypad data
  2012-04-04 13:30   ` Sourav Poddar
  (?)
@ 2012-04-04 13:51     ` Cousson, Benoit
  -1 siblings, 0 replies; 18+ messages in thread
From: Cousson, Benoit @ 2012-04-04 13:51 UTC (permalink / raw)
  To: Sourav Poddar
  Cc: devicetree-discuss, linux-arm-kernel, linux-kernel, linux-input,
	Rob Herring, Grant Likely, Felipe Balbi

On 4/4/2012 3:30 PM, Sourav Poddar wrote:
> This patch add keypad data node in omap4 device tree
> file.

Nit #2: Never write "this patch" in a patch changelog... Because at some 
point it will become a commit in a GIT tree.

I think AKPM wrote something on that.

Benoit

>
> Cc: Benoit Cousson<b-cousson@ti.com>
> Cc: Rob Herring<rob.herring@calxeda.com>
> Cc: Grant Likely<grant.likely@secretlab.ca>
> Cc: Felipe Balbi<balbi@ti.com>
> Signed-off-by: Sourav Poddar<sourav.poddar@ti.com>
> ---
>   arch/arm/boot/dts/omap4-sdp.dts |  291 +++++++++++++++++++++++++++++++++++++++
>   arch/arm/boot/dts/omap4.dtsi    |    5 +
>   2 files changed, 296 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
> index 63c6b2b..ac855b8 100644
> --- a/arch/arm/boot/dts/omap4-sdp.dts
> +++ b/arch/arm/boot/dts/omap4-sdp.dts
> @@ -17,4 +17,295 @@
>   		device_type = "memory";
>   		reg =<0x80000000 0x40000000>; /* 1 GB */
>   	};
> +
> +	keypad@4ae1c000 {
> +		keypad,num-rows =<8>;
> +		keypad,num-columns =<8>;
> +
> +		key_E {
> +			keypad,row =<0>;
> +			keypad,column =<0>;
> +			linux,code =<18>;
> +		};
> +		key_R {
> +			keypad,row =<0>;
> +			keypad,column =<1>;
> +			linux,code =<19>;
> +		};
> +		key_T {
> +			keypad,row =<0>;
> +			keypad,column =<2>;
> +			linux,code =<20>;
> +		};
> +		key_HOME {
> +			keypad,row =<0>;
> +			keypad,column =<3>;
> +			linux,code =<102>;
> +		};
> +		key_F5 {
> +			keypad,row =<0>;
> +			keypad,column =<4>;
> +			linux,code =<63>;
> +		};
> +		key_I {
> +			keypad,row =<0>;
> +			keypad,column =<6>;
> +			linux,code =<23>;
> +		};
> +		key_LEFTSHIFT {
> +			keypad,row =<0>;
> +			keypad,column =<7>;
> +			linux,code =<42>;
> +		};
> +		key_D {
> +			keypad,row =<1>;
> +			keypad,column =<0>;
> +			linux,code =<32>;
> +		};
> +		key_F {
> +			keypad,row =<1>;
> +			keypad,column =<1>;
> +			linux,code =<33>;
> +		};
> +		key_G {
> +			keypad,row =<1>;
> +			keypad,column =<2>;
> +			linux,code =<34>;
> +		};
> +		key_SEND {
> +			keypad,row =<1>;
> +			keypad,column =<3>;
> +			linux,code =<84>;
> +		};
> +		key_F6 {
> +			keypad,row =<1>;
> +			keypad,column =<4>;
> +			linux,code =<64>;
> +		};
> +		key_K {
> +			keypad,row =<1>;
> +			keypad,column =<6>;
> +			linux,code =<37>;
> +		};
> +		key_ENTER {
> +			keypad,row =<1>;
> +			keypad,column =<7>;
> +			linux,code =<28>;
> +		};
> +		key_X {
> +			keypad,row =<2>;
> +			keypad,column =<0>;
> +			linux,code =<45>;
> +		};
> +		key_C {
> +			keypad,row =<2>;
> +			keypad,column =<1>;
> +			linux,code =<46>;
> +		};
> +		key_V {
> +			keypad,row =<2>;
> +			keypad,column =<2>;
> +			linux,code =<47>;
> +		};
> +		key_END {
> +			keypad,row =<2>;
> +			keypad,column =<3>;
> +			linux,code =<107>;
> +		};
> +		key_F7 {
> +			keypad,row =<2>;
> +			keypad,column =<4>;
> +			linux,code =<65>;
> +		};
> +		key_DOT {
> +			keypad,row =<2>;
> +			keypad,column =<6>;
> +			linux,code =<52>;
> +		};
> +		key_CAPSLOCK {
> +                        keypad,row =<2>;
> +                        keypad,column =<7>;
> +                        linux,code =<58>;
> +                };
> +		key_Z {
> +			keypad,row =<3>;
> +			keypad,column =<0>;
> +			linux,code =<44>;
> +		};
> +		key_KPLUS {
> +			keypad,row =<3>;
> +			keypad,column =<1>;
> +			linux,code =<78>;
> +		};
> +		key_B {
> +			keypad,row =<3>;
> +			keypad,column =<2>;
> +			linux,code =<48>;
> +		};
> +		key_F1 {
> +			keypad,row =<3>;
> +			keypad,column =<3>;
> +			linux,code =<59>;
> +		};
> +		key_F8 {
> +			keypad,row =<3>;
> +			keypad,column =<4>;
> +			linux,code =<66>;
> +		};
> +		key_O {
> +			keypad,row =<3>;
> +			keypad,column =<6>;
> +			linux,code =<24>;
> +                };
> +		key_SPACE {
> +			keypad,row =<3>;
> +			keypad,column =<7>;
> +			linux,code =<57>;
> +                };
> +		key_W {
> +			keypad,row =<4>;
> +			keypad,column =<0>;
> +			linux,code =<17>;
> +                };
> +		key_Y {
> +			keypad,row =<4>;
> +			keypad,column =<1>;
> +			linux,code =<21>;
> +		};
> +		key_U {
> +			keypad,row =<4>;
> +			keypad,column =<2>;
> +			linux,code =<22>;
> +		};
> +		key_F2 {
> +			keypad,row =<4>;
> +			keypad,column =<3>;
> +			linux,code =<60>;
> +		};
> +		key_VOLUMEUP {
> +			keypad,row =<4>;
> +			keypad,column =<4>;
> +			linux,code =<115>;
> +		};
> +		key_L {
> +			keypad,row =<4>;
> +			keypad,column =<6>;
> +			linux,code =<38>;
> +		};
> +		key_LEFT {
> +			keypad,row =<4>;
> +			keypad,column =<7>;
> +			linux,code =<105>;
> +		};
> +		key_S {
> +			keypad,row =<5>;
> +			keypad,column =<0>;
> +			linux,code =<31>;
> +		};
> +		key_H {
> +			keypad,row =<5>;
> +			keypad,column =<1>;
> +			linux,code =<35>;
> +		};
> +		key_J {
> +			keypad,row =<5>;
> +			keypad,column =<2>;
> +			linux,code =<36>;
> +		};
> +		key_F3 {
> +			keypad,row =<5>;
> +			keypad,column =<3>;
> +			linux,code =<61>;
> +		};
> +		key_F9 {
> +			keypad,row =<5>;
> +			keypad,column =<4>;
> +			linux,code =<67>;
> +		};
> +		key_VOLUMEDOWN {
> +			keypad,row =<5>;
> +			keypad,column =<5>;
> +			linux,code =<114>;
> +		};
> +		key_M {
> +			keypad,row =<5>;
> +			keypad,column =<6>;
> +			linux,code =<50>;
> +		};
> +		key_RIGHT {
> +			keypad,row =<5>;
> +			keypad,column =<7>;
> +			linux,code =<106>;
> +		};
> +		key_Q {
> +			keypad,row =<6>;
> +			keypad,column =<0>;
> +			linux,code =<16>;
> +		};
> +		key_A {
> +			keypad,row =<6>;
> +			keypad,column =<1>;
> +			linux,code =<30>;
> +                };
> +		key_N {
> +			keypad,row =<6>;
> +			keypad,column =<2>;
> +			linux,code =<49>;
> +                };
> +		key_BACK {
> +			keypad,row =<6>;
> +			keypad,column =<3>;
> +			linux,code =<92>;
> +                };
> +		key_BACKSPACE {
> +			keypad,row =<6>;
> +			keypad,column =<4>;
> +			linux,code =<14>;
> +		};
> +		key_P {
> +			keypad,row =<6>;
> +			keypad,column =<6>;
> +			linux,code =<25>;
> +		};
> +		key_UP {
> +			keypad,row =<6>;
> +			keypad,column =<7>;
> +			linux,code =<103>;
> +		};
> +		key_PROG1 {
> +			keypad,row =<7>;
> +			keypad,column =<0>;
> +			linux,code =<148>;
> +		};
> +		key_PROG2 {
> +			keypad,row =<7>;
> +			keypad,column =<1>;
> +			linux,code =<149>;
> +		};
> +		key_PROG3 {
> +			keypad,row =<7>;
> +			keypad,column =<2>;
> +			linux,code =<202>;
> +                };
> +		key_PROG4 {
> +			keypad,row =<7>;
> +			keypad,column =<3>;
> +			linux,code =<203>;
> +		};
> +		key_F4 {
> +			keypad,row =<7>;
> +			keypad,column =<4>;
> +			linux,code =<62>;
> +		};
> +		key_Ok {
> +			keypad,row =<7>;
> +			keypad,column =<6>;
> +			linux,code =<352>;
> +		};
> +		key_DOWN {
> +			keypad,row =<7>;
> +			keypad,column =<7>;
> +			linux,code =<108>;
> +		};
> +	};
>   };
> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> index 3d35559..e0f678a 100644
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -156,4 +156,9 @@
>   			ti,hwmods = "i2c4";
>   		};
>   	};
> +
> +	keypad@4ae1c000 {
> +		compatible = "ti,omap4-keypad";
> +		ti,hwmods = "kbd";
> +	};
>   };


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

* Re: [PATCH 1/2] arm/dts: omap4-sdp: Add keypad data
@ 2012-04-04 13:51     ` Cousson, Benoit
  0 siblings, 0 replies; 18+ messages in thread
From: Cousson, Benoit @ 2012-04-04 13:51 UTC (permalink / raw)
  To: Sourav Poddar
  Cc: devicetree-discuss, linux-arm-kernel, linux-kernel, linux-input,
	Rob Herring, Grant Likely, Felipe Balbi

On 4/4/2012 3:30 PM, Sourav Poddar wrote:
> This patch add keypad data node in omap4 device tree
> file.

Nit #2: Never write "this patch" in a patch changelog... Because at some 
point it will become a commit in a GIT tree.

I think AKPM wrote something on that.

Benoit

>
> Cc: Benoit Cousson<b-cousson@ti.com>
> Cc: Rob Herring<rob.herring@calxeda.com>
> Cc: Grant Likely<grant.likely@secretlab.ca>
> Cc: Felipe Balbi<balbi@ti.com>
> Signed-off-by: Sourav Poddar<sourav.poddar@ti.com>
> ---
>   arch/arm/boot/dts/omap4-sdp.dts |  291 +++++++++++++++++++++++++++++++++++++++
>   arch/arm/boot/dts/omap4.dtsi    |    5 +
>   2 files changed, 296 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
> index 63c6b2b..ac855b8 100644
> --- a/arch/arm/boot/dts/omap4-sdp.dts
> +++ b/arch/arm/boot/dts/omap4-sdp.dts
> @@ -17,4 +17,295 @@
>   		device_type = "memory";
>   		reg =<0x80000000 0x40000000>; /* 1 GB */
>   	};
> +
> +	keypad@4ae1c000 {
> +		keypad,num-rows =<8>;
> +		keypad,num-columns =<8>;
> +
> +		key_E {
> +			keypad,row =<0>;
> +			keypad,column =<0>;
> +			linux,code =<18>;
> +		};
> +		key_R {
> +			keypad,row =<0>;
> +			keypad,column =<1>;
> +			linux,code =<19>;
> +		};
> +		key_T {
> +			keypad,row =<0>;
> +			keypad,column =<2>;
> +			linux,code =<20>;
> +		};
> +		key_HOME {
> +			keypad,row =<0>;
> +			keypad,column =<3>;
> +			linux,code =<102>;
> +		};
> +		key_F5 {
> +			keypad,row =<0>;
> +			keypad,column =<4>;
> +			linux,code =<63>;
> +		};
> +		key_I {
> +			keypad,row =<0>;
> +			keypad,column =<6>;
> +			linux,code =<23>;
> +		};
> +		key_LEFTSHIFT {
> +			keypad,row =<0>;
> +			keypad,column =<7>;
> +			linux,code =<42>;
> +		};
> +		key_D {
> +			keypad,row =<1>;
> +			keypad,column =<0>;
> +			linux,code =<32>;
> +		};
> +		key_F {
> +			keypad,row =<1>;
> +			keypad,column =<1>;
> +			linux,code =<33>;
> +		};
> +		key_G {
> +			keypad,row =<1>;
> +			keypad,column =<2>;
> +			linux,code =<34>;
> +		};
> +		key_SEND {
> +			keypad,row =<1>;
> +			keypad,column =<3>;
> +			linux,code =<84>;
> +		};
> +		key_F6 {
> +			keypad,row =<1>;
> +			keypad,column =<4>;
> +			linux,code =<64>;
> +		};
> +		key_K {
> +			keypad,row =<1>;
> +			keypad,column =<6>;
> +			linux,code =<37>;
> +		};
> +		key_ENTER {
> +			keypad,row =<1>;
> +			keypad,column =<7>;
> +			linux,code =<28>;
> +		};
> +		key_X {
> +			keypad,row =<2>;
> +			keypad,column =<0>;
> +			linux,code =<45>;
> +		};
> +		key_C {
> +			keypad,row =<2>;
> +			keypad,column =<1>;
> +			linux,code =<46>;
> +		};
> +		key_V {
> +			keypad,row =<2>;
> +			keypad,column =<2>;
> +			linux,code =<47>;
> +		};
> +		key_END {
> +			keypad,row =<2>;
> +			keypad,column =<3>;
> +			linux,code =<107>;
> +		};
> +		key_F7 {
> +			keypad,row =<2>;
> +			keypad,column =<4>;
> +			linux,code =<65>;
> +		};
> +		key_DOT {
> +			keypad,row =<2>;
> +			keypad,column =<6>;
> +			linux,code =<52>;
> +		};
> +		key_CAPSLOCK {
> +                        keypad,row =<2>;
> +                        keypad,column =<7>;
> +                        linux,code =<58>;
> +                };
> +		key_Z {
> +			keypad,row =<3>;
> +			keypad,column =<0>;
> +			linux,code =<44>;
> +		};
> +		key_KPLUS {
> +			keypad,row =<3>;
> +			keypad,column =<1>;
> +			linux,code =<78>;
> +		};
> +		key_B {
> +			keypad,row =<3>;
> +			keypad,column =<2>;
> +			linux,code =<48>;
> +		};
> +		key_F1 {
> +			keypad,row =<3>;
> +			keypad,column =<3>;
> +			linux,code =<59>;
> +		};
> +		key_F8 {
> +			keypad,row =<3>;
> +			keypad,column =<4>;
> +			linux,code =<66>;
> +		};
> +		key_O {
> +			keypad,row =<3>;
> +			keypad,column =<6>;
> +			linux,code =<24>;
> +                };
> +		key_SPACE {
> +			keypad,row =<3>;
> +			keypad,column =<7>;
> +			linux,code =<57>;
> +                };
> +		key_W {
> +			keypad,row =<4>;
> +			keypad,column =<0>;
> +			linux,code =<17>;
> +                };
> +		key_Y {
> +			keypad,row =<4>;
> +			keypad,column =<1>;
> +			linux,code =<21>;
> +		};
> +		key_U {
> +			keypad,row =<4>;
> +			keypad,column =<2>;
> +			linux,code =<22>;
> +		};
> +		key_F2 {
> +			keypad,row =<4>;
> +			keypad,column =<3>;
> +			linux,code =<60>;
> +		};
> +		key_VOLUMEUP {
> +			keypad,row =<4>;
> +			keypad,column =<4>;
> +			linux,code =<115>;
> +		};
> +		key_L {
> +			keypad,row =<4>;
> +			keypad,column =<6>;
> +			linux,code =<38>;
> +		};
> +		key_LEFT {
> +			keypad,row =<4>;
> +			keypad,column =<7>;
> +			linux,code =<105>;
> +		};
> +		key_S {
> +			keypad,row =<5>;
> +			keypad,column =<0>;
> +			linux,code =<31>;
> +		};
> +		key_H {
> +			keypad,row =<5>;
> +			keypad,column =<1>;
> +			linux,code =<35>;
> +		};
> +		key_J {
> +			keypad,row =<5>;
> +			keypad,column =<2>;
> +			linux,code =<36>;
> +		};
> +		key_F3 {
> +			keypad,row =<5>;
> +			keypad,column =<3>;
> +			linux,code =<61>;
> +		};
> +		key_F9 {
> +			keypad,row =<5>;
> +			keypad,column =<4>;
> +			linux,code =<67>;
> +		};
> +		key_VOLUMEDOWN {
> +			keypad,row =<5>;
> +			keypad,column =<5>;
> +			linux,code =<114>;
> +		};
> +		key_M {
> +			keypad,row =<5>;
> +			keypad,column =<6>;
> +			linux,code =<50>;
> +		};
> +		key_RIGHT {
> +			keypad,row =<5>;
> +			keypad,column =<7>;
> +			linux,code =<106>;
> +		};
> +		key_Q {
> +			keypad,row =<6>;
> +			keypad,column =<0>;
> +			linux,code =<16>;
> +		};
> +		key_A {
> +			keypad,row =<6>;
> +			keypad,column =<1>;
> +			linux,code =<30>;
> +                };
> +		key_N {
> +			keypad,row =<6>;
> +			keypad,column =<2>;
> +			linux,code =<49>;
> +                };
> +		key_BACK {
> +			keypad,row =<6>;
> +			keypad,column =<3>;
> +			linux,code =<92>;
> +                };
> +		key_BACKSPACE {
> +			keypad,row =<6>;
> +			keypad,column =<4>;
> +			linux,code =<14>;
> +		};
> +		key_P {
> +			keypad,row =<6>;
> +			keypad,column =<6>;
> +			linux,code =<25>;
> +		};
> +		key_UP {
> +			keypad,row =<6>;
> +			keypad,column =<7>;
> +			linux,code =<103>;
> +		};
> +		key_PROG1 {
> +			keypad,row =<7>;
> +			keypad,column =<0>;
> +			linux,code =<148>;
> +		};
> +		key_PROG2 {
> +			keypad,row =<7>;
> +			keypad,column =<1>;
> +			linux,code =<149>;
> +		};
> +		key_PROG3 {
> +			keypad,row =<7>;
> +			keypad,column =<2>;
> +			linux,code =<202>;
> +                };
> +		key_PROG4 {
> +			keypad,row =<7>;
> +			keypad,column =<3>;
> +			linux,code =<203>;
> +		};
> +		key_F4 {
> +			keypad,row =<7>;
> +			keypad,column =<4>;
> +			linux,code =<62>;
> +		};
> +		key_Ok {
> +			keypad,row =<7>;
> +			keypad,column =<6>;
> +			linux,code =<352>;
> +		};
> +		key_DOWN {
> +			keypad,row =<7>;
> +			keypad,column =<7>;
> +			linux,code =<108>;
> +		};
> +	};
>   };
> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> index 3d35559..e0f678a 100644
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -156,4 +156,9 @@
>   			ti,hwmods = "i2c4";
>   		};
>   	};
> +
> +	keypad@4ae1c000 {
> +		compatible = "ti,omap4-keypad";
> +		ti,hwmods = "kbd";
> +	};
>   };


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

* [PATCH 1/2] arm/dts: omap4-sdp: Add keypad data
@ 2012-04-04 13:51     ` Cousson, Benoit
  0 siblings, 0 replies; 18+ messages in thread
From: Cousson, Benoit @ 2012-04-04 13:51 UTC (permalink / raw)
  To: linux-arm-kernel

On 4/4/2012 3:30 PM, Sourav Poddar wrote:
> This patch add keypad data node in omap4 device tree
> file.

Nit #2: Never write "this patch" in a patch changelog... Because at some 
point it will become a commit in a GIT tree.

I think AKPM wrote something on that.

Benoit

>
> Cc: Benoit Cousson<b-cousson@ti.com>
> Cc: Rob Herring<rob.herring@calxeda.com>
> Cc: Grant Likely<grant.likely@secretlab.ca>
> Cc: Felipe Balbi<balbi@ti.com>
> Signed-off-by: Sourav Poddar<sourav.poddar@ti.com>
> ---
>   arch/arm/boot/dts/omap4-sdp.dts |  291 +++++++++++++++++++++++++++++++++++++++
>   arch/arm/boot/dts/omap4.dtsi    |    5 +
>   2 files changed, 296 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
> index 63c6b2b..ac855b8 100644
> --- a/arch/arm/boot/dts/omap4-sdp.dts
> +++ b/arch/arm/boot/dts/omap4-sdp.dts
> @@ -17,4 +17,295 @@
>   		device_type = "memory";
>   		reg =<0x80000000 0x40000000>; /* 1 GB */
>   	};
> +
> +	keypad at 4ae1c000 {
> +		keypad,num-rows =<8>;
> +		keypad,num-columns =<8>;
> +
> +		key_E {
> +			keypad,row =<0>;
> +			keypad,column =<0>;
> +			linux,code =<18>;
> +		};
> +		key_R {
> +			keypad,row =<0>;
> +			keypad,column =<1>;
> +			linux,code =<19>;
> +		};
> +		key_T {
> +			keypad,row =<0>;
> +			keypad,column =<2>;
> +			linux,code =<20>;
> +		};
> +		key_HOME {
> +			keypad,row =<0>;
> +			keypad,column =<3>;
> +			linux,code =<102>;
> +		};
> +		key_F5 {
> +			keypad,row =<0>;
> +			keypad,column =<4>;
> +			linux,code =<63>;
> +		};
> +		key_I {
> +			keypad,row =<0>;
> +			keypad,column =<6>;
> +			linux,code =<23>;
> +		};
> +		key_LEFTSHIFT {
> +			keypad,row =<0>;
> +			keypad,column =<7>;
> +			linux,code =<42>;
> +		};
> +		key_D {
> +			keypad,row =<1>;
> +			keypad,column =<0>;
> +			linux,code =<32>;
> +		};
> +		key_F {
> +			keypad,row =<1>;
> +			keypad,column =<1>;
> +			linux,code =<33>;
> +		};
> +		key_G {
> +			keypad,row =<1>;
> +			keypad,column =<2>;
> +			linux,code =<34>;
> +		};
> +		key_SEND {
> +			keypad,row =<1>;
> +			keypad,column =<3>;
> +			linux,code =<84>;
> +		};
> +		key_F6 {
> +			keypad,row =<1>;
> +			keypad,column =<4>;
> +			linux,code =<64>;
> +		};
> +		key_K {
> +			keypad,row =<1>;
> +			keypad,column =<6>;
> +			linux,code =<37>;
> +		};
> +		key_ENTER {
> +			keypad,row =<1>;
> +			keypad,column =<7>;
> +			linux,code =<28>;
> +		};
> +		key_X {
> +			keypad,row =<2>;
> +			keypad,column =<0>;
> +			linux,code =<45>;
> +		};
> +		key_C {
> +			keypad,row =<2>;
> +			keypad,column =<1>;
> +			linux,code =<46>;
> +		};
> +		key_V {
> +			keypad,row =<2>;
> +			keypad,column =<2>;
> +			linux,code =<47>;
> +		};
> +		key_END {
> +			keypad,row =<2>;
> +			keypad,column =<3>;
> +			linux,code =<107>;
> +		};
> +		key_F7 {
> +			keypad,row =<2>;
> +			keypad,column =<4>;
> +			linux,code =<65>;
> +		};
> +		key_DOT {
> +			keypad,row =<2>;
> +			keypad,column =<6>;
> +			linux,code =<52>;
> +		};
> +		key_CAPSLOCK {
> +                        keypad,row =<2>;
> +                        keypad,column =<7>;
> +                        linux,code =<58>;
> +                };
> +		key_Z {
> +			keypad,row =<3>;
> +			keypad,column =<0>;
> +			linux,code =<44>;
> +		};
> +		key_KPLUS {
> +			keypad,row =<3>;
> +			keypad,column =<1>;
> +			linux,code =<78>;
> +		};
> +		key_B {
> +			keypad,row =<3>;
> +			keypad,column =<2>;
> +			linux,code =<48>;
> +		};
> +		key_F1 {
> +			keypad,row =<3>;
> +			keypad,column =<3>;
> +			linux,code =<59>;
> +		};
> +		key_F8 {
> +			keypad,row =<3>;
> +			keypad,column =<4>;
> +			linux,code =<66>;
> +		};
> +		key_O {
> +			keypad,row =<3>;
> +			keypad,column =<6>;
> +			linux,code =<24>;
> +                };
> +		key_SPACE {
> +			keypad,row =<3>;
> +			keypad,column =<7>;
> +			linux,code =<57>;
> +                };
> +		key_W {
> +			keypad,row =<4>;
> +			keypad,column =<0>;
> +			linux,code =<17>;
> +                };
> +		key_Y {
> +			keypad,row =<4>;
> +			keypad,column =<1>;
> +			linux,code =<21>;
> +		};
> +		key_U {
> +			keypad,row =<4>;
> +			keypad,column =<2>;
> +			linux,code =<22>;
> +		};
> +		key_F2 {
> +			keypad,row =<4>;
> +			keypad,column =<3>;
> +			linux,code =<60>;
> +		};
> +		key_VOLUMEUP {
> +			keypad,row =<4>;
> +			keypad,column =<4>;
> +			linux,code =<115>;
> +		};
> +		key_L {
> +			keypad,row =<4>;
> +			keypad,column =<6>;
> +			linux,code =<38>;
> +		};
> +		key_LEFT {
> +			keypad,row =<4>;
> +			keypad,column =<7>;
> +			linux,code =<105>;
> +		};
> +		key_S {
> +			keypad,row =<5>;
> +			keypad,column =<0>;
> +			linux,code =<31>;
> +		};
> +		key_H {
> +			keypad,row =<5>;
> +			keypad,column =<1>;
> +			linux,code =<35>;
> +		};
> +		key_J {
> +			keypad,row =<5>;
> +			keypad,column =<2>;
> +			linux,code =<36>;
> +		};
> +		key_F3 {
> +			keypad,row =<5>;
> +			keypad,column =<3>;
> +			linux,code =<61>;
> +		};
> +		key_F9 {
> +			keypad,row =<5>;
> +			keypad,column =<4>;
> +			linux,code =<67>;
> +		};
> +		key_VOLUMEDOWN {
> +			keypad,row =<5>;
> +			keypad,column =<5>;
> +			linux,code =<114>;
> +		};
> +		key_M {
> +			keypad,row =<5>;
> +			keypad,column =<6>;
> +			linux,code =<50>;
> +		};
> +		key_RIGHT {
> +			keypad,row =<5>;
> +			keypad,column =<7>;
> +			linux,code =<106>;
> +		};
> +		key_Q {
> +			keypad,row =<6>;
> +			keypad,column =<0>;
> +			linux,code =<16>;
> +		};
> +		key_A {
> +			keypad,row =<6>;
> +			keypad,column =<1>;
> +			linux,code =<30>;
> +                };
> +		key_N {
> +			keypad,row =<6>;
> +			keypad,column =<2>;
> +			linux,code =<49>;
> +                };
> +		key_BACK {
> +			keypad,row =<6>;
> +			keypad,column =<3>;
> +			linux,code =<92>;
> +                };
> +		key_BACKSPACE {
> +			keypad,row =<6>;
> +			keypad,column =<4>;
> +			linux,code =<14>;
> +		};
> +		key_P {
> +			keypad,row =<6>;
> +			keypad,column =<6>;
> +			linux,code =<25>;
> +		};
> +		key_UP {
> +			keypad,row =<6>;
> +			keypad,column =<7>;
> +			linux,code =<103>;
> +		};
> +		key_PROG1 {
> +			keypad,row =<7>;
> +			keypad,column =<0>;
> +			linux,code =<148>;
> +		};
> +		key_PROG2 {
> +			keypad,row =<7>;
> +			keypad,column =<1>;
> +			linux,code =<149>;
> +		};
> +		key_PROG3 {
> +			keypad,row =<7>;
> +			keypad,column =<2>;
> +			linux,code =<202>;
> +                };
> +		key_PROG4 {
> +			keypad,row =<7>;
> +			keypad,column =<3>;
> +			linux,code =<203>;
> +		};
> +		key_F4 {
> +			keypad,row =<7>;
> +			keypad,column =<4>;
> +			linux,code =<62>;
> +		};
> +		key_Ok {
> +			keypad,row =<7>;
> +			keypad,column =<6>;
> +			linux,code =<352>;
> +		};
> +		key_DOWN {
> +			keypad,row =<7>;
> +			keypad,column =<7>;
> +			linux,code =<108>;
> +		};
> +	};
>   };
> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> index 3d35559..e0f678a 100644
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -156,4 +156,9 @@
>   			ti,hwmods = "i2c4";
>   		};
>   	};
> +
> +	keypad at 4ae1c000 {
> +		compatible = "ti,omap4-keypad";
> +		ti,hwmods = "kbd";
> +	};
>   };

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

* Re: [PATCH 1/2] arm/dts: omap4-sdp: Add keypad data
  2012-04-04 13:51     ` Cousson, Benoit
  (?)
@ 2012-04-07  1:39       ` Grant Likely
  -1 siblings, 0 replies; 18+ messages in thread
From: Grant Likely @ 2012-04-07  1:39 UTC (permalink / raw)
  To: Cousson, Benoit, Sourav Poddar
  Cc: devicetree-discuss, linux-kernel, Felipe Balbi, Rob Herring,
	linux-input, linux-arm-kernel

On Wed, 4 Apr 2012 15:51:38 +0200, "Cousson, Benoit" <b-cousson@ti.com> wrote:
> On 4/4/2012 3:30 PM, Sourav Poddar wrote:
> > This patch add keypad data node in omap4 device tree
> > file.
> 
> Nit #2: Never write "this patch" in a patch changelog... Because at some 
> point it will become a commit in a GIT tree.
> 
> I think AKPM wrote something on that.

Whatever.  I'm won't *ever* get worked up about something like that if
the changelog is otherwise well written.  What I do want to see is a
description of what the patch does, why it is needed, and how it was
tested.

g.

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

* Re: [PATCH 1/2] arm/dts: omap4-sdp: Add keypad data
@ 2012-04-07  1:39       ` Grant Likely
  0 siblings, 0 replies; 18+ messages in thread
From: Grant Likely @ 2012-04-07  1:39 UTC (permalink / raw)
  To: Cousson, Benoit, Sourav Poddar
  Cc: devicetree-discuss, linux-kernel, Rob Herring, Felipe Balbi,
	linux-input, linux-arm-kernel

On Wed, 4 Apr 2012 15:51:38 +0200, "Cousson, Benoit" <b-cousson@ti.com> wrote:
> On 4/4/2012 3:30 PM, Sourav Poddar wrote:
> > This patch add keypad data node in omap4 device tree
> > file.
> 
> Nit #2: Never write "this patch" in a patch changelog... Because at some 
> point it will become a commit in a GIT tree.
> 
> I think AKPM wrote something on that.

Whatever.  I'm won't *ever* get worked up about something like that if
the changelog is otherwise well written.  What I do want to see is a
description of what the patch does, why it is needed, and how it was
tested.

g.


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

* [PATCH 1/2] arm/dts: omap4-sdp: Add keypad data
@ 2012-04-07  1:39       ` Grant Likely
  0 siblings, 0 replies; 18+ messages in thread
From: Grant Likely @ 2012-04-07  1:39 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, 4 Apr 2012 15:51:38 +0200, "Cousson, Benoit" <b-cousson@ti.com> wrote:
> On 4/4/2012 3:30 PM, Sourav Poddar wrote:
> > This patch add keypad data node in omap4 device tree
> > file.
> 
> Nit #2: Never write "this patch" in a patch changelog... Because at some 
> point it will become a commit in a GIT tree.
> 
> I think AKPM wrote something on that.

Whatever.  I'm won't *ever* get worked up about something like that if
the changelog is otherwise well written.  What I do want to see is a
description of what the patch does, why it is needed, and how it was
tested.

g.

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

* [PATCH 2/2] drivers: input: keypad: Add device tree support
  2012-04-04 13:30 ` Sourav Poddar
  (?)
@ 2012-04-04 13:30   ` Sourav Poddar
  -1 siblings, 0 replies; 18+ messages in thread
From: Sourav Poddar @ 2012-04-04 13:30 UTC (permalink / raw)
  To: devicetree-discuss
  Cc: Benoit Cousson, Dmitry Torokhov, linux-kernel, Rob Herring,
	Grant Likely, Randy Dunlap, Felipe Balbi, linux-input,
	Sourav Poddar, linux-arm-kernel

Add device tree support for omap4 keypad driver.

Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
---
 .../devicetree/bindings/input/omap-keypad.txt      |   52 +++++++++
 drivers/input/keyboard/omap4-keypad.c              |  114 ++++++++++++++++----
 2 files changed, 143 insertions(+), 23 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/omap-keypad.txt

diff --git a/Documentation/devicetree/bindings/input/omap-keypad.txt b/Documentation/devicetree/bindings/input/omap-keypad.txt
new file mode 100644
index 0000000..21fb64a
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/omap-keypad.txt
@@ -0,0 +1,52 @@
+* TI's Keypad Controller device tree bindings
+
+TI's Keypad controller is used to interface a SoC with a matrix-type
+keypad device. The keypad controller supports multiple row and column lines.
+A key can be placed at each intersection of a unique row and a unique column.
+The keypad controller can sense a key-press and key-release and report the
+event using a interrupt to the cpu.
+
+Required SoC Specific Properties:
+- compatible: should be one of the following
+   - "ti,omap4-keypad": For controllers compatible with omap4 keypad
+      controller.
+
+Required Board Specific Properties:
+- keypad,num-rows: Number of row lines connected to the keypad
+  controller.
+
+- keypad,num-columns: Number of column lines connected to the
+  keypad controller.
+
+- Keys represented as child nodes: Each key connected to the keypad
+  controller is represented as a child node to the keypad controller
+  device node and should include the following properties.
+  - keypad,row: the row number to which the key is connected.
+  - keypad,column: the column number to which the key is connected.
+  - linux,code: the key-code to be reported when the key is pressed
+    and released.
+
+Example:
+        keypad@4ae1c000{
+                compatible = "ti,omap4-keypad";
+                keypad,num-rows = <2>;
+                keypad,num-columns = <8>;
+
+		key_1 {
+                        keypad,row = <0>;
+                        keypad,column = <3>;
+                        linux,code = <2>;
+                };
+
+                key_2 {
+                        keypad,row = <0>;
+                        keypad,column = <4>;
+                        linux,code = <3>;
+                };
+
+                key_3 {
+                        keypad,row = <0>;
+                        keypad,column = <5>;
+                        linux,code = <4>;
+                };
+        };
diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index e809ac0..52942bd 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -27,6 +27,7 @@
 #include <linux/platform_device.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/of.h>
 #include <linux/input.h>
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
@@ -70,6 +71,7 @@
 
 struct omap4_keypad {
 	struct input_dev *input;
+	struct matrix_keymap_data *keymap_data;
 
 	void __iomem *base;
 	int irq;
@@ -174,24 +176,103 @@ static void omap4_keypad_close(struct input_dev *input)
 	pm_runtime_put_sync(input->dev.parent);
 }
 
+static struct omap4_keypad *omap_keypad_parse_dt(struct device *dev,
+					uint32_t num_rows, uint32_t num_cols)
+{
+	struct matrix_keymap_data *keymap_data;
+	struct device_node *np = dev->of_node, *key_np;
+	struct platform_device *pdev = to_platform_device(dev);
+	struct omap4_keypad *keypad_data = platform_get_drvdata(pdev);
+	uint32_t *keymap;
+	unsigned int key_count = 0;
+
+	keypad_data->rows = num_rows;
+	keypad_data->cols = num_cols;
+
+	keymap_data = devm_kzalloc(dev, sizeof(*keymap_data), GFP_KERNEL);
+	if (!keymap_data) {
+		dev_err(dev, "could not allocate memory for keymap data\n");
+		return NULL;
+	}
+	keypad_data->keymap_data = keymap_data;
+
+	for_each_child_of_node(np, key_np)
+		key_count++;
+
+	keymap_data->keymap_size = key_count;
+	keymap = devm_kzalloc(dev, sizeof(uint32_t) * key_count, GFP_KERNEL);
+	if (!keymap) {
+		dev_err(dev, "could not allocate memory for keymap\n");
+		return NULL;
+	}
+	keypad_data->keymap_data->keymap = keymap;
+
+	for_each_child_of_node(np, key_np) {
+		u32 row, col, key_code;
+		of_property_read_u32(key_np, "keypad,row", &row);
+		of_property_read_u32(key_np, "keypad,column", &col);
+		of_property_read_u32(key_np, "linux,code", &key_code);
+		*keymap++ = KEY(row, col, key_code);
+	}
+
+	return keypad_data;
+}
+
 static int __devinit omap4_keypad_probe(struct platform_device *pdev)
 {
+	struct device *dev = &pdev->dev;
+	struct device_node *np = dev->of_node;
 	const struct omap4_keypad_platform_data *pdata;
 	struct omap4_keypad *keypad_data;
 	struct input_dev *input_dev;
 	struct resource *res;
 	resource_size_t size;
-	unsigned int row_shift, max_keys;
+	unsigned int row_shift = 0, max_keys = 0;
+	uint32_t num_rows = 0, num_cols = 0;
 	int irq;
 	int error;
 
 	/* platform data */
 	pdata = pdev->dev.platform_data;
-	if (!pdata) {
+	if (np) {
+		of_property_read_u32(np, "keypad,num-rows", &num_rows);
+		of_property_read_u32(np, "keypad,num-columns", &num_cols);
+		if (!num_rows || !num_cols) {
+			dev_err(&pdev->dev, "number of keypad rows/columns not specified\n");
+			return -EINVAL;
+		}
+	} else if (pdata) {
+		num_rows = pdata->rows;
+		num_cols = pdata->cols;
+	} else {
 		dev_err(&pdev->dev, "no platform data defined\n");
 		return -EINVAL;
 	}
 
+	row_shift = get_count_order(num_cols);
+	max_keys = num_rows << row_shift;
+
+	keypad_data = devm_kzalloc(sizeof(struct omap4_keypad) +
+			max_keys * sizeof(keypad_data->keymap[0]),
+				GFP_KERNEL);
+
+	if (!keypad_data) {
+		dev_err(&pdev->dev, "keypad_data memory allocation failed\n");
+		return -ENOMEM;
+	}
+
+	platform_set_drvdata(pdev, keypad_data);
+
+	if (np) {
+		keypad_data = omap_keypad_parse_dt(&pdev->dev,
+						num_rows, num_cols);
+	} else {
+		keypad_data->rows = num_rows;
+		keypad_data->cols = num_cols;
+		keypad_data->keymap_data =
+				(struct matrix_keymap_data *)pdata->keymap_data;
+	}
+
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res) {
 		dev_err(&pdev->dev, "no base address specified\n");
@@ -204,22 +285,6 @@ static int __devinit omap4_keypad_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	if (!pdata->keymap_data) {
-		dev_err(&pdev->dev, "no keymap data defined\n");
-		return -EINVAL;
-	}
-
-	row_shift = get_count_order(pdata->cols);
-	max_keys = pdata->rows << row_shift;
-
-	keypad_data = kzalloc(sizeof(struct omap4_keypad) +
-				max_keys * sizeof(keypad_data->keymap[0]),
-			      GFP_KERNEL);
-	if (!keypad_data) {
-		dev_err(&pdev->dev, "keypad_data memory allocation failed\n");
-		return -ENOMEM;
-	}
-
 	size = resource_size(res);
 
 	res = request_mem_region(res->start, size, pdev->name);
@@ -237,9 +302,6 @@ static int __devinit omap4_keypad_probe(struct platform_device *pdev)
 	}
 
 	keypad_data->irq = irq;
-	keypad_data->row_shift = row_shift;
-	keypad_data->rows = pdata->rows;
-	keypad_data->cols = pdata->cols;
 
 	/* input device allocation */
 	keypad_data->input = input_dev = input_allocate_device();
@@ -269,7 +331,7 @@ static int __devinit omap4_keypad_probe(struct platform_device *pdev)
 
 	input_set_drvdata(input_dev, keypad_data);
 
-	matrix_keypad_build_keymap(pdata->keymap_data, row_shift,
+	matrix_keypad_build_keymap(keypad_data->keymap_data, row_shift,
 			input_dev->keycode, input_dev->keybit);
 
 	error = request_irq(keypad_data->irq, omap4_keypad_interrupt,
@@ -288,7 +350,6 @@ static int __devinit omap4_keypad_probe(struct platform_device *pdev)
 		goto err_pm_disable;
 	}
 
-	platform_set_drvdata(pdev, keypad_data);
 	return 0;
 
 err_pm_disable:
@@ -327,12 +388,19 @@ static int __devexit omap4_keypad_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id omap_keypad_dt_match[] = {
+	{ .compatible = "ti,omap4-keypad" },
+	{},
+};
+MODULE_DEVICE_TABLE(of, omap_keypad_dt_match);
+
 static struct platform_driver omap4_keypad_driver = {
 	.probe		= omap4_keypad_probe,
 	.remove		= __devexit_p(omap4_keypad_remove),
 	.driver		= {
 		.name	= "omap4-keypad",
 		.owner	= THIS_MODULE,
+		.of_match_table = of_match_ptr(omap_keypad_dt_match),
 	},
 };
 module_platform_driver(omap4_keypad_driver);
-- 
1.7.1

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

* [PATCH 2/2] drivers: input: keypad: Add device tree support
@ 2012-04-04 13:30   ` Sourav Poddar
  0 siblings, 0 replies; 18+ messages in thread
From: Sourav Poddar @ 2012-04-04 13:30 UTC (permalink / raw)
  To: devicetree-discuss
  Cc: linux-arm-kernel, linux-kernel, linux-input, Sourav Poddar,
	Benoit Cousson, Rob Herring, Grant Likely, Felipe Balbi,
	Dmitry Torokhov, Randy Dunlap

Add device tree support for omap4 keypad driver.

Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
---
 .../devicetree/bindings/input/omap-keypad.txt      |   52 +++++++++
 drivers/input/keyboard/omap4-keypad.c              |  114 ++++++++++++++++----
 2 files changed, 143 insertions(+), 23 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/omap-keypad.txt

diff --git a/Documentation/devicetree/bindings/input/omap-keypad.txt b/Documentation/devicetree/bindings/input/omap-keypad.txt
new file mode 100644
index 0000000..21fb64a
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/omap-keypad.txt
@@ -0,0 +1,52 @@
+* TI's Keypad Controller device tree bindings
+
+TI's Keypad controller is used to interface a SoC with a matrix-type
+keypad device. The keypad controller supports multiple row and column lines.
+A key can be placed at each intersection of a unique row and a unique column.
+The keypad controller can sense a key-press and key-release and report the
+event using a interrupt to the cpu.
+
+Required SoC Specific Properties:
+- compatible: should be one of the following
+   - "ti,omap4-keypad": For controllers compatible with omap4 keypad
+      controller.
+
+Required Board Specific Properties:
+- keypad,num-rows: Number of row lines connected to the keypad
+  controller.
+
+- keypad,num-columns: Number of column lines connected to the
+  keypad controller.
+
+- Keys represented as child nodes: Each key connected to the keypad
+  controller is represented as a child node to the keypad controller
+  device node and should include the following properties.
+  - keypad,row: the row number to which the key is connected.
+  - keypad,column: the column number to which the key is connected.
+  - linux,code: the key-code to be reported when the key is pressed
+    and released.
+
+Example:
+        keypad@4ae1c000{
+                compatible = "ti,omap4-keypad";
+                keypad,num-rows = <2>;
+                keypad,num-columns = <8>;
+
+		key_1 {
+                        keypad,row = <0>;
+                        keypad,column = <3>;
+                        linux,code = <2>;
+                };
+
+                key_2 {
+                        keypad,row = <0>;
+                        keypad,column = <4>;
+                        linux,code = <3>;
+                };
+
+                key_3 {
+                        keypad,row = <0>;
+                        keypad,column = <5>;
+                        linux,code = <4>;
+                };
+        };
diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index e809ac0..52942bd 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -27,6 +27,7 @@
 #include <linux/platform_device.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/of.h>
 #include <linux/input.h>
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
@@ -70,6 +71,7 @@
 
 struct omap4_keypad {
 	struct input_dev *input;
+	struct matrix_keymap_data *keymap_data;
 
 	void __iomem *base;
 	int irq;
@@ -174,24 +176,103 @@ static void omap4_keypad_close(struct input_dev *input)
 	pm_runtime_put_sync(input->dev.parent);
 }
 
+static struct omap4_keypad *omap_keypad_parse_dt(struct device *dev,
+					uint32_t num_rows, uint32_t num_cols)
+{
+	struct matrix_keymap_data *keymap_data;
+	struct device_node *np = dev->of_node, *key_np;
+	struct platform_device *pdev = to_platform_device(dev);
+	struct omap4_keypad *keypad_data = platform_get_drvdata(pdev);
+	uint32_t *keymap;
+	unsigned int key_count = 0;
+
+	keypad_data->rows = num_rows;
+	keypad_data->cols = num_cols;
+
+	keymap_data = devm_kzalloc(dev, sizeof(*keymap_data), GFP_KERNEL);
+	if (!keymap_data) {
+		dev_err(dev, "could not allocate memory for keymap data\n");
+		return NULL;
+	}
+	keypad_data->keymap_data = keymap_data;
+
+	for_each_child_of_node(np, key_np)
+		key_count++;
+
+	keymap_data->keymap_size = key_count;
+	keymap = devm_kzalloc(dev, sizeof(uint32_t) * key_count, GFP_KERNEL);
+	if (!keymap) {
+		dev_err(dev, "could not allocate memory for keymap\n");
+		return NULL;
+	}
+	keypad_data->keymap_data->keymap = keymap;
+
+	for_each_child_of_node(np, key_np) {
+		u32 row, col, key_code;
+		of_property_read_u32(key_np, "keypad,row", &row);
+		of_property_read_u32(key_np, "keypad,column", &col);
+		of_property_read_u32(key_np, "linux,code", &key_code);
+		*keymap++ = KEY(row, col, key_code);
+	}
+
+	return keypad_data;
+}
+
 static int __devinit omap4_keypad_probe(struct platform_device *pdev)
 {
+	struct device *dev = &pdev->dev;
+	struct device_node *np = dev->of_node;
 	const struct omap4_keypad_platform_data *pdata;
 	struct omap4_keypad *keypad_data;
 	struct input_dev *input_dev;
 	struct resource *res;
 	resource_size_t size;
-	unsigned int row_shift, max_keys;
+	unsigned int row_shift = 0, max_keys = 0;
+	uint32_t num_rows = 0, num_cols = 0;
 	int irq;
 	int error;
 
 	/* platform data */
 	pdata = pdev->dev.platform_data;
-	if (!pdata) {
+	if (np) {
+		of_property_read_u32(np, "keypad,num-rows", &num_rows);
+		of_property_read_u32(np, "keypad,num-columns", &num_cols);
+		if (!num_rows || !num_cols) {
+			dev_err(&pdev->dev, "number of keypad rows/columns not specified\n");
+			return -EINVAL;
+		}
+	} else if (pdata) {
+		num_rows = pdata->rows;
+		num_cols = pdata->cols;
+	} else {
 		dev_err(&pdev->dev, "no platform data defined\n");
 		return -EINVAL;
 	}
 
+	row_shift = get_count_order(num_cols);
+	max_keys = num_rows << row_shift;
+
+	keypad_data = devm_kzalloc(sizeof(struct omap4_keypad) +
+			max_keys * sizeof(keypad_data->keymap[0]),
+				GFP_KERNEL);
+
+	if (!keypad_data) {
+		dev_err(&pdev->dev, "keypad_data memory allocation failed\n");
+		return -ENOMEM;
+	}
+
+	platform_set_drvdata(pdev, keypad_data);
+
+	if (np) {
+		keypad_data = omap_keypad_parse_dt(&pdev->dev,
+						num_rows, num_cols);
+	} else {
+		keypad_data->rows = num_rows;
+		keypad_data->cols = num_cols;
+		keypad_data->keymap_data =
+				(struct matrix_keymap_data *)pdata->keymap_data;
+	}
+
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res) {
 		dev_err(&pdev->dev, "no base address specified\n");
@@ -204,22 +285,6 @@ static int __devinit omap4_keypad_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	if (!pdata->keymap_data) {
-		dev_err(&pdev->dev, "no keymap data defined\n");
-		return -EINVAL;
-	}
-
-	row_shift = get_count_order(pdata->cols);
-	max_keys = pdata->rows << row_shift;
-
-	keypad_data = kzalloc(sizeof(struct omap4_keypad) +
-				max_keys * sizeof(keypad_data->keymap[0]),
-			      GFP_KERNEL);
-	if (!keypad_data) {
-		dev_err(&pdev->dev, "keypad_data memory allocation failed\n");
-		return -ENOMEM;
-	}
-
 	size = resource_size(res);
 
 	res = request_mem_region(res->start, size, pdev->name);
@@ -237,9 +302,6 @@ static int __devinit omap4_keypad_probe(struct platform_device *pdev)
 	}
 
 	keypad_data->irq = irq;
-	keypad_data->row_shift = row_shift;
-	keypad_data->rows = pdata->rows;
-	keypad_data->cols = pdata->cols;
 
 	/* input device allocation */
 	keypad_data->input = input_dev = input_allocate_device();
@@ -269,7 +331,7 @@ static int __devinit omap4_keypad_probe(struct platform_device *pdev)
 
 	input_set_drvdata(input_dev, keypad_data);
 
-	matrix_keypad_build_keymap(pdata->keymap_data, row_shift,
+	matrix_keypad_build_keymap(keypad_data->keymap_data, row_shift,
 			input_dev->keycode, input_dev->keybit);
 
 	error = request_irq(keypad_data->irq, omap4_keypad_interrupt,
@@ -288,7 +350,6 @@ static int __devinit omap4_keypad_probe(struct platform_device *pdev)
 		goto err_pm_disable;
 	}
 
-	platform_set_drvdata(pdev, keypad_data);
 	return 0;
 
 err_pm_disable:
@@ -327,12 +388,19 @@ static int __devexit omap4_keypad_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id omap_keypad_dt_match[] = {
+	{ .compatible = "ti,omap4-keypad" },
+	{},
+};
+MODULE_DEVICE_TABLE(of, omap_keypad_dt_match);
+
 static struct platform_driver omap4_keypad_driver = {
 	.probe		= omap4_keypad_probe,
 	.remove		= __devexit_p(omap4_keypad_remove),
 	.driver		= {
 		.name	= "omap4-keypad",
 		.owner	= THIS_MODULE,
+		.of_match_table = of_match_ptr(omap_keypad_dt_match),
 	},
 };
 module_platform_driver(omap4_keypad_driver);
-- 
1.7.1


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

* [PATCH 2/2] drivers: input: keypad: Add device tree support
@ 2012-04-04 13:30   ` Sourav Poddar
  0 siblings, 0 replies; 18+ messages in thread
From: Sourav Poddar @ 2012-04-04 13:30 UTC (permalink / raw)
  To: linux-arm-kernel

Add device tree support for omap4 keypad driver.

Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
---
 .../devicetree/bindings/input/omap-keypad.txt      |   52 +++++++++
 drivers/input/keyboard/omap4-keypad.c              |  114 ++++++++++++++++----
 2 files changed, 143 insertions(+), 23 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/omap-keypad.txt

diff --git a/Documentation/devicetree/bindings/input/omap-keypad.txt b/Documentation/devicetree/bindings/input/omap-keypad.txt
new file mode 100644
index 0000000..21fb64a
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/omap-keypad.txt
@@ -0,0 +1,52 @@
+* TI's Keypad Controller device tree bindings
+
+TI's Keypad controller is used to interface a SoC with a matrix-type
+keypad device. The keypad controller supports multiple row and column lines.
+A key can be placed at each intersection of a unique row and a unique column.
+The keypad controller can sense a key-press and key-release and report the
+event using a interrupt to the cpu.
+
+Required SoC Specific Properties:
+- compatible: should be one of the following
+   - "ti,omap4-keypad": For controllers compatible with omap4 keypad
+      controller.
+
+Required Board Specific Properties:
+- keypad,num-rows: Number of row lines connected to the keypad
+  controller.
+
+- keypad,num-columns: Number of column lines connected to the
+  keypad controller.
+
+- Keys represented as child nodes: Each key connected to the keypad
+  controller is represented as a child node to the keypad controller
+  device node and should include the following properties.
+  - keypad,row: the row number to which the key is connected.
+  - keypad,column: the column number to which the key is connected.
+  - linux,code: the key-code to be reported when the key is pressed
+    and released.
+
+Example:
+        keypad at 4ae1c000{
+                compatible = "ti,omap4-keypad";
+                keypad,num-rows = <2>;
+                keypad,num-columns = <8>;
+
+		key_1 {
+                        keypad,row = <0>;
+                        keypad,column = <3>;
+                        linux,code = <2>;
+                };
+
+                key_2 {
+                        keypad,row = <0>;
+                        keypad,column = <4>;
+                        linux,code = <3>;
+                };
+
+                key_3 {
+                        keypad,row = <0>;
+                        keypad,column = <5>;
+                        linux,code = <4>;
+                };
+        };
diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index e809ac0..52942bd 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -27,6 +27,7 @@
 #include <linux/platform_device.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/of.h>
 #include <linux/input.h>
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
@@ -70,6 +71,7 @@
 
 struct omap4_keypad {
 	struct input_dev *input;
+	struct matrix_keymap_data *keymap_data;
 
 	void __iomem *base;
 	int irq;
@@ -174,24 +176,103 @@ static void omap4_keypad_close(struct input_dev *input)
 	pm_runtime_put_sync(input->dev.parent);
 }
 
+static struct omap4_keypad *omap_keypad_parse_dt(struct device *dev,
+					uint32_t num_rows, uint32_t num_cols)
+{
+	struct matrix_keymap_data *keymap_data;
+	struct device_node *np = dev->of_node, *key_np;
+	struct platform_device *pdev = to_platform_device(dev);
+	struct omap4_keypad *keypad_data = platform_get_drvdata(pdev);
+	uint32_t *keymap;
+	unsigned int key_count = 0;
+
+	keypad_data->rows = num_rows;
+	keypad_data->cols = num_cols;
+
+	keymap_data = devm_kzalloc(dev, sizeof(*keymap_data), GFP_KERNEL);
+	if (!keymap_data) {
+		dev_err(dev, "could not allocate memory for keymap data\n");
+		return NULL;
+	}
+	keypad_data->keymap_data = keymap_data;
+
+	for_each_child_of_node(np, key_np)
+		key_count++;
+
+	keymap_data->keymap_size = key_count;
+	keymap = devm_kzalloc(dev, sizeof(uint32_t) * key_count, GFP_KERNEL);
+	if (!keymap) {
+		dev_err(dev, "could not allocate memory for keymap\n");
+		return NULL;
+	}
+	keypad_data->keymap_data->keymap = keymap;
+
+	for_each_child_of_node(np, key_np) {
+		u32 row, col, key_code;
+		of_property_read_u32(key_np, "keypad,row", &row);
+		of_property_read_u32(key_np, "keypad,column", &col);
+		of_property_read_u32(key_np, "linux,code", &key_code);
+		*keymap++ = KEY(row, col, key_code);
+	}
+
+	return keypad_data;
+}
+
 static int __devinit omap4_keypad_probe(struct platform_device *pdev)
 {
+	struct device *dev = &pdev->dev;
+	struct device_node *np = dev->of_node;
 	const struct omap4_keypad_platform_data *pdata;
 	struct omap4_keypad *keypad_data;
 	struct input_dev *input_dev;
 	struct resource *res;
 	resource_size_t size;
-	unsigned int row_shift, max_keys;
+	unsigned int row_shift = 0, max_keys = 0;
+	uint32_t num_rows = 0, num_cols = 0;
 	int irq;
 	int error;
 
 	/* platform data */
 	pdata = pdev->dev.platform_data;
-	if (!pdata) {
+	if (np) {
+		of_property_read_u32(np, "keypad,num-rows", &num_rows);
+		of_property_read_u32(np, "keypad,num-columns", &num_cols);
+		if (!num_rows || !num_cols) {
+			dev_err(&pdev->dev, "number of keypad rows/columns not specified\n");
+			return -EINVAL;
+		}
+	} else if (pdata) {
+		num_rows = pdata->rows;
+		num_cols = pdata->cols;
+	} else {
 		dev_err(&pdev->dev, "no platform data defined\n");
 		return -EINVAL;
 	}
 
+	row_shift = get_count_order(num_cols);
+	max_keys = num_rows << row_shift;
+
+	keypad_data = devm_kzalloc(sizeof(struct omap4_keypad) +
+			max_keys * sizeof(keypad_data->keymap[0]),
+				GFP_KERNEL);
+
+	if (!keypad_data) {
+		dev_err(&pdev->dev, "keypad_data memory allocation failed\n");
+		return -ENOMEM;
+	}
+
+	platform_set_drvdata(pdev, keypad_data);
+
+	if (np) {
+		keypad_data = omap_keypad_parse_dt(&pdev->dev,
+						num_rows, num_cols);
+	} else {
+		keypad_data->rows = num_rows;
+		keypad_data->cols = num_cols;
+		keypad_data->keymap_data =
+				(struct matrix_keymap_data *)pdata->keymap_data;
+	}
+
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res) {
 		dev_err(&pdev->dev, "no base address specified\n");
@@ -204,22 +285,6 @@ static int __devinit omap4_keypad_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	if (!pdata->keymap_data) {
-		dev_err(&pdev->dev, "no keymap data defined\n");
-		return -EINVAL;
-	}
-
-	row_shift = get_count_order(pdata->cols);
-	max_keys = pdata->rows << row_shift;
-
-	keypad_data = kzalloc(sizeof(struct omap4_keypad) +
-				max_keys * sizeof(keypad_data->keymap[0]),
-			      GFP_KERNEL);
-	if (!keypad_data) {
-		dev_err(&pdev->dev, "keypad_data memory allocation failed\n");
-		return -ENOMEM;
-	}
-
 	size = resource_size(res);
 
 	res = request_mem_region(res->start, size, pdev->name);
@@ -237,9 +302,6 @@ static int __devinit omap4_keypad_probe(struct platform_device *pdev)
 	}
 
 	keypad_data->irq = irq;
-	keypad_data->row_shift = row_shift;
-	keypad_data->rows = pdata->rows;
-	keypad_data->cols = pdata->cols;
 
 	/* input device allocation */
 	keypad_data->input = input_dev = input_allocate_device();
@@ -269,7 +331,7 @@ static int __devinit omap4_keypad_probe(struct platform_device *pdev)
 
 	input_set_drvdata(input_dev, keypad_data);
 
-	matrix_keypad_build_keymap(pdata->keymap_data, row_shift,
+	matrix_keypad_build_keymap(keypad_data->keymap_data, row_shift,
 			input_dev->keycode, input_dev->keybit);
 
 	error = request_irq(keypad_data->irq, omap4_keypad_interrupt,
@@ -288,7 +350,6 @@ static int __devinit omap4_keypad_probe(struct platform_device *pdev)
 		goto err_pm_disable;
 	}
 
-	platform_set_drvdata(pdev, keypad_data);
 	return 0;
 
 err_pm_disable:
@@ -327,12 +388,19 @@ static int __devexit omap4_keypad_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id omap_keypad_dt_match[] = {
+	{ .compatible = "ti,omap4-keypad" },
+	{},
+};
+MODULE_DEVICE_TABLE(of, omap_keypad_dt_match);
+
 static struct platform_driver omap4_keypad_driver = {
 	.probe		= omap4_keypad_probe,
 	.remove		= __devexit_p(omap4_keypad_remove),
 	.driver		= {
 		.name	= "omap4-keypad",
 		.owner	= THIS_MODULE,
+		.of_match_table = of_match_ptr(omap_keypad_dt_match),
 	},
 };
 module_platform_driver(omap4_keypad_driver);
-- 
1.7.1

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

end of thread, other threads:[~2012-04-07  1:52 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-04 13:30 [PATCH 0/2] Add device tree support for omap4 keypad Sourav Poddar
2012-04-04 13:30 ` Sourav Poddar
2012-04-04 13:30 ` Sourav Poddar
2012-04-04 13:30 ` [PATCH 1/2] arm/dts: omap4-sdp: Add keypad data Sourav Poddar
2012-04-04 13:30   ` Sourav Poddar
2012-04-04 13:30   ` Sourav Poddar
2012-04-04 13:48   ` Cousson, Benoit
2012-04-04 13:48     ` Cousson, Benoit
2012-04-04 13:48     ` Cousson, Benoit
2012-04-04 13:51   ` Cousson, Benoit
2012-04-04 13:51     ` Cousson, Benoit
2012-04-04 13:51     ` Cousson, Benoit
2012-04-07  1:39     ` Grant Likely
2012-04-07  1:39       ` Grant Likely
2012-04-07  1:39       ` Grant Likely
2012-04-04 13:30 ` [PATCH 2/2] drivers: input: keypad: Add device tree support Sourav Poddar
2012-04-04 13:30   ` Sourav Poddar
2012-04-04 13:30   ` Sourav Poddar

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.