mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-30 11:03:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

sh: mach-rsk: rsk7203: use static device properties for LEDs and GPIO buttons

Browse Source 
Convert the board to use static device properties instead of platform
data to describe LEDs and GPIO-connected buttons on the board, so
that support for platform data can be removed from gpio-keys and other
drivers, unifying their behavior.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Linus Walleij <linusw@kernel.org>
This commit is contained in:
Dmitry Torokhov
2026-05-20 22:13:19 -07:00
committed by Linus Walleij
parent 62067bc0a0
commit 6905cdac0e
1 changed files with 142 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

221
arch/sh/boards/mach-rsk/devices-rsk7203.c
View File

@@ -4,17 +4,19 @@
*
* Copyright (C) 2008 - 2010 Paul Mundt
*/
#include <linux/err.h>
#include <linux/init.h>
#include <linux/types.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <linux/smsc911x.h>
#include <linux/input.h>
#include <linux/io.h>
#include <linux/gpio.h>
#include <linux/gpio_keys.h>
#include <linux/leds.h>
#include <linux/gpio/machine.h>
#include <linux/gpio/property.h>
#include <asm/machvec.h>
#include <asm/io.h>
#include <cpu/pfc.h>
#include <cpu/sh7203.h>
static struct smsc911x_platform_config smsc911x_config = {
@@ -37,92 +39,138 @@ static struct resource smsc911x_resources[] = {
},
};
static struct platform_device smsc911x_device = {
.name = "smsc911x",
.id = -1,
.num_resources = ARRAY_SIZE(smsc911x_resources),
.resource = smsc911x_resources,
.dev = {
.platform_data = &smsc911x_config,
static const struct software_node rsk7203_gpio_leds_node = {
.name = "rsk7203-gpio-leds",
};
static const struct software_node rsk7203_green_led_node = {
.name = "green",
.parent = &rsk7203_gpio_leds_node,
.properties = (const struct property_entry[]) {
PROPERTY_ENTRY_STRING("label", "green"),
PROPERTY_ENTRY_GPIO("gpios", &pfc_gpiochip_node,
GPIO_PE10, GPIO_ACTIVE_LOW),
{ }
},
};
static struct gpio_led rsk7203_gpio_leds[] = {
static const struct software_node rsk7203_orange_led_node = {
.name = "orange",
.parent = &rsk7203_gpio_leds_node,
.properties = (const struct property_entry[]) {
PROPERTY_ENTRY_STRING("label", "orange"),
PROPERTY_ENTRY_STRING("linux,default-trigger", "nand-disk"),
PROPERTY_ENTRY_GPIO("gpios", &pfc_gpiochip_node,
GPIO_PE12, GPIO_ACTIVE_LOW),
{ }
},
};
static const struct software_node rsk7203_red1_led_node = {
.name = "red:timer",
.parent = &rsk7203_gpio_leds_node,
.properties = (const struct property_entry[]) {
PROPERTY_ENTRY_STRING("label", "red:timer"),
PROPERTY_ENTRY_STRING("linux,default-trigger", "timer"),
PROPERTY_ENTRY_GPIO("gpios", &pfc_gpiochip_node,
GPIO_PC14, GPIO_ACTIVE_LOW),
{ }
},
};
static const struct software_node rsk7203_red2_led_node = {
.name = "red:heartbeat",
.parent = &rsk7203_gpio_leds_node,
.properties = (const struct property_entry[]) {
PROPERTY_ENTRY_STRING("label", "red:heartbeat"),
PROPERTY_ENTRY_STRING("linux,default-trigger", "heartbeat"),
PROPERTY_ENTRY_GPIO("gpios", &pfc_gpiochip_node,
GPIO_PE11, GPIO_ACTIVE_LOW),
{ }
},
};
static const struct software_node rsk7203_gpio_keys_node = {
.name = "rsk7203-gpio-keys",
.properties = (const struct property_entry[]) {
PROPERTY_ENTRY_U32("poll-interval", 50),
{ }
},
};
static const struct software_node rsk7203_sw1_key_node = {
.parent = &rsk7203_gpio_keys_node,
.properties = (const struct property_entry[]) {
PROPERTY_ENTRY_U32("linux,code", BTN_0),
PROPERTY_ENTRY_GPIO("gpios", &pfc_gpiochip_node,
GPIO_PB0, GPIO_ACTIVE_LOW),
PROPERTY_ENTRY_STRING("label", "SW1"),
{ }
},
};
static const struct software_node rsk7203_sw2_key_node = {
.parent = &rsk7203_gpio_keys_node,
.properties = (const struct property_entry[]) {
PROPERTY_ENTRY_U32("linux,code", BTN_1),
PROPERTY_ENTRY_GPIO("gpios", &pfc_gpiochip_node,
GPIO_PB1, GPIO_ACTIVE_LOW),
PROPERTY_ENTRY_STRING("label", "SW2"),
{ }
},
};
static const struct software_node rsk7203_sw3_key_node = {
.parent = &rsk7203_gpio_keys_node,
.properties = (const struct property_entry[]) {
PROPERTY_ENTRY_U32("linux,code", BTN_2),
PROPERTY_ENTRY_GPIO("gpios", &pfc_gpiochip_node,
GPIO_PB2, GPIO_ACTIVE_LOW),
PROPERTY_ENTRY_STRING("label", "SW3"),
{ }
},
};
static const struct software_node * const rsk7203_swnodes[] __initconst = {
&rsk7203_gpio_leds_node,
&rsk7203_green_led_node,
&rsk7203_orange_led_node,
&rsk7203_red1_led_node,
&rsk7203_red2_led_node,
&rsk7203_gpio_keys_node,
&rsk7203_sw1_key_node,
&rsk7203_sw2_key_node,
&rsk7203_sw3_key_node,
NULL
};
static const struct platform_device_info rsk7203_devices[] __initconst = {
{
.name = "green",
.gpio = GPIO_PE10,
.active_low = 1,
}, {
.name = "orange",
.default_trigger = "nand-disk",
.gpio = GPIO_PE12,
.active_low = 1,
}, {
.name = "red:timer",
.default_trigger = "timer",
.gpio = GPIO_PC14,
.active_low = 1,
}, {
.name = "red:heartbeat",
.default_trigger = "heartbeat",
.gpio = GPIO_PE11,
.active_low = 1,
.name = "smsc911x",
.id = PLATFORM_DEVID_NONE,
.res = smsc911x_resources,
.num_res = ARRAY_SIZE(smsc911x_resources),
.data = &smsc911x_config,
.size_data = sizeof(smsc911x_config),
},
};
static struct gpio_led_platform_data rsk7203_gpio_leds_info = {
.leds = rsk7203_gpio_leds,
.num_leds = ARRAY_SIZE(rsk7203_gpio_leds),
};
static struct platform_device led_device = {
.name = "leds-gpio",
.id = -1,
.dev = {
.platform_data = &rsk7203_gpio_leds_info,
},
};
static struct gpio_keys_button rsk7203_gpio_keys_table[] = {
{
.code = BTN_0,
.gpio = GPIO_PB0,
.active_low = 1,
.desc = "SW1",
}, {
.code = BTN_1,
.gpio = GPIO_PB1,
.active_low = 1,
.desc = "SW2",
}, {
.code = BTN_2,
.gpio = GPIO_PB2,
.active_low = 1,
.desc = "SW3",
.name = "leds-gpio",
.id = PLATFORM_DEVID_NONE,
.swnode = &rsk7203_gpio_leds_node,
},
};
static struct gpio_keys_platform_data rsk7203_gpio_keys_info = {
.buttons = rsk7203_gpio_keys_table,
.nbuttons = ARRAY_SIZE(rsk7203_gpio_keys_table),
.poll_interval = 50, /* default to 50ms */
};
static struct platform_device keys_device = {
.name = "gpio-keys-polled",
.dev = {
.platform_data = &rsk7203_gpio_keys_info,
{
.name = "gpio-keys-polled",
.id = PLATFORM_DEVID_NONE,
.swnode = &rsk7203_gpio_keys_node,
},
};
static struct platform_device *rsk7203_devices[] __initdata = {
&smsc911x_device,
&led_device,
&keys_device,
};
static int __init rsk7203_devices_setup(void)
{
struct platform_device *pd;
int error;
int i;
/* Select pins for SCIF0 */
gpio_request(GPIO_FN_TXD0, NULL);
gpio_request(GPIO_FN_RXD0, NULL);
@@ -131,7 +179,22 @@ static int __init rsk7203_devices_setup(void)
__raw_writel(0x36db0400, 0xfffc0008); /* CS1BCR */
gpio_request(GPIO_FN_IRQ0_PB, NULL);
return platform_add_devices(rsk7203_devices,
ARRAY_SIZE(rsk7203_devices));
error = software_node_register_node_group(rsk7203_swnodes);
if (error) {
pr_err("failed to register software nodes: %d\n", error);
return error;
}
for (i = 0; i < ARRAY_SIZE(rsk7203_devices); i++) {
pd = platform_device_register_full(&rsk7203_devices[i]);
error = PTR_ERR_OR_ZERO(pd);
if (error) {
pr_err("failed to create platform device %s: %d\n",
rsk7203_devices[i].name, error);
return error;
}
}
return 0;
}
device_initcall(rsk7203_devices_setup);