Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1268611

[PATCH 01/39] pinctrl: Move am4372 and dra7 macros to the the SoC header files

From Javier Martinez Canillas <javier@osg.samsung.com>
Newsgroups linux.kernel
Subject [PATCH 01/39] pinctrl: Move am4372 and dra7 macros to the the SoC header files
Date 2015-11-13 06:00 +0100
Message-ID <queCT-1MO-43@gated-at.bofh.it> (permalink)
References <queCS-1MO-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


The <dt-bindings/pinctrl/omap.h> header file defines a set of macros
for different SoCs families that falls under the OMAP sub-arch, that
allow to define the padconf register physical address instead of the
register offset from the padconf base.

But the am43xx and dra7xx SoCs families have their own pinctrl header
file so the DTS using these SoCs aren't able to use the AM4372_IOPAD()
and DRA7XX_CORE_IOPAD() macros since <dt-bindings/pinctrl/omap.h> is
not included.

Move the macros to the correct header files so can be used by the DTS.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

---

 include/dt-bindings/pinctrl/am43xx.h | 6 ++++++
 include/dt-bindings/pinctrl/dra.h    | 6 ++++++
 include/dt-bindings/pinctrl/omap.h   | 2 --
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/include/dt-bindings/pinctrl/am43xx.h b/include/dt-bindings/pinctrl/am43xx.h
index 774dc1e843c5..344bd1eb3386 100644
--- a/include/dt-bindings/pinctrl/am43xx.h
+++ b/include/dt-bindings/pinctrl/am43xx.h
@@ -31,5 +31,11 @@
 #define PIN_INPUT_PULLUP	(INPUT_EN | PULL_UP)
 #define PIN_INPUT_PULLDOWN	(INPUT_EN)
 
+/*
+ * Macro to allow using the absolute physical address instead of the
+ * padconf registers instead of the offset from padconf base.
+ */
+#define AM4372_IOPAD(pa, val)	(((pa) & 0xffff) - 0x0800) (val)
+
 #endif
 
diff --git a/include/dt-bindings/pinctrl/dra.h b/include/dt-bindings/pinctrl/dra.h
index 4379e29f0460..5c75e80915fc 100644
--- a/include/dt-bindings/pinctrl/dra.h
+++ b/include/dt-bindings/pinctrl/dra.h
@@ -67,5 +67,11 @@
 #define PIN_INPUT_PULLUP	(PULL_ENA | INPUT_EN | PULL_UP)
 #define PIN_INPUT_PULLDOWN	(PULL_ENA | INPUT_EN)
 
+/*
+ * Macro to allow using the absolute physical address instead of the
+ * padconf registers instead of the offset from padconf base.
+ */
+#define DRA7XX_CORE_IOPAD(pa, val)	(((pa) & 0xffff) - 0x3400) (val)
+
 #endif
 
diff --git a/include/dt-bindings/pinctrl/omap.h b/include/dt-bindings/pinctrl/omap.h
index 13949259705a..8100de13851c 100644
--- a/include/dt-bindings/pinctrl/omap.h
+++ b/include/dt-bindings/pinctrl/omap.h
@@ -63,8 +63,6 @@
 #define OMAP3_WKUP_IOPAD(pa, val)	OMAP_IOPAD_OFFSET((pa), 0x2a00) (val)
 #define DM816X_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
 #define AM33XX_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
-#define AM4372_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
-#define DRA7XX_CORE_IOPAD(pa, val)	OMAP_IOPAD_OFFSET((pa), 0x3400) (val)
 
 /*
  * Macros to allow using the offset from the padconf physical address
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 00/39] ARM: dts: Convert OMAP boards to use IOPAD pinmux macros Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 02/39] ARM: dts: am335x-baltos-ir5221: Remove leftover pinctrl lines Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 27/39] ARM: dts: omap3-n900: Use OMAP3_CORE1_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 13/39] ARM: dts: am335x-phycore-som: Use AM33XX_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 33/39] ARM: dts: omap4-panda-es: Use OMAP4_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 37/39] ARM: dts: omap5-board-common: Use OMAP5_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 04/39] ARM: dts: am335x-bone-common: Use AM33XX_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 28/39] ARM: dts: omap3-n9: Use OMAP3_CORE1_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 34/39] ARM: dts: omap4-sdp: Use OMAP4_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 08/39] ARM: dts: am335x-evm: Use AM33XX_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 38/39] ARM: dts: omap5-cm-t54: Use OMAP5_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 10/39] ARM: dts: am335x-lxm: Use AM33XX_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 31/39] ARM: dts: omap4-panda-a4: Use OMAP4_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 16/39] ARM: dts: am437x-gp-evm: Use AM4372_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 24/39] ARM: dts: omap3-beagle-xm: Use OMAP3_*_IOPAD pinmux macros Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 06/39] ARM: dts: am335x-chiliboard: Use AM33XX_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 01/39] pinctrl: Move am4372 and dra7 macros to the the SoC header files Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 26/39] ARM: dts: omap3-ldp: Use OMAP3_CORE1_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:00 +0100
  [PATCH 12/39] ARM: dts: am335x-pepper: Use AM33XX_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:10 +0100
  [PATCH 19/39] ARM: dts: am43x-epos-evm: Use AM4372_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:10 +0100
  [PATCH 03/39] ARM: dts: am335x-baltos-ir5221: Use AM33XX_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:10 +0100
  [PATCH 15/39] ARM: dts: am3517-craneboard: Use OMAP3_CORE1_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:10 +0100
  [PATCH 07/39] ARM: dts: am335x-chilisom: Use AM33XX_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:10 +0100
  [PATCH 25/39] ARM: dts: omap3-evm-37xx: Use OMAP3_*_IOPAD pinmux macros Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:10 +0100
  [PATCH 17/39] ARM: dts: am437x-idk-evm: Use AM4372_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:10 +0100
  [PATCH 05/39] ARM: dts: am335x-bonegreen: Use AM33XX_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:10 +0100
  [PATCH 22/39] ARM: dts: dra72-evm: Use DRA7XX_CORE_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:10 +0100
  [PATCH 21/39] ARM: dts: dra7-evm: Use DRA7XX_CORE_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:10 +0100
  [PATCH 23/39] ARM: dts: omap3-beagle: Use OMAP3_*_IOPAD pinmux macros Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:10 +0100
  [PATCH 20/39] ARM: dts: am57xx-beagle-x15: Use DRA7XX_CORE_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:10 +0100
  [PATCH 14/39] ARM: dts: am335x-wega: Use AM33XX_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:10 +0100
  [PATCH 09/39] ARM: dts: am335x-evmsk: Use AM33XX_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:10 +0100
  [PATCH 11/39] ARM: dts: am335x-nano: Use AM33XX_IOPAD pinmux macro Javier Martinez Canillas <javier@osg.samsung.com> - 2015-11-13 06:10 +0100
  Re: [PATCH 00/39] ARM: dts: Convert OMAP boards to use IOPAD pinmux  macros Tony Lindgren <tony@atomide.com> - 2015-11-13 15:50 +0100

csiph-web