| Message ID | 1452669980-16460-1-git-send-email-ldewangan@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Jan 13, 2016 at 12:56:20PM +0530, Laxman Dewangan wrote: > Add support to disable the button from DT via status property > if given button is not supporting on given platforms. > > This will help to re-use the existing dtsi file with status > enable/disable across platforms. > > Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Applied, thank you. > --- > Changes from V1: > - Converted print to dev_dbg. > Changes from V2: > - use of_get_available_child_count() and for_each_available_child_of_node() > > drivers/input/keyboard/gpio_keys.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c > index bef317f..ef6ca1c 100644 > --- a/drivers/input/keyboard/gpio_keys.c > +++ b/drivers/input/keyboard/gpio_keys.c > @@ -613,7 +613,7 @@ gpio_keys_get_devtree_pdata(struct device *dev) > if (!node) > return ERR_PTR(-ENODEV); > > - nbuttons = of_get_child_count(node); > + nbuttons = of_get_available_child_count(node); > if (nbuttons == 0) > return ERR_PTR(-ENODEV); > > @@ -629,7 +629,7 @@ gpio_keys_get_devtree_pdata(struct device *dev) > pdata->rep = !!of_get_property(node, "autorepeat", NULL); > > i = 0; > - for_each_child_of_node(node, pp) { > + for_each_available_child_of_node(node, pp) { > enum of_gpio_flags flags; > > button = &pdata->buttons[i++]; > -- > 2.1.4 >
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index bef317f..ef6ca1c 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -613,7 +613,7 @@ gpio_keys_get_devtree_pdata(struct device *dev) if (!node) return ERR_PTR(-ENODEV); - nbuttons = of_get_child_count(node); + nbuttons = of_get_available_child_count(node); if (nbuttons == 0) return ERR_PTR(-ENODEV); @@ -629,7 +629,7 @@ gpio_keys_get_devtree_pdata(struct device *dev) pdata->rep = !!of_get_property(node, "autorepeat", NULL); i = 0; - for_each_child_of_node(node, pp) { + for_each_available_child_of_node(node, pp) { enum of_gpio_flags flags; button = &pdata->buttons[i++];
Add support to disable the button from DT via status property if given button is not supporting on given platforms. This will help to re-use the existing dtsi file with status enable/disable across platforms. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> --- Changes from V1: - Converted print to dev_dbg. Changes from V2: - use of_get_available_child_count() and for_each_available_child_of_node() drivers/input/keyboard/gpio_keys.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)