Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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.
+4
-3
+4
-3
drivers/reset/core.c
+4
-3
drivers/reset/core.c
···
868
868
*/
869
869
static int __reset_add_reset_gpio_device(const struct of_phandle_args *args)
870
870
{
871
-
struct property_entry properties[2] = { };
871
+
struct property_entry properties[3] = { };
872
872
unsigned int offset, of_flags, lflags;
873
873
struct reset_gpio_lookup *rgpio_dev;
874
874
struct device *parent;
875
-
int id, ret;
875
+
int id, ret, prop = 0;
876
876
877
877
/*
878
878
* Currently only #gpio-cells=2 is supported with the meaning of:
···
923
923
924
924
lflags = GPIO_PERSISTENT | (of_flags & GPIO_ACTIVE_LOW);
925
925
parent = gpio_device_to_device(gdev);
926
-
properties[0] = PROPERTY_ENTRY_GPIO("reset-gpios", parent->fwnode, offset, lflags);
926
+
properties[prop++] = PROPERTY_ENTRY_STRING("compatible", "reset-gpio");
927
+
properties[prop++] = PROPERTY_ENTRY_GPIO("reset-gpios", parent->fwnode, offset, lflags);
927
928
928
929
id = ida_alloc(&reset_gpio_ida, GFP_KERNEL);
929
930
if (id < 0)