From: Linus Walleij <linus.walleij@linaro.org>
Date: Thu, 26 Jan 2017 14:27:54 +0000 (+0100)
Subject: Merge branch 'ib-pinctrl-genprops' into devel
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=27a2873617415f7a5b9881a532008efd92334b05;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'ib-pinctrl-genprops' into devel
---

27a2873617415f7a5b9881a532008efd92334b05
diff --cc drivers/pinctrl/pinctrl-amd.c
index 6b75bd2b71db,e440665ecc35..6120c6f7eeca
--- a/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;