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

Commit bc6f5cf6 authored by Rickard Andersson's avatar Rickard Andersson Committed by Grant Likely
Browse files

gpio/nomadik: add function to read GPIO pull down status 



Signed-off-by: default avatarRickard Andersson <rickard.andersson@stericsson.com>
Reviewed-by: default avatarMartin Persson <martin.persson@stericsson.com>
[Split off from larger patch]
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 8ea72a30

arch/arm/plat-nomadik/include/plat/gpio.h

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ extern int nmk_gpio_get_mode(int gpio); 
extern void nmk_gpio_wakeups_suspend(void);

extern void nmk_gpio_wakeups_resume(void);



extern void nmk_gpio_read_pull(int gpio_bank, u32 *pull_up);



/*

 * Platform data to register a block: only the initial gpio/irq number.

 */

drivers/gpio/gpio-nomadik.c

+30 −4
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ struct nmk_gpio_chip { 
	u32 fwimsc;

	u32 slpm;

	u32 enabled;

	u32 pull_up;

};



static struct nmk_gpio_chip *
@@ -103,17 +104,23 @@ static void __nmk_gpio_set_pull(struct nmk_gpio_chip *nmk_chip, 
	u32 pdis;



	pdis = readl(nmk_chip->addr + NMK_GPIO_PDIS);

	if (pull == NMK_GPIO_PULL_NONE)

	if (pull == NMK_GPIO_PULL_NONE) {

		pdis |= bit;

	else

		nmk_chip->pull_up &= ~bit;

	} else {

		pdis &= ~bit;

	}



	writel(pdis, nmk_chip->addr + NMK_GPIO_PDIS);



	if (pull == NMK_GPIO_PULL_UP)

	if (pull == NMK_GPIO_PULL_UP) {

		nmk_chip->pull_up |= bit;

		writel(bit, nmk_chip->addr + NMK_GPIO_DATS);

	else if (pull == NMK_GPIO_PULL_DOWN)

	} else if (pull == NMK_GPIO_PULL_DOWN) {

		nmk_chip->pull_up &= ~bit;

		writel(bit, nmk_chip->addr + NMK_GPIO_DATC);

	}

}



static void __nmk_gpio_make_input(struct nmk_gpio_chip *nmk_chip,

				  unsigned offset)
@@ -921,6 +928,25 @@ void nmk_gpio_wakeups_resume(void) 
	}

}



/*

 * Read the pull up/pull down status.

 * A bit set in 'pull_up' means that pull up

 * is selected if pull is enabled in PDIS register.

 * Note: only pull up/down set via this driver can

 * be detected due to HW limitations.

 */

void nmk_gpio_read_pull(int gpio_bank, u32 *pull_up)

{

	if (gpio_bank < NUM_BANKS) {

		struct nmk_gpio_chip *chip = nmk_gpio_chips[gpio_bank];



		if (!chip)

			return;



		*pull_up = chip->pull_up;

	}

}



static int __devinit nmk_gpio_probe(struct platform_device *dev)

{

	struct nmk_gpio_platform_data *pdata = dev->dev.platform_data;