Skip to contentSkip to conversation

Add Nokia N900 DT support

PATCH In review Sebastian Reichel 6 participants 15 messages Oct 22, 2013 – Oct 30, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover Add Nokia N900 DT support

Add device tree support for the Nokia N900 keyboard.

Changes since v1:
* create "DTS: ARM: TWL4030: Add keypad node" patch, which was part of "Input: twl4030-keypad - add device tree support" before.
* use "IS_ENABLED(CONFIG_OF)" to check if DT is enabled

Currently non-DT boot crashes for me very early, so I was not able to check this patch using non-DT boot.

-- Sebastian

Sebastian Reichel (3):
Input: twl4030-keypad - add device tree support
DTS: ARM: TWL4030: Add keypad node
ARM: dts: N900: TWL4030 Keypad Matrix definition

 .../devicetree/bindings/input/twl4030-keypad.txt   | 31 ++++++++
 arch/arm/boot/dts/omap3-n900.dts                   | 55 +++++++++++++
 arch/arm/boot/dts/twl4030.dtsi                     |  7 ++
 drivers/input/keyboard/twl4030_keypad.c            | 91 ++++++++++++++++++----
 4 files changed, 167 insertions(+), 17 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/twl4030-keypad.txt
Signature · 1 line
1.8.4.rc3
#1 lore raw

PATCH v2 1/3 Input: twl4030-keypad - add device tree support

Add device tree support for twl4030 keypad driver and update the Documentation with twl4030 keypad device tree binding information.

Tested on Nokia N900.

---
 .../devicetree/bindings/input/twl4030-keypad.txt   | 31 ++++++++
 drivers/input/keyboard/twl4030_keypad.c            | 91 ++++++++++++++++++----
 2 files changed, 105 insertions(+), 17 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/twl4030-keypad.txt
Documentation/devicetree/bindings/input/twl4030-keypad.txt new file +31 -0
new file mode 100644
index 0000000..2b4bd7a
@@ -0,0 +1,31 @@
+* TWL4030's Keypad Controller device tree bindings
+
+TWL4030'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.
+
+This binding is based on the matrix-keymap binding with the following
+changes:
+
+ * keypad,num-rows and keypad,num-columns are required.
+
+Required SoC Specific Properties:
+- compatible: should be one of the following
+   - "ti,twl4030-keypad": For controllers compatible with twl4030 keypad
+      controller.
+- interrupt: should be one of the following
+   - <1>: For controllers compatible with twl4030 keypad controller.
+
+Optional Properties specific to linux:
+- linux,keypad-no-autorepeat: do no enable autorepeat feature.
+
+Example:
+	twl_keypad: keypad {
+		compatible = "ti,twl4030-keypad";
+		interrupts = <1>;
+		keypad,num-rows = <8>;
+		keypad,num-columns = <8>;
+		linux,keypad-no-autorepeat;
+	};
drivers/input/keyboard/twl4030_keypad.c +74 -17

150 lines not on this page · raw message

Signature · 1 line
1.8.4.rc3
#2 lore raw

Re: [PATCHv2 1/3] Input: twl4030-keypad - add device tree support

Hi!

Quoted 4 lines

Add device tree support for twl4030 keypad driver and update the Documentation with twl4030 keypad device tree binding information.

Tested on Nokia N900.

It looks pretty good.

Quoted 4 lines

+++ b/Documentation/devicetree/bindings/input/twl4030-keypad.txt

Documentation/devicetree/bindings/input/twl4030-keypad.txt new file +2 -0
@@ -0,0 +1,31 @@
+* TWL4030's Keypad Controller device tree bindings
+

Documentation/devicetree/bindings/input/twl4030-keypad.txt line 12

Quoted 10 lines
Documentation/devicetree/bindings/input/twl4030-keypad.txt new file +10 -0
+TWL4030'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.
+
+This binding is based on the matrix-keymap binding with the following
+changes:
+
+ * keypad,num-rows and keypad,num-columns are required.

Is "keypad," prefix neccessary here?

Documentation/devicetree/bindings/input/twl4030-keypad.txt line 22

Quoted 2 lines
Documentation/devicetree/bindings/input/twl4030-keypad.txt new file +2 -0
+Optional Properties specific to linux:
+- linux,keypad-no-autorepeat: do no enable autorepeat feature.

"do not autorepeat". Plus I do not see what is Linux specifc about not autorepeating... Other systems will likely know about autorepeat, too.

drivers/input/keyboard/twl4030_keypad.c static int twl4030_kp_program(struct twl4030_keypad *kp) · line 329

Quoted 5 lines
drivers/input/keyboard/twl4030_keypad.c +1 -0
@@ -324,6 +326,31 @@ static int twl4030_kp_program(struct twl4030_keypad *kp)
 	return 0;
 }
 
+#if IS_ENABLED(CONFIG_OF)

I'm probably missing something here, but why not #ifdef CONFIG_OF?

drivers/input/keyboard/twl4030_keypad.c static int twl4030_kp_probe(struct platform_device *pdev) · line 431

Quoted 8 lines
drivers/input/keyboard/twl4030_keypad.c +1 -1
@@ -381,7 +426,7 @@ static int twl4030_kp_probe(struct platform_device *pdev)
 
 	input_set_capability(input, EV_MSC, MSC_SCAN);
 	/* Enable auto repeat feature of Linux input subsystem */
-	if (pdata->rep)
+	if (!kp->no_autorepeat)
 		__set_bit(EV_REP, input->evbit);
 

Double negation is nasty to read. I believe code would be more readable if you switched logic to kp->autorepeat.

Thanks,
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#3 lore raw

Re: [PATCHv2 1/3] Input: twl4030-keypad - add device tree support

Hi Pavel,

Quoted 6 lines · Pavel Machek
Quoted 4 lines

Add device tree support for twl4030 keypad driver and update the Documentation with twl4030 keypad device tree binding information.

Tested on Nokia N900.

It looks pretty good.

Thanks.

Quoted 2 lines
Quoted 1 line

+ * keypad,num-rows and keypad,num-columns are required.

Is "keypad," prefix neccessary here?

See Documentation/devicetree/bindings/input/matrix-keymap.txt

Quoted 5 lines
Quoted 2 lines

+Optional Properties specific to linux:
+- linux,keypad-no-autorepeat: do no enable autorepeat feature.

"do not autorepeat". Plus I do not see what is Linux specifc about not autorepeating... Other systems will likely know about autorepeat, too.

This property has already been used like this for samsung-keypad, stmpe-keypad, omap-keypad and gpio-matrix-keypad.

Quoted 2 lines
Quoted 1 line

+#if IS_ENABLED(CONFIG_OF)

I'm probably missing something here, but why not #ifdef CONFIG_OF?

I have been told for other drivers, that IS_ENABLED() is the prefered way to check for configuration these days.

Quoted 11 lines

drivers/input/keyboard/twl4030_keypad.c static int twl4030_kp_probe(struct platform_device *pdev) · line 431

Quoted 8 lines
drivers/input/keyboard/twl4030_keypad.c +1 -1
@@ -381,7 +426,7 @@ static int twl4030_kp_probe(struct platform_device *pdev)
 
 	input_set_capability(input, EV_MSC, MSC_SCAN);
 	/* Enable auto repeat feature of Linux input subsystem */
-	if (pdata->rep)
+	if (!kp->no_autorepeat)
 		__set_bit(EV_REP, input->evbit);
 

Double negation is nasty to read. I believe code would be more readable if you switched logic to kp->autorepeat.

I was thinking about the same when writing it, but decided against it, since it will just move the double negation to the variable initialization.

-- Sebastian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131027/258e9392/attachment.sig>

#4 lore raw

Re: [PATCHv2 1/3] Input: twl4030-keypad - add device tree support

Hi!

Quoted 8 lines
Quoted 2 lines
Quoted 1 line

+ * keypad,num-rows and keypad,num-columns are required.

Is "keypad," prefix neccessary here?

See Documentation/devicetree/bindings/input/matrix-keymap.txt

Quoted 3 lines
Quoted 2 lines

+Optional Properties specific to linux:
+- linux,keypad-no-autorepeat: do no enable autorepeat feature.

Quoted 6 lines
Quoted 2 lines

"do not autorepeat". Plus I do not see what is Linux specifc about not autorepeating... Other systems will likely know about autorepeat, too.

This property has already been used like this for samsung-keypad, stmpe-keypad, omap-keypad and gpio-matrix-keypad.

Ok. But you still have a typo. "do no enable" => "do not enable".

Quoted 5 lines
Quoted 2 lines
Quoted 1 line

+#if IS_ENABLED(CONFIG_OF)

I'm probably missing something here, but why not #ifdef CONFIG_OF?

I have been told for other drivers, that IS_ENABLED() is the prefered way to check for configuration these days.

CONFIG_OF can not be module, using IS_ENABLED() on it is just wrong.

Quoted 12 lines
Quoted 11 lines

drivers/input/keyboard/twl4030_keypad.c static int twl4030_kp_probe(struct platform_device *pdev) · line 431

Quoted 8 lines
drivers/input/keyboard/twl4030_keypad.c +1 -1
@@ -381,7 +426,7 @@ static int twl4030_kp_probe(struct platform_device *pdev)
 
 	input_set_capability(input, EV_MSC, MSC_SCAN);
 	/* Enable auto repeat feature of Linux input subsystem */
-	if (pdata->rep)
+	if (!kp->no_autorepeat)
 		__set_bit(EV_REP, input->evbit);
 

Double negation is nasty to read. I believe code would be more readable if you switched logic to kp->autorepeat.

Quoted 3 lines

I was thinking about the same when writing it, but decided against it, since it will just move the double negation to the variable initialization.

Well, the property should be linux,keypad-autorepeat in the first place, but it is too late to change that.

Thanks,
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#5 lore raw

Re: [PATCHv2 1/3] Input: twl4030-keypad - add device tree support

Quoted 8 lines · Pavel Machek
Quoted 6 lines
Quoted 3 lines
Quoted 2 lines

+#if IS_ENABLED(CONFIG_OF)

I'm probably missing something here, but why not #ifdef CONFIG_OF?

I have been told for other drivers, that IS_ENABLED() is the prefered way to check for configuration these days.

CONFIG_OF can not be module, using IS_ENABLED() on it is just wrong.

Good point. Looks like there's IS_BUILTIN that's for boolean options.

Regards,

Tony

#6 lore raw

Re: [PATCHv2 1/3] Input: twl4030-keypad - add device tree support

Quoted 10 lines · Tony Lindgren
Quoted 7 lines · Pavel Machek
Quoted 5 lines
Quoted 2 lines
Quoted 1 line

+#if IS_ENABLED(CONFIG_OF)

I'm probably missing something here, but why not #ifdef CONFIG_OF?

I have been told for other drivers, that IS_ENABLED() is the prefered way to check for configuration these days.

CONFIG_OF can not be module, using IS_ENABLED() on it is just wrong.

Good point. Looks like there's IS_BUILTIN that's for boolean options.

Using IS_ENABLED for boolean options is supposed to be supported according to the comment above IS_BUILTIN:

/*
* IS_BUILTIN(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y', 0
* otherwise. For boolean options, this is equivalent to
* IS_ENABLED(CONFIG_FOO).
*/
#define IS_BUILTIN(option) config_enabled(option)

-- Sebastian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131027/708acccd/attachment.sig>

#7 lore raw

Re: [PATCHv2 1/3] Input: twl4030-keypad - add device tree support

In reply to Pavel Machek
Quoted 7 lines · Pavel Machek
Quoted 5 lines
Quoted 2 lines
Quoted 1 line

+#if IS_ENABLED(CONFIG_OF)

I'm probably missing something here, but why not #ifdef CONFIG_OF?

I have been told for other drivers, that IS_ENABLED() is the prefered way to check for configuration these days.

CONFIG_OF can not be module, using IS_ENABLED() on it is just wrong.

That makes no sense. There is absolutely nothing wrong with using IS_ENABLED() for CONFIG_OF.

g.

#8 lore raw

Re: [PATCHv2 1/3] Input: twl4030-keypad - add device tree support

Quoted 11 lines · Grant Likely
Quoted 7 lines · Pavel Machek
Quoted 5 lines
Quoted 2 lines
Quoted 1 line

+#if IS_ENABLED(CONFIG_OF)

I'm probably missing something here, but why not #ifdef CONFIG_OF?

I have been told for other drivers, that IS_ENABLED() is the prefered way to check for configuration these days.

CONFIG_OF can not be module, using IS_ENABLED() on it is just wrong.

That makes no sense. There is absolutely nothing wrong with using IS_ENABLED() for CONFIG_OF.

Besides being too long, confusing for a reader, and testing for an option that can't exist?

include/linux/kconfig.h-/*
include/linux/kconfig.h: * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm', include/linux/kconfig.h- * 0 otherwise.
include/linux/kconfig.h- *
include/linux/kconfig.h- */
include/linux/kconfig.h:#define IS_ENABLED(option) \
include/linux/kconfig.h- (config_enabled(option) || config_enabled(option##_MODULE))
include/linux/kconfig.h-
include/linux/kconfig.h-/*
include/linux/kconfig.h- * IS_BUILTIN(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y', 0 include/linux/kconfig.h- * otherwise. For boolean options, this is
equivalent to
include/linux/kconfig.h: * IS_ENABLED(CONFIG_FOO).
include/linux/kconfig.h- */
include/linux/kconfig.h-#define IS_BUILTIN(option) config_enabled(option) include/linux/kconfig.h-

Oops. And I made a mistake of looking up config_enabled(). Obfuscated C code contest.

Just use #ifdef CONFIG_foo.
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#9 lore raw

Re: [PATCHv2 1/3] Input: twl4030-keypad - add device tree support

In reply to Sebastian Reichel
Quoted 18 lines · Sebastian Reichel

Add device tree support for twl4030 keypad driver and update the Documentation with twl4030 keypad device tree binding information.

Tested on Nokia N900.

---
.../devicetree/bindings/input/twl4030-keypad.txt | 31 ++++++++
drivers/input/keyboard/twl4030_keypad.c | 91 ++++++++++++++++++----

2 files changed, 105 insertions(+), 17 deletions(-)

create mode 100644 Documentation/devicetree/bindings/input/twl4030-keypad.txt

Documentation/devicetree/bindings/input/twl4030-keypad.txt new file +0 -0
new file mode 100644
index 0000000..2b4bd7a

Documentation/devicetree/bindings/input/twl4030-keypad.txt line 10

Quoted 10 lines
Documentation/devicetree/bindings/input/twl4030-keypad.txt new file +10 -0
@@ -0,0 +1,31 @@
+* TWL4030's Keypad Controller device tree bindings
+
+TWL4030'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.
+
+This binding is based on the matrix-keymap binding with the following
+changes:

Maybe be a bit more specific and say 'based on the input/matrix-keymap.txt binding'..

Documentation/devicetree/bindings/input/twl4030-keypad.txt line 13

Quoted 3 lines
Documentation/devicetree/bindings/input/twl4030-keypad.txt new file +3 -0
+
+ * keypad,num-rows and keypad,num-columns are required.
+

Is linux,keymap required from matrix-keymap.txt?

Documentation/devicetree/bindings/input/twl4030-keypad.txt line 22

Quoted 9 lines
Documentation/devicetree/bindings/input/twl4030-keypad.txt new file +9 -0
+Required SoC Specific Properties:
+- compatible: should be one of the following
+   - "ti,twl4030-keypad": For controllers compatible with twl4030 keypad
+      controller.
+- interrupt: should be one of the following
+   - <1>: For controllers compatible with twl4030 keypad controller.
+
+Optional Properties specific to linux:
+- linux,keypad-no-autorepeat: do no enable autorepeat feature.

Does it make sense to update the matrix-keymap.txt binding to add 'linux,keypad-no-autorepeat' there?

Quoted 9 lines
Documentation/devicetree/bindings/input/twl4030-keypad.txt new file +9 -0
+
+Example:
+	twl_keypad: keypad {
+		compatible = "ti,twl4030-keypad";
+		interrupts = <1>;
+		keypad,num-rows = <8>;
+		keypad,num-columns = <8>;
+		linux,keypad-no-autorepeat;
+	};
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
#10 lore raw

Re: [PATCHv2 1/3] Input: twl4030-keypad - add device tree support

Quoted 4 lines · Kumar Gala

Documentation/devicetree/bindings/input/twl4030-keypad.txt line 10

Quoted 2 lines
Documentation/devicetree/bindings/input/twl4030-keypad.txt new file +2 -0
+This binding is based on the matrix-keymap binding with the following
+changes:

Maybe be a bit more specific and say 'based on the input/matrix-keymap.txt binding'..

OK.

Quoted 3 lines
Quoted 1 line

+ * keypad,num-rows and keypad,num-columns are required.

Is linux,keymap required from matrix-keymap.txt?

Yes, matrix-keymap.txt contains descriptions for the following:

required:
- linux,keymap
optional:
- keypad,num-rows
- keypad,num-columns

Quoted 5 lines
Quoted 2 lines

+Optional Properties specific to linux:
+- linux,keypad-no-autorepeat: do no enable autorepeat feature.

Does it make sense to update the matrix-keymap.txt binding to add 'linux,keypad-no-autorepeat' there?

At least according to devicetree documentation there are keymap-matrix.txt based drivers, which do not support "linux,keypad-no-autorepeat".

-- Sebastian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131029/c6090ce8/attachment-0001.sig>

#11 lore raw

Re: [PATCHv2 1/3] Input: twl4030-keypad - add device tree support

Quoted 8 lines · Sebastian Reichel
Quoted 4 lines · Kumar Gala

Documentation/devicetree/bindings/input/twl4030-keypad.txt line 10

Quoted 2 lines
Documentation/devicetree/bindings/input/twl4030-keypad.txt new file +2 -0
+This binding is based on the matrix-keymap binding with the following
+changes:

Maybe be a bit more specific and say 'based on the input/matrix-keymap.txt binding'..

OK.

Quoted 8 lines
Quoted 3 lines
Quoted 1 line

+ * keypad,num-rows and keypad,num-columns are required.

Is linux,keymap required from matrix-keymap.txt?

Yes, matrix-keymap.txt contains descriptions for the following:

required:
- linux,keymap

So you don't say that linux,keymap is required for twl4030-keypad (wasn't clear if you assumed that or not).

Quoted 7 lines

optional:
- keypad,num-rows
- keypad,num-columns

Quoted 3 lines
Quoted 2 lines

+Optional Properties specific to linux:
+- linux,keypad-no-autorepeat: do no enable autorepeat feature.

Quoted 6 lines
Quoted 2 lines

Does it make sense to update the matrix-keymap.txt binding to add 'linux,keypad-no-autorepeat' there?

At least according to devicetree documentation there are keymap-matrix.txt based drivers, which do not support "linux,keypad-no-autorepeat".

Which is why it could be optional in keymap-matrix.txt. I dont know anything about keymap/keypad's just asking the question?

It seems as if linux,keypad-no-autorepeat is intended to mean the same thing (if relevant to the device) across all drivers. Is that correct? If so it seems like moving it to be specified in a generic input binding makes sense, just not sure if keymap-matrix.txt is that place or not.

- k

Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
#12 lore raw

Re: [PATCHv2 1/3] Input: twl4030-keypad - add device tree support

Quoted 13 lines · Kumar Gala
Quoted 12 lines · Sebastian Reichel
Quoted 4 lines · Kumar Gala

Documentation/devicetree/bindings/input/twl4030-keypad.txt line 10

Quoted 2 lines
Documentation/devicetree/bindings/input/twl4030-keypad.txt new file +2 -0
+This binding is based on the matrix-keymap binding with the following
+changes:

Maybe be a bit more specific and say 'based on the input/matrix-keymap.txt binding'..

OK.

Quoted 3 lines
Quoted 1 line

+ * keypad,num-rows and keypad,num-columns are required.

Is linux,keymap required from matrix-keymap.txt?

Quoted 7 lines
Quoted 4 lines

Yes, matrix-keymap.txt contains descriptions for the following:

required:
- linux,keymap

So you don't say that linux,keymap is required for twl4030-keypad (wasn't clear if you assumed that or not).

It's already required by matrix-keypad, so I assumed the requirement is inherited by twl4030-keypad. The other matrix-keymap based bindings assume the same.

keypad,num-rows and keypad,num-columns are only stated explicitly, because they are optional in matrix-keymap, but required by twl4030-keympad.

Quoted 14 lines
Quoted 7 lines

optional:
- keypad,num-rows
- keypad,num-columns

Quoted 3 lines
Quoted 2 lines

+Optional Properties specific to linux:
+- linux,keypad-no-autorepeat: do no enable autorepeat feature.

Quoted 6 lines
Quoted 2 lines

Does it make sense to update the matrix-keymap.txt binding to add 'linux,keypad-no-autorepeat' there?

At least according to devicetree documentation there are keymap-matrix.txt based drivers, which do not support "linux,keypad-no-autorepeat".

Quoted 8 lines

Which is why it could be optional in keymap-matrix.txt. I dont know anything about keymap/keypad's just asking the question?

It seems as if linux,keypad-no-autorepeat is intended to mean the same thing (if relevant to the device) across all drivers. Is that correct? If so it seems like moving it to be specified in a generic input binding makes sense, just not sure if keymap-matrix.txt is that place or not.

Yes, when supported it means the same. I can add it to keymap-matrix.txt.

-- Sebastian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131029/e8b1e02f/attachment.sig>

#13 lore raw

PATCH v2 2/3 DTS: ARM: TWL4030: Add keypad node

In reply to Sebastian Reichel

Add keypad node to twl4030, so that board DTS
files can just add the keymap.

---
 arch/arm/boot/dts/twl4030.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)
arch/arm/boot/dts/twl4030.dtsi +7 -0
index ae6a17a..773c94c 100644
@@ -97,4 +97,11 @@
 		compatible = "ti,twl4030-pwmled";
 		#pwm-cells = <2>;
 	};
+
+	twl_keypad: keypad {
+		compatible = "ti,twl4030-keypad";
+		interrupts = <1>;
+		keypad,num-rows = <8>;
+		keypad,num-columns = <8>;
+	};
 };
Signature · 1 line
1.8.4.rc3
#14 lore raw

PATCH v2 3/3 ARM: dts: N900: TWL4030 Keypad Matrix definition

In reply to Sebastian Reichel

Add Keyboard Matrix information to N900's DTS file. This patch maps the keys exactly as the original board code.

---
 arch/arm/boot/dts/omap3-n900.dts | 55 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
arch/arm/boot/dts/omap3-n900.dts +55 -0
index c2b92e8..30ac779 100644
@@ -109,6 +109,61 @@
 #include "twl4030.dtsi"
 #include "twl4030_omap3.dtsi"
 
+&twl_keypad {
+	linux,keymap = < 0x00000010 /* KEY_Q */
+			 0x00010018 /* KEY_O */
+			 0x00020019 /* KEY_P */
+			 0x00030033 /* KEY_COMMA */
+			 0x0004000e /* KEY_BACKSPACE */
+			 0x0006001e /* KEY_A */
+			 0x0007001f /* KEY_S */
+
+			 0x01000011 /* KEY_W */
+			 0x01010020 /* KEY_D */
+			 0x01020021 /* KEY_F */
+			 0x01030022 /* KEY_G */
+			 0x01040023 /* KEY_H */
+			 0x01050024 /* KEY_J */
+			 0x01060025 /* KEY_K */
+			 0x01070026 /* KEY_L */
+
+			 0x02000012 /* KEY_E */
+			 0x02010034 /* KEY_DOT */
+			 0x02020067 /* KEY_UP */
+			 0x0203001c /* KEY_ENTER */
+			 0x0205002c /* KEY_Z */
+			 0x0206002d /* KEY_X */
+			 0x0207002e /* KEY_C */
+			 0x02080043 /* KEY_F9 */
+
+			 0x03000013 /* KEY_R */
+			 0x0301002f /* KEY_V */
+			 0x03020030 /* KEY_B */
+			 0x03030031 /* KEY_N */
+			 0x03040032 /* KEY_M */
+			 0x03050039 /* KEY_SPACE */
+			 0x03060039 /* KEY_SPACE */
+			 0x03070069 /* KEY_LEFT */
+
+			 0x04000014 /* KEY_T */
+			 0x0401006c /* KEY_DOWN */
+			 0x0402006a /* KEY_RIGHT */
+			 0x0404001d /* KEY_LEFTCTRL */
+			 0x04050064 /* KEY_RIGHTALT */
+			 0x0406002a /* KEY_LEFTSHIFT */
+			 0x04080044 /* KEY_F10 */
+
+			 0x05000015 /* KEY_Y */
+			 0x05080057 /* KEY_F11 */
+
+			 0x06000016 /* KEY_U */
+
+			 0x07000017 /* KEY_I */
+			 0x07010041 /* KEY_F7 */
+			 0x07020042 /* KEY_F8 */
+			 >;
+};
+
 &twl_gpio {
 	ti,pullups	= <0x0>;
 	ti,pulldowns	= <0x03ff3f>; /* BIT(0..5) | BIT(8..17) */
Signature · 1 line
1.8.4.rc3