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

Commit 0fa2fd9a authored by Grant Likely's avatar Grant Likely
Browse files

Merge branch 'linusw/devel' of... 

Merge branch 'linusw/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git

 into gpio/next

Device driver features, cleanups and bug fixes.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parents 46ebfbc3 476171ce

arch/arm/mach-pxa/tosa.c

+0 −6
Original line number Diff line number Diff line
@@ -927,8 +927,6 @@ static void tosa_restart(char mode, const char *cmd) 


static void __init tosa_init(void)

{

	int dummy;



	pxa2xx_mfp_config(ARRAY_AND_SIZE(tosa_pin_config));



	pxa_set_ffuart_info(NULL);
@@ -947,10 +945,6 @@ static void __init tosa_init(void) 
	/* enable batt_fault */

	PMCR = 0x01;



	dummy = gpiochip_reserve(TOSA_SCOOP_GPIO_BASE, 12);

	dummy = gpiochip_reserve(TOSA_SCOOP_JC_GPIO_BASE, 12);

	dummy = gpiochip_reserve(TOSA_TC6393XB_GPIO_BASE, 16);



	pxa_set_mci_info(&tosa_mci_platform_data);

	pxa_set_ficp_info(&tosa_ficp_platform_data);

	pxa_set_i2c_info(NULL);

drivers/gpio/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ config ARCH_REQUIRE_GPIOLIB 
	  Selecting this from the architecture code will cause the gpiolib

	  code to always get built in.



config GPIO_DEVRES

	def_bool y

	depends on HAS_IOMEM





menuconfig GPIOLIB

drivers/gpio/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 


ccflags-$(CONFIG_DEBUG_GPIO)	+= -DDEBUG



obj-$(CONFIG_GPIOLIB)		+= gpiolib.o devres.o

obj-$(CONFIG_GPIO_DEVRES)	+= devres.o

obj-$(CONFIG_GPIOLIB)		+= gpiolib.o

obj-$(CONFIG_OF_GPIO)		+= gpiolib-of.o

obj-$(CONFIG_GPIO_ACPI)		+= gpiolib-acpi.o

drivers/gpio/gpio-mpc8xxx.c

+0 −1
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ static int mpc8xxx_gpio_irq_map(struct irq_domain *h, unsigned int virq, 


	irq_set_chip_data(virq, h->host_data);

	irq_set_chip_and_handler(virq, &mpc8xxx_irq_chip, handle_level_irq);

	irq_set_irq_type(virq, IRQ_TYPE_NONE);



	return 0;

}

drivers/gpio/gpio-mxs.c

+31 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ struct mxs_gpio_port { 
	struct irq_domain *domain;

	struct bgpio_chip bgc;

	enum mxs_gpio_id devid;

	u32 both_edges;

};



static inline int is_imx23_gpio(struct mxs_gpio_port *port)
@@ -81,13 +82,23 @@ static inline int is_imx28_gpio(struct mxs_gpio_port *port) 


static int mxs_gpio_set_irq_type(struct irq_data *d, unsigned int type)

{

	u32 val;

	u32 pin_mask = 1 << d->hwirq;

	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);

	struct mxs_gpio_port *port = gc->private;

	void __iomem *pin_addr;

	int edge;



	port->both_edges &= ~pin_mask;

	switch (type) {

	case IRQ_TYPE_EDGE_BOTH:

		val = gpio_get_value(port->bgc.gc.base + d->hwirq);

		if (val)

			edge = GPIO_INT_FALL_EDGE;

		else

			edge = GPIO_INT_RISE_EDGE;

		port->both_edges |= pin_mask;

		break;

	case IRQ_TYPE_EDGE_RISING:

		edge = GPIO_INT_RISE_EDGE;

		break;
@@ -124,6 +135,23 @@ static int mxs_gpio_set_irq_type(struct irq_data *d, unsigned int type) 
	return 0;

}



static void mxs_flip_edge(struct mxs_gpio_port *port, u32 gpio)

{

	u32 bit, val, edge;

	void __iomem *pin_addr;



	bit = 1 << gpio;



	pin_addr = port->base + PINCTRL_IRQPOL(port);

	val = readl(pin_addr);

	edge = val & bit;



	if (edge)

		writel(bit, pin_addr + MXS_CLR);

	else

		writel(bit, pin_addr + MXS_SET);

}



/* MXS has one interrupt *per* gpio port */

static void mxs_gpio_irq_handler(u32 irq, struct irq_desc *desc)

{
@@ -137,6 +165,9 @@ static void mxs_gpio_irq_handler(u32 irq, struct irq_desc *desc) 


	while (irq_stat != 0) {

		int irqoffset = fls(irq_stat) - 1;

		if (port->both_edges & (1 << irqoffset))

			mxs_flip_edge(port, irqoffset);



		generic_handle_irq(irq_find_mapping(port->domain, irqoffset));

		irq_stat &= ~(1 << irqoffset);

	}