From f0b9ed3b9c0c2f4c5b6d5b1180645149f66b0e22 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Thu, 31 Jan 2013 11:00:24 +0100
Subject: [PATCH] --- yaml --- r: 355789 b: refs/heads/master c:
 0943b96058c4262b4e4cd05398f42e8730d5ee08 h: refs/heads/master i:   355787:
 253bb02c98a516c23b880ca3e23a44d1fe992684 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/boot/dts/imx28-cfa10049.dts | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1c6697ede9f9..cf75d7a04545 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a640cf64ff68bd92292c47a77c5fb4530385a8cb
+refs/heads/master: 0943b96058c4262b4e4cd05398f42e8730d5ee08
diff --git a/trunk/arch/arm/boot/dts/imx28-cfa10049.dts b/trunk/arch/arm/boot/dts/imx28-cfa10049.dts
index 5db3789b26be..a0d3e9f1738e 100644
--- a/trunk/arch/arm/boot/dts/imx28-cfa10049.dts
+++ b/trunk/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>;