summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Coquelin <mcoquelin.stm32@gmail.com>2016-02-08 18:57:38 +0100
committerLinus Walleij <linus.walleij@linaro.org>2016-02-09 10:52:28 +0100
commit38a3fbf16a47868231894cdabef862d2f4e7b40a (patch)
tree6ad102d540ad6383d5dc173104bdd1a309a4c7eb
parentpinctrl: pinctrl-pic32: Add PIC32 pin control driver (diff)
downloadlinux-38a3fbf16a47868231894cdabef862d2f4e7b40a.tar.xz
linux-38a3fbf16a47868231894cdabef862d2f4e7b40a.zip
pinctrl: stm32: Remove dependency with DT bindings header files
Some macros where defined in DT bindings headers, whereas only used in the driver. This patch moves these macros to the driver side. Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/stm32/pinctrl-stm32.c2
-rw-r--r--drivers/pinctrl/stm32/pinctrl-stm32.h8
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index 9a08222ecb72..8deb566ed4cd 100644
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -23,8 +23,6 @@
#include <linux/reset.h>
#include <linux/slab.h>
-#include <dt-bindings/pinctrl/pinctrl-stm32.h>
-
#include "../core.h"
#include "../pinconf.h"
#include "../pinctrl-utils.h"
diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.h b/drivers/pinctrl/stm32/pinctrl-stm32.h
index 1b7c369acd8c..35ebc94c01e4 100644
--- a/drivers/pinctrl/stm32/pinctrl-stm32.h
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.h
@@ -9,6 +9,14 @@
#include <linux/pinctrl/pinctrl.h>
#include <linux/pinctrl/pinconf-generic.h>
+#define STM32_PIN_NO(x) ((x) << 8)
+#define STM32_GET_PIN_NO(x) ((x) >> 8)
+#define STM32_GET_PIN_FUNC(x) ((x) & 0xff)
+
+#define STM32_PIN_GPIO 0
+#define STM32_PIN_AF(x) ((x) + 1)
+#define STM32_PIN_ANALOG (STM32_PIN_AF(15) + 1)
+
struct stm32_desc_function {
const char *name;
const unsigned char num;