Skip to contentSkip to conversation

pinctrl: samsung: dt-bindings: Use better name for external interrupt function

PATCH New Krzysztof Kozlowski 1 participant 2 messages Jun 15, 2017

Subsystems (5)
Device tree bindings GPIO Arm Samsung Exynos Pin control +1 more subsystems
lore
Share & tools
lore

Krzysztof Kozlowski

author maintainer
#0 lore raw

PATCH 1/2 pinctrl: samsung: dt-bindings: Use better name for external interrupt function

On Exynos, 0xf is always used as value of external interrupt in pin mux function thus a more descriptive macro name can be used.

Signed-off-by Krzysztof Kozlowski <[email protected]>
---
 include/dt-bindings/pinctrl/samsung.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
include/dt-bindings/pinctrl/samsung.h +2 -1
index b7aa3646208b..ceb672305f59 100644
@@ -66,7 +66,8 @@
 #define EXYNOS_PIN_FUNC_4		4
 #define EXYNOS_PIN_FUNC_5		5
 #define EXYNOS_PIN_FUNC_6		6
-#define EXYNOS_PIN_FUNC_F		0xf
+#define EXYNOS_PIN_FUNC_EINT		0xf
+#define EXYNOS_PIN_FUNC_F		EXYNOS_PIN_FUNC_EINT
 
 /* Drive strengths for Exynos7 FSYS1 block */
 #define EXYNOS7_FSYS1_PIN_DRV_LV1	0
Signature · 1 line
2.9.3
author maintainer
#1 lore raw

PATCH 2/2 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 <[email protected]>
---
 drivers/pinctrl/samsung/pinctrl-exynos.c  | 6 ++++--
 drivers/pinctrl/samsung/pinctrl-exynos.h  | 1 -
 drivers/pinctrl/samsung/pinctrl-samsung.c | 4 +++-
 drivers/pinctrl/samsung/pinctrl-samsung.h | 4 ----
 4 files changed, 7 insertions(+), 8 deletions(-)
drivers/pinctrl/samsung/pinctrl-exynos.c +4 -2
index d95a746f45d7..bdc4e0310060 100644
@@ -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);

@@ -208,7 +210,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);
drivers/pinctrl/samsung/pinctrl-exynos.h +0 -1
index b90139715c8f..7639b926c5c1 100644
@@ -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
drivers/pinctrl/samsung/pinctrl-samsung.c +3 -1
index a25c3ffae25c..86c98c1dec3a 100644
@@ -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;
drivers/pinctrl/samsung/pinctrl-samsung.h +0 -4
index 61c4cab0ad24..15b26c786b1e 100644
@@ -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.
Signature · 1 line
2.9.3