diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 13:57:30 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 13:57:30 +1000 |
commit | ecaf642a5cb604c4903cf95ed5cb4e81d6128705 (patch) | |
tree | 75c724a5e1cd92300fa7d58f91a75f39c016f2f6 /drivers/pinctrl/samsung/pinctrl-exynos.c | |
parent | ef0c47c2a605c01a2e21bd097ef981291a2c643a (diff) | |
parent | 12cdd5790fe342bf223cbfc13f9929201fbe22db (diff) |
Merge remote-tracking branch 'pinctrl-samsung/for-next'
Diffstat (limited to 'drivers/pinctrl/samsung/pinctrl-exynos.c')
-rw-r--r-- | drivers/pinctrl/samsung/pinctrl-exynos.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c index 731530a9ce38..d68d52dc6804 100644 --- a/drivers/pinctrl/samsung/pinctrl-exynos.c +++ b/drivers/pinctrl/samsung/pinctrl-exynos.c @@ -31,6 +31,8 @@ #include <linux/err.h> #include <linux/soc/samsung/exynos-pmu.h> +#include <dt-bindings/pinctrl/samsung.h> + #include "pinctrl-samsung.h" #include "pinctrl-exynos.h" @@ -174,10 +176,10 @@ static int exynos_irq_request_resources(struct irq_data *irqd) spin_lock_irqsave(&bank->slock, flags); - con = readl(bank->eint_base + reg_con); + con = readl(bank->pctl_base + reg_con); con &= ~(mask << shift); - con |= EXYNOS_EINT_FUNC << shift; - writel(con, bank->eint_base + reg_con); + con |= EXYNOS_PIN_FUNC_EINT << shift; + writel(con, bank->pctl_base + reg_con); spin_unlock_irqrestore(&bank->slock, flags); @@ -202,10 +204,10 @@ static void exynos_irq_release_resources(struct irq_data *irqd) spin_lock_irqsave(&bank->slock, flags); - con = readl(bank->eint_base + reg_con); + con = readl(bank->pctl_base + reg_con); con &= ~(mask << shift); - con |= FUNC_INPUT << shift; - writel(con, bank->eint_base + reg_con); + con |= EXYNOS_PIN_FUNC_INPUT << shift; + writel(con, bank->pctl_base + reg_con); spin_unlock_irqrestore(&bank->slock, flags); |