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

Commit 1b90e06b authored by Jamie Lentin's avatar Jamie Lentin Committed by Jason Cooper
Browse files

ARM: kirkwood: Use devicetree to define DNS-32[05] fan 



Remove more board-specific code by using devicetree to define the fan
attached to both boards.

Signed-off-by: default avatarJamie Lentin <jm@lentin.co.uk>
Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 55fb8b06

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

+10 −0
Original line number Diff line number Diff line
@@ -25,6 +25,16 @@ 
		};

	};



	gpio_fan {

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

		compatible = "gpio-fan";

		gpios = <&gpio1 14 1

			 &gpio1 13 1>;

		gpio-fan,speed-map = <0    0

				      3000 1

				      6000 2>;

	};



	ocp@f1000000 {

		sata@80000 {

			status = "okay";

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

+0 −26
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-fan.h>

#include <linux/leds.h>

#include <asm/mach-types.h>

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

};



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

static struct gpio_fan_speed dnskw_fan_speed[] = {

	{    0,  0 },

	{ 3000,	 1 },

	{ 6000,	 2 },

};

static unsigned dnskw_fan_pins[] = {46, 45};



static struct gpio_fan_platform_data dnskw_fan_data = {

	.num_ctrl	= ARRAY_SIZE(dnskw_fan_pins),

	.ctrl		= dnskw_fan_pins,

	.num_speed	= ARRAY_SIZE(dnskw_fan_speed),

	.speed		= dnskw_fan_speed,

};



static struct platform_device dnskw_fan_device = {

	.name	= "gpio-fan",

	.id	= -1,

	.dev	= {

		.platform_data	= &dnskw_fan_data,

	},

};



static void dnskw_power_off(void)

{

	gpio_set_value(36, 1);
@@ -114,8 +90,6 @@ void __init dnskw_init(void) 
	kirkwood_ehci_init();

	kirkwood_ge00_init(&dnskw_ge00_data);



	platform_device_register(&dnskw_fan_device);



	/* Register power-off GPIO. */

	if (gpio_request(36, "dnskw:power:off") == 0

	    && gpio_direction_output(36, 0) == 0)