Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0586624 authored by Thomas Abraham's avatar Thomas Abraham Committed by Kukjin Kim
Browse files

gpio: exynos4: skip gpiolib registration if pinctrl driver is used 



Pinctrl driver, when enabled, registers all the gpio pins and hence the
registration of gpio pins by this driver can be skipped.

Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 43b169db

drivers/gpio/gpio-samsung.c

+21 −0
Original line number Diff line number Diff line
@@ -2734,6 +2734,27 @@ static __init void exynos4_gpiolib_init(void) 
	int group = 0;

	void __iomem *gpx_base;



#ifdef CONFIG_PINCTRL_SAMSUNG

		/*

		 * This gpio driver includes support for device tree support and

		 * there are platforms using it. In order to maintain

		 * compatibility with those platforms, and to allow non-dt

		 * Exynos4210 platforms to use this gpiolib support, a check

		 * is added to find out if there is a active pin-controller

		 * driver support available. If it is available, this gpiolib

		 * support is ignored and the gpiolib support available in

		 * pin-controller driver is used. This is a temporary check and

		 * will go away when all of the Exynos4210 platforms have

		 * switched to using device tree and the pin-ctrl driver.

		 */

		struct device_node *pctrl_np;

		const char *pctrl_compat = "samsung,pinctrl-exynos4210";

		pctrl_np = of_find_compatible_node(NULL, NULL, pctrl_compat);

		if (pctrl_np)

			if (of_device_is_available(pctrl_np))

				return;

#endif



	/* gpio part1 */

	gpio_base1 = ioremap(EXYNOS4_PA_GPIO1, SZ_4K);

	if (gpio_base1 == NULL) {