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

Commit b75b25b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-v3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fixes from Linus Walleij:
 "Here are some GPIO fixes I stacked up in my GPIO tree:

   - Remove a bad #include from the Samsung driver
   - Some Kconfig hazzle for the Samsungs
   - Skip gpiolib registration on EXYNOS5440
   - Don't free the MVEBU label"

* tag 'fixes-for-v3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: mvebu: Don't free chip label memory
  gpio: samsung: skip gpio lib registration for EXYNOS5440
  gpio: samsung: silent build warning for EXYNOS5 SoCs
  gpio: samsung: fix pinctrl condition for exynos and exynos5440
  gpio: samsung: remove inclusion <mach/regs-clock.h>
parents 05c2cf35 11c0ceec

drivers/gpio/gpio-mvebu.c

+0 −6
Original line number Diff line number Diff line
@@ -547,7 +547,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev) 
	mvchip->membase = devm_request_and_ioremap(&pdev->dev, res);

	if (! mvchip->membase) {

		dev_err(&pdev->dev, "Cannot ioremap\n");

		kfree(mvchip->chip.label);

		return -ENOMEM;

	}
@@ -557,14 +556,12 @@ static int mvebu_gpio_probe(struct platform_device *pdev) 
		res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

		if (! res) {

			dev_err(&pdev->dev, "Cannot get memory resource\n");

			kfree(mvchip->chip.label);

			return -ENODEV;

		}



		mvchip->percpu_membase = devm_request_and_ioremap(&pdev->dev, res);

		if (! mvchip->percpu_membase) {

			dev_err(&pdev->dev, "Cannot ioremap\n");

			kfree(mvchip->chip.label);

			return -ENOMEM;

		}

	}
@@ -625,7 +622,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev) 
	mvchip->irqbase = irq_alloc_descs(-1, 0, ngpios, -1);

	if (mvchip->irqbase < 0) {

		dev_err(&pdev->dev, "no irqs\n");

		kfree(mvchip->chip.label);

		return -ENOMEM;

	}
@@ -633,7 +629,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev) 
				    mvchip->membase, handle_level_irq);

	if (! gc) {

		dev_err(&pdev->dev, "Cannot allocate generic irq_chip\n");

		kfree(mvchip->chip.label);

		return -ENOMEM;

	}
@@ -668,7 +663,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev) 
		irq_remove_generic_chip(gc, IRQ_MSK(ngpios), IRQ_NOREQUEST,

					IRQ_LEVEL | IRQ_NOPROBE);

		kfree(gc);

		kfree(mvchip->chip.label);

		return -ENODEV;

	}

drivers/gpio/gpio-samsung.c

+7 −7
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 


#include <mach/hardware.h>

#include <mach/map.h>

#include <mach/regs-clock.h>

#include <mach/regs-gpio.h>



#include <plat/cpu.h>
@@ -446,7 +445,7 @@ static struct samsung_gpio_cfg s3c24xx_gpiocfg_banka = { 
};

#endif



#if defined(CONFIG_ARCH_EXYNOS4) || defined(CONFIG_ARCH_EXYNOS5)

#if defined(CONFIG_ARCH_EXYNOS4) || defined(CONFIG_SOC_EXYNOS5250)

static struct samsung_gpio_cfg exynos_gpio_cfg = {

	.set_pull	= exynos_gpio_setpull,

	.get_pull	= exynos_gpio_getpull,
@@ -2446,7 +2445,7 @@ static struct samsung_gpio_chip exynos4_gpios_3[] = { 
};

#endif



#ifdef CONFIG_ARCH_EXYNOS5

#ifdef CONFIG_SOC_EXYNOS5250

static struct samsung_gpio_chip exynos5_gpios_1[] = {

	{

		.chip	= {
@@ -2614,7 +2613,7 @@ static struct samsung_gpio_chip exynos5_gpios_1[] = { 
};

#endif



#ifdef CONFIG_ARCH_EXYNOS5

#ifdef CONFIG_SOC_EXYNOS5250

static struct samsung_gpio_chip exynos5_gpios_2[] = {

	{

		.chip	= {
@@ -2675,7 +2674,7 @@ static struct samsung_gpio_chip exynos5_gpios_2[] = { 
};

#endif



#ifdef CONFIG_ARCH_EXYNOS5

#ifdef CONFIG_SOC_EXYNOS5250

static struct samsung_gpio_chip exynos5_gpios_3[] = {

	{

		.chip	= {
@@ -2711,7 +2710,7 @@ static struct samsung_gpio_chip exynos5_gpios_3[] = { 
};

#endif



#ifdef CONFIG_ARCH_EXYNOS5

#ifdef CONFIG_SOC_EXYNOS5250

static struct samsung_gpio_chip exynos5_gpios_4[] = {

	{

		.chip	= {
@@ -3010,7 +3009,7 @@ static __init int samsung_gpiolib_init(void) 
	int i, nr_chips;

	int group = 0;



#ifdef CONFIG_PINCTRL_SAMSUNG

#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440)

	/*

	* This gpio driver includes support for device tree support and there

	* are platforms using it. In order to maintain compatibility with those
@@ -3026,6 +3025,7 @@ static __init int samsung_gpiolib_init(void) 
	static const struct of_device_id exynos_pinctrl_ids[] = {

		{ .compatible = "samsung,pinctrl-exynos4210", },

		{ .compatible = "samsung,pinctrl-exynos4x12", },

		{ .compatible = "samsung,pinctrl-exynos5440", },

	};

	for_each_matching_node(pctrl_np, exynos_pinctrl_ids)

		if (pctrl_np && of_device_is_available(pctrl_np))