From b835cbc80ee739f7c47eae1ca96487bc126aad46 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 20 May 2007 19:46:50 +0000
Subject: Use the generic GPIO api for bcm947xx and ar7 (for now), thanks to
 Gabor Juhos

SVN-Revision: 7285
---
 target/linux/brcm47xx-2.6/config/default           |  1 +
 .../brcm47xx-2.6/files/include/asm-generic/gpio.h  | 25 ----------------------
 .../brcm47xx-2.6/patches/100-board_support.patch   |  3 ++-
 3 files changed, 3 insertions(+), 26 deletions(-)

(limited to 'target/linux/brcm47xx-2.6')

diff --git a/target/linux/brcm47xx-2.6/config/default b/target/linux/brcm47xx-2.6/config/default
index a92a0aa448..353c9d8f77 100644
--- a/target/linux/brcm47xx-2.6/config/default
+++ b/target/linux/brcm47xx-2.6/config/default
@@ -254,6 +254,7 @@ CONFIG_SSB_PCICORE_HOSTMODE=y
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_SERIAL=y
 # CONFIG_SSB_SILENT is not set
+CONFIG_GENERIC_GPIO=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
diff --git a/target/linux/brcm47xx-2.6/files/include/asm-generic/gpio.h b/target/linux/brcm47xx-2.6/files/include/asm-generic/gpio.h
index 2d0aab1d86..e69de29bb2 100644
--- a/target/linux/brcm47xx-2.6/files/include/asm-generic/gpio.h
+++ b/target/linux/brcm47xx-2.6/files/include/asm-generic/gpio.h
@@ -1,25 +0,0 @@
-#ifndef _ASM_GENERIC_GPIO_H
-#define _ASM_GENERIC_GPIO_H
-
-/* platforms that don't directly support access to GPIOs through I2C, SPI,
- * or other blocking infrastructure can use these wrappers.
- */
-
-static inline int gpio_cansleep(unsigned gpio)
-{
-	return 0;
-}
-
-static inline int gpio_get_value_cansleep(unsigned gpio)
-{
-	might_sleep();
-	return gpio_get_value(gpio);
-}
-
-static inline void gpio_set_value_cansleep(unsigned gpio, int value)
-{
-	might_sleep();
-	gpio_set_value(gpio, value);
-}
-
-#endif /* _ASM_GENERIC_GPIO_H */
diff --git a/target/linux/brcm47xx-2.6/patches/100-board_support.patch b/target/linux/brcm47xx-2.6/patches/100-board_support.patch
index 963b05dba0..4d06dcdafe 100644
--- a/target/linux/brcm47xx-2.6/patches/100-board_support.patch
+++ b/target/linux/brcm47xx-2.6/patches/100-board_support.patch
@@ -12,7 +12,7 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
  mainmenu "Linux/MIPS Kernel Configuration"
  
  menu "Machine selection"
-@@ -222,6 +226,22 @@
+@@ -222,6 +226,23 @@
  	 Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
  	 Olivetti M700-10 workstations.
  
@@ -29,6 +29,7 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
 +	select SSB_DRIVER_PCICORE
 +	select SSB_PCICORE_HOSTMODE
 +	select CFE
++	select GENERIC_GPIO
 +	help
 +	 Support for BCM947xx based boards
 +
-- 
cgit v1.2.3