Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17ba0226 authored by Arnaud Patard's avatar Arnaud Patard Committed by Jason Cooper
Browse files

ARM: Kirkwood: Describe iconnect keys in DT. 



Define the 2 keys found on iconnect in DT. It's also changing the keycodes/
switches to use better ones.

Signed-off-by: default avatarArnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 55d512e2

arch/arm/boot/dts/kirkwood-iconnect.dts

+18 −0
Original line number Diff line number Diff line
@@ -69,4 +69,22 @@ 
			gpios = <&gpio1 16 0>;

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		button@1 {

			label = "OTB Button";

			linux,code = <133>;

			gpios = <&gpio1 3 1>;

			debounce-interval = <100>;

		};

		button@2 {

			label = "Reset";

			linux,code = <0x198>;

			gpios = <&gpio0 12 1>;

			debounce-interval = <100>;

		};

	};

};

arch/arm/mach-kirkwood/board-iconnect.c

+0 −38
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#include <linux/mtd/partitions.h>

#include <linux/mv643xx_eth.h>

#include <linux/gpio.h>

#include <linux/input.h>

#include <linux/gpio_keys.h>

#include <asm/mach/arch.h>

#include <mach/kirkwood.h>

#include "common.h"
@@ -52,40 +50,6 @@ static struct mtd_partition iconnect_nand_parts[] = { 
	},

};



/* yikes... theses are the original input buttons */

/* but I'm not convinced by the sw event choices  */

static struct gpio_keys_button iconnect_buttons[] = {

	{

		.type		= EV_SW,

		.code		= SW_LID,

		.gpio		= 12,

		.desc		= "Reset Button",

		.active_low	= 1,

		.debounce_interval = 100,

	}, {

		.type		= EV_SW,

		.code		= SW_TABLET_MODE,

		.gpio		= 35,

		.desc		= "OTB Button",

		.active_low	= 1,

		.debounce_interval = 100,

	},

};



static struct gpio_keys_platform_data iconnect_button_data = {

	.buttons	= iconnect_buttons,

	.nbuttons	= ARRAY_SIZE(iconnect_buttons),

};



static struct platform_device iconnect_button_device = {

	.name		= "gpio-keys",

	.id		= -1,

	.num_resources	= 0,

	.dev        = {

		.platform_data  = &iconnect_button_data,

	},

};



void __init iconnect_init(void)

{

	kirkwood_mpp_conf(iconnect_mpp_config);
@@ -93,8 +57,6 @@ void __init iconnect_init(void) 


	kirkwood_ehci_init();

	kirkwood_ge00_init(&iconnect_ge00_data);



	platform_device_register(&iconnect_button_device);

}



static int __init iconnect_pci_init(void)