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

Message ID 1447390457-1158-2-git-send-email-javier@osg.samsung.com
State New
Headers show

Commit Message

Javier Martinez Canillas Nov. 13, 2015, 4:53 a.m. UTC
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(-)

Comments

Linus Walleij Nov. 17, 2015, 1:47 p.m. UTC | #1
On Fri, Nov 13, 2015 at 5:53 AM, Javier Martinez Canillas
<javier@osg.samsung.com> wrote:

> 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>

I need Tony's ACK on this.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Javier Martinez Canillas Nov. 17, 2015, 1:50 p.m. UTC | #2
Hello Linus,

On 11/17/2015 10:47 AM, Linus Walleij wrote:
> On Fri, Nov 13, 2015 at 5:53 AM, Javier Martinez Canillas
> <javier@osg.samsung.com> wrote:
> 
>> 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>
> 
> I need Tony's ACK on this.
>

OK, I believe he was waiting for yours to pick the series though ;)
 
> Yours,
> Linus Walleij
> 

Best regards,
Tony Lindgren Nov. 19, 2015, 12:23 a.m. UTC | #3
* Javier Martinez Canillas <javier@osg.samsung.com> [151117 05:51]:
> Hello Linus,
> 
> On 11/17/2015 10:47 AM, Linus Walleij wrote:
> > On Fri, Nov 13, 2015 at 5:53 AM, Javier Martinez Canillas
> > <javier@osg.samsung.com> wrote:
> > 
> >> 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>
> > 
> > I need Tony's ACK on this.
> >
> 
> OK, I believe he was waiting for yours to pick the series though ;)

Yeah probably best to keep this series together if you're OK with that.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren Nov. 25, 2015, 6:39 p.m. UTC | #4
Linus,

* Tony Lindgren <tony@atomide.com> [151118 16:25]:
> * Javier Martinez Canillas <javier@osg.samsung.com> [151117 05:51]:
> > Hello Linus,
> > 
> > On 11/17/2015 10:47 AM, Linus Walleij wrote:
> > > On Fri, Nov 13, 2015 at 5:53 AM, Javier Martinez Canillas
> > > <javier@osg.samsung.com> wrote:
> > > 
> > >> 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>
> > > 
> > > I need Tony's ACK on this.
> > >
> > 
> > OK, I believe he was waiting for yours to pick the series though ;)
> 
> Yeah probably best to keep this series together if you're OK with that.

Care to ack this one? I'd like to apply this series for v4.5 within next
few days..

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren Nov. 30, 2015, 4:46 p.m. UTC | #5
* Tony Lindgren <tony@atomide.com> [151125 10:40]:
> Linus,
> 
> * Tony Lindgren <tony@atomide.com> [151118 16:25]:
> > * Javier Martinez Canillas <javier@osg.samsung.com> [151117 05:51]:
> > > Hello Linus,
> > > 
> > > On 11/17/2015 10:47 AM, Linus Walleij wrote:
> > > > On Fri, Nov 13, 2015 at 5:53 AM, Javier Martinez Canillas
> > > > <javier@osg.samsung.com> wrote:
> > > > 
> > > >> 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>
> > > > 
> > > > I need Tony's ACK on this.
> > > >
> > > 
> > > OK, I believe he was waiting for yours to pick the series though ;)
> > 
> > Yeah probably best to keep this series together if you're OK with that.
> 
> Care to ack this one? I'd like to apply this series for v4.5 within next
> few days..

Applying this series today into omap-for-v4.5/dt.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Linus Walleij Dec. 10, 2015, 4:48 p.m. UTC | #6
On Wed, Nov 25, 2015 at 7:39 PM, Tony Lindgren <tony@atomide.com> wrote:
> Linus,
(...)
>> > OK, I believe he was waiting for yours to pick the series though ;)
>>
>> Yeah probably best to keep this series together if you're OK with that.
>
> Care to ack this one? I'd like to apply this series for v4.5 within next
> few days..

Sorry for the delay. ACK.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

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