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

Commit 098e30f6 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: ixp4xx: stop broadcasting the custom GPIO API 



Now that these custom GPIO accessors are only used from the
gpio chip in this machine, move the code out of the include
file and right next to the gpiochip implementation.

Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: default avatarKrzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 81ded3c1

arch/arm/mach-ixp4xx/common.c

+38 −0
Original line number Diff line number Diff line
@@ -81,6 +81,44 @@ void __init ixp4xx_map_io(void) 
  	iotable_init(ixp4xx_io_desc, ARRAY_SIZE(ixp4xx_io_desc));

}



/*

 * GPIO-functions

 */

/*

 * The following converted to the real HW bits the gpio_line_config

 */

/* GPIO pin types */

#define IXP4XX_GPIO_OUT 		0x1

#define IXP4XX_GPIO_IN  		0x2



/* GPIO signal types */

#define IXP4XX_GPIO_LOW			0

#define IXP4XX_GPIO_HIGH		1



/* GPIO Clocks */

#define IXP4XX_GPIO_CLK_0		14

#define IXP4XX_GPIO_CLK_1		15



static void gpio_line_config(u8 line, u32 direction)

{

	if (direction == IXP4XX_GPIO_IN)

		*IXP4XX_GPIO_GPOER |= (1 << line);

	else

		*IXP4XX_GPIO_GPOER &= ~(1 << line);

}



static void gpio_line_get(u8 line, int *value)

{

	*value = (*IXP4XX_GPIO_GPINR >> line) & 0x1;

}



static void gpio_line_set(u8 line, int value)

{

	if (value == IXP4XX_GPIO_HIGH)

	    *IXP4XX_GPIO_GPOUTR |= (1 << line);

	else if (value == IXP4XX_GPIO_LOW)

	    *IXP4XX_GPIO_GPOUTR &= ~(1 << line);

}



/*************************************************************************

 * IXP4xx chipset IRQ handling

arch/arm/mach-ixp4xx/include/mach/platform.h

+0 −39
Original line number Diff line number Diff line
@@ -131,44 +131,5 @@ struct pci_sys_data; 
extern int ixp4xx_setup(int nr, struct pci_sys_data *sys);

extern struct pci_ops ixp4xx_ops;



/*

 * GPIO-functions

 */

/*

 * The following converted to the real HW bits the gpio_line_config

 */

/* GPIO pin types */

#define IXP4XX_GPIO_OUT 		0x1

#define IXP4XX_GPIO_IN  		0x2



/* GPIO signal types */

#define IXP4XX_GPIO_LOW			0

#define IXP4XX_GPIO_HIGH		1



/* GPIO Clocks */

#define IXP4XX_GPIO_CLK_0		14

#define IXP4XX_GPIO_CLK_1		15



static inline void gpio_line_config(u8 line, u32 direction)

{

	if (direction == IXP4XX_GPIO_IN)

		*IXP4XX_GPIO_GPOER |= (1 << line);

	else

		*IXP4XX_GPIO_GPOER &= ~(1 << line);

}



static inline void gpio_line_get(u8 line, int *value)

{

	*value = (*IXP4XX_GPIO_GPINR >> line) & 0x1;

}



static inline void gpio_line_set(u8 line, int value)

{

	if (value == IXP4XX_GPIO_HIGH)

	    *IXP4XX_GPIO_GPOUTR |= (1 << line);

	else if (value == IXP4XX_GPIO_LOW)

	    *IXP4XX_GPIO_GPOUTR &= ~(1 << line);

}



#endif // __ASSEMBLY__