[PATCH v2] dts: cubox: Map gpio-keys to gpio3 8

[PATCH v2] dts: cubox: Map gpio-keys to gpio3 8

[George Joseph]

The Cubox has a recessed button between the HDMI and RJ-45 connectors
that wasn't mapped in the device tree, so I've mapped it to gpio-keys
BTN_0.

Signed-off-by: George Joseph <george.joseph-H+B1fhQ+CpcEVd8bySq3Wg@public.gmane.org>
Tested-by: George Joseph <george.joseph-H+B1fhQ+CpcEVd8bySq3Wg@public.gmane.org>
---
 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
index 6a524ca..de6e3a8 100644
--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
@@ -3,6 +3,8 @@
  */
 #include "imx6qdl-microsom.dtsi"
 #include "imx6qdl-microsom-ar8035.dtsi"
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
 
 / {
 	ir_recv: ir-receiver {
@@ -66,6 +68,18 @@
 		spdif-controller = <&spdif>;
 		spdif-out;
 	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+		pinctrl-0 = <&pinctrl_gpio_key>;
+		pinctrl-names = "default";
+
+		button_0 {
+			label = "Button 0";
+			gpios = <&gpio3 8 GPIO_ACTIVE_LOW>;
+			linux,code = <BTN_0>;
+		};
+	};
 };
 
 &hdmi {
@@ -170,6 +184,12 @@
 				MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059
 			>;
 		};
+
+		pinctrl_gpio_key: gpio-key {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_DA8__GPIO3_IO08	0x17059
+			>;
+		};
 	};
 };
 
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] dts: cubox: Map gpio-keys to gpio3 8

[Shawn Guo]

On Mon, Mar 16, 2015 at 03:53:49PM -0600, George Joseph wrote:
> The Cubox has a recessed button between the HDMI and RJ-45 connectors
> that wasn't mapped in the device tree, so I've mapped it to gpio-keys
> BTN_0.
> 
> Signed-off-by: George Joseph <george.joseph-H+B1fhQ+CpcEVd8bySq3Wg@public.gmane.org>
> Tested-by: George Joseph <george.joseph-H+B1fhQ+CpcEVd8bySq3Wg@public.gmane.org>

Russell,

Are you fine with this patch?

Shawn

> ---
>  arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
> index 6a524ca..de6e3a8 100644
> --- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
> @@ -3,6 +3,8 @@
>   */
>  #include "imx6qdl-microsom.dtsi"
>  #include "imx6qdl-microsom-ar8035.dtsi"
> +#include <dt-bindings/input/input.h>
> +#include <dt-bindings/gpio/gpio.h>
>  
>  / {
>  	ir_recv: ir-receiver {
> @@ -66,6 +68,18 @@
>  		spdif-controller = <&spdif>;
>  		spdif-out;
>  	};
> +
> +	gpio-keys {
> +		compatible = "gpio-keys";
> +		pinctrl-0 = <&pinctrl_gpio_key>;
> +		pinctrl-names = "default";
> +
> +		button_0 {
> +			label = "Button 0";
> +			gpios = <&gpio3 8 GPIO_ACTIVE_LOW>;
> +			linux,code = <BTN_0>;
> +		};
> +	};
>  };
>  
>  &hdmi {
> @@ -170,6 +184,12 @@
>  				MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059
>  			>;
>  		};
> +
> +		pinctrl_gpio_key: gpio-key {
> +			fsl,pins = <
> +				MX6QDL_PAD_EIM_DA8__GPIO3_IO08	0x17059
> +			>;
> +		};
>  	};
>  };
>  
> -- 
> 2.1.0
> 
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] dts: cubox: Map gpio-keys to gpio3 8

[Russell King - ARM Linux]

On Mon, Mar 23, 2015 at 09:32:54PM +0800, Shawn Guo wrote:
> On Mon, Mar 16, 2015 at 03:53:49PM -0600, George Joseph wrote:
> > The Cubox has a recessed button between the HDMI and RJ-45 connectors
> > that wasn't mapped in the device tree, so I've mapped it to gpio-keys
> > BTN_0.
> > 
> > Signed-off-by: George Joseph <george.joseph@fairview5.com>
> > Tested-by: George Joseph <george.joseph@fairview5.com>
> 
> Russell,
> 
> Are you fine with this patch?

No.  It's not submitted against a version of the DT file which has the
new licensing, so it cocks up that change (and would mean I'd need
George to agree to the new license.)

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.

Re: [PATCH v2] dts: cubox: Map gpio-keys to gpio3 8

[George Joseph]

On Mon, Mar 23, 2015 at 9:19 AM, Russell King - ARM Linux
<linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> wrote:
> On Mon, Mar 23, 2015 at 09:32:54PM +0800, Shawn Guo wrote:
>> On Mon, Mar 16, 2015 at 03:53:49PM -0600, George Joseph wrote:
>> > The Cubox has a recessed button between the HDMI and RJ-45 connectors
>> > that wasn't mapped in the device tree, so I've mapped it to gpio-keys
>> > BTN_0.
>> >
>> > Signed-off-by: George Joseph <george.joseph-H+B1fhQ+CpcEVd8bySq3Wg@public.gmane.org>
>> > Tested-by: George Joseph <george.joseph-H+B1fhQ+CpcEVd8bySq3Wg@public.gmane.org>
>>
>> Russell,
>>
>> Are you fine with this patch?
>
> No.  It's not submitted against a version of the DT file which has the
> new licensing, so it cocks up that change (and would mean I'd need
> George to agree to the new license.)

Didn't know there was a new license.  Tell me what you need and I'll fix it.

>
> --
> FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
> according to speedtest.net.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v3 0/1] dts: cubox: Map gpio-keys to gpio3 8

[George Joseph]

Rebased the patch on rmk's relicensing patch...
"ARM: dts: Re-license SolidRun iMX6 platform DT GPL v2/X11"

George Joseph (1):
  dts: cubox: Map gpio-keys to gpio3 8

 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

-- 
2.1.0

[PATCH v3 1/1] dts: cubox: Map gpio-keys to gpio3 8

[George Joseph]

The Cubox has a recessed button between the HDMI and RJ-45 connectors
that wasn't mapped in the device tree, so I've mapped it to gpio-keys
BTN_0.

Signed-off-by: George Joseph <george.joseph@fairview5.com>
Tested-by: George Joseph <george.joseph@fairview5.com>
---
 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
index 4303bc0..d033bb1 100644
--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
@@ -41,6 +41,8 @@
  */
 #include "imx6qdl-microsom.dtsi"
 #include "imx6qdl-microsom-ar8035.dtsi"
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
 
 / {
 	ir_recv: ir-receiver {
@@ -104,6 +106,18 @@
 		spdif-controller = <&spdif>;
 		spdif-out;
 	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+		pinctrl-0 = <&pinctrl_gpio_key>;
+		pinctrl-names = "default";
+
+		button_0 {
+			label = "Button 0";
+			gpios = <&gpio3 8 GPIO_ACTIVE_LOW>;
+			linux,code = <BTN_0>;
+		};
+	};
 };
 
 &hdmi {
@@ -208,6 +222,12 @@
 				MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059
 			>;
 		};
+
+		pinctrl_gpio_key: gpio-key {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_DA8__GPIO3_IO08	0x17059
+			>;
+		};
 	};
 };
 
-- 
2.1.0

Re: [PATCH v3 1/1] dts: cubox: Map gpio-keys to gpio3 8

[Shawn Guo]

On Tue, Mar 24, 2015 at 10:31:35AM -0600, George Joseph wrote:
> The Cubox has a recessed button between the HDMI and RJ-45 connectors
> that wasn't mapped in the device tree, so I've mapped it to gpio-keys
> BTN_0.
> 
> Signed-off-by: George Joseph <george.joseph-H+B1fhQ+CpcEVd8bySq3Wg@public.gmane.org>
> Tested-by: George Joseph <george.joseph-H+B1fhQ+CpcEVd8bySq3Wg@public.gmane.org>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html