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

Commit bb53d827 authored by Jamie Lentin's avatar Jamie Lentin Committed by Andrew Lunn
Browse files

ARM: Kirkwood: Describe DNS32? gpio-keys in DT. 



Move description of GPIO keys on both the DNS320 and DNS325 into DT.

Signed-off-by: default avatarJamie Lentin <jm@lentin.co.uk>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
parent 5b60c145

arch/arm/boot/dts/kirkwood-dnskw.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -4,6 +4,27 @@ 
	model = "D-Link DNS NASes (kirkwood-based)";

	compatible = "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		button@1 {

			label = "Power button";

			linux,code = <116>;

			gpios = <&gpio1 2 1>;

		};

		button@2 {

			label = "USB unmount button";

			linux,code = <161>;

			gpios = <&gpio1 15 1>;

		};

		button@3 {

			label = "Reset button";

			linux,code = <0x198>;

			gpios = <&gpio1 16 1>;

		};

	};



	ocp@f1000000 {

		sata@80000 {

			status = "okay";

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

+0 −37
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/of.h>

#include <linux/gpio.h>

#include <linux/input.h>

#include <linux/gpio_keys.h>

#include <linux/gpio-fan.h>

#include <linux/leds.h>

#include <asm/mach-types.h>
@@ -68,41 +67,6 @@ static unsigned int dnskw_mpp_config[] __initdata = { 
	0

};



static struct gpio_keys_button dnskw_button_pins[] = {

	{

		.code		= KEY_POWER,

		.gpio		= 34,

		.desc		= "Power button",

		.active_low	= 1,

	},

	{

		.code		= KEY_EJECTCD,

		.gpio		= 47,

		.desc		= "USB unmount button",

		.active_low	= 1,

	},

	{

		.code		= KEY_RESTART,

		.gpio		= 48,

		.desc		= "Reset button",

		.active_low	= 1,

	},

};



static struct gpio_keys_platform_data dnskw_button_data = {

	.buttons	= dnskw_button_pins,

	.nbuttons	= ARRAY_SIZE(dnskw_button_pins),

};



static struct platform_device dnskw_button_device = {

	.name		= "gpio-keys",

	.id		= -1,

	.num_resources	= 0,

	.dev		= {

		.platform_data	= &dnskw_button_data,

	}

};



/* Fan: ADDA AD045HB-G73 40mm 6000rpm@5v */

static struct gpio_fan_speed dnskw_fan_speed[] = {

	{    0,  0 },
@@ -150,7 +114,6 @@ void __init dnskw_init(void) 
	kirkwood_ehci_init();

	kirkwood_ge00_init(&dnskw_ge00_data);



	platform_device_register(&dnskw_button_device);

	platform_device_register(&dnskw_fan_device);



	/* Register power-off GPIO. */