diff options
| author | Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> | 2026-01-12 15:28:51 +0300 |
|---|---|---|
| committer | Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> | 2026-01-12 15:28:51 +0300 |
| commit | 4d944187a1288bb48b21715e95098e81bc0e28f6 (patch) | |
| tree | 88bc5e74047200ba01f5b1ac6e3b4df713628d0f | |
| parent | 43f37d44f2b8a75a896e218bac1e43d75063f8d3 (diff) | |
| parent | b3d8508351af7f6366a0a18068c194b399ead2c3 (diff) | |
| download | linux-4d944187a1288bb48b21715e95098e81bc0e28f6.tar.xz | |
Merge branch 'reset/gpio-compatible' of https://git.pengutronix.de/git/pza/linux into gpio/for-next
Pull in reset changes adding the "compatible" property to reset-gpio
devices.
| -rw-r--r-- | drivers/reset/core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/reset/core.c b/drivers/reset/core.c index 0135dd0ae204..0666dfc41ca9 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -868,11 +868,11 @@ static int reset_add_gpio_aux_device(struct device *parent, */ static int __reset_add_reset_gpio_device(const struct of_phandle_args *args) { - struct property_entry properties[2] = { }; + struct property_entry properties[3] = { }; unsigned int offset, of_flags, lflags; struct reset_gpio_lookup *rgpio_dev; struct device *parent; - int id, ret; + int id, ret, prop = 0; /* * Currently only #gpio-cells=2 is supported with the meaning of: @@ -923,7 +923,8 @@ static int __reset_add_reset_gpio_device(const struct of_phandle_args *args) lflags = GPIO_PERSISTENT | (of_flags & GPIO_ACTIVE_LOW); parent = gpio_device_to_device(gdev); - properties[0] = PROPERTY_ENTRY_GPIO("reset-gpios", parent->fwnode, offset, lflags); + properties[prop++] = PROPERTY_ENTRY_STRING("compatible", "reset-gpio"); + properties[prop++] = PROPERTY_ENTRY_GPIO("reset-gpios", parent->fwnode, offset, lflags); id = ida_alloc(&reset_gpio_ida, GFP_KERNEL); if (id < 0) |