pinctrl: samsung: Use define from dt-bindings for pin mux function

We already have macros for values used by driver and Device Tree
sources for pin mux configuration.  Use them instead of duplicating
defines.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c
index 9ab8faf528a6c07018e5fba267a84e9b7c8eb8d4..d68d52dc68044c085b4ee3fb8d06bd51b65ff4c8 100644 (file)
--- 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"
 
@@ -176,7 +178,7 @@ static int exynos_irq_request_resources(struct irq_data *irqd)
 
        con = readl(bank->pctl_base + reg_con);
        con &= ~(mask << shift);
-       con |= EXYNOS_EINT_FUNC << shift;
+       con |= EXYNOS_PIN_FUNC_EINT << shift;
        writel(con, bank->pctl_base + reg_con);
 
        spin_unlock_irqrestore(&bank->slock, flags);
@@ -204,7 +206,7 @@ static void exynos_irq_release_resources(struct irq_data *irqd)
 
        con = readl(bank->pctl_base + reg_con);
        con &= ~(mask << shift);
-       con |= FUNC_INPUT << shift;
+       con |= EXYNOS_PIN_FUNC_INPUT << shift;
        writel(con, bank->pctl_base + reg_con);
 
        spin_unlock_irqrestore(&bank->slock, flags);

diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.h b/drivers/pinctrl/samsung/pinctrl-exynos.h
index b90139715c8ffd117a8d814dce233d6d3a00e806..7639b926c5c174f2fd1a3de311ff748537c8dbf7 100644 (file)
--- a/drivers/pinctrl/samsung/pinctrl-exynos.h
+++ b/drivers/pinctrl/samsung/pinctrl-exynos.h
@@ -32,7 +32,6 @@
 #define EXYNOS7_WKUP_EMASK_OFFSET      0x900
 #define EXYNOS7_WKUP_EPEND_OFFSET      0xA00
 #define EXYNOS_SVC_OFFSET              0xB08
-#define EXYNOS_EINT_FUNC               0xF
 
 /* helpers to access interrupt service register */
 #define EXYNOS_SVC_GROUP_SHIFT         3

diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c
index 61bbd54e35ba0371320e904069295c2078370b8f..1f73dd25665aab83d706e414a8d7a7e33335323f 100644 (file)
--- a/drivers/pinctrl/samsung/pinctrl-samsung.c
+++ b/drivers/pinctrl/samsung/pinctrl-samsung.c
@@ -30,6 +30,8 @@
 #include <linux/of_device.h>
 #include <linux/spinlock.h>
 
+#include <dt-bindings/pinctrl/samsung.h>
+
 #include "../core.h"
 #include "pinctrl-samsung.h"
 
@@ -586,7 +588,7 @@ static int samsung_gpio_set_direction(struct gpio_chip *gc,
        data = readl(reg);
        data &= ~(mask << shift);
        if (!input)
-               data |= FUNC_OUTPUT << shift;
+               data |= EXYNOS_PIN_FUNC_OUTPUT << shift;
        writel(data, reg);
 
        return 0;

diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.h b/drivers/pinctrl/samsung/pinctrl-samsung.h
index 61c4cab0ad24f5330ada380d048269b468f006ad..15b26c786b1e642a33b7d70aee7f38d7ed8ce74f 100644 (file)
--- a/drivers/pinctrl/samsung/pinctrl-samsung.h
+++ b/drivers/pinctrl/samsung/pinctrl-samsung.h
@@ -25,10 +25,6 @@
 
 #include <linux/gpio.h>
 
-/* pinmux function number for pin as gpio output line */
-#define FUNC_INPUT     0x0
-#define FUNC_OUTPUT    0x1
-
 /**
  * enum pincfg_type - possible pin configuration types supported.
  * @PINCFG_TYPE_FUNC: Function configuration.