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

Commit 8838becd authored by Gabor Juhos's avatar Gabor Juhos Committed by John Crispin
Browse files

MIPS: ath79: fix GPIO function selection for AR934x SoCs 



GPIO function selection is not working on the AR934x
SoCs because the offset of the function selection
register is different on those.

Add a helper routine which returns the correct
register address based on the SoC type, and use
that in the 'ath79_gpio_function_*' routines.

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/4870/


Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
parent 778eeb1b

arch/mips/ath79/gpio.c

+26 −12
Original line number Diff line number Diff line
@@ -137,47 +137,61 @@ static struct gpio_chip ath79_gpio_chip = { 
	.base			= 0,

};



static void __iomem *ath79_gpio_get_function_reg(void)

{

	u32 reg = 0;



	if (soc_is_ar71xx() ||

	    soc_is_ar724x() ||

	    soc_is_ar913x() ||

	    soc_is_ar933x())

		reg = AR71XX_GPIO_REG_FUNC;

	else if (soc_is_ar934x())

		reg = AR934X_GPIO_REG_FUNC;

	else

		BUG();



	return ath79_gpio_base + reg;

}



void ath79_gpio_function_enable(u32 mask)

{

	void __iomem *base = ath79_gpio_base;

	void __iomem *reg = ath79_gpio_get_function_reg();

	unsigned long flags;



	spin_lock_irqsave(&ath79_gpio_lock, flags);



	__raw_writel(__raw_readl(base + AR71XX_GPIO_REG_FUNC) | mask,

		     base + AR71XX_GPIO_REG_FUNC);

	__raw_writel(__raw_readl(reg) | mask, reg);

	/* flush write */

	__raw_readl(base + AR71XX_GPIO_REG_FUNC);

	__raw_readl(reg);



	spin_unlock_irqrestore(&ath79_gpio_lock, flags);

}



void ath79_gpio_function_disable(u32 mask)

{

	void __iomem *base = ath79_gpio_base;

	void __iomem *reg = ath79_gpio_get_function_reg();

	unsigned long flags;



	spin_lock_irqsave(&ath79_gpio_lock, flags);



	__raw_writel(__raw_readl(base + AR71XX_GPIO_REG_FUNC) & ~mask,

		     base + AR71XX_GPIO_REG_FUNC);

	__raw_writel(__raw_readl(reg) & ~mask, reg);

	/* flush write */

	__raw_readl(base + AR71XX_GPIO_REG_FUNC);

	__raw_readl(reg);



	spin_unlock_irqrestore(&ath79_gpio_lock, flags);

}



void ath79_gpio_function_setup(u32 set, u32 clear)

{

	void __iomem *base = ath79_gpio_base;

	void __iomem *reg = ath79_gpio_get_function_reg();

	unsigned long flags;



	spin_lock_irqsave(&ath79_gpio_lock, flags);



	__raw_writel((__raw_readl(base + AR71XX_GPIO_REG_FUNC) & ~clear) | set,

		     base + AR71XX_GPIO_REG_FUNC);

	__raw_writel((__raw_readl(reg) & ~clear) | set, reg);

	/* flush write */

	__raw_readl(base + AR71XX_GPIO_REG_FUNC);

	__raw_readl(reg);



	spin_unlock_irqrestore(&ath79_gpio_lock, flags);

}

arch/mips/include/asm/mach-ath79/ar71xx_regs.h

+2 −0
Original line number Diff line number Diff line
@@ -401,6 +401,8 @@ 
#define AR71XX_GPIO_REG_INT_ENABLE	0x24

#define AR71XX_GPIO_REG_FUNC		0x28



#define AR934X_GPIO_REG_FUNC		0x6c



#define AR71XX_GPIO_COUNT		16

#define AR7240_GPIO_COUNT		18

#define AR7241_GPIO_COUNT		20