Nanako/immortalwrt-mt798x-24.10
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ramips: adjusted pinctrl-aw9523 for kernel 6.6

Browse Source 
Compatiblity with kernel 6.6 for Awinic AW9523B i2c pin controller driver.
It follows the kernel patch: i2c: Drop legacy callback .probe_new() (5eb1e6e459)
and kernel patch: gpiolib: Get rid of not used of_node member (70d0fc4288)

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
This commit is contained in:
Mieczyslaw Nalewaj 2024-03-15 09:08:09 +01:00 committed by Nick Hainke
parent fddadcae43
commit 359a9295f2
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c
View File

@ -810,7 +810,11 @@ static int aw9523_init_gpiochip(struct aw9523 *awi, unsigned int npins)
gpiochip->set_multiple = aw9523_gpio_set_multiple; gpiochip->set_multiple = aw9523_gpio_set_multiple;
gpiochip->set_config = gpiochip_generic_config; gpiochip->set_config = gpiochip_generic_config;
gpiochip->parent = dev; 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->owner = THIS_MODULE;
gpiochip->can_sleep = true; 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, static int aw9523_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
#endif
{ {
struct device *dev = &client->dev; struct device *dev = &client->dev;
struct pinctrl_desc *pdesc; struct pinctrl_desc *pdesc;