linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] ARM: mxs: dts: Add gpio-keys for the rotary to the CFA-10049
       [not found] <1359626424-22546-1-git-send-email-maxime.ripard@free-electrons.com>
@ 2013-01-31 10:00 ` Maxime Ripard
  2013-02-03 13:36   ` Shawn Guo
  2013-01-31 10:00 ` [PATCH 2/2] ARM: mxs: dts: Add rotary encoder " Maxime Ripard
  1 sibling, 1 reply; 3+ messages in thread
From: Maxime Ripard @ 2013-01-31 10:00 UTC (permalink / raw)
  To: Shawn Guo; +Cc: Brian Lilly, Russell King, linux-arm-kernel, linux-kernel

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 arch/arm/boot/dts/imx28-cfa10049.dts |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/boot/dts/imx28-cfa10049.dts b/arch/arm/boot/dts/imx28-cfa10049.dts
index cabc33a..5db3789 100644
--- a/arch/arm/boot/dts/imx28-cfa10049.dts
+++ b/arch/arm/boot/dts/imx28-cfa10049.dts
@@ -45,6 +45,7 @@
 					reg = <0>;
 					fsl,pinmux-ids = <
 						0x2133 /* MX28_PAD_SSP2_D3__GPIO_2_19 */
+						0x31a3 /* MX28_PAD_SAIF_SDATA0__GPIO_3_26 */
 						0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */
 					>;
 					fsl,drive-strength = <0>;
@@ -276,6 +277,19 @@
 		};
 	};
 
+	gpio_keys {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		rotary_button {
+			label = "rotary_button";
+			gpios = <&gpio3 26 1>;
+			debounce-interval = <10>;
+			linux,code = <28>;
+		};
+	};
+
 	backlight {
 		compatible = "pwm-backlight";
 		pwms = <&pwm 3 5000000>;
-- 
1.7.10.4


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

* [PATCH 2/2] ARM: mxs: dts: Add rotary encoder to the CFA-10049
       [not found] <1359626424-22546-1-git-send-email-maxime.ripard@free-electrons.com>
  2013-01-31 10:00 ` [PATCH 1/2] ARM: mxs: dts: Add gpio-keys for the rotary to the CFA-10049 Maxime Ripard
@ 2013-01-31 10:00 ` Maxime Ripard
  1 sibling, 0 replies; 3+ messages in thread
From: Maxime Ripard @ 2013-01-31 10:00 UTC (permalink / raw)
  To: Shawn Guo; +Cc: Brian Lilly, Russell King, linux-arm-kernel, linux-kernel

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 arch/arm/boot/dts/imx28-cfa10049.dts |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/imx28-cfa10049.dts b/arch/arm/boot/dts/imx28-cfa10049.dts
index 5db3789..a0d3e9f 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>;
-- 
1.7.10.4


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

* Re: [PATCH 1/2] ARM: mxs: dts: Add gpio-keys for the rotary to the CFA-10049
  2013-01-31 10:00 ` [PATCH 1/2] ARM: mxs: dts: Add gpio-keys for the rotary to the CFA-10049 Maxime Ripard
@ 2013-02-03 13:36   ` Shawn Guo
  0 siblings, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2013-02-03 13:36 UTC (permalink / raw)
  To: Maxime Ripard; +Cc: Brian Lilly, Russell King, linux-arm-kernel, linux-kernel

On Thu, Jan 31, 2013 at 11:00:23AM +0100, Maxime Ripard wrote:
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Applied both, thanks.

> ---
>  arch/arm/boot/dts/imx28-cfa10049.dts |   14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx28-cfa10049.dts b/arch/arm/boot/dts/imx28-cfa10049.dts
> index cabc33a..5db3789 100644
> --- a/arch/arm/boot/dts/imx28-cfa10049.dts
> +++ b/arch/arm/boot/dts/imx28-cfa10049.dts
> @@ -45,6 +45,7 @@
>  					reg = <0>;
>  					fsl,pinmux-ids = <
>  						0x2133 /* MX28_PAD_SSP2_D3__GPIO_2_19 */
> +						0x31a3 /* MX28_PAD_SAIF_SDATA0__GPIO_3_26 */
>  						0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */
>  					>;
>  					fsl,drive-strength = <0>;
> @@ -276,6 +277,19 @@
>  		};
>  	};
>  
> +	gpio_keys {
> +		compatible = "gpio-keys";
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +
> +		rotary_button {
> +			label = "rotary_button";
> +			gpios = <&gpio3 26 1>;
> +			debounce-interval = <10>;
> +			linux,code = <28>;
> +		};
> +	};
> +
>  	backlight {
>  		compatible = "pwm-backlight";
>  		pwms = <&pwm 3 5000000>;
> -- 
> 1.7.10.4
> 


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

end of thread, other threads:[~2013-02-03 13:36 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <1359626424-22546-1-git-send-email-maxime.ripard@free-electrons.com>
2013-01-31 10:00 ` [PATCH 1/2] ARM: mxs: dts: Add gpio-keys for the rotary to the CFA-10049 Maxime Ripard
2013-02-03 13:36   ` Shawn Guo
2013-01-31 10:00 ` [PATCH 2/2] ARM: mxs: dts: Add rotary encoder " Maxime Ripard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).