Commit f7f611f2 authored by Linus Walleij's avatar Linus Walleij Committed by Krzysztof Kozlowski
Browse files

ARM: s3c24xx: leds: Convert to use GPIO descriptors 



This converts the s3c24xx LED driver to use GPIO descriptors
and also modify all board files to account for these changes
by registering the appropriate GPIO tables for each board.

The driver was using a custom flag to indicate open drain
(tristate) but this can be handled by standard descriptor
machine tables.

The driver was setting non-pull-up for the pin using the custom
S3C24xx GPIO API, but this is a custom pin control system used
by the S3C24xx and no generic GPIO function, so this has simply
been pushed back into the respective board files.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent ea9dd8f6

arch/arm/mach-s3c24xx/common-smdk.c

+45 −22
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/timer.h>

#include <linux/init.h>

#include <linux/gpio.h>

#include <linux/gpio/machine.h>

#include <linux/device.h>

#include <linux/platform_device.h>
@@ -44,29 +45,53 @@ 


/* LED devices */



static struct gpiod_lookup_table smdk_led4_gpio_table = {

	.dev_id = "s3c24xx_led.0",

	.table = {

		GPIO_LOOKUP("GPF", 4, NULL, GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN),

		{ },

	},

};



static struct gpiod_lookup_table smdk_led5_gpio_table = {

	.dev_id = "s3c24xx_led.1",

	.table = {

		GPIO_LOOKUP("GPF", 5, NULL, GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN),

		{ },

	},

};



static struct gpiod_lookup_table smdk_led6_gpio_table = {

	.dev_id = "s3c24xx_led.2",

	.table = {

		GPIO_LOOKUP("GPF", 6, NULL, GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN),

		{ },

	},

};



static struct gpiod_lookup_table smdk_led7_gpio_table = {

	.dev_id = "s3c24xx_led.3",

	.table = {

		GPIO_LOOKUP("GPF", 7, NULL, GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN),

		{ },

	},

};



static struct s3c24xx_led_platdata smdk_pdata_led4 = {

	.gpio		= S3C2410_GPF(4),

	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,

	.name		= "led4",

	.def_trigger	= "timer",

};



static struct s3c24xx_led_platdata smdk_pdata_led5 = {

	.gpio		= S3C2410_GPF(5),

	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,

	.name		= "led5",

	.def_trigger	= "nand-disk",

};



static struct s3c24xx_led_platdata smdk_pdata_led6 = {

	.gpio		= S3C2410_GPF(6),

	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,

	.name		= "led6",

};



static struct s3c24xx_led_platdata smdk_pdata_led7 = {

	.gpio		= S3C2410_GPF(7),

	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,

	.name		= "led7",

};
@@ -179,27 +204,25 @@ static struct platform_device __initdata *smdk_devs[] = { 
	&smdk_led7,

};



static const struct gpio smdk_led_gpios[] = {

	{ S3C2410_GPF(4), GPIOF_OUT_INIT_HIGH, NULL },

	{ S3C2410_GPF(5), GPIOF_OUT_INIT_HIGH, NULL },

	{ S3C2410_GPF(6), GPIOF_OUT_INIT_HIGH, NULL },

	{ S3C2410_GPF(7), GPIOF_OUT_INIT_HIGH, NULL },

};



void __init smdk_machine_init(void)

{

	/* Configure the LEDs (even if we have no LED support)*/



	int ret = gpio_request_array(smdk_led_gpios,

				     ARRAY_SIZE(smdk_led_gpios));

	if (!WARN_ON(ret < 0))

		gpio_free_array(smdk_led_gpios, ARRAY_SIZE(smdk_led_gpios));



	if (machine_is_smdk2443())

		smdk_nand_info.twrph0 = 50;



	s3c_nand_set_platdata(&smdk_nand_info);



	/* Disable pull-up on the LED lines */

	s3c_gpio_setpull(S3C2410_GPF(4), S3C_GPIO_PULL_NONE);

	s3c_gpio_setpull(S3C2410_GPF(5), S3C_GPIO_PULL_NONE);

	s3c_gpio_setpull(S3C2410_GPF(6), S3C_GPIO_PULL_NONE);

	s3c_gpio_setpull(S3C2410_GPF(7), S3C_GPIO_PULL_NONE);



	/* Add lookups for the lines */

	gpiod_add_lookup_table(&smdk_led4_gpio_table);

	gpiod_add_lookup_table(&smdk_led5_gpio_table);

	gpiod_add_lookup_table(&smdk_led6_gpio_table);

	gpiod_add_lookup_table(&smdk_led7_gpio_table);



	platform_add_devices(smdk_devs, ARRAY_SIZE(smdk_devs));



	s3c_pm_init();

arch/arm/mach-s3c24xx/mach-mini2440.c

+54 −9
Original line number Diff line number Diff line
@@ -402,37 +402,68 @@ static struct platform_device mini2440_button_device = { 


/* LEDS */



static struct gpiod_lookup_table mini2440_led1_gpio_table = {

	.dev_id = "s3c24xx_led.1",

	.table = {

		GPIO_LOOKUP("GPB", 5, NULL, GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN),

		{ },

	},

};



static struct gpiod_lookup_table mini2440_led2_gpio_table = {

	.dev_id = "s3c24xx_led.2",

	.table = {

		GPIO_LOOKUP("GPB", 6, NULL, GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN),

		{ },

	},

};



static struct gpiod_lookup_table mini2440_led3_gpio_table = {

	.dev_id = "s3c24xx_led.3",

	.table = {

		GPIO_LOOKUP("GPB", 7, NULL, GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN),

		{ },

	},

};



static struct gpiod_lookup_table mini2440_led4_gpio_table = {

	.dev_id = "s3c24xx_led.4",

	.table = {

		GPIO_LOOKUP("GPB", 8, NULL, GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN),

		{ },

	},

};



static struct gpiod_lookup_table mini2440_backlight_gpio_table = {

	.dev_id = "s3c24xx_led.5",

	.table = {

		GPIO_LOOKUP("GPG", 4, NULL, GPIO_ACTIVE_HIGH),

		{ },

	},

};



static struct s3c24xx_led_platdata mini2440_led1_pdata = {

	.name		= "led1",

	.gpio		= S3C2410_GPB(5),

	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,

	.def_trigger	= "heartbeat",

};



static struct s3c24xx_led_platdata mini2440_led2_pdata = {

	.name		= "led2",

	.gpio		= S3C2410_GPB(6),

	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,

	.def_trigger	= "nand-disk",

};



static struct s3c24xx_led_platdata mini2440_led3_pdata = {

	.name		= "led3",

	.gpio		= S3C2410_GPB(7),

	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,

	.def_trigger	= "mmc0",

};



static struct s3c24xx_led_platdata mini2440_led4_pdata = {

	.name		= "led4",

	.gpio		= S3C2410_GPB(8),

	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,

	.def_trigger	= "",

};



static struct s3c24xx_led_platdata mini2440_led_backlight_pdata = {

	.name		= "backlight",

	.gpio		= S3C2410_GPG(4),

	.def_trigger	= "backlight",

};
@@ -714,6 +745,20 @@ static void __init mini2440_init(void) 
	i2c_register_board_info(0, mini2440_i2c_devs,

				ARRAY_SIZE(mini2440_i2c_devs));



	/* Disable pull-up on the LED lines */

	s3c_gpio_setpull(S3C2410_GPB(5), S3C_GPIO_PULL_NONE);

	s3c_gpio_setpull(S3C2410_GPB(6), S3C_GPIO_PULL_NONE);

	s3c_gpio_setpull(S3C2410_GPB(7), S3C_GPIO_PULL_NONE);

	s3c_gpio_setpull(S3C2410_GPB(8), S3C_GPIO_PULL_NONE);

	s3c_gpio_setpull(S3C2410_GPG(4), S3C_GPIO_PULL_NONE);



	/* Add lookups for the lines */

	gpiod_add_lookup_table(&mini2440_led1_gpio_table);

	gpiod_add_lookup_table(&mini2440_led2_gpio_table);

	gpiod_add_lookup_table(&mini2440_led3_gpio_table);

	gpiod_add_lookup_table(&mini2440_led4_gpio_table);

	gpiod_add_lookup_table(&mini2440_backlight_gpio_table);



	platform_add_devices(mini2440_devices, ARRAY_SIZE(mini2440_devices));



	if (features.count)	/* the optional features */

arch/arm/mach-s3c24xx/mach-n30.c

+48 −6
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 


#include <plat/cpu.h>

#include <plat/devs.h>

#include <plat/gpio-cfg.h>

#include <linux/platform_data/mmc-s3cmci.h>

#include <linux/platform_data/usb-s3c2410_udc.h>

#include <plat/samsung-time.h>
@@ -246,17 +247,33 @@ static struct platform_device n35_button_device = { 
};



/* This is the bluetooth LED on the device. */



static struct gpiod_lookup_table n30_blue_led_gpio_table = {

	.dev_id = "s3c24xx_led.1",

	.table = {

		GPIO_LOOKUP("GPG", 6, NULL, GPIO_ACTIVE_HIGH),

		{ },

	},

};



static struct s3c24xx_led_platdata n30_blue_led_pdata = {

	.name		= "blue_led",

	.gpio		= S3C2410_GPG(6),

	.def_trigger	= "",

};



/* This is the blue LED on the device. Originally used to indicate GPS activity

 * by flashing. */



static struct gpiod_lookup_table n35_blue_led_gpio_table = {

	.dev_id = "s3c24xx_led.1",

	.table = {

		GPIO_LOOKUP("GPD", 8, NULL, GPIO_ACTIVE_HIGH),

		{ },

	},

};



static struct s3c24xx_led_platdata n35_blue_led_pdata = {

	.name		= "blue_led",

	.gpio		= S3C2410_GPD(8),

	.def_trigger	= "",

};
@@ -264,17 +281,30 @@ static struct s3c24xx_led_platdata n35_blue_led_pdata = { 
 * red, blinking green or solid green when the battery is low,

 * charging or full respectively.  By driving GPD9 low, it's possible

 * to force the LED to blink red, so call that warning LED.  */



static struct gpiod_lookup_table n30_warning_led_gpio_table = {

	.dev_id = "s3c24xx_led.2",

	.table = {

		GPIO_LOOKUP("GPD", 9, NULL, GPIO_ACTIVE_LOW),

		{ },

	},

};



static struct s3c24xx_led_platdata n30_warning_led_pdata = {

	.name		= "warning_led",

	.flags          = S3C24XX_LEDF_ACTLOW,

	.gpio		= S3C2410_GPD(9),

	.def_trigger	= "",

};



static struct gpiod_lookup_table n35_warning_led_gpio_table = {

	.dev_id = "s3c24xx_led.2",

	.table = {

		GPIO_LOOKUP("GPD", 9, NULL, GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN),

		{ },

	},

};



static struct s3c24xx_led_platdata n35_warning_led_pdata = {

	.name		= "warning_led",

	.flags          = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,

	.gpio		= S3C2410_GPD(9),

	.def_trigger	= "",

};
@@ -577,6 +607,12 @@ static void __init n30_init(void) 
				      S3C2410_MISCCR_USBSUSPND0 |

				      S3C2410_MISCCR_USBSUSPND1, 0x0);



		/* Disable pull-up and add GPIO tables */

		s3c_gpio_setpull(S3C2410_GPG(6), S3C_GPIO_PULL_NONE);

		s3c_gpio_setpull(S3C2410_GPD(9), S3C_GPIO_PULL_NONE);

		gpiod_add_lookup_table(&n30_blue_led_gpio_table);

		gpiod_add_lookup_table(&n30_warning_led_gpio_table);



		platform_add_devices(n30_devices, ARRAY_SIZE(n30_devices));

	}
@@ -594,6 +630,12 @@ static void __init n30_init(void) 
				      S3C2410_MISCCR_USBSUSPND1,

				      S3C2410_MISCCR_USBSUSPND0);



		/* Disable pull-up and add GPIO tables */

		s3c_gpio_setpull(S3C2410_GPD(8), S3C_GPIO_PULL_NONE);

		s3c_gpio_setpull(S3C2410_GPD(9), S3C_GPIO_PULL_NONE);

		gpiod_add_lookup_table(&n35_blue_led_gpio_table);

		gpiod_add_lookup_table(&n35_warning_led_gpio_table);



		platform_add_devices(n35_devices, ARRAY_SIZE(n35_devices));

	}

}

arch/arm/mach-s3c24xx/mach-qt2410.c

+10 −2
Original line number Diff line number Diff line
@@ -177,9 +177,15 @@ static struct platform_device qt2410_cs89x0 = { 


/* LED */



static struct gpiod_lookup_table qt2410_led_gpio_table = {

	.dev_id = "s3c24xx_led.0",

	.table = {

		GPIO_LOOKUP("GPB", 0, NULL, GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN),

		{ },

	},

};



static struct s3c24xx_led_platdata qt2410_pdata_led = {

	.gpio		= S3C2410_GPB(0),

	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,

	.name		= "led",

	.def_trigger	= "timer",

};
@@ -338,6 +344,8 @@ static void __init qt2410_machine_init(void) 
	s3c_i2c0_set_platdata(NULL);



	gpiod_add_lookup_table(&qt2410_spi_gpiod_table);

	s3c_gpio_setpull(S3C2410_GPB(0), S3C_GPIO_PULL_NONE);

	gpiod_add_lookup_table(&qt2410_led_gpio_table);

	platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices));

	s3c_pm_init();

}

arch/arm/mach-s3c24xx/mach-vr1000.c

+35 −3
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/timer.h>

#include <linux/init.h>

#include <linux/gpio.h>

#include <linux/gpio/machine.h>

#include <linux/dm9000.h>

#include <linux/i2c.h>
@@ -40,6 +41,7 @@ 


#include <plat/cpu.h>

#include <plat/devs.h>

#include <plat/gpio-cfg.h>

#include <plat/samsung-time.h>



#include "bast.h"
@@ -223,21 +225,42 @@ static struct platform_device vr1000_dm9k1 = { 


/* LEDS */



static struct gpiod_lookup_table vr1000_led1_gpio_table = {

	.dev_id = "s3c24xx_led.1",

	.table = {

		GPIO_LOOKUP("GPB", 0, NULL, GPIO_ACTIVE_HIGH),

		{ },

	},

};



static struct gpiod_lookup_table vr1000_led2_gpio_table = {

	.dev_id = "s3c24xx_led.2",

	.table = {

		GPIO_LOOKUP("GPB", 1, NULL, GPIO_ACTIVE_HIGH),

		{ },

	},

};



static struct gpiod_lookup_table vr1000_led3_gpio_table = {

	.dev_id = "s3c24xx_led.3",

	.table = {

		GPIO_LOOKUP("GPB", 2, NULL, GPIO_ACTIVE_HIGH),

		{ },

	},

};



static struct s3c24xx_led_platdata vr1000_led1_pdata = {

	.name		= "led1",

	.gpio		= S3C2410_GPB(0),

	.def_trigger	= "",

};



static struct s3c24xx_led_platdata vr1000_led2_pdata = {

	.name		= "led2",

	.gpio		= S3C2410_GPB(1),

	.def_trigger	= "",

};



static struct s3c24xx_led_platdata vr1000_led3_pdata = {

	.name		= "led3",

	.gpio		= S3C2410_GPB(2),

	.def_trigger	= "",

};
@@ -317,6 +340,15 @@ static void __init vr1000_init_time(void) 
static void __init vr1000_init(void)

{

	s3c_i2c0_set_platdata(NULL);



	/* Disable pull-up on LED lines and register GPIO lookups */

	s3c_gpio_setpull(S3C2410_GPB(0), S3C_GPIO_PULL_NONE);

	s3c_gpio_setpull(S3C2410_GPB(1), S3C_GPIO_PULL_NONE);

	s3c_gpio_setpull(S3C2410_GPB(2), S3C_GPIO_PULL_NONE);

	gpiod_add_lookup_table(&vr1000_led1_gpio_table);

	gpiod_add_lookup_table(&vr1000_led2_gpio_table);

	gpiod_add_lookup_table(&vr1000_led3_gpio_table);



	platform_add_devices(vr1000_devices, ARRAY_SIZE(vr1000_devices));



	i2c_register_board_info(0, vr1000_i2c_devs,

CRA Git | Maintained and supported by SUSTech CRA and CCSE