aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2013-01-31 05:00:24 -0500
committerShawn Guo <shawn.guo@linaro.org>2013-01-31 09:31:19 -0500
commit0943b96058c4262b4e4cd05398f42e8730d5ee08 (patch)
treedb2217c6bb24ca6fbbf5576efc9806293100f67f /arch/arm
parenta640cf64ff68bd92292c47a77c5fb4530385a8cb (diff)
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>
Diffstat (limited to 'arch/arm')
-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 @@
45 reg = <0>; 45 reg = <0>;
46 fsl,pinmux-ids = < 46 fsl,pinmux-ids = <
47 0x2133 /* MX28_PAD_SSP2_D3__GPIO_2_19 */ 47 0x2133 /* MX28_PAD_SSP2_D3__GPIO_2_19 */
48 0x3183 /* MX28_PAD_I2C0_SCL__GPIO_3_24 */
49 0x3193 /* MX28_PAD_I2C0_SDA__GPIO_3_25 */
48 0x31a3 /* MX28_PAD_SAIF_SDATA0__GPIO_3_26 */ 50 0x31a3 /* MX28_PAD_SAIF_SDATA0__GPIO_3_26 */
49 0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */ 51 0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */
50 >; 52 >;
@@ -290,6 +292,13 @@
290 }; 292 };
291 }; 293 };
292 294
295 rotary {
296 compatible = "rotary-encoder";
297 gpios = <&gpio3 24 1>, <&gpio3 25 1>;
298 linux,axis = <1>; /* REL_Y */
299 rotary-encoder,relative-axis;
300 };
301
293 backlight { 302 backlight {
294 compatible = "pwm-backlight"; 303 compatible = "pwm-backlight";
295 pwms = <&pwm 3 5000000>; 304 pwms = <&pwm 3 5000000>;