From: Laxman Dewangan Date: Wed, 13 Jan 2016 08:14:19 +0000 (-0800) Subject: Input: gpio-keys - allow disabling individual buttons in DT X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=809d9516da73345cca587743b57e45e9095d851e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Input: gpio-keys - allow disabling individual buttons in DT Add support to disable buttons from DT via status property if given button is not supported on given platforms. This will help re-using existing dtsi files across multiple platforms. Signed-off-by: Laxman Dewangan Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 671cdc9a6aea..29093657f2ef 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -630,7 +630,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); @@ -648,7 +648,7 @@ gpio_keys_get_devtree_pdata(struct device *dev) of_property_read_string(node, "label", &pdata->name); 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++];