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

Commit 4aa7cf79 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/gpio-samsung' of... 

Merge branch 'next/gpio-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers

From Kukjin Kim:
This is for Samsung gpio stuff and got the ack from Linus Walleij.

* 'next/gpio-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  gpio: samsung: use pr_* instead of printk
  gpio: samsung: Fix input mode setting function for GPIO int
  ARM: SAMSUNG: Insert bitmap_gpio_int member in samsung_gpio_chip
parents a19e2337 343db4bd

arch/arm/plat-samsung/include/plat/gpio-core.h

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ struct samsung_gpio_cfg; 
 * @config: special function and pull-resistor control information.

 * @lock: Lock for exclusive access to this gpio bank.

 * @pm_save: Save information for suspend/resume support.

 * @bitmap_gpio_int: Bitmap for representing GPIO interrupt or not.

 *

 * This wrapper provides the necessary information for the Samsung

 * specific gpios being registered with gpiolib.
@@ -71,6 +72,7 @@ struct samsung_gpio_chip { 
#ifdef CONFIG_PM

	u32			pm_save[4];

#endif

	u32			bitmap_gpio_int;

};



static inline struct samsung_gpio_chip *to_samsung_gpio(struct gpio_chip *gpc)

arch/arm/plat-samsung/s5p-irq-gpioint.c

+6 −2
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ int __init s5p_register_gpio_interrupt(int pin) 


	/* check if the group has been already registered */

	if (my_chip->irq_base)

		return my_chip->irq_base + offset;

		goto success;



	/* register gpio group */

	ret = s5p_gpioint_add(my_chip);
@@ -193,9 +193,13 @@ int __init s5p_register_gpio_interrupt(int pin) 
		my_chip->chip.to_irq = samsung_gpiolib_to_irq;

		printk(KERN_INFO "Registered interrupt support for gpio group %d.\n",

		       group);

		return my_chip->irq_base + offset;

		goto success;

	}

	return ret;

success:

	my_chip->bitmap_gpio_int |= BIT(offset);



	return my_chip->irq_base + offset;

}



int __init s5p_register_gpioint_bank(int chain_irq, int start, int nr_groups)

drivers/gpio/gpio-samsung.c

+12 −13
Original line number Diff line number Diff line
@@ -42,12 +42,6 @@ 
#include <plat/gpio-fns.h>

#include <plat/pm.h>



#ifndef DEBUG_GPIO

#define gpio_dbg(x...) do { } while (0)

#else

#define gpio_dbg(x...) printk(KERN_DEBUG x)

#endif



int samsung_gpio_setpull_updown(struct samsung_gpio_chip *chip,

				unsigned int off, samsung_gpio_pull_t pull)

{
@@ -596,10 +590,13 @@ static int samsung_gpiolib_4bit_input(struct gpio_chip *chip, 
	unsigned long con;



	con = __raw_readl(base + GPIOCON_OFF);

	if (ourchip->bitmap_gpio_int & BIT(offset))

		con |= 0xf << con_4bit_shift(offset);

	else

		con &= ~(0xf << con_4bit_shift(offset));

	__raw_writel(con, base + GPIOCON_OFF);



	gpio_dbg("%s: %p: CON now %08lx\n", __func__, base, con);

	pr_debug("%s: %p: CON now %08lx\n", __func__, base, con);



	return 0;

}
@@ -627,7 +624,7 @@ static int samsung_gpiolib_4bit_output(struct gpio_chip *chip, 
	__raw_writel(con, base + GPIOCON_OFF);

	__raw_writel(dat, base + GPIODAT_OFF);



	gpio_dbg("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);

	pr_debug("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);



	return 0;

}
@@ -671,7 +668,7 @@ static int samsung_gpiolib_4bit2_input(struct gpio_chip *chip, 
	con &= ~(0xf << con_4bit_shift(offset));

	__raw_writel(con, regcon);



	gpio_dbg("%s: %p: CON %08lx\n", __func__, base, con);

	pr_debug("%s: %p: CON %08lx\n", __func__, base, con);



	return 0;

}
@@ -706,7 +703,7 @@ static int samsung_gpiolib_4bit2_output(struct gpio_chip *chip, 
	__raw_writel(con, regcon);

	__raw_writel(dat, base + GPIODAT_OFF);



	gpio_dbg("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);

	pr_debug("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);



	return 0;

}
@@ -926,10 +923,10 @@ static void __init samsung_gpiolib_add(struct samsung_gpio_chip *chip) 
#ifdef CONFIG_PM

	if (chip->pm != NULL) {

		if (!chip->pm->save || !chip->pm->resume)

			printk(KERN_ERR "gpio: %s has missing PM functions\n",

			pr_err("gpio: %s has missing PM functions\n",

			       gc->label);

	} else

		printk(KERN_ERR "gpio: %s has no PM function\n", gc->label);

		pr_err("gpio: %s has no PM function\n", gc->label);

#endif



	/* gpiochip_add() prints own failure message on error. */
@@ -1081,6 +1078,8 @@ static void __init samsung_gpiolib_add_4bit_chips(struct samsung_gpio_chip *chip 
		if ((base != NULL) && (chip->base == NULL))

			chip->base = base + ((i) * 0x20);



		chip->bitmap_gpio_int = 0;



		samsung_gpiolib_add(chip);

	}

}