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

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
...@@ -100,7 +100,7 @@ void __init ixp4xx_map_io(void) ...@@ -100,7 +100,7 @@ void __init ixp4xx_map_io(void)
#define IXP4XX_GPIO_CLK_0 14 #define IXP4XX_GPIO_CLK_0 14
#define IXP4XX_GPIO_CLK_1 15 #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) if (direction == IXP4XX_GPIO_IN)
*IXP4XX_GPIO_GPOER |= (1 << line); *IXP4XX_GPIO_GPOER |= (1 << line);
...@@ -108,12 +108,12 @@ void gpio_line_config(u8 line, u32 direction) ...@@ -108,12 +108,12 @@ void gpio_line_config(u8 line, u32 direction)
*IXP4XX_GPIO_GPOER &= ~(1 << line); *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; *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) if (value == IXP4XX_GPIO_HIGH)
*IXP4XX_GPIO_GPOUTR |= (1 << line); *IXP4XX_GPIO_GPOUTR |= (1 << line);
......
...@@ -17,13 +17,6 @@ ...@@ -17,13 +17,6 @@
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <asm/system_info.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_ETHA 0x0B /* IDSEL = AD21 */
#define SLOT_ETHB 0x0C /* IDSEL = AD20 */ #define SLOT_ETHB 0x0C /* IDSEL = AD20 */
#define SLOT_MPCI 0x0D /* IDSEL = AD19 */ #define SLOT_MPCI 0x0D /* IDSEL = AD19 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment