summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2013-01-31 11:00:24 +0100
committerShawn Guo <shawn.guo@linaro.org>2013-01-31 15:31:19 +0100
commit0943b96058c4262b4e4cd05398f42e8730d5ee08 (patch)
treedb2217c6bb24ca6fbbf5576efc9806293100f67f
parentARM: mxs: dts: Add gpio-keys for the rotary to the CFA-10049 (diff)
downloadlinux-0943b96058c4262b4e4cd05398f42e8730d5ee08.tar.xz
linux-0943b96058c4262b4e4cd05398f42e8730d5ee08.zip
ARM: mxs: dts: Add rotary encoder to the CFA-10049
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--arch/arm/boot/dts/imx28-cfa10049.dts9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx28-cfa10049.dts b/arch/arm/boot/dts/imx28-cfa10049.dts
index 5db3789b26be..a0d3e9f1738e 100644
--- a/arch/arm/boot/dts/imx28-cfa10049.dts
+++ b/arch/arm/boot/dts/imx28-cfa10049.dts
@@ -45,6 +45,8 @@
reg = <0>;
fsl,pinmux-ids = <
0x2133 /* MX28_PAD_SSP2_D3__GPIO_2_19 */
+ 0x3183 /* MX28_PAD_I2C0_SCL__GPIO_3_24 */
+ 0x3193 /* MX28_PAD_I2C0_SDA__GPIO_3_25 */
0x31a3 /* MX28_PAD_SAIF_SDATA0__GPIO_3_26 */
0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */
>;
@@ -290,6 +292,13 @@
};
};
+ rotary {
+ compatible = "rotary-encoder";
+ gpios = <&gpio3 24 1>, <&gpio3 25 1>;
+ linux,axis = <1>; /* REL_Y */
+ rotary-encoder,relative-axis;
+ };
+
backlight {
compatible = "pwm-backlight";
pwms = <&pwm 3 5000000>;