[PATCH] ARM: dts: socfpga: Fix up button mapping on VINING FPGA

[PATCH] ARM: dts: socfpga: Fix up button mapping on VINING FPGA

[Marek Vasut]

Add missing buttons and signals to the VINING FPGA device tree,
so they are presented to the userspace via gpio-keys evdev.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@kernel.org>
---
 .../boot/dts/socfpga_cyclone5_vining_fpga.dts | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts b/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts
index 355b3dbf438d..622cc7cc1471 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts
@@ -36,21 +36,33 @@
 
 		hps_temp0 {
 			label = "BTN_0";			/* TEMP_OS */
-			gpios = <&portc 18 GPIO_ACTIVE_LOW>;	/* HPS_GPIO60 */
+			gpios = <&portc 18 GPIO_ACTIVE_LOW>;	/* HPS_GPI5 */
 			linux,code = <BTN_0>;
 		};
 
 		hps_hkey0 {
-			label = "BTN_1";			/* DIS_PWR */
-			gpios = <&portc 19 GPIO_ACTIVE_LOW>;	/* HPS_GPIO61 */
+			label = "GP_SWITCH";			/* GP_SWITCH */
+			gpios = <&portc 19 GPIO_ACTIVE_LOW>;	/* HPS_GPI6 */
 			linux,code = <BTN_1>;
 		};
 
 		hps_hkey1 {
-			label = "hps_hkey1";			/* POWER_DOWN */
-			gpios = <&portc 20 GPIO_ACTIVE_LOW>;	/* HPS_GPIO62 */
+			label = "RESET_SWITCH";			/* RESET_SWITCH */
+			gpios = <&portc 20 GPIO_ACTIVE_LOW>;	/* HPS_GPI7 */
+			linux,code = <BTN_2>;
+		};
+
+		hps_hkey2 {
+			label = "POWER_DOWN";			/* POWER_DOWN */
+			gpios = <&portc 4 GPIO_ACTIVE_LOW>;	/* HPS_GPIO62 */
 			linux,code = <KEY_POWER>;
 		};
+
+		hps_hkey3 {
+			label = "SENSE";			/* SENSE */
+			gpios = <&porta 9 GPIO_ACTIVE_LOW>;	/* HPS_GPIO9 */
+			linux,code = <BTN_3>;
+		};
 	};
 
 	regulator-usb-nrst {
-- 
2.20.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM: dts: socfpga: Fix up button mapping on VINING FPGA

[Dinh Nguyen]

On 6/27/19 7:19 PM, Marek Vasut wrote:
> Add missing buttons and signals to the VINING FPGA device tree,
> so they are presented to the userspace via gpio-keys evdev.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Dinh Nguyen <dinguyen@kernel.org>
> ---
>  .../boot/dts/socfpga_cyclone5_vining_fpga.dts | 22 ++++++++++++++-----
>  1 file changed, 17 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts b/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts
> index 355b3dbf438d..622cc7cc1471 100644
> --- a/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts
> +++ b/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts
> @@ -36,21 +36,33 @@
>  

Applied!

Thanks,
Dinh

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM: dts: socfpga: Fix up button mapping on VINING FPGA

[Marek Vasut]

On 6/28/19 2:19 AM, Marek Vasut wrote:
> Add missing buttons and signals to the VINING FPGA device tree,
> so they are presented to the userspace via gpio-keys evdev.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Dinh Nguyen <dinguyen@kernel.org>

Bump ?

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM: dts: socfpga: Fix up button mapping on VINING FPGA

[Dinh Nguyen]

Hi Marek,

On 8/7/19 6:13 AM, Marek Vasut wrote:
> On 6/28/19 2:19 AM, Marek Vasut wrote:
>> Add missing buttons and signals to the VINING FPGA device tree,
>> so they are presented to the userspace via gpio-keys evdev.
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> Cc: Dinh Nguyen <dinguyen@kernel.org>
> 
> Bump ?
> 

Sorry for being late on this. I've applied it and it was queued for
v5.3, but I missed the merged window. It's queued for v5.4.

Dinh

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM: dts: socfpga: Fix up button mapping on VINING FPGA

[Marek Vasut]

On 8/7/19 4:10 PM, Dinh Nguyen wrote:
> Hi Marek,
> 
> On 8/7/19 6:13 AM, Marek Vasut wrote:
>> On 6/28/19 2:19 AM, Marek Vasut wrote:
>>> Add missing buttons and signals to the VINING FPGA device tree,
>>> so they are presented to the userspace via gpio-keys evdev.
>>>
>>> Signed-off-by: Marek Vasut <marex@denx.de>
>>> Cc: Dinh Nguyen <dinguyen@kernel.org>
>>
>> Bump ?
>>
> 
> Sorry for being late on this. I've applied it and it was queued for
> v5.3, but I missed the merged window. It's queued for v5.4.

Cool, thanks

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel