| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1393984400-14687-1-git-send-email-wenyou.yang@atmel.com>
Date: Wed, 5 Mar 2014 09:53:20 +0800
From: Wenyou Yang <wenyou.yang@...el.com>
To: <linus.walleij@...aro.org>, <plagnioj@...osoft.com>
CC: <b.brezillon@...rkiz.com>, <linux-arm-kernel@...ts.infradead.org>,
<linux-kernel@...r.kernel.org>, <devicetree@...r.kernel.org>,
<robh+dt@...nel.org>, <pawel.moll@....com>, <mark.rutland@....com>,
<ijc+devicetree@...lion.org.uk>, <galak@...eaurora.org>,
<wenyou.yang@...el.com>
Subject: [PATCH] pinctrl: at91: add the config GPIO_OUTPUT_x
In order to support the pinctrl sleep state.
Signed-off-by: Wenyou Yang <wenyou.yang@...el.com>
---
Hi Linus,
The patch is based on branch: for-next
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Best Regards,
Wenyou Yang
drivers/pinctrl/pinctrl-at91.c | 31 +++++++++++++++++++++++++++++++
include/dt-bindings/pinctrl/at91.h | 2 ++
2 files changed, 33 insertions(+)
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 5d24aae..fc51e59 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -62,6 +62,8 @@ static int gpio_banks;
#define DEGLITCH (1 << 2)
#define PULL_DOWN (1 << 3)
#define DIS_SCHMIT (1 << 4)
+#define GPIO_OUTPUT_HIGH (1 << 5)
+#define GPIO_OUTPUT_LOW (1 << 6)
#define DEBOUNCE (1 << 16)
#define DEBOUNCE_VAL_SHIFT 17
#define DEBOUNCE_VAL (0x3fff << DEBOUNCE_VAL_SHIFT)
@@ -152,12 +154,15 @@ struct at91_pinctrl_mux_ops {
void (*set_pulldown)(void __iomem *pio, unsigned mask, bool is_on);
bool (*get_schmitt_trig)(void __iomem *pio, unsigned pin);
void (*disable_schmitt_trig)(void __iomem *pio, unsigned mask);
+ bool (*get_gpio_output)(void __iomem *pio, unsigned mask);
+ void (*set_gpio_output)(void __iomem *pio, unsigned mask, bool is_high);
/* irq */
int (*irq_type)(struct irq_data *d, unsigned type);
};
static int gpio_irq_type(struct irq_data *d, unsigned type);
static int alt_gpio_irq_type(struct irq_data *d, unsigned type);
+static void at91_mux_gpio_enable(void __iomem *pio, unsigned mask, bool input);
struct at91_pinctrl {
struct device *dev;
@@ -472,6 +477,20 @@ static bool at91_mux_pio3_get_schmitt_trig(void __iomem *pio, unsigned pin)
return (__raw_readl(pio + PIO_SCHMITT) >> pin) & 0x1;
}
+static bool at91_mux_pio3_get_gpio_output(void __iomem *pio, unsigned pin)
+{
+ return (__raw_readl(pio + PIO_ODSR) >> pin) & 0x1;
+}
+
+static void at91_mux_pio3_set_gpio_output(void __iomem *pio,
+ unsigned mask,
+ bool is_high)
+{
+ at91_mux_gpio_enable(pio, mask, 0);
+ writel_relaxed(mask, pio + (is_high ? PIO_SODR : PIO_CODR));
+}
+
+
static struct at91_pinctrl_mux_ops at91rm9200_ops = {
.get_periph = at91_mux_get_periph,
.mux_A_periph = at91_mux_set_A_periph,
@@ -495,6 +514,8 @@ static struct at91_pinctrl_mux_ops at91sam9x5_ops = {
.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,
+ .get_gpio_output = at91_mux_pio3_get_gpio_output,
+ .set_gpio_output = at91_mux_pio3_set_gpio_output,
.irq_type = alt_gpio_irq_type,
};
@@ -741,6 +762,10 @@ static int at91_pinconf_get(struct pinctrl_dev *pctldev,
*config |= PULL_DOWN;
if (info->ops->get_schmitt_trig && info->ops->get_schmitt_trig(pio, pin))
*config |= DIS_SCHMIT;
+ if (info->ops->get_gpio_output) {
+ *config |= info->ops->get_gpio_output(pio, pin) ?
+ GPIO_OUTPUT_HIGH : GPIO_OUTPUT_LOW;
+ }
return 0;
}
@@ -778,6 +803,12 @@ static int at91_pinconf_set(struct pinctrl_dev *pctldev,
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);
+ if (info->ops->set_gpio_output) {
+ if (config & GPIO_OUTPUT_HIGH)
+ info->ops->set_gpio_output(pio, mask, 1);
+ if (config & GPIO_OUTPUT_LOW)
+ info->ops->set_gpio_output(pio, mask, 0);
+ };
} /* for each config */
diff --git a/include/dt-bindings/pinctrl/at91.h b/include/dt-bindings/pinctrl/at91.h
index 0fee6ff..e799268 100644
--- a/include/dt-bindings/pinctrl/at91.h
+++ b/include/dt-bindings/pinctrl/at91.h
@@ -15,6 +15,8 @@
#define AT91_PINCTRL_DEGLITCH (1 << 2)
#define AT91_PINCTRL_PULL_DOWN (1 << 3)
#define AT91_PINCTRL_DIS_SCHMIT (1 << 4)
+#define AT91_PINCTRL_OUTPUT_HIGH (1 << 5)
+#define AT91_PINCTRL_OUTPUT_LOW (1 << 6)
#define AT91_PINCTRL_DEBOUNCE (1 << 16)
#define AT91_PINCTRL_DEBOUNCE_VAL(x) (x << 17)
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists