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

Commit 9c9c6c55 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Revert "ARM: ixp4xx: fix gpio rework" 



This reverts commit 48ba81f6.

A better fix was sent by Krzysztof Halasa.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 600a1dfa

arch/arm/mach-ixp4xx/common.c

+3 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ void __init ixp4xx_map_io(void) 
#define IXP4XX_GPIO_CLK_0		14

#define IXP4XX_GPIO_CLK_1		15



void gpio_line_config(u8 line, u32 direction)

static void gpio_line_config(u8 line, u32 direction)

{

	if (direction == IXP4XX_GPIO_IN)

		*IXP4XX_GPIO_GPOER |= (1 << line);
@@ -108,12 +108,12 @@ void gpio_line_config(u8 line, u32 direction) 
		*IXP4XX_GPIO_GPOER &= ~(1 << line);

}



void gpio_line_get(u8 line, int *value)

static void gpio_line_get(u8 line, int *value)

{

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

}



void gpio_line_set(u8 line, int value)

static void gpio_line_set(u8 line, int value)

{

	if (value == IXP4XX_GPIO_HIGH)

	    *IXP4XX_GPIO_GPOUTR |= (1 << line);

arch/arm/mach-ixp4xx/goramo_mlr.c

+0 −7
Original line number Diff line number Diff line
@@ -17,13 +17,6 @@ 
#include <asm/mach/pci.h>

#include <asm/system_info.h>



#define IXP4XX_GPIO_OUT 		0x1

#define IXP4XX_GPIO_IN  		0x2



void gpio_line_config(u8 line, u32 direction);

void gpio_line_get(u8 line, int *value);

void gpio_line_set(u8 line, int value);



#define SLOT_ETHA		0x0B	/* IDSEL = AD21 */

#define SLOT_ETHB		0x0C	/* IDSEL = AD20 */

#define SLOT_MPCI		0x0D	/* IDSEL = AD19 */