Skip to contentSkip to conversation

ARM: dts: socfpga: Fix up button mapping on VINING FPGA

PATCH Applied Marek Vasut 2 participants 5 messages Jun 28, 2019 – Aug 8, 2019 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: socfpga: Fix up button mapping on VINING FPGA

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

---
 .../boot/dts/socfpga_cyclone5_vining_fpga.dts | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)
arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts +17 -5
index 355b3dbf438d..622cc7cc1471 100644
@@ -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 {
Signature · 7 lines
2.20.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Applied
#1 lore raw
Quoted 14 lines · Marek Vasut

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

---
 .../boot/dts/socfpga_cyclone5_vining_fpga.dts | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)
arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts +0 -0
index 355b3dbf438d..622cc7cc1471 100644

arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts line 36

Quoted 1 line
arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts +0 -0
@@ -36,21 +36,33 @@
 

Applied!

Thanks,
Dinh

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#3 lore raw

Hi Marek,

Quoted 9 lines · Marek Vasut
Quoted 5 lines · Marek Vasut

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

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
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#4 lore raw
Quoted 7 lines · Dinh Nguyen

Hi Marek,

Quoted 4 lines · Marek Vasut
Quoted 3 lines · Marek Vasut

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

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

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
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel