Merge branch 'delivery/pinctrl-at91-3.8' of http://github.com/at91linux/linux-at91 into at91

1 files changed, 125 insertions, 1 deletions

diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index b9e2cbd2ea7b..0d7e6c3c33a7 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -59,6 +59,12 @@ static int gpio_banks;
 
 #define PULL_UP         (1 << 0)
 #define MULTI_DRIVE     (1 << 1)
+#define DEGLITCH        (1 << 2)
+#define PULL_DOWN       (1 << 3)
+#define DIS_SCHMIT      (1 << 4)
+#define DEBOUNCE        (1 << 16)
+#define DEBOUNCE_VAL_SHIFT      17
+#define DEBOUNCE_VAL    (0x3fff << DEBOUNCE_VAL_SHIFT)
 
 /**
  * struct at91_pmx_func - describes AT91 pinmux functions
@@ -122,6 +128,14 @@ struct at91_pin_group {
  * @mux_B_periph: mux as periph B
  * @mux_C_periph: mux as periph C
  * @mux_D_periph: mux as periph D
+ * @get_deglitch: get deglitch status
+ * @set_deglitch: enable/disable deglitch
+ * @get_debounce: get debounce status
+ * @set_debounce: enable/disable debounce
+ * @get_pulldown: get pulldown status
+ * @set_pulldown: enable/disable pulldown
+ * @get_schmitt_trig: get schmitt trigger status
+ * @disable_schmitt_trig: disable schmitt trigger
  * @irq_type: return irq type
  */
 struct at91_pinctrl_mux_ops {
@@ -130,6 +144,14 @@ struct at91_pinctrl_mux_ops {
         void (*mux_B_periph)(void __iomem *pio, unsigned mask);
         void (*mux_C_periph)(void __iomem *pio, unsigned mask);
         void (*mux_D_periph)(void __iomem *pio, unsigned mask);
+        bool (*get_deglitch)(void __iomem *pio, unsigned pin);
+        void (*set_deglitch)(void __iomem *pio, unsigned mask, bool in_on);
+        bool (*get_debounce)(void __iomem *pio, unsigned pin, u32 *div);
+        void (*set_debounce)(void __iomem *pio, unsigned mask, bool in_on, u32 div);
+        bool (*get_pulldown)(void __iomem *pio, unsigned pin);
+        void (*set_pulldown)(void __iomem *pio, unsigned mask, bool in_on);
+        bool (*get_schmitt_trig)(void __iomem *pio, unsigned pin);
+        void (*disable_schmitt_trig)(void __iomem *pio, unsigned mask);
         /* irq */
         int (*irq_type)(struct irq_data *d, unsigned type);
 };
@@ -386,10 +408,68 @@ static enum at91_mux at91_mux_get_periph(void __iomem *pio, unsigned mask)
         return select + 1;
 }
 
+static bool at91_mux_get_deglitch(void __iomem *pio, unsigned pin)
+{
+        return (__raw_readl(pio + PIO_IFSR) >> pin) & 0x1;
+}
+
+static void at91_mux_set_deglitch(void __iomem *pio, unsigned mask, bool is_on)
+{
+        __raw_writel(mask, pio + (is_on ? PIO_IFER : PIO_IFDR));
+}
+
+static void at91_mux_pio3_set_deglitch(void __iomem *pio, unsigned mask, bool is_on)
+{
+        if (is_on)
+                __raw_writel(mask, pio + PIO_IFSCDR);
+        at91_mux_set_deglitch(pio, mask, is_on);
+}
+
+static bool at91_mux_pio3_get_debounce(void __iomem *pio, unsigned pin, u32 *div)
+{
+        *div = __raw_readl(pio + PIO_SCDR);
+
+        return (__raw_readl(pio + PIO_IFSCSR) >> pin) & 0x1;
+}
+
+static void at91_mux_pio3_set_debounce(void __iomem *pio, unsigned mask,
+                                bool is_on, u32 div)
+{
+        if (is_on) {
+                __raw_writel(mask, pio + PIO_IFSCER);
+                __raw_writel(div & PIO_SCDR_DIV, pio + PIO_SCDR);
+                __raw_writel(mask, pio + PIO_IFER);
+        } else {
+                __raw_writel(mask, pio + PIO_IFDR);
+        }
+}
+
+static bool at91_mux_pio3_get_pulldown(void __iomem *pio, unsigned pin)
+{
+        return (__raw_readl(pio + PIO_PPDSR) >> pin) & 0x1;
+}
+
+static void at91_mux_pio3_set_pulldown(void __iomem *pio, unsigned mask, bool is_on)
+{
+        __raw_writel(mask, pio + (is_on ? PIO_PPDER : PIO_PPDDR));
+}
+
+static void at91_mux_pio3_disable_schmitt_trig(void __iomem *pio, unsigned mask)
+{
+        __raw_writel(__raw_readl(pio + PIO_SCHMITT) | mask, pio + PIO_SCHMITT);
+}
+
+static bool at91_mux_pio3_get_schmitt_trig(void __iomem *pio, unsigned pin)
+{
+        return (__raw_readl(pio + PIO_SCHMITT) >> pin) & 0x1;
+}
+
 static struct at91_pinctrl_mux_ops at91rm9200_ops = {
         .get_periph     = at91_mux_get_periph,
         .mux_A_periph   = at91_mux_set_A_periph,
         .mux_B_periph   = at91_mux_set_B_periph,
+        .get_deglitch   = at91_mux_get_deglitch,
+        .set_deglitch   = at91_mux_set_deglitch,
         .irq_type       = gpio_irq_type,
 };
 
@@ -399,6 +479,14 @@ static struct at91_pinctrl_mux_ops at91sam9x5_ops = {
         .mux_B_periph   = at91_mux_pio3_set_B_periph,
         .mux_C_periph   = at91_mux_pio3_set_C_periph,
         .mux_D_periph   = at91_mux_pio3_set_D_periph,
+        .get_deglitch   = at91_mux_get_deglitch,
+        .set_deglitch   = at91_mux_pio3_set_deglitch,
+        .get_debounce   = at91_mux_pio3_get_debounce,
+        .set_debounce   = at91_mux_pio3_set_debounce,
+        .get_pulldown   = at91_mux_pio3_get_pulldown,
+        .set_pulldown   = at91_mux_pio3_set_pulldown,
+        .get_schmitt_trig = at91_mux_pio3_get_schmitt_trig,
+        .disable_schmitt_trig = at91_mux_pio3_disable_schmitt_trig,
         .irq_type       = alt_gpio_irq_type,
 };
 
@@ -624,6 +712,7 @@ static int at91_pinconf_get(struct pinctrl_dev *pctldev,
         struct at91_pinctrl *info = pinctrl_dev_get_drvdata(pctldev);
         void __iomem *pio;
         unsigned pin;
+        int div;
 
         dev_dbg(info->dev, "%s:%d, pin_id=%d, config=0x%lx", __func__, __LINE__, pin_id, *config);
         pio = pin_to_controller(info, pin_to_bank(pin_id));
@@ -635,6 +724,15 @@ static int at91_pinconf_get(struct pinctrl_dev *pctldev,
         if (at91_mux_get_pullup(pio, pin))
                 *config |= PULL_UP;
 
+        if (info->ops->get_deglitch && info->ops->get_deglitch(pio, pin))
+                *config |= DEGLITCH;
+        if (info->ops->get_debounce && info->ops->get_debounce(pio, pin, &div))
+                *config |= DEBOUNCE | (div << DEBOUNCE_VAL_SHIFT);
+        if (info->ops->get_pulldown && info->ops->get_pulldown(pio, pin))
+                *config |= PULL_DOWN;
+        if (info->ops->get_schmitt_trig && info->ops->get_schmitt_trig(pio, pin))
+                *config |= DIS_SCHMIT;
+
         return 0;
 }
 
@@ -649,8 +747,21 @@ static int at91_pinconf_set(struct pinctrl_dev *pctldev,
         pio = pin_to_controller(info, pin_to_bank(pin_id));
         mask = pin_to_mask(pin_id % MAX_NB_GPIO_PER_BANK);
 
+        if (config & PULL_UP && config & PULL_DOWN)
+                return -EINVAL;
+
         at91_mux_set_pullup(pio, mask, config & PULL_UP);
         at91_mux_set_multidrive(pio, mask, config & MULTI_DRIVE);
+        if (info->ops->set_deglitch)
+                info->ops->set_deglitch(pio, mask, config & DEGLITCH);
+        if (info->ops->set_debounce)
+                info->ops->set_debounce(pio, mask, config & DEBOUNCE,
+                                (config & DEBOUNCE_VAL) >> DEBOUNCE_VAL_SHIFT);
+        if (info->ops->set_pulldown)
+                info->ops->set_pulldown(pio, mask, config & PULL_DOWN);
+        if (info->ops->disable_schmitt_trig && config & DIS_SCHMIT)
+                info->ops->disable_schmitt_trig(pio, mask);
+
         return 0;
 }
 
@@ -1364,9 +1475,10 @@ static int __devinit at91_gpio_probe(struct platform_device *pdev)
         struct gpio_chip *chip;
         struct pinctrl_gpio_range *range;
         int ret = 0;
-        int irq;
+        int irq, i;
         int alias_idx = of_alias_get_id(np, "gpio");
         uint32_t ngpio;
+        char **names;
 
         BUG_ON(alias_idx >= ARRAY_SIZE(gpio_chips));
         if (gpio_chips[alias_idx]) {
@@ -1436,6 +1548,18 @@ static int __devinit at91_gpio_probe(struct platform_device *pdev)
                         chip->ngpio = ngpio;
         }
 
+        names = devm_kzalloc(&pdev->dev, sizeof(char*) * chip->ngpio, GFP_KERNEL);
+
+        if (!names) {
+                ret = -ENOMEM;
+                goto clk_err;
+        }
+
+        for (i = 0; i < chip->ngpio; i++)
+                names[i] = kasprintf(GFP_KERNEL, "pio%c%d", alias_idx + 'A', i);
+
+        chip->names = (const char*const*)names;
+
         range = &at91_chip->range;
         range->name = chip->label;
         range->id = alias_idx;