Ver código fonte

Revert "ARM: ixp4xx: fix gpio rework"

This reverts commit 48ba81f6fdb7580a5c474da1b14a338e1358e6ab.

A better fix was sent by Krzysztof Halasa.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann 11 anos atrás
pai
commit
9c9c6c55a8
2 arquivos alterados com 3 adições e 10 exclusões
  1. 3 3
      arch/arm/mach-ixp4xx/common.c
  2. 0 7
      arch/arm/mach-ixp4xx/goramo_mlr.c

+ 3 - 3
arch/arm/mach-ixp4xx/common.c

@@ -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);

+ 0 - 7
arch/arm/mach-ixp4xx/goramo_mlr.c

@@ -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 */