projects / openwrt / openwrt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: a1bee93)
ixp4xx: fix GPIOLIB support
authorGabor Juhos <juhosg@openwrt.org>
Sat, 14 Aug 2010 21:07:46 +0000 (21:07 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Sat, 14 Aug 2010 21:07:46 +0000 (21:07 +0000)
SVN-Revision: 22650

target/linux/ixp4xx/patches-2.6.32/402-ixp4xx_gpiolib.patch patch | blob | history
target/linux/ixp4xx/patches-2.6.33/402-ixp4xx_gpiolib.patch patch | blob | history
target/linux/ixp4xx/patches-2.6.34/402-ixp4xx_gpiolib.patch patch | blob | history
target/linux/ixp4xx/patches-2.6.35/402-ixp4xx_gpiolib.patch patch | blob | history

diff --git a/target/linux/ixp4xx/patches-2.6.32/402-ixp4xx_gpiolib.patch b/target/linux/ixp4xx/patches-2.6.32/402-ixp4xx_gpiolib.patch
index b3f1336f5224c73b3ae4ac475cf166dab569eba6..2d2cec55059672fdd6e7361e8e23ba7a9e8718a0 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.32/402-ixp4xx_gpiolib.patch
+++ b/target/linux/ixp4xx/patches-2.6.32/402-ixp4xx_gpiolib.patch
@@ -8,7 +8,7 @@
  
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>
-@@ -375,12 +376,39 @@ static struct platform_device *ixp46x_de
+@@ -375,12 +376,50 @@ static struct platform_device *ixp46x_de
  unsigned long ixp4xx_exp_bus_size;
  EXPORT_SYMBOL(ixp4xx_exp_bus_size);
  
@@ -17,7 +17,6 @@
 +      gpio_line_config(gpio, IXP4XX_GPIO_IN);
 +      return 0;
 +}
-+EXPORT_SYMBOL(ixp4xx_gpio_direction_input);
 +
 +static int ixp4xx_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, int level)
 +{
@@ -25,14 +24,26 @@
 +      gpio_line_config(gpio, IXP4XX_GPIO_OUT);
 +      return 0;
 +}
-+EXPORT_SYMBOL(ixp4xx_gpio_direction_output);
++
++static int ixp4xx_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
++{
++      int value;
++
++      gpio_line_get(gpio, &value);
++      return value;
++}
++
++static void ixp4xx_gpio_set_value(struct gpio_chip *chip, unsigned gpio, int value)
++{
++      gpio_line_set(gpio, value);
++}
 +
 +static struct gpio_chip ixp4xx_gpio_chip = {
 +      .label                  = "IXP4XX_GPIO_CHIP",
 +      .direction_input        = ixp4xx_gpio_direction_input,
 +      .direction_output       = ixp4xx_gpio_direction_output,
-+      .get                    = gpio_get_value,
-+      .set                    = gpio_set_value,
++      .get                    = ixp4xx_gpio_get_value,
++      .set                    = ixp4xx_gpio_set_value,
 +      .base                   = 0,
 +      .ngpio                  = 16,
 +};
diff --git a/target/linux/ixp4xx/patches-2.6.33/402-ixp4xx_gpiolib.patch b/target/linux/ixp4xx/patches-2.6.33/402-ixp4xx_gpiolib.patch
index 5b0a63a253f00fb215ec84f0acb16d21ad0d4c9b..1b1b910656de8e448ea95372fc85bc64bba5b46b 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.33/402-ixp4xx_gpiolib.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/402-ixp4xx_gpiolib.patch
@@ -8,7 +8,7 @@
  
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>
-@@ -375,12 +376,39 @@ static struct platform_device *ixp46x_de
+@@ -375,12 +376,50 @@ static struct platform_device *ixp46x_de
  unsigned long ixp4xx_exp_bus_size;
  EXPORT_SYMBOL(ixp4xx_exp_bus_size);
  
@@ -17,7 +17,6 @@
 +      gpio_line_config(gpio, IXP4XX_GPIO_IN);
 +      return 0;
 +}
-+EXPORT_SYMBOL(ixp4xx_gpio_direction_input);
 +
 +static int ixp4xx_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, int level)
 +{
@@ -25,14 +24,26 @@
 +      gpio_line_config(gpio, IXP4XX_GPIO_OUT);
 +      return 0;
 +}
-+EXPORT_SYMBOL(ixp4xx_gpio_direction_output);
++
++static int ixp4xx_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
++{
++      int value;
++
++      gpio_line_get(gpio, &value);
++      return value;
++}
++
++static void ixp4xx_gpio_set_value(struct gpio_chip *chip, unsigned gpio, int value)
++{
++      gpio_line_set(gpio, value);
++}
 +
 +static struct gpio_chip ixp4xx_gpio_chip = {
 +      .label                  = "IXP4XX_GPIO_CHIP",
 +      .direction_input        = ixp4xx_gpio_direction_input,
 +      .direction_output       = ixp4xx_gpio_direction_output,
-+      .get                    = gpio_get_value,
-+      .set                    = gpio_set_value,
++      .get                    = ixp4xx_gpio_get_value,
++      .set                    = ixp4xx_gpio_set_value,
 +      .base                   = 0,
 +      .ngpio                  = 16,
 +};
diff --git a/target/linux/ixp4xx/patches-2.6.34/402-ixp4xx_gpiolib.patch b/target/linux/ixp4xx/patches-2.6.34/402-ixp4xx_gpiolib.patch
index 0ec3a91546893b7c492b0dc64a1537e9c465c660..5fb5edba46baab70f7d5450138508c7b05f2714d 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.34/402-ixp4xx_gpiolib.patch
+++ b/target/linux/ixp4xx/patches-2.6.34/402-ixp4xx_gpiolib.patch
@@ -8,7 +8,7 @@
  
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>
-@@ -375,12 +376,39 @@ static struct platform_device *ixp46x_de
+@@ -375,12 +376,50 @@ static struct platform_device *ixp46x_de
  unsigned long ixp4xx_exp_bus_size;
  EXPORT_SYMBOL(ixp4xx_exp_bus_size);
  
@@ -17,7 +17,6 @@
 +      gpio_line_config(gpio, IXP4XX_GPIO_IN);
 +      return 0;
 +}
-+EXPORT_SYMBOL(ixp4xx_gpio_direction_input);
 +
 +static int ixp4xx_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, int level)
 +{
@@ -25,14 +24,26 @@
 +      gpio_line_config(gpio, IXP4XX_GPIO_OUT);
 +      return 0;
 +}
-+EXPORT_SYMBOL(ixp4xx_gpio_direction_output);
++
++static int ixp4xx_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
++{
++      int value;
++
++      gpio_line_get(gpio, &value);
++      return value;
++}
++
++static void ixp4xx_gpio_set_value(struct gpio_chip *chip, unsigned gpio, int value)
++{
++      gpio_line_set(gpio, value);
++}
 +
 +static struct gpio_chip ixp4xx_gpio_chip = {
 +      .label                  = "IXP4XX_GPIO_CHIP",
 +      .direction_input        = ixp4xx_gpio_direction_input,
 +      .direction_output       = ixp4xx_gpio_direction_output,
-+      .get                    = gpio_get_value,
-+      .set                    = gpio_set_value,
++      .get                    = ixp4xx_gpio_get_value,
++      .set                    = ixp4xx_gpio_set_value,
 +      .base                   = 0,
 +      .ngpio                  = 16,
 +};
diff --git a/target/linux/ixp4xx/patches-2.6.35/402-ixp4xx_gpiolib.patch b/target/linux/ixp4xx/patches-2.6.35/402-ixp4xx_gpiolib.patch
index bfe22272f3b1db1e00c08d9eeca2dbecf6dadf2f..52255071379afcc60bc32383453f6b7a8f13d448 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.35/402-ixp4xx_gpiolib.patch
+++ b/target/linux/ixp4xx/patches-2.6.35/402-ixp4xx_gpiolib.patch
@@ -8,7 +8,7 @@
  
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>
-@@ -374,12 +375,39 @@ static struct platform_device *ixp46x_de
+@@ -374,12 +375,50 @@ static struct platform_device *ixp46x_de
  unsigned long ixp4xx_exp_bus_size;
  EXPORT_SYMBOL(ixp4xx_exp_bus_size);
  
@@ -17,7 +17,6 @@
 +      gpio_line_config(gpio, IXP4XX_GPIO_IN);
 +      return 0;
 +}
-+EXPORT_SYMBOL(ixp4xx_gpio_direction_input);
 +
 +static int ixp4xx_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, int level)
 +{
@@ -25,14 +24,26 @@
 +      gpio_line_config(gpio, IXP4XX_GPIO_OUT);
 +      return 0;
 +}
-+EXPORT_SYMBOL(ixp4xx_gpio_direction_output);
++
++static int ixp4xx_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
++{
++      int value;
++
++      gpio_line_get(gpio, &value);
++      return value;
++}
++
++static void ixp4xx_gpio_set_value(struct gpio_chip *chip, unsigned gpio, int value)
++{
++      gpio_line_set(gpio, value);
++}
 +
 +static struct gpio_chip ixp4xx_gpio_chip = {
 +      .label                  = "IXP4XX_GPIO_CHIP",
 +      .direction_input        = ixp4xx_gpio_direction_input,
 +      .direction_output       = ixp4xx_gpio_direction_output,
-+      .get                    = gpio_get_value,
-+      .set                    = gpio_set_value,
++      .get                    = ixp4xx_gpio_get_value,
++      .set                    = ixp4xx_gpio_set_value,
 +      .base                   = 0,
 +      .ngpio                  = 16,
 +};
OpenWrt Source Repository