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

Revert "Merge branch 'ib-rsk7204' into devel"

Browse Source 
This reverts commit d922b54e94, reversing
changes made to 3f0245e23a.

The SH maintainer has indicated that he want to carry these changes
in the SH tree instead, and need more time to review and merge the
changes, so reverting it out from my tree.

Signed-off-by: Linus Walleij <linusw@kernel.org>
This commit is contained in:
Linus Walleij
2026-08-11 08:49:40 +02:00
parent 63113d4fce
commit fedfa225fd
4 changed files with 89 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,18 +4,17 @@
*
* 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/machine.h>
#include <linux/gpio/property.h>
#include <linux/gpio.h>
#include <linux/gpio_keys.h>
#include <linux/leds.h>
#include <asm/machvec.h>
#include <cpu/pfc.h>
#include <asm/io.h>
#include <cpu/sh7203.h>
static struct smsc911x_platform_config smsc911x_config = {
@@ -38,236 +37,101 @@ static struct resource smsc911x_resources[] = {
},
};
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 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_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"),
{ }
},
};
/* The base of the function GPIOs in the flat enum */
#define SH7203_FN_BASE GPIO_FN_PINT7_PB
static const struct software_node rsk7203_pfc_functions_node = {
.name = "functions",
.parent = &pfc_gpiochip_node,
};
static const struct software_node rsk7203_txd0_hog_node = {
.name = "txd0-hog",
.parent = &rsk7203_pfc_functions_node,
.properties = (const struct property_entry[]) {
PROPERTY_ENTRY_BOOL("gpio-hog"),
PROPERTY_ENTRY_U32_ARRAY("gpios", ((u32[]){
GPIO_FN_TXD0 - SH7203_FN_BASE, GPIO_ACTIVE_HIGH
})),
PROPERTY_ENTRY_BOOL("input"),
PROPERTY_ENTRY_STRING("line-name", "TXD0"),
{ }
},
};
static const struct software_node rsk7203_rxd0_hog_node = {
.name = "rxd0-hog",
.parent = &rsk7203_pfc_functions_node,
.properties = (const struct property_entry[]) {
PROPERTY_ENTRY_BOOL("gpio-hog"),
PROPERTY_ENTRY_U32_ARRAY("gpios", ((u32[]){
GPIO_FN_RXD0 - SH7203_FN_BASE, GPIO_ACTIVE_HIGH
})),
PROPERTY_ENTRY_BOOL("input"),
PROPERTY_ENTRY_STRING("line-name", "RXD0"),
{ }
},
};
static const struct software_node rsk7203_irq0_hog_node = {
.name = "irq0-hog",
.parent = &rsk7203_pfc_functions_node,
.properties = (const struct property_entry[]) {
PROPERTY_ENTRY_BOOL("gpio-hog"),
PROPERTY_ENTRY_U32_ARRAY("gpios", ((u32[]){
GPIO_FN_IRQ0_PB - SH7203_FN_BASE, GPIO_ACTIVE_HIGH
})),
PROPERTY_ENTRY_BOOL("input"),
PROPERTY_ENTRY_STRING("line-name", "IRQ0_PB"),
{ }
},
};
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,
&rsk7203_pfc_functions_node,
&rsk7203_txd0_hog_node,
&rsk7203_rxd0_hog_node,
&rsk7203_irq0_hog_node,
NULL
};
static const struct platform_device_info rsk7203_devices[] __initconst = {
static struct gpio_led rsk7203_gpio_leds[] = {
{
.name = "smsc911x",
.id = PLATFORM_DEVID_NONE,
.res = smsc911x_resources,
.num_res = ARRAY_SIZE(smsc911x_resources),
.data = &smsc911x_config,
.size_data = sizeof(smsc911x_config),
},
{
.name = "leds-gpio",
.id = PLATFORM_DEVID_NONE,
.swnode = &rsk7203_gpio_leds_node,
},
{
.name = "gpio-keys-polled",
.id = PLATFORM_DEVID_NONE,
.swnode = &rsk7203_gpio_keys_node,
.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,
},
};
/*
* The pfc-sh7203 device is registered at arch_initcall level, and the
* sh-pfc driver (registered at postcore_initcall level) probes as soon
* as the device is created.
*
* We need to register our software nodes at postcore_initcall level so
* they are already present in the system when the driver probes and
* tries to apply GPIO hogs.
*/
static int __init rsk7203_sw_nodes_setup(void)
{
int error;
static struct gpio_led_platform_data rsk7203_gpio_leds_info = {
.leds = rsk7203_gpio_leds,
.num_leds = ARRAY_SIZE(rsk7203_gpio_leds),
};
error = software_node_register(&pfc_gpiochip_node);
if (error && error != -EEXIST) {
pr_err("RSK7203: failed to register PFC software node: %d\n",
error);
return error;
}
static struct platform_device led_device = {
.name = "leds-gpio",
.id = -1,
.dev = {
.platform_data = &rsk7203_gpio_leds_info,
},
};
error = software_node_register_node_group(rsk7203_swnodes);
if (error) {
pr_err("RSK7203: failed to register board software nodes: %d\n",
error);
return error;
}
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",
},
};
return 0;
}
postcore_initcall(rsk7203_sw_nodes_setup);
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,
},
};
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);
/* Setup LAN9118: CS1 in 16-bit Big Endian Mode, IRQ0 at Port B */
__raw_writel(0x36db0400, 0xfffc0008); /* CS1BCR */
gpio_request(GPIO_FN_IRQ0_PB, NULL);
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;
return platform_add_devices(rsk7203_devices,
ARRAY_SIZE(rsk7203_devices));
}
device_initcall(rsk7203_devices_setup);

3
arch/sh/include/cpu-common/cpu/pfc.h
View File

@@ -11,9 +11,6 @@
#include <linux/types.h>
struct resource;
struct software_node;
extern const struct software_node pfc_gpiochip_node;
int sh_pfc_register(const char *name,
struct resource *resource, u32 num_resources);

20
arch/sh/kernel/cpu/pfc.c
View File

@@ -5,29 +5,21 @@
* Copyright (C) 2012 Renesas Solutions Corp.
*/
#include <linux/err.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/property.h>
#include <cpu/pfc.h>
const struct software_node pfc_gpiochip_node = {
.name = "sh-pfc",
static struct platform_device sh_pfc_device = {
.id = -1,
};
int __init sh_pfc_register(const char *name,
struct resource *resource, u32 num_resources)
{
struct platform_device_info pdev_info = {
.name = name,
.id = PLATFORM_DEVID_NONE,
.res = resource,
.num_res = num_resources,
.swnode = &pfc_gpiochip_node,
};
struct platform_device *pdev;
sh_pfc_device.name = name;
sh_pfc_device.num_resources = num_resources;
sh_pfc_device.resource = resource;
pdev = platform_device_register_full(&pdev_info);
return PTR_ERR_OR_ZERO(pdev);
return platform_device_register(&sh_pfc_device);
}

28
drivers/pinctrl/renesas/gpio.c
View File

@@ -271,41 +271,13 @@ static int gpio_function_request(struct gpio_chip *gc, unsigned offset)
return ret;
}
static void sh_pfc_fwnode_put(void *data)
{
fwnode_handle_put(data);
}
static int gpio_function_setup(struct sh_pfc_chip *chip)
{
struct sh_pfc *pfc = chip->pfc;
struct gpio_chip *gc = &chip->gpio_chip;
struct fwnode_handle *fwnode = dev_fwnode(pfc->dev);
gc->request = gpio_function_request;
if (is_software_node(fwnode)) {
fwnode = fwnode_get_named_child_node(fwnode, "functions");
if (fwnode) {
int ret;
ret = devm_add_action_or_reset(pfc->dev,
sh_pfc_fwnode_put,
fwnode);
if (ret)
return ret;
gc->fwnode = fwnode;
}
}
/*
* If we did not find 'functions' node, explicitly mask the parent's
* fwnode to prevent gpiolib from reusing it for function GPIOs.
*/
if (!gc->fwnode)
gc->fwnode = ERR_PTR(-ENODEV);
gc->label = pfc->info->name;
gc->owner = THIS_MODULE;
gc->base = pfc->nr_gpio_pins;