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

Commit 26cc6660 authored by Gregory Bean's avatar Gregory Bean Committed by Daniel Walker
Browse files

msm: gpio: Add gpiomux calls to request and free. 



Add gpiomux get and put calls to msmgpio request and free,
in order to allow gpio lines to be properly reference-counted
and power-managed.

Signed-off-by: default avatarGregory Bean <gbean@codeaurora.org>
Signed-off-by: default avatarDaniel Walker <dwalker@codeaurora.org>
parent 2783cc26

arch/arm/mach-msm/gpio.c

+18 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/irq.h>

#include <linux/module.h>

#include "gpio_hw.h"

#include "gpiomux.h"



#define FIRST_GPIO_IRQ MSM_GPIO_TO_INT(0)
@@ -44,6 +45,8 @@ 
			.direction_input = msm_gpio_direction_input,	\

			.direction_output = msm_gpio_direction_output,	\

			.to_irq = msm_gpio_to_irq,			\

			.request = msm_gpio_request,			\

			.free = msm_gpio_free,				\

		}							\

	}
@@ -171,6 +174,21 @@ static int msm_gpio_to_irq(struct gpio_chip *chip, unsigned offset) 
	return MSM_GPIO_TO_INT(chip->base + offset);

}



#ifdef CONFIG_MSM_GPIOMUX

static int msm_gpio_request(struct gpio_chip *chip, unsigned offset)

{

	return msm_gpiomux_get(chip->base + offset);

}



static void msm_gpio_free(struct gpio_chip *chip, unsigned offset)

{

	msm_gpiomux_put(chip->base + offset);

}

#else

#define msm_gpio_request NULL

#define msm_gpio_free NULL

#endif



struct msm_gpio_chip msm_gpio_chips[] = {

#if defined(CONFIG_ARCH_MSM7X00A)

	MSM_GPIO_BANK(0,   0,  15),