projects
/
openwrt
/
staging
/
stintel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ramips: adjusted pinctrl-aw9523 for kernel 6.6
[openwrt/staging/stintel.git]
/
target
/
linux
/
ramips
/
files
/
drivers
/
pinctrl
/
pinctrl-aw9523.c
diff --git
a/target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c
b/target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c
index 65babf994625ea3205d7c3a823de73361db7dd39..a429bb82a3a08121e187ad05e8f50f335d40eb30 100644
(file)
--- a/
target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c
+++ b/
target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c
@@
-810,7
+810,11
@@
static int aw9523_init_gpiochip(struct aw9523 *awi, unsigned int npins)
gpiochip->set_multiple = aw9523_gpio_set_multiple;
gpiochip->set_config = gpiochip_generic_config;
gpiochip->parent = dev;
gpiochip->set_multiple = aw9523_gpio_set_multiple;
gpiochip->set_config = gpiochip_generic_config;
gpiochip->parent = dev;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 0)
+ gpiochip->fwnode = dev->fwnode;
+#else
gpiochip->of_node = dev->of_node;
gpiochip->of_node = dev->of_node;
+#endif
gpiochip->owner = THIS_MODULE;
gpiochip->can_sleep = true;
gpiochip->owner = THIS_MODULE;
gpiochip->can_sleep = true;
@@
-984,8
+988,12
@@
static int aw9523_hw_init(struct aw9523 *awi)
return regmap_reinit_cache(awi->regmap, &aw9523_regmap);
}
return regmap_reinit_cache(awi->regmap, &aw9523_regmap);
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 0)
+static int aw9523_probe(struct i2c_client *client)
+#else
static int aw9523_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int aw9523_probe(struct i2c_client *client,
const struct i2c_device_id *id)
+#endif
{
struct device *dev = &client->dev;
struct pinctrl_desc *pdesc;
{
struct device *dev = &client->dev;
struct pinctrl_desc *pdesc;