target/linux/ixp4xx/patches-2.6.30/402-ixp4xx_gpiolib.patch

   1 --- a/arch/arm/mach-ixp4xx/common.c
   2 +++ b/arch/arm/mach-ixp4xx/common.c
   3 @@ -36,6 +36,7 @@
   4  #include <asm/pgtable.h>
   5  #include <asm/page.h>
   6  #include <asm/irq.h>
   7 +#include <asm/gpio.h>
   8
   9  #include <asm/mach/map.h>
  10  #include <asm/mach/irq.h>
  11 @@ -374,12 +375,39 @@ static struct platform_device *ixp46x_de
  12  unsigned long ixp4xx_exp_bus_size;
  13  EXPORT_SYMBOL(ixp4xx_exp_bus_size);
  14
  15 +static int ixp4xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
  16 +{
  17 +       gpio_line_config(gpio, IXP4XX_GPIO_IN);
  18 +       return 0;
  19 +}
  20 +EXPORT_SYMBOL(ixp4xx_gpio_direction_input);
  21 +
  22 +static int ixp4xx_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, int level)
  23 +{
  24 +       gpio_line_set(gpio, level);
  25 +       gpio_line_config(gpio, IXP4XX_GPIO_OUT);
  26 +       return 0;
  27 +}
  28 +EXPORT_SYMBOL(ixp4xx_gpio_direction_output);
  29 +
  30 +static struct gpio_chip ixp4xx_gpio_chip = {
  31 +       .label                  = "IXP4XX_GPIO_CHIP",
  32 +       .direction_input        = ixp4xx_gpio_direction_input,
  33 +       .direction_output       = ixp4xx_gpio_direction_output,
  34 +       .get                    = gpio_get_value,
  35 +       .set                    = gpio_set_value,
  36 +       .base                   = 0,
  37 +       .ngpio                  = 16,
  38 +};
  39 +
  40  void __init ixp4xx_sys_init(void)
  41  {
  42         ixp4xx_exp_bus_size = SZ_16M;
  43
  44         platform_add_devices(ixp4xx_devices, ARRAY_SIZE(ixp4xx_devices));
  45
  46 +       gpiochip_add(&ixp4xx_gpio_chip);
  47 +
  48         if (cpu_is_ixp46x()) {
  49                 int region;
  50
  51 --- a/arch/arm/Kconfig
  52 +++ b/arch/arm/Kconfig
  53 @@ -374,6 +374,7 @@ config ARCH_IXP4XX
  54         select GENERIC_GPIO
  55         select GENERIC_TIME
  56         select GENERIC_CLOCKEVENTS
  57 +       select ARCH_REQUIRE_GPIOLIB
  58         help
  59           Support for Intel's IXP4XX (XScale) family of processors.
  60
  61 --- a/arch/arm/mach-ixp4xx/include/mach/gpio.h
  62 +++ b/arch/arm/mach-ixp4xx/include/mach/gpio.h
  63 @@ -27,47 +27,31 @@
  64
  65  #include <linux/kernel.h>
  66  #include <mach/hardware.h>
  67 +#include <asm-generic/gpio.h>                  /* cansleep wrappers */
  68
  69 -static inline int gpio_request(unsigned gpio, const char *label)
  70 -{
  71 -       return 0;
  72 -}
  73 -
  74 -static inline void gpio_free(unsigned gpio)
  75 -{
  76 -       might_sleep();
  77 -
  78 -       return;
  79 -}
  80 -
  81 -static inline int gpio_direction_input(unsigned gpio)
  82 -{
  83 -       gpio_line_config(gpio, IXP4XX_GPIO_IN);
  84 -       return 0;
  85 -}
  86 -
  87 -static inline int gpio_direction_output(unsigned gpio, int level)
  88 -{
  89 -       gpio_line_set(gpio, level);
  90 -       gpio_line_config(gpio, IXP4XX_GPIO_OUT);
  91 -       return 0;
  92 -}
  93 +#define NR_BUILTIN_GPIO 16
  94
  95  static inline int gpio_get_value(unsigned gpio)
  96  {
  97 -       int value;
  98 -
  99 -       gpio_line_get(gpio, &value);
 100 -
 101 -       return value;
 102 +       if (gpio < NR_BUILTIN_GPIO)
 103 +       {
 104 +               int value;
 105 +               gpio_line_get(gpio, &value);
 106 +               return value;
 107 +       }
 108 +       else
 109 +               return __gpio_get_value(gpio);
 110  }
 111
 112  static inline void gpio_set_value(unsigned gpio, int value)
 113  {
 114 -       gpio_line_set(gpio, value);
 115 +       if (gpio < NR_BUILTIN_GPIO)
 116 +               gpio_line_set(gpio, value);
 117 +       else
 118 +               __gpio_set_value(gpio, value);
 119  }
 120
 121 -#include <asm-generic/gpio.h>                  /* cansleep wrappers */
 122 +#define gpio_cansleep __gpio_cansleep
 123
 124  extern int gpio_to_irq(int gpio);
 125  extern int irq_to_gpio(int gpio);