Merge branch 'ib-pinctrl-genprops' into devel

diff --cc drivers/pinctrl/core.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-amd.c
index 6b75bd2b71db38136fa80008817139c7250ea3a4,e440665ecc35f11f927f394a2c587e4a14cb8e2e..6120c6f7eecadf9cac2a6519d2bc6ac69ab7765a
--- 1/drivers/pinctrl/pinctrl-amd.c
--- 2/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@@ -768,10 -773,10 +780,10 @@@ static int amd_gpio_probe(struct platfo
        gpio_dev->gc.direction_output   = amd_gpio_direction_output;
        gpio_dev->gc.get                        = amd_gpio_get_value;
        gpio_dev->gc.set                        = amd_gpio_set_value;
-       gpio_dev->gc.set_debounce       = amd_gpio_set_debounce;
+       gpio_dev->gc.set_config         = amd_gpio_set_config;
        gpio_dev->gc.dbg_show           = amd_gpio_dbg_show;
  
 -      gpio_dev->gc.base                       = 0;
 +      gpio_dev->gc.base               = -1;
        gpio_dev->gc.label                      = pdev->name;
        gpio_dev->gc.owner                      = THIS_MODULE;
        gpio_dev->gc.parent                     = &pdev->dev;

diff --cc drivers/pinctrl/pinctrl-da850-pupd.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-single.c
Simple merge

diff --cc drivers/pinctrl/sirf/pinctrl-atlas7.c
Simple merge

diff --cc drivers/pinctrl/sunxi/pinctrl-sunxi.c
Simple merge