leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpio: samsung: Skip initialization if device tree is present

Browse Source 
Since this driver does not handle GPIO on device tree enabled platforms
any more, it should be bypassed whenever device tree is available, to
not conflict with the new pinctrl-samsung driver.

Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Tomasz Figa 2013-08-26 02:37:41 +09:00 committed by Kukjin Kim
parent c836c90e27
commit 608f9737f1
1 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/gpio/gpio-samsung.c
View File

@ -2082,34 +2082,14 @@ static __init int samsung_gpiolib_init(void)
int i, nr_chips; int i, nr_chips;
int group = 0; int group = 0;
#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440)
/* /*
* This gpio driver includes support for device tree support and there * Currently there are two drivers that can provide GPIO support for
* are platforms using it. In order to maintain compatibility with those * Samsung SoCs. For device tree enabled platforms, the new
* platforms, and to allow non-dt Exynos4210 platforms to use this * pinctrl-samsung driver is used, providing both GPIO and pin control
* gpiolib support, a check is added to find out if there is a active * interfaces. For legacy (non-DT) platforms this driver is used.
* pin-controller driver support available. If it is available, this */
* gpiolib support is ignored and the gpiolib support available in if (of_have_populated_dt())
* pin-controller driver is used. This is a temporary check and will go return -ENODEV;
* away when all of the Exynos4210 platforms have switched to using
* device tree and the pin-ctrl driver.
*/
struct device_node *pctrl_np;
static const struct of_device_id exynos_pinctrl_ids[] = {
{ .compatible = "samsung,s3c2412-pinctrl", },
{ .compatible = "samsung,s3c2416-pinctrl", },
{ .compatible = "samsung,s3c2440-pinctrl", },
{ .compatible = "samsung,s3c2450-pinctrl", },
{ .compatible = "samsung,exynos4210-pinctrl", },
{ .compatible = "samsung,exynos4x12-pinctrl", },
{ .compatible = "samsung,exynos5250-pinctrl", },
{ .compatible = "samsung,exynos5440-pinctrl", },
{ }
};
for_each_matching_node(pctrl_np, exynos_pinctrl_ids)
if (pctrl_np && of_device_is_available(pctrl_np))
return -ENODEV;
#endif
samsung_gpiolib_set_cfg(samsung_gpio_cfgs, ARRAY_SIZE(samsung_gpio_cfgs)); samsung_gpiolib_set_cfg(samsung_gpio_cfgs, ARRAY_SIZE(samsung_gpio_cfgs));