Commit f2ee7314 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Bartosz Golaszewski
Browse files

gpio: lpc32xx: allow building on non-lpc32xx targets 



The driver uses hardwire MMIO addresses instead of the data
that is passed in device tree. Change it over to only
hardcode the register offset values and allow compile-testing.

Acked-by: default avatarSylvain Lemieux <slemieux.tyco@gmail.com>
Tested-by: default avatarSylvain Lemieux <slemieux.tyco@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
parent f4160faa

arch/arm/configs/lpc32xx_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ CONFIG_SERIAL_HS_LPC32XX_CONSOLE=y 
# CONFIG_HW_RANDOM is not set

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_PNX=y

CONFIG_GPIO_LPC32XX=y

CONFIG_SPI=y

CONFIG_SPI_PL022=y

CONFIG_GPIO_SYSFS=y

drivers/gpio/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -311,6 +311,13 @@ config GPIO_LPC18XX 
	  Select this option to enable GPIO driver for

	  NXP LPC18XX/43XX devices.



config GPIO_LPC32XX

	tristate "NXP LPC32XX GPIO support"

	depends on OF_GPIO && (ARCH_LPC32XX || COMPILE_TEST)

	help

	  Select this option to enable GPIO driver for

	  NXP LPC32XX devices.



config GPIO_LYNXPOINT

	tristate "Intel Lynxpoint GPIO support"

	depends on ACPI && X86

drivers/gpio/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ obj-$(CONFIG_GPIO_LP3943) += gpio-lp3943.o 
obj-$(CONFIG_GPIO_LP873X)		+= gpio-lp873x.o

obj-$(CONFIG_GPIO_LP87565)		+= gpio-lp87565.o

obj-$(CONFIG_GPIO_LPC18XX)		+= gpio-lpc18xx.o

obj-$(CONFIG_ARCH_LPC32XX)		+= gpio-lpc32xx.o

obj-$(CONFIG_GPIO_LPC32XX)		+= gpio-lpc32xx.o

obj-$(CONFIG_GPIO_LYNXPOINT)		+= gpio-lynxpoint.o

obj-$(CONFIG_GPIO_MADERA)		+= gpio-madera.o

obj-$(CONFIG_GPIO_MAX3191X)		+= gpio-max3191x.o

drivers/gpio/gpio-lpc32xx.c

+68 −50
Original line number Diff line number Diff line
@@ -16,36 +16,33 @@ 
#include <linux/platform_device.h>

#include <linux/module.h>



#include <mach/hardware.h>

#include <mach/platform.h>



#define LPC32XX_GPIO_P3_INP_STATE		_GPREG(0x000)

#define LPC32XX_GPIO_P3_OUTP_SET		_GPREG(0x004)

#define LPC32XX_GPIO_P3_OUTP_CLR		_GPREG(0x008)

#define LPC32XX_GPIO_P3_OUTP_STATE		_GPREG(0x00C)

#define LPC32XX_GPIO_P2_DIR_SET			_GPREG(0x010)

#define LPC32XX_GPIO_P2_DIR_CLR			_GPREG(0x014)

#define LPC32XX_GPIO_P2_DIR_STATE		_GPREG(0x018)

#define LPC32XX_GPIO_P2_INP_STATE		_GPREG(0x01C)

#define LPC32XX_GPIO_P2_OUTP_SET		_GPREG(0x020)

#define LPC32XX_GPIO_P2_OUTP_CLR		_GPREG(0x024)

#define LPC32XX_GPIO_P2_MUX_SET			_GPREG(0x028)

#define LPC32XX_GPIO_P2_MUX_CLR			_GPREG(0x02C)

#define LPC32XX_GPIO_P2_MUX_STATE		_GPREG(0x030)

#define LPC32XX_GPIO_P0_INP_STATE		_GPREG(0x040)

#define LPC32XX_GPIO_P0_OUTP_SET		_GPREG(0x044)

#define LPC32XX_GPIO_P0_OUTP_CLR		_GPREG(0x048)

#define LPC32XX_GPIO_P0_OUTP_STATE		_GPREG(0x04C)

#define LPC32XX_GPIO_P0_DIR_SET			_GPREG(0x050)

#define LPC32XX_GPIO_P0_DIR_CLR			_GPREG(0x054)

#define LPC32XX_GPIO_P0_DIR_STATE		_GPREG(0x058)

#define LPC32XX_GPIO_P1_INP_STATE		_GPREG(0x060)

#define LPC32XX_GPIO_P1_OUTP_SET		_GPREG(0x064)

#define LPC32XX_GPIO_P1_OUTP_CLR		_GPREG(0x068)

#define LPC32XX_GPIO_P1_OUTP_STATE		_GPREG(0x06C)

#define LPC32XX_GPIO_P1_DIR_SET			_GPREG(0x070)

#define LPC32XX_GPIO_P1_DIR_CLR			_GPREG(0x074)

#define LPC32XX_GPIO_P1_DIR_STATE		_GPREG(0x078)

#define LPC32XX_GPIO_P3_INP_STATE		(0x000)

#define LPC32XX_GPIO_P3_OUTP_SET		(0x004)

#define LPC32XX_GPIO_P3_OUTP_CLR		(0x008)

#define LPC32XX_GPIO_P3_OUTP_STATE		(0x00C)

#define LPC32XX_GPIO_P2_DIR_SET			(0x010)

#define LPC32XX_GPIO_P2_DIR_CLR			(0x014)

#define LPC32XX_GPIO_P2_DIR_STATE		(0x018)

#define LPC32XX_GPIO_P2_INP_STATE		(0x01C)

#define LPC32XX_GPIO_P2_OUTP_SET		(0x020)

#define LPC32XX_GPIO_P2_OUTP_CLR		(0x024)

#define LPC32XX_GPIO_P2_MUX_SET			(0x028)

#define LPC32XX_GPIO_P2_MUX_CLR			(0x02C)

#define LPC32XX_GPIO_P2_MUX_STATE		(0x030)

#define LPC32XX_GPIO_P0_INP_STATE		(0x040)

#define LPC32XX_GPIO_P0_OUTP_SET		(0x044)

#define LPC32XX_GPIO_P0_OUTP_CLR		(0x048)

#define LPC32XX_GPIO_P0_OUTP_STATE		(0x04C)

#define LPC32XX_GPIO_P0_DIR_SET			(0x050)

#define LPC32XX_GPIO_P0_DIR_CLR			(0x054)

#define LPC32XX_GPIO_P0_DIR_STATE		(0x058)

#define LPC32XX_GPIO_P1_INP_STATE		(0x060)

#define LPC32XX_GPIO_P1_OUTP_SET		(0x064)

#define LPC32XX_GPIO_P1_OUTP_CLR		(0x068)

#define LPC32XX_GPIO_P1_OUTP_STATE		(0x06C)

#define LPC32XX_GPIO_P1_DIR_SET			(0x070)

#define LPC32XX_GPIO_P1_DIR_CLR			(0x074)

#define LPC32XX_GPIO_P1_DIR_STATE		(0x078)



#define GPIO012_PIN_TO_BIT(x)			(1 << (x))

#define GPIO3_PIN_TO_BIT(x)			(1 << ((x) + 25))
@@ -72,12 +69,12 @@ 
#define LPC32XX_GPO_P3_GRP	(LPC32XX_GPI_P3_GRP + LPC32XX_GPI_P3_MAX)



struct gpio_regs {

	void __iomem *inp_state;

	void __iomem *outp_state;

	void __iomem *outp_set;

	void __iomem *outp_clr;

	void __iomem *dir_set;

	void __iomem *dir_clr;

	unsigned long inp_state;

	unsigned long outp_state;

	unsigned long outp_set;

	unsigned long outp_clr;

	unsigned long dir_set;

	unsigned long dir_clr;

};



/*
@@ -165,16 +162,27 @@ static struct gpio_regs gpio_grp_regs_p3 = { 
struct lpc32xx_gpio_chip {

	struct gpio_chip	chip;

	struct gpio_regs	*gpio_grp;

	void __iomem		*reg_base;

};



static inline u32 gpreg_read(struct lpc32xx_gpio_chip *group, unsigned long offset)

{

	return __raw_readl(group->reg_base + offset);

}



static inline void gpreg_write(struct lpc32xx_gpio_chip *group, u32 val, unsigned long offset)

{

	__raw_writel(val, group->reg_base + offset);

}



static void __set_gpio_dir_p012(struct lpc32xx_gpio_chip *group,

	unsigned pin, int input)

{

	if (input)

		__raw_writel(GPIO012_PIN_TO_BIT(pin),

		gpreg_write(group, GPIO012_PIN_TO_BIT(pin),

			group->gpio_grp->dir_clr);

	else

		__raw_writel(GPIO012_PIN_TO_BIT(pin),

		gpreg_write(group, GPIO012_PIN_TO_BIT(pin),

			group->gpio_grp->dir_set);

}
@@ -184,19 +192,19 @@ static void __set_gpio_dir_p3(struct lpc32xx_gpio_chip *group, 
	u32 u = GPIO3_PIN_TO_BIT(pin);



	if (input)

		__raw_writel(u, group->gpio_grp->dir_clr);

		gpreg_write(group, u, group->gpio_grp->dir_clr);

	else

		__raw_writel(u, group->gpio_grp->dir_set);

		gpreg_write(group, u, group->gpio_grp->dir_set);

}



static void __set_gpio_level_p012(struct lpc32xx_gpio_chip *group,

	unsigned pin, int high)

{

	if (high)

		__raw_writel(GPIO012_PIN_TO_BIT(pin),

		gpreg_write(group, GPIO012_PIN_TO_BIT(pin),

			group->gpio_grp->outp_set);

	else

		__raw_writel(GPIO012_PIN_TO_BIT(pin),

		gpreg_write(group, GPIO012_PIN_TO_BIT(pin),

			group->gpio_grp->outp_clr);

}
@@ -206,31 +214,31 @@ static void __set_gpio_level_p3(struct lpc32xx_gpio_chip *group, 
	u32 u = GPIO3_PIN_TO_BIT(pin);



	if (high)

		__raw_writel(u, group->gpio_grp->outp_set);

		gpreg_write(group, u, group->gpio_grp->outp_set);

	else

		__raw_writel(u, group->gpio_grp->outp_clr);

		gpreg_write(group, u, group->gpio_grp->outp_clr);

}



static void __set_gpo_level_p3(struct lpc32xx_gpio_chip *group,

	unsigned pin, int high)

{

	if (high)

		__raw_writel(GPO3_PIN_TO_BIT(pin), group->gpio_grp->outp_set);

		gpreg_write(group, GPO3_PIN_TO_BIT(pin), group->gpio_grp->outp_set);

	else

		__raw_writel(GPO3_PIN_TO_BIT(pin), group->gpio_grp->outp_clr);

		gpreg_write(group, GPO3_PIN_TO_BIT(pin), group->gpio_grp->outp_clr);

}



static int __get_gpio_state_p012(struct lpc32xx_gpio_chip *group,

	unsigned pin)

{

	return GPIO012_PIN_IN_SEL(__raw_readl(group->gpio_grp->inp_state),

	return GPIO012_PIN_IN_SEL(gpreg_read(group, group->gpio_grp->inp_state),

		pin);

}



static int __get_gpio_state_p3(struct lpc32xx_gpio_chip *group,

	unsigned pin)

{

	int state = __raw_readl(group->gpio_grp->inp_state);

	int state = gpreg_read(group, group->gpio_grp->inp_state);



	/*

	 * P3 GPIO pin input mapping is not contiguous, GPIOP3-0..4 is mapped
@@ -242,13 +250,13 @@ static int __get_gpio_state_p3(struct lpc32xx_gpio_chip *group, 
static int __get_gpi_state_p3(struct lpc32xx_gpio_chip *group,

	unsigned pin)

{

	return GPI3_PIN_IN_SEL(__raw_readl(group->gpio_grp->inp_state), pin);

	return GPI3_PIN_IN_SEL(gpreg_read(group, group->gpio_grp->inp_state), pin);

}



static int __get_gpo_state_p3(struct lpc32xx_gpio_chip *group,

	unsigned pin)

{

	return GPO3_PIN_IN_SEL(__raw_readl(group->gpio_grp->outp_state), pin);

	return GPO3_PIN_IN_SEL(gpreg_read(group, group->gpio_grp->outp_state), pin);

}



/*
@@ -497,12 +505,18 @@ static int lpc32xx_of_xlate(struct gpio_chip *gc, 
static int lpc32xx_gpio_probe(struct platform_device *pdev)

{

	int i;

	void __iomem *reg_base;



	reg_base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(reg_base))

		return PTR_ERR(reg_base);



	for (i = 0; i < ARRAY_SIZE(lpc32xx_gpiochip); i++) {

		if (pdev->dev.of_node) {

			lpc32xx_gpiochip[i].chip.of_xlate = lpc32xx_of_xlate;

			lpc32xx_gpiochip[i].chip.of_gpio_n_cells = 3;

			lpc32xx_gpiochip[i].chip.of_node = pdev->dev.of_node;

			lpc32xx_gpiochip[i].reg_base = reg_base;

		}

		devm_gpiochip_add_data(&pdev->dev, &lpc32xx_gpiochip[i].chip,

				  &lpc32xx_gpiochip[i]);
@@ -527,3 +541,7 @@ static struct platform_driver lpc32xx_gpio_driver = { 
};



module_platform_driver(lpc32xx_gpio_driver);



MODULE_AUTHOR("Kevin Wells <kevin.wells@nxp.com>");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("GPIO driver for LPC32xx SoC");