This patch series contains fixes for the Cygnus GPIO driver including 1) a
typo fix and 2) a fix of the GPIO-to-pin mapping
Code based on v4.1-rc3
Ray Jui (2):
pinctrl: cygnus: fixed typo in the gpio driver
pinctrl: cygnus: fixed incorrect GPIO-pin mapping
drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--
1.7.9.5
Fixed a small typo in the Cygnus GPIO driver
Signed-off-by: Jason Uy <[email protected]>
Signed-off-by: Ray Jui <[email protected]>
---
drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c b/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c
index 4ad5c1a..bde45ba 100644
--- a/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c
+++ b/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c
@@ -38,7 +38,7 @@
#define CYGNUS_GPIO_DATA_IN_OFFSET 0x00
#define CYGNUS_GPIO_DATA_OUT_OFFSET 0x04
#define CYGNUS_GPIO_OUT_EN_OFFSET 0x08
-#define CYGNUS_GPIO_IN_TYPE_OFFSET 0x0c
+#define CYGNUS_GPIO_INT_TYPE_OFFSET 0x0c
#define CYGNUS_GPIO_INT_DE_OFFSET 0x10
#define CYGNUS_GPIO_INT_EDGE_OFFSET 0x14
#define CYGNUS_GPIO_INT_MSK_OFFSET 0x18
@@ -264,7 +264,7 @@ static int cygnus_gpio_irq_set_type(struct irq_data *d, unsigned int type)
}
spin_lock_irqsave(&chip->lock, flags);
- cygnus_set_bit(chip, CYGNUS_GPIO_IN_TYPE_OFFSET, gpio,
+ cygnus_set_bit(chip, CYGNUS_GPIO_INT_TYPE_OFFSET, gpio,
level_triggered);
cygnus_set_bit(chip, CYGNUS_GPIO_INT_DE_OFFSET, gpio, dual_edge);
cygnus_set_bit(chip, CYGNUS_GPIO_INT_EDGE_OFFSET, gpio,
--
1.7.9.5
This patch fixes an incorrect GPIO-to-pin mapping in the Cygnus GPIO
driver
Signed-off-by: Ray Jui <[email protected]>
---
drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c b/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c
index bde45ba..e8c50f0 100644
--- a/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c
+++ b/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c
@@ -643,7 +643,9 @@ static const struct cygnus_gpio_pin_range cygnus_gpio_pintable[] = {
CYGNUS_PINRANGE(87, 104, 12),
CYGNUS_PINRANGE(99, 102, 2),
CYGNUS_PINRANGE(101, 90, 4),
- CYGNUS_PINRANGE(105, 116, 10),
+ CYGNUS_PINRANGE(105, 116, 6),
+ CYGNUS_PINRANGE(111, 100, 2),
+ CYGNUS_PINRANGE(113, 122, 4),
CYGNUS_PINRANGE(123, 11, 1),
CYGNUS_PINRANGE(124, 38, 4),
CYGNUS_PINRANGE(128, 43, 1),
--
1.7.9.5
On Thu, May 14, 2015 at 2:06 AM, Ray Jui <[email protected]> wrote:
> Fixed a small typo in the Cygnus GPIO driver
>
> Signed-off-by: Jason Uy <[email protected]>
> Signed-off-by: Ray Jui <[email protected]>
Patch applied.
Yours,
Linus Walleij
On Thu, May 14, 2015 at 2:06 AM, Ray Jui <[email protected]> wrote:
> This patch fixes an incorrect GPIO-to-pin mapping in the Cygnus GPIO
> driver
>
> Signed-off-by: Ray Jui <[email protected]>
Patch applied for fixes.
Yours,
Linus Walleij