[RFC PATCH 0/3] mux framework rework

public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed

* [RFC PATCH 0/3] mux framework rework
@ 2009-10-28 13:07 Mike Rapoport
  2009-10-28 13:07 ` [PATCH 1/3] omap2: mux: intoduce omap_mux_{read,write} Mike Rapoport
                   ` (3 more replies)
  0 siblings, 4 replies; 11+ messages in thread
From: Mike Rapoport @ 2009-10-28 13:07 UTC (permalink / raw)
  To: linux-omap; +Cc: Mike Rapoport

This is an attempt to start rework of the mux framework keeping as
much backward compatibility as possible.
The patch serie introduces a new mux configuration interface that
follows the ideas of PXA MFP implementation ([1] and [2]).
The mux configuration interface is implemented for OMAP3 and partially
for OMAP2 processors.
The OMAP2 implementation is far from being complete. Unfortunately I
do not have OMAP2 docs, so I've added only configration for pins
defined in omap24xx_pins table.

The older opam_cfg_reg interface is still present and can be used to
avoid too many broken things in steps 2 & 3 as of Tony's plans ([3]).

[1] Documentation/arm/pxa/mfp.txt
[2] http://elinux.org/OMAP_wishlist#References
[3] http://elinux.org/OMAP_wishlist#Initial_plans_.28from_Tony.2C_for_next_merge_window.29

Changes since commit 0bbf5337f2f2957775051a3caf60b66d3306c815
  Tony Lindgren
  	Fix compile for 1510 innovator

Mike Rapoport (3):
  omap2: mux: intoduce omap_mux_{read,write}
  omap: mux: add interface for encoded mux configration
  omap2: mux: implement encoded mux configuration

 arch/arm/mach-omap2/include/mach/mux.h     |  452 +++++++++++++++
 arch/arm/mach-omap2/include/mach/mux24xx.h |  128 ++++
 arch/arm/mach-omap2/include/mach/mux34xx.h |  862 ++++++++++++++++++++++++++++
 arch/arm/mach-omap2/mux.c                  |  158 +++++-
 arch/arm/plat-omap/include/plat/mux.h      |   62 +--
 arch/arm/plat-omap/mux.c                   |   17 +
 6 files changed, 1614 insertions(+), 65 deletions(-)
 create mode 100644 arch/arm/mach-omap2/include/mach/mux.h
 create mode 100644 arch/arm/mach-omap2/include/mach/mux24xx.h
 create mode 100644 arch/arm/mach-omap2/include/mach/mux34xx.h


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH 1/3] omap2: mux: intoduce omap_mux_{read,write}
  2009-10-28 13:07 [RFC PATCH 0/3] mux framework rework Mike Rapoport
@ 2009-10-28 13:07 ` Mike Rapoport
  2009-10-29 15:50   ` Tony Lindgren
  2009-10-28 13:07 ` [PATCH 2/3] omap: mux: add interface for encoded mux configration Mike Rapoport
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 11+ messages in thread
From: Mike Rapoport @ 2009-10-28 13:07 UTC (permalink / raw)
  To: linux-omap; +Cc: Mike Rapoport

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
---
 arch/arm/mach-omap2/mux.c |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 32c953e..eb6e202 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -37,6 +37,22 @@
 
 static struct omap_mux_cfg arch_mux_cfg;
 
+static inline u16 omap_mux_read(u16 reg)
+{
+	if (cpu_is_omap24xx())
+		return omap_ctrl_readb(reg);
+	else
+		return omap_ctrl_readw(reg);
+}
+
+static inline void omap_mux_write(u16 val, u16 reg)
+{
+	if (cpu_is_omap24xx())
+		return omap_ctrl_writeb(val, reg);
+	else
+		return omap_ctrl_writew(val, reg);
+}
+
 /* NOTE: See mux.h for the enumeration */
 
 #ifdef CONFIG_ARCH_OMAP24XX
@@ -566,10 +582,7 @@ static void __init_or_module omap2_cfg_debug(const struct pin_config *cfg, u16 r
 	u16 orig;
 	u8 warn = 0, debug = 0;
 
-	if (cpu_is_omap24xx())
-		orig = omap_ctrl_readb(cfg->mux_reg);
-	else
-		orig = omap_ctrl_readw(cfg->mux_reg);
+	orig = omap_mux_read(cfg->mux_reg);
 
 #ifdef	CONFIG_OMAP_MUX_DEBUG
 	debug = cfg->debug;
@@ -599,7 +612,7 @@ static int __init_or_module omap24xx_cfg_reg(const struct pin_config *cfg)
 	if (cfg->pu_pd_val)
 		reg |= OMAP2_PULL_UP;
 	omap2_cfg_debug(cfg, reg);
-	omap_ctrl_writeb(reg, cfg->mux_reg);
+	omap_mux_write(reg, cfg->mux_reg);
 	spin_unlock_irqrestore(&mux_spin_lock, flags);
 
 	return 0;
@@ -618,7 +631,7 @@ static int __init_or_module omap34xx_cfg_reg(const struct pin_config *cfg)
 	spin_lock_irqsave(&mux_spin_lock, flags);
 	reg |= cfg->mux_val;
 	omap2_cfg_debug(cfg, reg);
-	omap_ctrl_writew(reg, cfg->mux_reg);
+	omap_mux_write(reg, cfg->mux_reg);
 	spin_unlock_irqrestore(&mux_spin_lock, flags);
 
 	return 0;
-- 
1.6.0.6


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/3] omap2: mux: intoduce omap_mux_{read,write}
  2009-10-28 13:07 ` [PATCH 1/3] omap2: mux: intoduce omap_mux_{read,write} Mike Rapoport
@ 2009-10-29 15:50   ` Tony Lindgren
  2009-10-29 16:51     ` [PATCH 1/3] omap2: mux: intoduce omap_mux_{read,write}, v2 Tony Lindgren
  0 siblings, 1 reply; 11+ messages in thread
From: Tony Lindgren @ 2009-10-29 15:50 UTC (permalink / raw)
  To: Mike Rapoport; +Cc: linux-omap

* Mike Rapoport <mike@compulab.co.il> [091028 06:17]:
> Signed-off-by: Mike Rapoport <mike@compulab.co.il>
> ---
>  arch/arm/mach-omap2/mux.c |   25 +++++++++++++++++++------
>  1 files changed, 19 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
> index 32c953e..eb6e202 100644
> --- a/arch/arm/mach-omap2/mux.c
> +++ b/arch/arm/mach-omap2/mux.c
> @@ -37,6 +37,22 @@
>  
>  static struct omap_mux_cfg arch_mux_cfg;
>  
> +static inline u16 omap_mux_read(u16 reg)
> +{
> +	if (cpu_is_omap24xx())
> +		return omap_ctrl_readb(reg);
> +	else
> +		return omap_ctrl_readw(reg);
> +}
> +
> +static inline void omap_mux_write(u16 val, u16 reg)
> +{
> +	if (cpu_is_omap24xx())
> +		return omap_ctrl_writeb(val, reg);
> +	else
> +		return omap_ctrl_writew(val, reg);
> +}
> +

The void function should not return any values above..

I suggest we standardize on:

static void __iomem *mux_base;

static inline u16 omap_mux_read(u16 reg)
{
       if (cpu_is_omap24xx())
               return __raw_readb(mux_base + reg);
       else
               return __raw_readw(mux_base + reg);
}

static inline void _omap_mux_write(u16 val, u16 reg)
{
       if (cpu_is_omap24xx())
               __raw_writeb(val, mux_base + reg);
       else
               __raw_writew(val, mux_base + reg);
}

And then ioremap the mux_base during init. We should
also specifiy the mux base as the start of the mux
registers, 0x48002030 for omap3 instead of the ctrl
base at 0x48002000.

This means that we should deduct 0x30 from the
existing offset values to make conversion to new
data less error prone..

>  /* NOTE: See mux.h for the enumeration */
>  
>  #ifdef CONFIG_ARCH_OMAP24XX
> @@ -566,10 +582,7 @@ static void __init_or_module omap2_cfg_debug(const struct pin_config *cfg, u16 r
>  	u16 orig;
>  	u8 warn = 0, debug = 0;
>  
> -	if (cpu_is_omap24xx())
> -		orig = omap_ctrl_readb(cfg->mux_reg);
> -	else
> -		orig = omap_ctrl_readw(cfg->mux_reg);
> +	orig = omap_mux_read(cfg->mux_reg);
>  
>  #ifdef	CONFIG_OMAP_MUX_DEBUG
>  	debug = cfg->debug;

Or maybe use orig = omap_mux_read(cfg->mux_reg - 0x30);
here instead for the old mux data?

> @@ -599,7 +612,7 @@ static int __init_or_module omap24xx_cfg_reg(const struct pin_config *cfg)
>  	if (cfg->pu_pd_val)
>  		reg |= OMAP2_PULL_UP;
>  	omap2_cfg_debug(cfg, reg);
> -	omap_ctrl_writeb(reg, cfg->mux_reg);
> +	omap_mux_write(reg, cfg->mux_reg);
>  	spin_unlock_irqrestore(&mux_spin_lock, flags);
>  
>  	return 0;
> @@ -618,7 +631,7 @@ static int __init_or_module omap34xx_cfg_reg(const struct pin_config *cfg)
>  	spin_lock_irqsave(&mux_spin_lock, flags);
>  	reg |= cfg->mux_val;
>  	omap2_cfg_debug(cfg, reg);
> -	omap_ctrl_writew(reg, cfg->mux_reg);
> +	omap_mux_write(reg, cfg->mux_reg);
>  	spin_unlock_irqrestore(&mux_spin_lock, flags);
>  
>  	return 0;
> -- 
> 1.6.0.6
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/3] omap2: mux: intoduce omap_mux_{read,write}, v2
  2009-10-29 15:50   ` Tony Lindgren
@ 2009-10-29 16:51     ` Tony Lindgren
  2009-10-29 20:28       ` Mike Rapoport
  0 siblings, 1 reply; 11+ messages in thread
From: Tony Lindgren @ 2009-10-29 16:51 UTC (permalink / raw)
  To: Mike Rapoport; +Cc: linux-omap

[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]

* Tony Lindgren <tony@atomide.com> [091029 08:50]:
> * Mike Rapoport <mike@compulab.co.il> [091028 06:17]:
> > Signed-off-by: Mike Rapoport <mike@compulab.co.il>
> > ---
> >  arch/arm/mach-omap2/mux.c |   25 +++++++++++++++++++------
> >  1 files changed, 19 insertions(+), 6 deletions(-)
> > 
> > diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
> > index 32c953e..eb6e202 100644
> > --- a/arch/arm/mach-omap2/mux.c
> > +++ b/arch/arm/mach-omap2/mux.c
> > @@ -37,6 +37,22 @@
> >  
> >  static struct omap_mux_cfg arch_mux_cfg;
> >  
> > +static inline u16 omap_mux_read(u16 reg)
> > +{
> > +	if (cpu_is_omap24xx())
> > +		return omap_ctrl_readb(reg);
> > +	else
> > +		return omap_ctrl_readw(reg);
> > +}
> > +
> > +static inline void omap_mux_write(u16 val, u16 reg)
> > +{
> > +	if (cpu_is_omap24xx())
> > +		return omap_ctrl_writeb(val, reg);
> > +	else
> > +		return omap_ctrl_writew(val, reg);
> > +}
> > +
> 
> The void function should not return any values above..
> 
> I suggest we standardize on:

Here's an updated version of your patch, what do you think?

Tony

[-- Attachment #2: mux-read-write-v2.patch --]
[-- Type: text/x-diff, Size: 3062 bytes --]

>From db32fbf2e64174568e4ca4019926f9e43bba9b7e Mon Sep 17 00:00:00 2001
From: Mike Rapoport <mike@compulab.co.il>
Date: Wed, 28 Oct 2009 14:36:38 -0700
Subject: [PATCH] omap2: mux: intoduce omap_mux_{read,write}

intoduce omap_mux_{read,write}

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 32c953e..ad8e0d0 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -35,7 +35,27 @@
 
 #ifdef CONFIG_OMAP_MUX
 
+#define OMAP_MUX_BASE_OFFSET		0x30	/* Offset from CTRL_BASE */
+#define OMAP_MUX_BASE_SZ		0x5ca
+
 static struct omap_mux_cfg arch_mux_cfg;
+static void __iomem *mux_base;
+
+static inline u16 omap_mux_read(u16 reg)
+{
+       if (cpu_is_omap24xx())
+               return __raw_readb(mux_base + reg);
+       else
+               return __raw_readw(mux_base + reg);
+}
+
+static inline void omap_mux_write(u16 val, u16 reg)
+{
+       if (cpu_is_omap24xx())
+               __raw_writeb(val, mux_base + reg);
+       else
+               __raw_writew(val, mux_base + reg);
+}
 
 /* NOTE: See mux.h for the enumeration */
 
@@ -566,10 +586,7 @@ static void __init_or_module omap2_cfg_debug(const struct pin_config *cfg, u16 r
 	u16 orig;
 	u8 warn = 0, debug = 0;
 
-	if (cpu_is_omap24xx())
-		orig = omap_ctrl_readb(cfg->mux_reg);
-	else
-		orig = omap_ctrl_readw(cfg->mux_reg);
+	orig = omap_mux_read(cfg->mux_reg - OMAP_MUX_BASE_OFFSET);
 
 #ifdef	CONFIG_OMAP_MUX_DEBUG
 	debug = cfg->debug;
@@ -599,7 +616,7 @@ static int __init_or_module omap24xx_cfg_reg(const struct pin_config *cfg)
 	if (cfg->pu_pd_val)
 		reg |= OMAP2_PULL_UP;
 	omap2_cfg_debug(cfg, reg);
-	omap_ctrl_writeb(reg, cfg->mux_reg);
+	omap_mux_write(reg, cfg->mux_reg - OMAP_MUX_BASE_OFFSET);
 	spin_unlock_irqrestore(&mux_spin_lock, flags);
 
 	return 0;
@@ -618,7 +635,7 @@ static int __init_or_module omap34xx_cfg_reg(const struct pin_config *cfg)
 	spin_lock_irqsave(&mux_spin_lock, flags);
 	reg |= cfg->mux_val;
 	omap2_cfg_debug(cfg, reg);
-	omap_ctrl_writew(reg, cfg->mux_reg);
+	omap_mux_write(reg, cfg->mux_reg - OMAP_MUX_BASE_OFFSET);
 	spin_unlock_irqrestore(&mux_spin_lock, flags);
 
 	return 0;
@@ -627,8 +644,27 @@ static int __init_or_module omap34xx_cfg_reg(const struct pin_config *cfg)
 #define omap34xx_cfg_reg	NULL
 #endif
 
+#define OMAP2
+#define OMAP2_CONTROL_PADCONF_MUX_PBASE	0x48002030LU
+#define OMAP3_CONTROL_PADCONF_MUX_PBASE	0x48002030LU
+
 int __init omap2_mux_init(void)
 {
+	u32 mux_pbase;
+
+	if (cpu_is_omap2420())
+		mux_pbase = OMAP2420_CTRL_BASE + OMAP_MUX_BASE_OFFSET;
+	else if (cpu_is_omap2430())
+		mux_pbase = OMAP243X_CTRL_BASE + OMAP_MUX_BASE_OFFSET;
+	else if (cpu_is_omap34xx())
+		mux_pbase = OMAP343X_CTRL_BASE + OMAP_MUX_BASE_OFFSET;
+
+	mux_base = ioremap(mux_pbase, OMAP_MUX_BASE_SZ);
+	if (!mux_base) {
+		printk(KERN_ERR "mux: Could not ioremap\n");
+		return -ENODEV;
+	}
+
 	if (cpu_is_omap24xx()) {
 		arch_mux_cfg.pins	= omap24xx_pins;
 		arch_mux_cfg.size	= OMAP24XX_PINS_SZ;

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/3] omap2: mux: intoduce omap_mux_{read,write}, v2
  2009-10-29 16:51     ` [PATCH 1/3] omap2: mux: intoduce omap_mux_{read,write}, v2 Tony Lindgren
@ 2009-10-29 20:28       ` Mike Rapoport
  2009-10-29 20:30         ` Tony Lindgren
  0 siblings, 1 reply; 11+ messages in thread
From: Mike Rapoport @ 2009-10-29 20:28 UTC (permalink / raw)
  To: Tony Lindgren; +Cc: Mike Rapoport, linux-omap

On Thu, Oct 29, 2009 at 6:51 PM, Tony Lindgren <tony@atomide.com> wrote:
> * Tony Lindgren <tony@atomide.com> [091029 08:50]:
>> * Mike Rapoport <mike@compulab.co.il> [091028 06:17]:
>> > Signed-off-by: Mike Rapoport <mike@compulab.co.il>
>> > ---
>> >  arch/arm/mach-omap2/mux.c |   25 +++++++++++++++++++------
>> >  1 files changed, 19 insertions(+), 6 deletions(-)
>> >
>> > +static inline void omap_mux_write(u16 val, u16 reg)
>> > +{
>> > +   if (cpu_is_omap24xx())
>> > +           return omap_ctrl_writeb(val, reg);
>> > +   else
>> > +           return omap_ctrl_writew(val, reg);
>> > +}
>> > +
>>
>> The void function should not return any values above..

damn copy-paset :)

>> I suggest we standardize on:
>
> Here's an updated version of your patch, what do you think?

I'm fine with ioremap and the offsets. Just one thing below:

> @@ -627,8 +644,27 @@ static int __init_or_module omap34xx_cfg_reg(const struct pin_config *cfg)
>  #define omap34xx_cfg_reg	NULL
>  #endif
>
> +#define OMAP2
> +#define OMAP2_CONTROL_PADCONF_MUX_PBASE	0x48002030LU
> +#define OMAP3_CONTROL_PADCONF_MUX_PBASE	0x48002030LU

what are these for?

>  int __init omap2_mux_init(void)
>  {
> +	u32 mux_pbase;
> +
> +	if (cpu_is_omap2420())
> +		mux_pbase = OMAP2420_CTRL_BASE + OMAP_MUX_BASE_OFFSET;
> +	else if (cpu_is_omap2430())
> +		mux_pbase = OMAP243X_CTRL_BASE + OMAP_MUX_BASE_OFFSET;
> +	else if (cpu_is_omap34xx())
> +		mux_pbase = OMAP343X_CTRL_BASE + OMAP_MUX_BASE_OFFSET;
> +


> Tony
>



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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/3] omap2: mux: intoduce omap_mux_{read,write}, v2
  2009-10-29 20:28       ` Mike Rapoport
@ 2009-10-29 20:30         ` Tony Lindgren
  0 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2009-10-29 20:30 UTC (permalink / raw)
  To: Mike Rapoport; +Cc: Mike Rapoport, linux-omap

* Mike Rapoport <mike.rapoport@gmail.com> [091029 13:28]:
> On Thu, Oct 29, 2009 at 6:51 PM, Tony Lindgren <tony@atomide.com> wrote:
> > * Tony Lindgren <tony@atomide.com> [091029 08:50]:
> >> * Mike Rapoport <mike@compulab.co.il> [091028 06:17]:
> >> > Signed-off-by: Mike Rapoport <mike@compulab.co.il>
> >> > ---
> >> >  arch/arm/mach-omap2/mux.c |   25 +++++++++++++++++++------
> >> >  1 files changed, 19 insertions(+), 6 deletions(-)
> >> >
> >> > +static inline void omap_mux_write(u16 val, u16 reg)
> >> > +{
> >> > +   if (cpu_is_omap24xx())
> >> > +           return omap_ctrl_writeb(val, reg);
> >> > +   else
> >> > +           return omap_ctrl_writew(val, reg);
> >> > +}
> >> > +
> >>
> >> The void function should not return any values above..
> 
> damn copy-paset :)
> 
> >> I suggest we standardize on:
> >
> > Here's an updated version of your patch, what do you think?
> 
> I'm fine with ioremap and the offsets. Just one thing below:
> 
> > @@ -627,8 +644,27 @@ static int __init_or_module omap34xx_cfg_reg(const struct pin_config *cfg)
> >  #define omap34xx_cfg_reg	NULL
> >  #endif
> >
> > +#define OMAP2
> > +#define OMAP2_CONTROL_PADCONF_MUX_PBASE	0x48002030LU
> > +#define OMAP3_CONTROL_PADCONF_MUX_PBASE	0x48002030LU
> 
> what are these for?

Oops, more copy-patse :) Removed now. Will send you my patches
now for you to check them out.

Tony
 
> >  int __init omap2_mux_init(void)
> >  {
> > +	u32 mux_pbase;
> > +
> > +	if (cpu_is_omap2420())
> > +		mux_pbase = OMAP2420_CTRL_BASE + OMAP_MUX_BASE_OFFSET;
> > +	else if (cpu_is_omap2430())
> > +		mux_pbase = OMAP243X_CTRL_BASE + OMAP_MUX_BASE_OFFSET;
> > +	else if (cpu_is_omap34xx())
> > +		mux_pbase = OMAP343X_CTRL_BASE + OMAP_MUX_BASE_OFFSET;
> > +
> 
> 
> > Tony
> >
> 
> 
> 
> -- 
> 	Sincerely Yours,
> 		Mike.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH 2/3] omap: mux: add interface for encoded mux configration
  2009-10-28 13:07 [RFC PATCH 0/3] mux framework rework Mike Rapoport
  2009-10-28 13:07 ` [PATCH 1/3] omap2: mux: intoduce omap_mux_{read,write} Mike Rapoport
@ 2009-10-28 13:07 ` Mike Rapoport
  2009-10-28 13:07 ` [PATCH 3/3] omap2: mux: implement encoded mux configuration Mike Rapoport
  2009-10-28 16:53 ` [RFC PATCH 0/3] mux framework rework Tony Lindgren
  3 siblings, 0 replies; 11+ messages in thread
From: Mike Rapoport @ 2009-10-28 13:07 UTC (permalink / raw)
  To: linux-omap; +Cc: Mike Rapoport

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
---
 arch/arm/plat-omap/include/plat/mux.h |    3 +++
 arch/arm/plat-omap/mux.c              |   17 +++++++++++++++++
 2 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/mux.h b/arch/arm/plat-omap/include/plat/mux.h
index f3c1d8a..edc3ff9 100644
--- a/arch/arm/plat-omap/include/plat/mux.h
+++ b/arch/arm/plat-omap/include/plat/mux.h
@@ -846,6 +846,7 @@ struct omap_mux_cfg {
 	struct pin_config	*pins;
 	unsigned long		size;
 	int			(*cfg_reg)(const struct pin_config *cfg);
+	int			(*cfg_pin)(unsigned long pin_config);
 };
 
 #ifdef	CONFIG_OMAP_MUX
@@ -854,11 +855,13 @@ extern int omap1_mux_init(void);
 extern int omap2_mux_init(void);
 extern int omap_mux_register(struct omap_mux_cfg *);
 extern int omap_cfg_reg(unsigned long reg_cfg);
+extern int omap_cfg_pin(unsigned long pin_config);
 #else
 /* boot loader does it all (no warnings from CONFIG_OMAP_MUX_WARNINGS) */
 static inline int omap1_mux_init(void) { return 0; }
 static inline int omap2_mux_init(void) { return 0; }
 static inline int omap_cfg_reg(unsigned long reg_cfg) { return 0; }
+static inline int omap_cfg_pin(unsigned long pin_config) { return 0; }
 #endif
 
 #endif
diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c
index 05aebca..94b37c1 100644
--- a/arch/arm/plat-omap/mux.c
+++ b/arch/arm/plat-omap/mux.c
@@ -77,7 +77,24 @@ int __init_or_module omap_cfg_reg(const unsigned long index)
 	return mux_cfg->cfg_reg(reg);
 }
 EXPORT_SYMBOL(omap_cfg_reg);
+
+int __init_or_module omap_cfg_pin(unsigned long pin_config)
+{
+	if (mux_cfg == NULL) {
+		printk(KERN_ERR "MUX: pin mux table not initialized\n");
+		return -ENODEV;
+	}
+
+	if (!mux_cfg->cfg_pin) {
+		printk(KERN_ERR "MUX: cfg_pin interface is not supported\n");
+		return -ENODEV;
+	}
+
+	return mux_cfg->cfg_pin(pin_config);
+}
+EXPORT_SYMBOL(omap_cfg_pin);
 #else
 #define omap_mux_init() do {} while(0)
 #define omap_cfg_reg(x)	do {} while(0)
+#define omap_cfg_pin(x)	do {} while(0)
 #endif	/* CONFIG_OMAP_MUX */
-- 
1.6.0.6


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 3/3] omap2: mux: implement encoded mux configuration
  2009-10-28 13:07 [RFC PATCH 0/3] mux framework rework Mike Rapoport
  2009-10-28 13:07 ` [PATCH 1/3] omap2: mux: intoduce omap_mux_{read,write} Mike Rapoport
  2009-10-28 13:07 ` [PATCH 2/3] omap: mux: add interface for encoded mux configration Mike Rapoport
@ 2009-10-28 13:07 ` Mike Rapoport
  2009-10-28 16:53 ` [RFC PATCH 0/3] mux framework rework Tony Lindgren
  3 siblings, 0 replies; 11+ messages in thread
From: Mike Rapoport @ 2009-10-28 13:07 UTC (permalink / raw)
  To: linux-omap; +Cc: Mike Rapoport

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
---
 arch/arm/mach-omap2/include/mach/mux.h     |  452 +++++++++++++++
 arch/arm/mach-omap2/include/mach/mux24xx.h |  128 ++++
 arch/arm/mach-omap2/include/mach/mux34xx.h |  862 ++++++++++++++++++++++++++++
 arch/arm/mach-omap2/mux.c                  |  133 +++++
 arch/arm/plat-omap/include/plat/mux.h      |   59 --
 5 files changed, 1575 insertions(+), 59 deletions(-)
 create mode 100644 arch/arm/mach-omap2/include/mach/mux.h
 create mode 100644 arch/arm/mach-omap2/include/mach/mux24xx.h
 create mode 100644 arch/arm/mach-omap2/include/mach/mux34xx.h

diff --git a/arch/arm/mach-omap2/include/mach/mux.h b/arch/arm/mach-omap2/include/mach/mux.h
new file mode 100644
index 0000000..c8f8be6
--- /dev/null
+++ b/arch/arm/mach-omap2/include/mach/mux.h
@@ -0,0 +1,452 @@
+/*
+ * arch/arm/mach-omap2/include/mach/mux.h
+ *
+ * Copyright (C) 2009 CompuLab, Ltd.
+ * Author: Mike Rapoport <mike@compulab.co.il>
+ *
+ * Based on PXA MFP code
+ * Copyright (C) 2007 Marvell International Ltd.
+ * Author: eric miao <eric.miao@marvell.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef __MACH_OMAP2_MUX_H
+#define __MACH_OMAP2_MUX_H
+
+/*
+ * list of all the configurable pins for omap2 and omap3 processors
+ * FIXME: add missing omap2 pins
+ */
+enum {
+	/* OMAP3 configurable pins */
+	MUX_PIN_INVALID = -1,
+	MUX_PIN_GPMC_A1 = 0,
+	MUX_PIN_GPMC_A2,
+	MUX_PIN_GPMC_A3,
+	MUX_PIN_GPMC_A4,
+	MUX_PIN_GPMC_A5,
+	MUX_PIN_GPMC_A6,
+	MUX_PIN_GPMC_A7,
+	MUX_PIN_GPMC_A8,
+	MUX_PIN_GPMC_A9,
+	MUX_PIN_GPMC_A10,
+	MUX_PIN_GPMC_D0,
+	MUX_PIN_GPMC_D1,
+	MUX_PIN_GPMC_D2,
+	MUX_PIN_GPMC_D3,
+	MUX_PIN_GPMC_D4,
+	MUX_PIN_GPMC_D5,
+	MUX_PIN_GPMC_D6,
+	MUX_PIN_GPMC_D7,
+	MUX_PIN_GPMC_D8,
+	MUX_PIN_GPMC_D9,
+	MUX_PIN_GPMC_D10,
+	MUX_PIN_GPMC_D11,
+	MUX_PIN_GPMC_D12,
+	MUX_PIN_GPMC_D13,
+	MUX_PIN_GPMC_D14,
+	MUX_PIN_GPMC_D15,
+	MUX_PIN_GPMC_NCS0,
+	MUX_PIN_GPMC_NCS1,
+	MUX_PIN_GPMC_NCS2,
+	MUX_PIN_GPMC_NCS3,
+	MUX_PIN_GPMC_NCS4,
+	MUX_PIN_GPMC_NCS5,
+	MUX_PIN_GPMC_NCS6,
+	MUX_PIN_GPMC_NCS7,
+	MUX_PIN_GPMC_CLK,
+	MUX_PIN_GPMC_NADV_ALE,
+	MUX_PIN_GPMC_NOE,
+	MUX_PIN_GPMC_NWE,
+	MUX_PIN_GPMC_NBE0_CLE,
+	MUX_PIN_GPMC_NBE1,
+	MUX_PIN_GPMC_NWP,
+	MUX_PIN_GPMC_WAIT0,
+	MUX_PIN_GPMC_WAIT1,
+	MUX_PIN_GPMC_WAIT2,
+	MUX_PIN_GPMC_WAIT3,
+	MUX_PIN_DSS_PCLK,
+	MUX_PIN_DSS_HSYNC,
+	MUX_PIN_DSS_VSYNC,
+	MUX_PIN_DSS_ACBIAS,
+	MUX_PIN_DSS_DATA0,
+	MUX_PIN_DSS_DATA1,
+	MUX_PIN_DSS_DATA2,
+	MUX_PIN_DSS_DATA3,
+	MUX_PIN_DSS_DATA4,
+	MUX_PIN_DSS_DATA5,
+	MUX_PIN_DSS_DATA6,
+	MUX_PIN_DSS_DATA7,
+	MUX_PIN_DSS_DATA8,
+	MUX_PIN_DSS_DATA9,
+	MUX_PIN_DSS_DATA10,
+	MUX_PIN_DSS_DATA11,
+	MUX_PIN_DSS_DATA12,
+	MUX_PIN_DSS_DATA13,
+	MUX_PIN_DSS_DATA14,
+	MUX_PIN_DSS_DATA15,
+	MUX_PIN_DSS_DATA16,
+	MUX_PIN_DSS_DATA17,
+	MUX_PIN_DSS_DATA18,
+	MUX_PIN_DSS_DATA19,
+	MUX_PIN_DSS_DATA20,
+	MUX_PIN_DSS_DATA21,
+	MUX_PIN_DSS_DATA22,
+	MUX_PIN_DSS_DATA23,
+	MUX_PIN_CAM_HS,
+	MUX_PIN_CAM_VS,
+	MUX_PIN_CAM_XCLKA,
+	MUX_PIN_CAM_PCLK,
+	MUX_PIN_CAM_FLD,
+	MUX_PIN_CAM_D0,
+	MUX_PIN_CAM_D1,
+	MUX_PIN_CAM_D2,
+	MUX_PIN_CAM_D3,
+	MUX_PIN_CAM_D4,
+	MUX_PIN_CAM_D5,
+	MUX_PIN_CAM_D6,
+	MUX_PIN_CAM_D7,
+	MUX_PIN_CAM_D8,
+	MUX_PIN_CAM_D9,
+	MUX_PIN_CAM_D10,
+	MUX_PIN_CAM_D11,
+	MUX_PIN_CAM_XCLKB,
+	MUX_PIN_CAM_WEN,
+	MUX_PIN_CAM_STROBE,
+	MUX_PIN_CSI2_DX0,
+	MUX_PIN_CSI2_DY0,
+	MUX_PIN_CSI2_DX1,
+	MUX_PIN_CSI2_DY1,
+	MUX_PIN_MCBSP2_FSX,
+	MUX_PIN_MCBSP2_CLKX,
+	MUX_PIN_MCBSP2_DR,
+	MUX_PIN_MCBSP2_DX,
+	MUX_PIN_MMC1_CLK,
+	MUX_PIN_MMC1_CMD,
+	MUX_PIN_MMC1_DAT0,
+	MUX_PIN_MMC1_DAT1,
+	MUX_PIN_MMC1_DAT2,
+	MUX_PIN_MMC1_DAT3,
+	MUX_PIN_MMC1_DAT4,
+	MUX_PIN_MMC1_DAT5,
+	MUX_PIN_MMC1_DAT6,
+	MUX_PIN_MMC1_DAT7,
+	MUX_PIN_MMC2_CLK,
+	MUX_PIN_MMC2_CMD,
+	MUX_PIN_MMC2_DAT0,
+	MUX_PIN_MMC2_DAT1,
+	MUX_PIN_MMC2_DAT2,
+	MUX_PIN_MMC2_DAT3,
+	MUX_PIN_MMC2_DAT4,
+	MUX_PIN_MMC2_DAT5,
+	MUX_PIN_MMC2_DAT6,
+	MUX_PIN_MMC2_DAT7,
+	MUX_PIN_MCBSP3_DX,
+	MUX_PIN_MCBSP3_DR,
+	MUX_PIN_MCBSP3_CLKX,
+	MUX_PIN_MCBSP3_FSX,
+	MUX_PIN_UART2_CTS,
+	MUX_PIN_UART2_RTS,
+	MUX_PIN_UART2_TX,
+	MUX_PIN_UART2_RX,
+	MUX_PIN_UART1_TX,
+	MUX_PIN_UART1_RTS,
+	MUX_PIN_UART1_CTS,
+	MUX_PIN_UART1_RX,
+	MUX_PIN_MCBSP4_CLKX,
+	MUX_PIN_MCBSP4_DR,
+	MUX_PIN_MCBSP4_DX,
+	MUX_PIN_MCBSP4_FSX,
+	MUX_PIN_MCBSP1_CLKR,
+	MUX_PIN_MCBSP1_FSR,
+	MUX_PIN_MCBSP1_DX,
+	MUX_PIN_MCBSP1_DR,
+	MUX_PIN_MCBSP_CLKS,
+	MUX_PIN_MCBSP1_FSX,
+	MUX_PIN_MCBSP1_CLKX,
+	MUX_PIN_UART3_CTS_RCTX,
+	MUX_PIN_UART3_RTS_SD,
+	MUX_PIN_UART3_RX,
+	MUX_PIN_UART3_TX,
+	MUX_PIN_HSUSB0_CLK,
+	MUX_PIN_HSUSB0_STP,
+	MUX_PIN_HSUSB0_DIR,
+	MUX_PIN_HSUSB0_NXT,
+	MUX_PIN_HSUSB0_DATA0,
+	MUX_PIN_HSUSB0_DATA1,
+	MUX_PIN_HSUSB0_DATA2,
+	MUX_PIN_HSUSB0_DATA3,
+	MUX_PIN_HSUSB0_DATA4,
+	MUX_PIN_HSUSB0_DATA5,
+	MUX_PIN_HSUSB0_DATA6,
+	MUX_PIN_HSUSB0_DATA7,
+	MUX_PIN_I2C1_SCL,
+	MUX_PIN_I2C1_SDA,
+	MUX_PIN_I2C2_SCL,
+	MUX_PIN_I2C2_SDA,
+	MUX_PIN_I2C3_SCL,
+	MUX_PIN_I2C3_SDA,
+	MUX_PIN_HDQ_SIO,
+	MUX_PIN_MCSPI1_CLK,
+	MUX_PIN_MCSPI1_SIMO,
+	MUX_PIN_MCSPI1_SOMI,
+	MUX_PIN_MCSPI1_CS0,
+	MUX_PIN_MCSPI1_CS1,
+	MUX_PIN_MCSPI1_CS2,
+	MUX_PIN_MCSPI1_CS3,
+	MUX_PIN_MCSPI2_CLK,
+	MUX_PIN_MCSPI2_SIMO,
+	MUX_PIN_MCSPI2_SOMI,
+	MUX_PIN_MCSPI2_CS0,
+	MUX_PIN_MCSPI2_CS1,
+	MUX_PIN_SYS_NIRQ,
+	MUX_PIN_SYS_CLKOUT2,
+	MUX_PIN_SAD2D_MCAD0,
+	MUX_PIN_SAD2D_MCAD1,
+	MUX_PIN_SAD2D_MCAD2,
+	MUX_PIN_SAD2D_MCAD3,
+	MUX_PIN_SAD2D_MCAD4,
+	MUX_PIN_SAD2D_MCAD5,
+	MUX_PIN_SAD2D_MCAD6,
+	MUX_PIN_SAD2D_MCAD7,
+	MUX_PIN_SAD2D_MCAD8,
+	MUX_PIN_SAD2D_MCAD9,
+	MUX_PIN_SAD2D_MCAD10,
+	MUX_PIN_SAD2D_MCAD11,
+	MUX_PIN_SAD2D_MCAD12,
+	MUX_PIN_SAD2D_MCAD13,
+	MUX_PIN_SAD2D_MCAD14,
+	MUX_PIN_SAD2D_MCAD15,
+	MUX_PIN_SAD2D_MCAD16,
+	MUX_PIN_SAD2D_MCAD17,
+	MUX_PIN_SAD2D_MCAD18,
+	MUX_PIN_SAD2D_MCAD19,
+	MUX_PIN_SAD2D_MCAD20,
+	MUX_PIN_SAD2D_MCAD21,
+	MUX_PIN_SAD2D_MCAD22,
+	MUX_PIN_SAD2D_MCAD23,
+	MUX_PIN_SAD2D_MCAD24,
+	MUX_PIN_SAD2D_MCAD25,
+	MUX_PIN_SAD2D_MCAD26,
+	MUX_PIN_SAD2D_MCAD27,
+	MUX_PIN_SAD2D_MCAD28,
+	MUX_PIN_SAD2D_MCAD29,
+	MUX_PIN_SAD2D_MCAD30,
+	MUX_PIN_SAD2D_MCAD31,
+	MUX_PIN_SAD2D_MCAD32,
+	MUX_PIN_SAD2D_MCAD33,
+	MUX_PIN_SAD2D_MCAD34,
+	MUX_PIN_SAD2D_MCAD35,
+	MUX_PIN_SAD2D_MCAD36,
+	MUX_PIN_SAD2D_CLK26MI,
+	MUX_PIN_SAD2D_NRESPWRON,
+	MUX_PIN_SAD2D_NRESWARM,
+	MUX_PIN_SAD2D_ARMNIRQ,
+	MUX_PIN_SAD2D_UMAFIQ,
+	MUX_PIN_SAD2D_SPINT,
+	MUX_PIN_SAD2D_FRINT,
+	MUX_PIN_SAD2D_DMAREQ0,
+	MUX_PIN_SAD2D_DMAREQ1,
+	MUX_PIN_SAD2D_DMAREQ2,
+	MUX_PIN_SAD2D_DMAREQ3,
+	MUX_PIN_SAD2D_NTRST,
+	MUX_PIN_SAD2D_TDI,
+	MUX_PIN_SAD2D_TDO,
+	MUX_PIN_SAD2D_TMS,
+	MUX_PIN_SAD2D_TCK,
+	MUX_PIN_SAD2D_RTCK,
+	MUX_PIN_SAD2D_MSTDBY,
+	MUX_PIN_SAD2D_IDLEREQ,
+	MUX_PIN_SAD2D_IDLEACK,
+	MUX_PIN_SAD2D_MWRITE,
+	MUX_PIN_SAD2D_SWRITE,
+	MUX_PIN_SAD2D_MREAD,
+	MUX_PIN_SAD2D_SREAD,
+	MUX_PIN_SAD2D_MBUSFLAG,
+	MUX_PIN_ETK_CLK,
+	MUX_PIN_ETK_CTL,
+	MUX_PIN_ETK_D0,
+	MUX_PIN_ETK_D1,
+	MUX_PIN_ETK_D2,
+	MUX_PIN_ETK_D3,
+	MUX_PIN_ETK_D4,
+	MUX_PIN_ETK_D5,
+	MUX_PIN_ETK_D6,
+	MUX_PIN_ETK_D7,
+	MUX_PIN_ETK_D8,
+	MUX_PIN_ETK_D9,
+	MUX_PIN_ETK_D10,
+	MUX_PIN_ETK_D11,
+	MUX_PIN_ETK_D12,
+	MUX_PIN_ETK_D13,
+	MUX_PIN_ETK_D14,
+	MUX_PIN_ETK_D15,
+	MUX_PIN_I2C4_SCL,
+	MUX_PIN_I2C4_SDA,
+	MUX_PIN_SYS_32K,
+	MUX_PIN_SYS_CLKREQ,
+	MUX_PIN_SYS_NRESWARM,
+	MUX_PIN_SYS_BOOT0,
+	MUX_PIN_SYS_BOOT1,
+	MUX_PIN_SYS_BOOT2,
+	MUX_PIN_SYS_BOOT3,
+	MUX_PIN_SYS_BOOT4,
+	MUX_PIN_SYS_BOOT5,
+	MUX_PIN_SYS_BOOT6,
+	MUX_PIN_SYS_OFF_MODE,
+	MUX_PIN_SYS_CLKOUT1,
+	MUX_PIN_JTAG_NTRST,
+	MUX_PIN_JTAG_TCK,
+	MUX_PIN_JTAG_TMS_TMSC,
+	MUX_PIN_JTAG_TDI,
+	MUX_PIN_JTAG_EMU0,
+	MUX_PIN_JTAG_EMU1,
+	MUX_PIN_SAD2D_SWAKEUP,
+	MUX_PIN_JTAG_RTCK,
+	MUX_PIN_JTAG_TDO,
+
+	/*
+	 * OMAP2 pins that do not have OMAP3 equivalents
+	 * (extracted from mux.c)
+	 */
+	MUX_PIN_SYS_CLKOUT,
+	MUX_PIN_DMAREQ4,
+	MUX_PIN_DMAREQ5,
+	MUX_PIN_KBR0,
+	MUX_PIN_KBR1,
+	MUX_PIN_KBR2,
+	MUX_PIN_KBR3,
+	MUX_PIN_KBR4,
+	MUX_PIN_KBR5,
+	MUX_PIN_KBC0,
+	MUX_PIN_KBC1,
+	MUX_PIN_KBC2,
+	MUX_PIN_KBC3,
+	MUX_PIN_KBC4,
+	MUX_PIN_KBC5,
+	MUX_PIN_KBC6,
+	MUX_PIN_MCBSP5_CLKX,
+	MUX_PIN_MCBSP5_FSX,
+	MUX_PIN_MCBSP5_DX,
+	MUX_PIN_MCBSP5_DR,
+	MUX_PIN_MMC_CLKO,
+	MUX_PIN_MMC_CLKI,
+	MUX_PIN_USB0_PUEN,
+	MUX_PIN_USB0_DAT,
+	MUX_PIN_MCBSP2_FSX_OFF,
+	MUX_PIN_MCBSP2_CLX_OFF,
+	MUX_PIN_MCBSP2_DX_OFF,
+	MUX_PIN_MCBSP2_DR_OFF,
+
+	MUX_PIN_MAX,
+};
+
+/*
+ * possible pin mux configuration is encoded into 32-bit integer
+ *
+ * for now very simplistic encoding is implemented:
+ * bits  0.. 9 - pin number (up to 1024 pins)
+ * bits 10..31 - PADCONF register value
+ *
+ * Currently only simple MUX_PIN and MUX_VAL accessors are defined.
+ */
+
+#define MUX_PIN(x)	((x) & 0x3ff)
+#define MUX_VAL(x)	((x) >> 10)
+
+struct omap_mux_addr_map {
+	unsigned int	start;
+	unsigned int	end;
+	unsigned long	offset;
+};
+
+#define MUX_ADDR_X(start, end, offset) \
+	{ MUX_PIN_##start, MUX_PIN_##end, offset }
+
+#define MUX_ADDR(pin, offset) \
+	{ MUX_PIN_##pin, -1, offset }
+
+#define MUX_ADDR_END	{ MUX_PIN_INVALID, 0 }
+
+/* 24xx/34xx mux bit defines */
+#define OMAP2_PULL_ENA		(1 << 3)
+#define OMAP2_PULL_UP		(1 << 4)
+#define OMAP2_ALTELECTRICALSEL	(1 << 5)
+
+/* 34xx specific mux bit defines */
+#define OMAP3_INPUT_EN		(1 << 8)
+#define OMAP3_OFF_EN		(1 << 9)
+#define OMAP3_OFFOUT_EN		(1 << 10)
+#define OMAP3_OFFOUT_VAL	(1 << 11)
+#define OMAP3_OFF_PULL_EN	(1 << 12)
+#define OMAP3_OFF_PULL_UP	(1 << 13)
+#define OMAP3_WAKEUP_EN		(1 << 14)
+
+/* 34xx mux mode options for each pin. See TRM for options */
+#define	OMAP34XX_MUX_MODE0	0
+#define	OMAP34XX_MUX_MODE1	1
+#define	OMAP34XX_MUX_MODE2	2
+#define	OMAP34XX_MUX_MODE3	3
+#define	OMAP34XX_MUX_MODE4	4
+#define	OMAP34XX_MUX_MODE5	5
+#define	OMAP34XX_MUX_MODE6	6
+#define	OMAP34XX_MUX_MODE7	7
+
+/* 34xx active pin states */
+#define OMAP34XX_PIN_OUTPUT		0
+#define OMAP34XX_PIN_INPUT		OMAP3_INPUT_EN
+#define OMAP34XX_PIN_INPUT_PULLUP	(OMAP2_PULL_ENA | OMAP3_INPUT_EN \
+						| OMAP2_PULL_UP)
+#define OMAP34XX_PIN_INPUT_PULLDOWN	(OMAP2_PULL_ENA | OMAP3_INPUT_EN)
+
+/* 34xx off mode states */
+#define OMAP34XX_PIN_OFF_NONE           0
+#define OMAP34XX_PIN_OFF_OUTPUT_HIGH	(OMAP3_OFF_EN | OMAP3_OFFOUT_EN \
+						| OMAP3_OFFOUT_VAL)
+#define OMAP34XX_PIN_OFF_OUTPUT_LOW	(OMAP3_OFF_EN | OMAP3_OFFOUT_EN)
+#define OMAP34XX_PIN_OFF_INPUT_PULLUP	(OMAP3_OFF_EN | OMAP3_OFF_PULL_EN \
+						| OMAP3_OFF_PULL_UP)
+#define OMAP34XX_PIN_OFF_INPUT_PULLDOWN	(OMAP3_OFF_EN | OMAP3_OFF_PULL_EN)
+#define OMAP34XX_PIN_OFF_WAKEUPENABLE	OMAP3_WAKEUP_EN
+
+#define MUX_CFG_24XX(desc, reg_offset, mode,			\
+				pull_en, pull_mode, dbg)	\
+{								\
+	.name		= desc,					\
+	.debug		= dbg,					\
+	.mux_reg	= reg_offset,				\
+	.mask		= mode,					\
+	.pull_val	= pull_en,				\
+	.pu_pd_val	= pull_mode,				\
+},
+
+#define MUX_CFG_34XX(desc, reg_offset, mux_value) {		\
+	.name		= desc,					\
+	.debug		= 0,					\
+	.mux_reg	= reg_offset,				\
+	.mux_val	= mux_value				\
+},
+
+#ifdef CONFIG_ARCH_OMAP24XX
+#include <mach/mux24xx.h>
+#endif
+
+#ifdef CONFIG_ARCH_OMAP34XX
+#include <mach/mux34xx.h>
+#endif
+
+#endif
diff --git a/arch/arm/mach-omap2/include/mach/mux24xx.h b/arch/arm/mach-omap2/include/mach/mux24xx.h
new file mode 100644
index 0000000..c6c8e00
--- /dev/null
+++ b/arch/arm/mach-omap2/include/mach/mux24xx.h
@@ -0,0 +1,128 @@
+/*
+ * arch/arm/mach-omap2/include/mach/mux34xx.h
+ *
+ * Copyright (C) 2009 CompuLab, Ltd.
+ * Author: Mike Rapoport <mike@compulab.co.il>
+ *
+ * Based on PXA MFP code
+ * Copyright (C) 2007 Marvell International Ltd.
+ * Author: eric miao <eric.miao@marvell.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef __MACH_OMAP2_MUX24XX_H
+#define __MACH_OMAP2_MUX24XX_H
+
+/*
+ * Mux options encodings for OMAP2
+ */
+/* mux mode options */
+#define	OMAP2_MUX_MODE0	(0 << 10)
+#define	OMAP2_MUX_MODE1	(1 << 10)
+#define	OMAP2_MUX_MODE2	(2 << 10)
+#define	OMAP2_MUX_MODE3	(3 << 10)
+#define	OMAP2_MUX_MODE4	(4 << 10)
+
+/* pull up/down selection */
+#define OMAP2_PIN_PULLDOWN	(OMAP2_PULL_ENA << 10)
+#define OMAP2_PIN_PULLUP	(OMAP2_PULL_UP << 10)
+#define OMAP2_PIN_PULLUP_EN	((OMAP2_PULL_ENA | OMAP2_PULL_UP) << 10)
+
+#define OMAP2_PIN(pin, mode) \
+	((MUX_PIN(MUX_PIN_##pin)) | (OMAP2_MUX_##mode))
+#define OMAP2_PIN_PD(pin, mode) \
+	(OMAP2_PIN(pin, mode) | OMAP2_PIN_PULLDOWN)
+#define OMAP2_PIN_PU(pin, mode) \
+	(OMAP2_PIN(pin, mode) | OMAP2_PIN_PULLUP)
+#define OMAP2_PIN_PU_EN(pin, mode) \
+	(OMAP2_PIN(pin, mode) | OMAP2_PIN_PULLUP_EN)
+
+/*
+ * Mux option encodings for possible pin configurations.
+ * Each encoding named by MODE0 pin function with addition of
+ * particular mode function.
+ *
+ * FIXME: currently encodings defined for MODE0 only as they can be
+ * extrated from omap24xx_pins table. We need to add encodings for
+ * missing pins and encodings for modes other than 0.
+ */
+#define OMAP2_I2C1_SCL		OMAP2_PIN(I2C1_SCL, MODE0)
+#define OMAP2_I2C1_SDA		OMAP2_PIN(I2C1_SDA, MODE0)
+#define OMAP2_I2C2_SCL		OMAP2_PIN_PU(I2C2_SCL, MODE0)
+#define OMAP2_I2C2_SDA		OMAP2_PIN(I2C2_SDA, MODE0)
+#define OMAP2_SYS_NIRQ		OMAP2_PIN_PU_EN(SYS_NIRQ, MODE0)
+#define OMAP2_SYS_CLKOUT	OMAP2_PIN_PU_EN(SYS_CLKOUT, MODE0)
+#define OMAP2_GPMC_NCS2		OMAP2_PIN_PU_EN(GPMC_NCS2, MODE0)
+#define OMAP2_GPMC_NCS7		OMAP2_PIN_PU_EN(GPMC_NCS7, MODE0)
+#define OMAP2_GPMC_WAIT0	OMAP2_PIN_PU_EN(GPMC_WAIT0, MODE0)
+#define OMAP2_GPMC_WAIT1	OMAP2_PIN_PU_EN(GPMC_WAIT1, MODE0)
+#define OMAP2_GPMC_WAIT2	OMAP2_PIN_PU_EN(GPMC_WAIT2, MODE0)
+#define OMAP2_GPMC_WAIT3	OMAP2_PIN_PU_EN(GPMC_WAIT3, MODE0)
+#define OMAP2_UART3_TX		OMAP2_PIN(UART3_TX, MODE0)
+#define OMAP2_UART3_RX		OMAP2_PIN(UART3_RX, MODE0)
+#define OMAP2_MMC_CLKO		OMAP2_PIN(MMC_CLKO, MODE0)
+#define OMAP2_MMC_CMD		OMAP2_PIN(MMC_CMD, MODE0)
+#define OMAP2_MMC_DAT0		OMAP2_PIN(MMC_DAT0, MODE0)
+#define OMAP2_MMC_DAT1		OMAP2_PIN(MMC_DAT1, MODE0)
+#define OMAP2_MMC_DAT2		OMAP2_PIN(MMC_DAT2, MODE0)
+#define OMAP2_MMC_DAT3		OMAP2_PIN(MMC_DAT3, MODE0)
+#define OMAP2_MMC_DAT_DIR0	OMAP2_PIN(MMC_DAT_DIR0, MODE0)
+#define OMAP2_MMC_DAT_DIR1	OMAP2_PIN(MMC_DAT_DIR1, MODE0)
+#define OMAP2_MMC_DAT_DIR2	OMAP2_PIN(MMC_DAT_DIR2, MODE0)
+#define OMAP2_MMC_DAT_DIR3	OMAP2_PIN(MMC_DAT_DIR3, MODE0)
+#define OMAP2_MMC_CMD_DIR	OMAP2_PIN(MMC_CMD_DIR, MODE0)
+#define OMAP2_MMC_CLKI		OMAP2_PIN(MMC_CLKI, MODE0)
+#define OMAP2_USB0_PUEN		OMAP2_PIN(USB0_PUEN, MODE0)
+#define OMAP2_USB0_VP		OMAP2_PIN(USB0_VP, MODE0)
+#define OMAP2_USB0_VM		OMAP2_PIN(USB0_VM, MODE0)
+#define OMAP2_USB0_RCV		OMAP2_PIN(USB0_RCV, MODE0)
+#define OMAP2_USB0_TXEN		OMAP2_PIN(USB0_TXEN, MODE0)
+#define OMAP2_USB0_SE0		OMAP2_PIN(USB0_SE0, MODE0)
+#define OMAP2_USB0_DAT		OMAP2_PIN(USB0_DAT, MODE0)
+#define OMAP2_USB0HS_DATA3	OMAP2_PIN(USB0HS_DATA3, MODE0)
+#define OMAP2_USB0HS_DATA4	OMAP2_PIN(USB0HS_DATA4, MODE0)
+#define OMAP2_USB0HS_DATA5	OMAP2_PIN(USB0HS_DATA5, MODE0)
+#define OMAP2_USB0HS_DATA6	OMAP2_PIN(USB0HS_DATA6, MODE0)
+#define OMAP2_USB0HS_DATA2	OMAP2_PIN(USB0HS_DATA2, MODE0)
+#define OMAP2_USB0HS_DATA0	OMAP2_PIN(USB0HS_DATA0, MODE0)
+#define OMAP2_USB0HS_DATA1	OMAP2_PIN(USB0HS_DATA1, MODE0)
+#define OMAP2_USB0HS_CLK	OMAP2_PIN(USB0HS_CLK, MODE0)
+#define OMAP2_USB0HS_DIR	OMAP2_PIN(USB0HS_DIR, MODE0)
+#define OMAP2_USB0HS_STP	OMAP2_PIN_PU_EN(USB0HS_STP, MODE0)
+#define OMAP2_USB0HS_NXT	OMAP2_PIN(USB0HS_NXT, MODE0)
+#define OMAP2_USB0HS_DATA7	OMAP2_PIN(USB0HS_DATA7, MODE0)
+#define OMAP2_MCBSP_CLKS	OMAP2_PIN(MCBSP_CLKS, MODE0)
+#define OMAP2_MCBSP1_CLKR	OMAP2_PIN(MCBSP1_CLKR, MODE0)
+#define OMAP2_MCBSP1_FSR	OMAP2_PIN(MCBSP1_FSR, MODE0)
+#define OMAP2_MCBSP1_DX		OMAP2_PIN(MCBSP1_DX, MODE0)
+#define OMAP2_MCBSP1_DR		OMAP2_PIN(MCBSP1_DR, MODE0)
+#define OMAP2_MCBSP1_FSX	OMAP2_PIN(MCBSP1_FSX, MODE0)
+#define OMAP2_MCBSP1_CLKX	OMAP2_PIN(MCBSP1_CLKX, MODE0)
+#define OMAP2_MCBSP2_FSX_OFF	OMAP2_PIN(MCBSP2_FSX_OFF, MODE0)
+#define OMAP2_MCBSP2_CLX_OFF	OMAP2_PIN(MCBSP2_CLX_OFF, MODE0)
+#define OMAP2_MCBSP2_DX_OFF	OMAP2_PIN(MCBSP2_DX_OFF, MODE0)
+#define OMAP2_MCBSP2_DR_OFF	OMAP2_PIN(MCBSP2_DR_OFF, MODE0)
+#define OMAP2_MCBSP3_CLKX	OMAP2_PIN(MCBSP3_CLKX, MODE0)
+#define OMAP2_MCBSP3_FSX	OMAP2_PIN(MCBSP3_FSX, MODE0)
+#define OMAP2_MCBSP3_DR		OMAP2_PIN(MCBSP3_DR, MODE0)
+#define OMAP2_MCBSP3_DX		OMAP2_PIN(MCBSP3_DX, MODE0)
+#define OMAP2_MCSPI1_CLK	OMAP2_PIN(MCSPI1_CLK, MODE0)
+#define OMAP2_MCSPI1_SIMO	OMAP2_PIN(MCSPI1_SIMO, MODE0)
+#define OMAP2_MCSPI1_SOMI	OMAP2_PIN(MCSPI1_SOMI, MODE0)
+#define OMAP2_MCSPI1_CS0	OMAP2_PIN(MCSPI1_CS0, MODE0)
+
+#endif
diff --git a/arch/arm/mach-omap2/include/mach/mux34xx.h b/arch/arm/mach-omap2/include/mach/mux34xx.h
new file mode 100644
index 0000000..10a8a06
--- /dev/null
+++ b/arch/arm/mach-omap2/include/mach/mux34xx.h
@@ -0,0 +1,862 @@
+/*
+ * arch/arm/mach-omap2/include/mach/mux34xx.h
+ *
+ * Copyright (C) 2009 CompuLab, Ltd.
+ * Author: Mike Rapoport <mike@compulab.co.il>
+ *
+ * Based on PXA MFP code
+ * Copyright (C) 2007 Marvell International Ltd.
+ * Author: eric miao <eric.miao@marvell.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef __MACH_OMAP2_MUX34XX_H
+#define __MACH_OMAP2_MUX34XX_H
+
+/*
+ * Mux options encodings for OMAP3
+ */
+/* mux mode options */
+#define	OMAP3_MUX_MODE0	(OMAP34XX_MUX_MODE0 << 10)
+#define	OMAP3_MUX_MODE1	(OMAP34XX_MUX_MODE1 << 10)
+#define	OMAP3_MUX_MODE2	(OMAP34XX_MUX_MODE2 << 10)
+#define	OMAP3_MUX_MODE3	(OMAP34XX_MUX_MODE3 << 10)
+#define	OMAP3_MUX_MODE4	(OMAP34XX_MUX_MODE4 << 10)
+#define	OMAP3_MUX_MODE5	(OMAP34XX_MUX_MODE5 << 10)
+#define	OMAP3_MUX_MODE6	(OMAP34XX_MUX_MODE6 << 10)
+#define	OMAP3_MUX_MODE7	(OMAP34XX_MUX_MODE7 << 10)
+
+/* 34xx active pin states */
+#define OMAP3_PIN_OUTPUT		(0 << 10)
+#define OMAP3_PIN_INPUT			(OMAP34XX_PIN_INPUT << 10)
+#define OMAP3_PIN_INPUT_PULLUP		(OMAP34XX_PIN_INPUT_PULLUP << 10)
+#define OMAP3_PIN_INPUT_PULLDOWN	(OMAP34XX_PIN_INPUT_PULLDOWN << 10)
+
+/* 34xx off mode states */
+#define OMAP3_PIN_OFF_NONE		(0 << 10)
+#define OMAP3_PIN_OFF_OUTPUT_HIGH	(OMAP34XX_PIN_OFF_OUTPUT_HIGH << 10)
+#define OMAP3_PIN_OFF_OUTPUT_LOW	(OMAP34XX_PIN_OFF_OUTPUT_LOW << 10)
+#define OMAP3_PIN_OFF_INPUT_PULLUP	(OMAP34XX_PIN_OFF_INPUT_PULLUP << 10)
+#define OMAP3_PIN_OFF_INPUT_PULLDOWN	(OMAP3_PIN_OFF_INPUT_PULLDOWN << 10)
+#define OMAP3_PIN_OFF_WAKEUPENABLE	(OMAP3_WAKEUP_EN << 10)
+
+#define OMAP3_PIN(pin, mode) \
+	((MUX_PIN(MUX_PIN_##pin)) | (OMAP3_MUX_##mode))
+#define OMAP3_PIN_IN(pin, mode)	\
+	(OMAP3_PIN(pin, mode) | OMAP3_PIN_INPUT)
+#define OMAP3_PIN_IN_PU(pin, mode) \
+	(OMAP3_PIN(pin, mode) | OMAP3_PIN_INPUT_PULLUP)
+#define OMAP3_PIN_IN_PD(pin, mode) \
+	(OMAP3_PIN(pin, mode) | OMAP3_PIN_INPUT_PULLDOWN)
+
+/*
+ * Mux option encodings for all possible pin configurations.
+ * Each encoding named by MODE0 pin function with addition of
+ * particular mode function.
+ * E.g. pin OMAP3_UART1_RX encoding for MODE2 will be called
+ * OMAP3_UART1_RX_MCBSP1_CLKR
+ *
+ * FIXME: add input and pull{up,down} enables where necessary
+ */
+#define OMAP3_GPMC_A1		OMAP3_PIN(GPMC_A1, MODE0)
+#define OMAP3_GPMC_A2		OMAP3_PIN(GPMC_A2, MODE0)
+#define OMAP3_GPMC_A3		OMAP3_PIN(GPMC_A3, MODE0)
+#define OMAP3_GPMC_A4		OMAP3_PIN(GPMC_A4, MODE0)
+#define OMAP3_GPMC_A5		OMAP3_PIN(GPMC_A5, MODE0)
+#define OMAP3_GPMC_A6		OMAP3_PIN(GPMC_A6, MODE0)
+#define OMAP3_GPMC_A7		OMAP3_PIN(GPMC_A7, MODE0)
+#define OMAP3_GPMC_A8		OMAP3_PIN(GPMC_A8, MODE0)
+#define OMAP3_GPMC_A9		OMAP3_PIN(GPMC_A9, MODE0)
+#define OMAP3_GPMC_A10		OMAP3_PIN(GPMC_A10, MODE0)
+#define OMAP3_GPMC_D0		OMAP3_PIN(GPMC_D0, MODE0)
+#define OMAP3_GPMC_D1		OMAP3_PIN(GPMC_D1, MODE0)
+#define OMAP3_GPMC_D2		OMAP3_PIN(GPMC_D2, MODE0)
+#define OMAP3_GPMC_D3		OMAP3_PIN(GPMC_D3, MODE0)
+#define OMAP3_GPMC_D4		OMAP3_PIN(GPMC_D4, MODE0)
+#define OMAP3_GPMC_D5		OMAP3_PIN(GPMC_D5, MODE0)
+#define OMAP3_GPMC_D6		OMAP3_PIN(GPMC_D6, MODE0)
+#define OMAP3_GPMC_D7		OMAP3_PIN(GPMC_D7, MODE0)
+#define OMAP3_GPMC_D8		OMAP3_PIN(GPMC_D8, MODE0)
+#define OMAP3_GPMC_D9		OMAP3_PIN(GPMC_D9, MODE0)
+#define OMAP3_GPMC_D10		OMAP3_PIN(GPMC_D10, MODE0)
+#define OMAP3_GPMC_D11		OMAP3_PIN(GPMC_D11, MODE0)
+#define OMAP3_GPMC_D12		OMAP3_PIN(GPMC_D12, MODE0)
+#define OMAP3_GPMC_D13		OMAP3_PIN(GPMC_D13, MODE0)
+#define OMAP3_GPMC_D14		OMAP3_PIN(GPMC_D14, MODE0)
+#define OMAP3_GPMC_D15		OMAP3_PIN(GPMC_D15, MODE0)
+#define OMAP3_GPMC_NCS0		OMAP3_PIN(GPMC_NCS0, MODE0)
+#define OMAP3_GPMC_NCS1		OMAP3_PIN(GPMC_NCS1, MODE0)
+#define OMAP3_GPMC_NCS2		OMAP3_PIN(GPMC_NCS2, MODE0)
+#define OMAP3_GPMC_NCS3		OMAP3_PIN(GPMC_NCS3, MODE0)
+#define OMAP3_GPMC_NCS4		OMAP3_PIN(GPMC_NCS4, MODE0)
+#define OMAP3_GPMC_NCS5		OMAP3_PIN(GPMC_NCS5, MODE0)
+#define OMAP3_GPMC_NCS6		OMAP3_PIN(GPMC_NCS6, MODE0)
+#define OMAP3_GPMC_NCS7		OMAP3_PIN(GPMC_NCS7, MODE0)
+#define OMAP3_GPMC_CLK		OMAP3_PIN(GPMC_CLK, MODE0)
+#define OMAP3_GPMC_NADV_ALE	OMAP3_PIN(GPMC_NADV_ALE, MODE0)
+#define OMAP3_GPMC_NOE		OMAP3_PIN(GPMC_NOE, MODE0)
+#define OMAP3_GPMC_NWE		OMAP3_PIN(GPMC_NWE, MODE0)
+#define OMAP3_GPMC_NBE0_CLE	OMAP3_PIN(GPMC_NBE0_CLE, MODE0)
+#define OMAP3_GPMC_NBE1		OMAP3_PIN(GPMC_NBE1, MODE0)
+#define OMAP3_GPMC_NWP		OMAP3_PIN(GPMC_NWP, MODE0)
+#define OMAP3_GPMC_WAIT0	OMAP3_PIN(GPMC_WAIT0, MODE0)
+#define OMAP3_GPMC_WAIT1	OMAP3_PIN(GPMC_WAIT1, MODE0)
+#define OMAP3_GPMC_WAIT2	OMAP3_PIN(GPMC_WAIT2, MODE0)
+#define OMAP3_GPMC_WAIT3	OMAP3_PIN(GPMC_WAIT3, MODE0)
+#define OMAP3_DSS_PCLK		OMAP3_PIN(DSS_PCLK, MODE0)
+#define OMAP3_DSS_HSYNC		OMAP3_PIN(DSS_HSYNC, MODE0)
+#define OMAP3_DSS_VSYNC		OMAP3_PIN(DSS_VSYNC, MODE0)
+#define OMAP3_DSS_ACBIAS	OMAP3_PIN(DSS_ACBIAS, MODE0)
+#define OMAP3_DSS_DATA0		OMAP3_PIN(DSS_DATA0, MODE0)
+#define OMAP3_DSS_DATA1		OMAP3_PIN(DSS_DATA1, MODE0)
+#define OMAP3_DSS_DATA2		OMAP3_PIN(DSS_DATA2, MODE0)
+#define OMAP3_DSS_DATA3		OMAP3_PIN(DSS_DATA3, MODE0)
+#define OMAP3_DSS_DATA4		OMAP3_PIN(DSS_DATA4, MODE0)
+#define OMAP3_DSS_DATA5		OMAP3_PIN(DSS_DATA5, MODE0)
+#define OMAP3_DSS_DATA6		OMAP3_PIN(DSS_DATA6, MODE0)
+#define OMAP3_DSS_DATA7		OMAP3_PIN(DSS_DATA7, MODE0)
+#define OMAP3_DSS_DATA8		OMAP3_PIN(DSS_DATA8, MODE0)
+#define OMAP3_DSS_DATA9		OMAP3_PIN(DSS_DATA9, MODE0)
+#define OMAP3_DSS_DATA10	OMAP3_PIN(DSS_DATA10, MODE0)
+#define OMAP3_DSS_DATA11	OMAP3_PIN(DSS_DATA11, MODE0)
+#define OMAP3_DSS_DATA12	OMAP3_PIN(DSS_DATA12, MODE0)
+#define OMAP3_DSS_DATA13	OMAP3_PIN(DSS_DATA13, MODE0)
+#define OMAP3_DSS_DATA14	OMAP3_PIN(DSS_DATA14, MODE0)
+#define OMAP3_DSS_DATA15	OMAP3_PIN(DSS_DATA15, MODE0)
+#define OMAP3_DSS_DATA16	OMAP3_PIN(DSS_DATA16, MODE0)
+#define OMAP3_DSS_DATA17	OMAP3_PIN(DSS_DATA17, MODE0)
+#define OMAP3_DSS_DATA18	OMAP3_PIN(DSS_DATA18, MODE0)
+#define OMAP3_DSS_DATA19	OMAP3_PIN(DSS_DATA19, MODE0)
+#define OMAP3_DSS_DATA20	OMAP3_PIN(DSS_DATA20, MODE0)
+#define OMAP3_DSS_DATA21	OMAP3_PIN(DSS_DATA21, MODE0)
+#define OMAP3_DSS_DATA22	OMAP3_PIN(DSS_DATA22, MODE0)
+#define OMAP3_DSS_DATA23	OMAP3_PIN(DSS_DATA23, MODE0)
+#define OMAP3_CAM_HS		OMAP3_PIN(CAM_HS, MODE0)
+#define OMAP3_CAM_VS		OMAP3_PIN(CAM_VS, MODE0)
+#define OMAP3_CAM_XCLKA		OMAP3_PIN(CAM_XCLKA, MODE0)
+#define OMAP3_CAM_PCLK		OMAP3_PIN(CAM_PCLK, MODE0)
+#define OMAP3_CAM_FLD		OMAP3_PIN(CAM_FLD, MODE0)
+#define OMAP3_CAM_D0		OMAP3_PIN(CAM_D0, MODE0)
+#define OMAP3_CAM_D1		OMAP3_PIN(CAM_D1, MODE0)
+#define OMAP3_CAM_D2		OMAP3_PIN(CAM_D2, MODE0)
+#define OMAP3_CAM_D3		OMAP3_PIN(CAM_D3, MODE0)
+#define OMAP3_CAM_D4		OMAP3_PIN(CAM_D4, MODE0)
+#define OMAP3_CAM_D5		OMAP3_PIN(CAM_D5, MODE0)
+#define OMAP3_CAM_D6		OMAP3_PIN(CAM_D6, MODE0)
+#define OMAP3_CAM_D7		OMAP3_PIN(CAM_D7, MODE0)
+#define OMAP3_CAM_D8		OMAP3_PIN(CAM_D8, MODE0)
+#define OMAP3_CAM_D9		OMAP3_PIN(CAM_D9, MODE0)
+#define OMAP3_CAM_D10		OMAP3_PIN(CAM_D10, MODE0)
+#define OMAP3_CAM_D11		OMAP3_PIN(CAM_D11, MODE0)
+#define OMAP3_CAM_XCLKB		OMAP3_PIN(CAM_XCLKB, MODE0)
+#define OMAP3_CAM_WEN		OMAP3_PIN(CAM_WEN, MODE0)
+#define OMAP3_CAM_STROBE	OMAP3_PIN(CAM_STROBE, MODE0)
+#define OMAP3_CSI2_DX0		OMAP3_PIN(CSI2_DX0, MODE0)
+#define OMAP3_CSI2_DY0		OMAP3_PIN(CSI2_DY0, MODE0)
+#define OMAP3_CSI2_DX1		OMAP3_PIN(CSI2_DX1, MODE0)
+#define OMAP3_CSI2_DY1		OMAP3_PIN(CSI2_DY1, MODE0)
+#define OMAP3_MCBSP2_FSX	OMAP3_PIN(MCBSP2_FSX, MODE0)
+#define OMAP3_MCBSP2_CLKX	OMAP3_PIN(MCBSP2_CLKX, MODE0)
+#define OMAP3_MCBSP2_DR		OMAP3_PIN(MCBSP2_DR, MODE0)
+#define OMAP3_MCBSP2_DX		OMAP3_PIN(MCBSP2_DX, MODE0)
+#define OMAP3_MMC1_CLK		OMAP3_PIN(MMC1_CLK, MODE0)
+#define OMAP3_MMC1_CMD		OMAP3_PIN(MMC1_CMD, MODE0)
+#define OMAP3_MMC1_DAT0		OMAP3_PIN(MMC1_DAT0, MODE0)
+#define OMAP3_MMC1_DAT1		OMAP3_PIN(MMC1_DAT1, MODE0)
+#define OMAP3_MMC1_DAT2		OMAP3_PIN(MMC1_DAT2, MODE0)
+#define OMAP3_MMC1_DAT3		OMAP3_PIN(MMC1_DAT3, MODE0)
+#define OMAP3_MMC1_DAT4		OMAP3_PIN(MMC1_DAT4, MODE0)
+#define OMAP3_MMC1_DAT5		OMAP3_PIN(MMC1_DAT5, MODE0)
+#define OMAP3_MMC1_DAT6		OMAP3_PIN(MMC1_DAT6, MODE0)
+#define OMAP3_MMC1_DAT7		OMAP3_PIN(MMC1_DAT7, MODE0)
+#define OMAP3_MMC2_CLK		OMAP3_PIN(MMC2_CLK, MODE0)
+#define OMAP3_MMC2_CMD		OMAP3_PIN(MMC2_CMD, MODE0)
+#define OMAP3_MMC2_DAT0		OMAP3_PIN(MMC2_DAT0, MODE0)
+#define OMAP3_MMC2_DAT1		OMAP3_PIN(MMC2_DAT1, MODE0)
+#define OMAP3_MMC2_DAT2		OMAP3_PIN(MMC2_DAT2, MODE0)
+#define OMAP3_MMC2_DAT3		OMAP3_PIN(MMC2_DAT3, MODE0)
+#define OMAP3_MMC2_DAT4		OMAP3_PIN(MMC2_DAT4, MODE0)
+#define OMAP3_MMC2_DAT5		OMAP3_PIN(MMC2_DAT5, MODE0)
+#define OMAP3_MMC2_DAT6		OMAP3_PIN(MMC2_DAT6, MODE0)
+#define OMAP3_MMC2_DAT7		OMAP3_PIN(MMC2_DAT7, MODE0)
+#define OMAP3_MCBSP3_DX		OMAP3_PIN(MCBSP3_DX, MODE0)
+#define OMAP3_MCBSP3_DR		OMAP3_PIN(MCBSP3_DR, MODE0)
+#define OMAP3_MCBSP3_CLKX	OMAP3_PIN(MCBSP3_CLKX, MODE0)
+#define OMAP3_MCBSP3_FSX	OMAP3_PIN(MCBSP3_FSX, MODE0)
+#define OMAP3_UART2_CTS		OMAP3_PIN(UART2_CTS, MODE0)
+#define OMAP3_UART2_RTS		OMAP3_PIN(UART2_RTS, MODE0)
+#define OMAP3_UART2_TX		OMAP3_PIN(UART2_TX, MODE0)
+#define OMAP3_UART2_RX		OMAP3_PIN(UART2_RX, MODE0)
+#define OMAP3_UART1_TX		OMAP3_PIN(UART1_TX, MODE0)
+#define OMAP3_UART1_RTS		OMAP3_PIN(UART1_RTS, MODE0)
+#define OMAP3_UART1_CTS		OMAP3_PIN(UART1_CTS, MODE0)
+#define OMAP3_UART1_RX		OMAP3_PIN(UART1_RX, MODE0)
+#define OMAP3_MCBSP4_CLKX	OMAP3_PIN(MCBSP4_CLKX, MODE0)
+#define OMAP3_MCBSP4_DR		OMAP3_PIN(MCBSP4_DR, MODE0)
+#define OMAP3_MCBSP4_DX		OMAP3_PIN(MCBSP4_DX, MODE0)
+#define OMAP3_MCBSP4_FSX	OMAP3_PIN(MCBSP4_FSX, MODE0)
+#define OMAP3_MCBSP1_CLKR	OMAP3_PIN(MCBSP1_CLKR, MODE0)
+#define OMAP3_MCBSP1_FSR	OMAP3_PIN(MCBSP1_FSR, MODE0)
+#define OMAP3_MCBSP1_DX		OMAP3_PIN(MCBSP1_DX, MODE0)
+#define OMAP3_MCBSP1_DR		OMAP3_PIN(MCBSP1_DR, MODE0)
+#define OMAP3_MCBSP_CLKS	OMAP3_PIN(MCBSP_CLKS, MODE0)
+#define OMAP3_MCBSP1_FSX	OMAP3_PIN(MCBSP1_FSX, MODE0)
+#define OMAP3_MCBSP1_CLKX	OMAP3_PIN(MCBSP1_CLKX, MODE0)
+#define OMAP3_UART3_CTS_RCTX	OMAP3_PIN(UART3_CTS_RCTX, MODE0)
+#define OMAP3_UART3_RTS_SD	OMAP3_PIN(UART3_RTS_SD, MODE0)
+#define OMAP3_UART3_RX_IRRX	OMAP3_PIN(UART3_RX, MODE0)
+#define OMAP3_UART3_TX_IRTX	OMAP3_PIN(UART3_TX, MODE0)
+#define OMAP3_HSUSB0_CLK	OMAP3_PIN(HSUSB0_CLK, MODE0)
+#define OMAP3_HSUSB0_STP	OMAP3_PIN(HSUSB0_STP, MODE0)
+#define OMAP3_HSUSB0_DIR	OMAP3_PIN(HSUSB0_DIR, MODE0)
+#define OMAP3_HSUSB0_NXT	OMAP3_PIN(HSUSB0_NXT, MODE0)
+#define OMAP3_HSUSB0_DATA0	OMAP3_PIN(HSUSB0_DATA0, MODE0)
+#define OMAP3_HSUSB0_DATA1	OMAP3_PIN(HSUSB0_DATA1, MODE0)
+#define OMAP3_HSUSB0_DATA2	OMAP3_PIN(HSUSB0_DATA2, MODE0)
+#define OMAP3_HSUSB0_DATA3	OMAP3_PIN(HSUSB0_DATA3, MODE0)
+#define OMAP3_HSUSB0_DATA4	OMAP3_PIN(HSUSB0_DATA4, MODE0)
+#define OMAP3_HSUSB0_DATA5	OMAP3_PIN(HSUSB0_DATA5, MODE0)
+#define OMAP3_HSUSB0_DATA6	OMAP3_PIN(HSUSB0_DATA6, MODE0)
+#define OMAP3_HSUSB0_DATA7	OMAP3_PIN(HSUSB0_DATA7, MODE0)
+#define OMAP3_I2C1_SCL		OMAP3_PIN(I2C1_SCL, MODE0)
+#define OMAP3_I2C1_SDA		OMAP3_PIN(I2C1_SDA, MODE0)
+#define OMAP3_I2C2_SCL		OMAP3_PIN(I2C2_SCL, MODE0)
+#define OMAP3_I2C2_SDA		OMAP3_PIN(I2C2_SDA, MODE0)
+#define OMAP3_I2C3_SCL		OMAP3_PIN(I2C3_SCL, MODE0)
+#define OMAP3_I2C3_SDA		OMAP3_PIN(I2C3_SDA, MODE0)
+#define OMAP3_HDQ_SIO		OMAP3_PIN(HDQ_SIO, MODE0)
+#define OMAP3_MCSPI1_CLK	OMAP3_PIN(MCSPI1_CLK, MODE0)
+#define OMAP3_MCSPI1_SIMO	OMAP3_PIN(MCSPI1_SIMO, MODE0)
+#define OMAP3_MCSPI1_SOMI	OMAP3_PIN(MCSPI1_SOMI, MODE0)
+#define OMAP3_MCSPI1_CS0	OMAP3_PIN(MCSPI1_CS0, MODE0)
+#define OMAP3_MCSPI1_CS1	OMAP3_PIN(MCSPI1_CS1, MODE0)
+#define OMAP3_MCSPI1_CS2	OMAP3_PIN(MCSPI1_CS2, MODE0)
+#define OMAP3_MCSPI1_CS3	OMAP3_PIN(MCSPI1_CS3, MODE0)
+#define OMAP3_MCSPI2_CLK	OMAP3_PIN(MCSPI2_CLK, MODE0)
+#define OMAP3_MCSPI2_SIMO	OMAP3_PIN(MCSPI2_SIMO, MODE0)
+#define OMAP3_MCSPI2_SOMI	OMAP3_PIN(MCSPI2_SOMI, MODE0)
+#define OMAP3_MCSPI2_CS0	OMAP3_PIN(MCSPI2_CS0, MODE0)
+#define OMAP3_MCSPI2_CS1	OMAP3_PIN(MCSPI2_CS1, MODE0)
+#define OMAP3_SYS_NIRQ		OMAP3_PIN(SYS_NIRQ, MODE0)
+#define OMAP3_SYS_CLKOUT2	OMAP3_PIN(SYS_CLKOUT2, MODE0)
+#define OMAP3_ETK_CLK		OMAP3_PIN(ETK_CLK, MODE0)
+#define OMAP3_ETK_CTL		OMAP3_PIN(ETK_CTL, MODE0)
+#define OMAP3_ETK_D0		OMAP3_PIN(ETK_D0, MODE0)
+#define OMAP3_ETK_D1		OMAP3_PIN(ETK_D1, MODE0)
+#define OMAP3_ETK_D2		OMAP3_PIN(ETK_D2, MODE0)
+#define OMAP3_ETK_D3		OMAP3_PIN(ETK_D3, MODE0)
+#define OMAP3_ETK_D4		OMAP3_PIN(ETK_D4, MODE0)
+#define OMAP3_ETK_D5		OMAP3_PIN(ETK_D5, MODE0)
+#define OMAP3_ETK_D6		OMAP3_PIN(ETK_D6, MODE0)
+#define OMAP3_ETK_D7		OMAP3_PIN(ETK_D7, MODE0)
+#define OMAP3_ETK_D8		OMAP3_PIN(ETK_D8, MODE0)
+#define OMAP3_ETK_D9		OMAP3_PIN(ETK_D9, MODE0)
+#define OMAP3_ETK_D10		OMAP3_PIN(ETK_D10, MODE0)
+#define OMAP3_ETK_D11		OMAP3_PIN(ETK_D11, MODE0)
+#define OMAP3_ETK_D12		OMAP3_PIN(ETK_D12, MODE0)
+#define OMAP3_ETK_D13		OMAP3_PIN(ETK_D13, MODE0)
+#define OMAP3_ETK_D14		OMAP3_PIN(ETK_D14, MODE0)
+#define OMAP3_ETK_D15		OMAP3_PIN(ETK_D15, MODE0)
+#define OMAP3_SAD2D_MCAD0	OMAP3_PIN(SAD2D_MCAD0, MODE0)
+#define OMAP3_SAD2D_MCAD1	OMAP3_PIN(SAD2D_MCAD1, MODE0)
+#define OMAP3_SAD2D_MCAD2	OMAP3_PIN(SAD2D_MCAD2, MODE0)
+#define OMAP3_SAD2D_MCAD3	OMAP3_PIN(SAD2D_MCAD3, MODE0)
+#define OMAP3_SAD2D_MCAD4	OMAP3_PIN(SAD2D_MCAD4, MODE0)
+#define OMAP3_SAD2D_MCAD5	OMAP3_PIN(SAD2D_MCAD5, MODE0)
+#define OMAP3_SAD2D_MCAD6	OMAP3_PIN(SAD2D_MCAD6, MODE0)
+#define OMAP3_SAD2D_MCAD7	OMAP3_PIN(SAD2D_MCAD7, MODE0)
+#define OMAP3_SAD2D_MCAD8	OMAP3_PIN(SAD2D_MCAD8, MODE0)
+#define OMAP3_SAD2D_MCAD9	OMAP3_PIN(SAD2D_MCAD9, MODE0)
+#define OMAP3_SAD2D_MCAD10	OMAP3_PIN(SAD2D_MCAD10, MODE0)
+#define OMAP3_SAD2D_MCAD11	OMAP3_PIN(SAD2D_MCAD11, MODE0)
+#define OMAP3_SAD2D_MCAD12	OMAP3_PIN(SAD2D_MCAD12, MODE0)
+#define OMAP3_SAD2D_MCAD13	OMAP3_PIN(SAD2D_MCAD13, MODE0)
+#define OMAP3_SAD2D_MCAD14	OMAP3_PIN(SAD2D_MCAD14, MODE0)
+#define OMAP3_SAD2D_MCAD15	OMAP3_PIN(SAD2D_MCAD15, MODE0)
+#define OMAP3_SAD2D_MCAD16	OMAP3_PIN(SAD2D_MCAD16, MODE0)
+#define OMAP3_SAD2D_MCAD17	OMAP3_PIN(SAD2D_MCAD17, MODE0)
+#define OMAP3_SAD2D_MCAD18	OMAP3_PIN(SAD2D_MCAD18, MODE0)
+#define OMAP3_SAD2D_MCAD19	OMAP3_PIN(SAD2D_MCAD19, MODE0)
+#define OMAP3_SAD2D_MCAD20	OMAP3_PIN(SAD2D_MCAD20, MODE0)
+#define OMAP3_SAD2D_MCAD21	OMAP3_PIN(SAD2D_MCAD21, MODE0)
+#define OMAP3_SAD2D_MCAD22	OMAP3_PIN(SAD2D_MCAD22, MODE0)
+#define OMAP3_SAD2D_MCAD23	OMAP3_PIN(SAD2D_MCAD23, MODE0)
+#define OMAP3_SAD2D_MCAD24	OMAP3_PIN(SAD2D_MCAD24, MODE0)
+#define OMAP3_SAD2D_MCAD25	OMAP3_PIN(SAD2D_MCAD25, MODE0)
+#define OMAP3_SAD2D_MCAD26	OMAP3_PIN(SAD2D_MCAD26, MODE0)
+#define OMAP3_SAD2D_MCAD27	OMAP3_PIN(SAD2D_MCAD27, MODE0)
+#define OMAP3_SAD2D_MCAD28	OMAP3_PIN(SAD2D_MCAD28, MODE0)
+#define OMAP3_SAD2D_MCAD29	OMAP3_PIN(SAD2D_MCAD29, MODE0)
+#define OMAP3_SAD2D_MCAD30	OMAP3_PIN(SAD2D_MCAD30, MODE0)
+#define OMAP3_SAD2D_MCAD31	OMAP3_PIN(SAD2D_MCAD31, MODE0)
+#define OMAP3_SAD2D_MCAD32	OMAP3_PIN(SAD2D_MCAD32, MODE0)
+#define OMAP3_SAD2D_MCAD33	OMAP3_PIN(SAD2D_MCAD33, MODE0)
+#define OMAP3_SAD2D_MCAD34	OMAP3_PIN(SAD2D_MCAD34, MODE0)
+#define OMAP3_SAD2D_MCAD35	OMAP3_PIN(SAD2D_MCAD35, MODE0)
+#define OMAP3_SAD2D_MCAD36	OMAP3_PIN(SAD2D_MCAD36, MODE0)
+#define OMAP3_SAD2D_CLK26MI	OMAP3_PIN(SAD2D_CLK26MI, MODE0)
+#define OMAP3_SAD2D_NRESPWRON	OMAP3_PIN(SAD2D_NRESPWRON, MODE0)
+#define OMAP3_SAD2D_NRESWARM	OMAP3_PIN(SAD2D_NRESWARM, MODE0)
+#define OMAP3_SAD2D_ARMNIRQ	OMAP3_PIN(SAD2D_ARMNIRQ, MODE0)
+#define OMAP3_SAD2D_UMAFIQ	OMAP3_PIN(SAD2D_UMAFIQ, MODE0)
+#define OMAP3_SAD2D_SPINT	OMAP3_PIN(SAD2D_SPINT, MODE0)
+#define OMAP3_SAD2D_FRINT	OMAP3_PIN(SAD2D_FRINT, MODE0)
+#define OMAP3_SAD2D_DMAREQ0	OMAP3_PIN(SAD2D_DMAREQ0, MODE0)
+#define OMAP3_SAD2D_DMAREQ1	OMAP3_PIN(SAD2D_DMAREQ1, MODE0)
+#define OMAP3_SAD2D_DMAREQ2	OMAP3_PIN(SAD2D_DMAREQ2, MODE0)
+#define OMAP3_SAD2D_DMAREQ3	OMAP3_PIN(SAD2D_DMAREQ3, MODE0)
+#define OMAP3_SAD2D_NTRST	OMAP3_PIN(SAD2D_NTRST, MODE0)
+#define OMAP3_SAD2D_TDI		OMAP3_PIN(SAD2D_TDI, MODE0)
+#define OMAP3_SAD2D_TDO		OMAP3_PIN(SAD2D_TDO, MODE0)
+#define OMAP3_SAD2D_TMS		OMAP3_PIN(SAD2D_TMS, MODE0)
+#define OMAP3_SAD2D_TCK		OMAP3_PIN(SAD2D_TCK, MODE0)
+#define OMAP3_SAD2D_RTCK	OMAP3_PIN(SAD2D_RTCK, MODE0)
+#define OMAP3_SAD2D_MSTDBY	OMAP3_PIN(SAD2D_MSTDBY, MODE0)
+#define OMAP3_SAD2D_IDLEREQ	OMAP3_PIN(SAD2D_IDLEREQ, MODE0)
+#define OMAP3_SAD2D_IDLEACK	OMAP3_PIN(SAD2D_IDLEACK, MODE0)
+#define OMAP3_SAD2D_MWRITE	OMAP3_PIN(SAD2D_MWRITE, MODE0)
+#define OMAP3_SAD2D_SWRITE	OMAP3_PIN(SAD2D_SWRITE, MODE0)
+#define OMAP3_SAD2D_MREAD	OMAP3_PIN(SAD2D_MREAD, MODE0)
+#define OMAP3_SAD2D_SREAD	OMAP3_PIN(SAD2D_SREAD, MODE0)
+#define OMAP3_SAD2D_MBUSFLAG	OMAP3_PIN(SAD2D_MBUSFLAG, MODE0)
+#define OMAP3_SAD2D_SBUSFLAG	OMAP3_PIN(SAD2D_SBUSFLAG, MODE0)
+#define OMAP3_I2C4_SCL		OMAP3_PIN(I2C4_SCL, MODE0)
+#define OMAP3_I2C4_SDA		OMAP3_PIN(I2C4_SDA, MODE0)
+#define OMAP3_SYS_32K		OMAP3_PIN(SYS_32K, MODE0)
+#define OMAP3_SYS_CLKREQ	OMAP3_PIN(SYS_CLKREQ, MODE0)
+#define OMAP3_SYS_NRESWARM	OMAP3_PIN(SYS_NRESWARM, MODE0)
+#define OMAP3_SYS_BOOT0		OMAP3_PIN(SYS_BOOT0, MODE0)
+#define OMAP3_SYS_BOOT1		OMAP3_PIN(SYS_BOOT1, MODE0)
+#define OMAP3_SYS_BOOT2		OMAP3_PIN(SYS_BOOT2, MODE0)
+#define OMAP3_SYS_BOOT3		OMAP3_PIN(SYS_BOOT3, MODE0)
+#define OMAP3_SYS_BOOT4		OMAP3_PIN(SYS_BOOT4, MODE0)
+#define OMAP3_SYS_BOOT5		OMAP3_PIN(SYS_BOOT5, MODE0)
+#define OMAP3_SYS_BOOT6		OMAP3_PIN(SYS_BOOT6, MODE0)
+#define OMAP3_SYS_OFF_MODE	OMAP3_PIN(SYS_OFF_MODE, MODE0)
+#define OMAP3_SYS_CLKOUT1	OMAP3_PIN(SYS_CLKOUT1, MODE0)
+#define OMAP3_JTAG_NTRST	OMAP3_PIN(JTAG_NTRST, MODE0)
+#define OMAP3_JTAG_TCK		OMAP3_PIN(JTAG_TCK, MODE0)
+#define OMAP3_JTAG_TMS_TMSC	OMAP3_PIN(JTAG_TMS_TMSC, MODE0)
+#define OMAP3_JTAG_TDI		OMAP3_PIN(JTAG_TDI, MODE0)
+#define OMAP3_JTAG_EMU0		OMAP3_PIN(JTAG_EMU0, MODE0)
+#define OMAP3_JTAG_EMU1		OMAP3_PIN(JTAG_EMU1, MODE0)
+#define OMAP3_SAD2D_SWAKEUP	OMAP3_PIN(SAD2D_SWAKEUP, MODE0)
+#define OMAP3_JTAG_RTCK		OMAP3_PIN(JTAG_RTCK, MODE0)
+#define OMAP3_JTAG_TDO		OMAP3_PIN(JTAG_TDO, MODE0)
+
+#define OMAP3_GPMC_A9_SYS_NDMAREQ2		OMAP3_PIN(GPMC_A9, MODE1)
+#define OMAP3_GPMC_A10_SYS_NDMAREQ3		OMAP3_PIN(GPMC_A10, MODE1)
+#define OMAP3_GPMC_NCS3_SYS_NDMAREQ0		OMAP3_PIN(GPMC_NCS3, MODE1)
+#define OMAP3_GPMC_NCS4_SYS_NDMAREQ1		OMAP3_PIN(GPMC_NCS4, MODE1)
+#define OMAP3_GPMC_NCS5_SYS_NDMAREQ2		OMAP3_PIN(GPMC_NCS5, MODE1)
+#define OMAP3_GPMC_NCS6_SYS_NDMAREQ3		OMAP3_PIN(GPMC_NCS6, MODE1)
+#define OMAP3_GPMC_NCS7_GPMC_IO_DIR		OMAP3_PIN(GPMC_NCS7, MODE1)
+#define OMAP3_GPMC_WAIT3_SYS_NDMAREQ1		OMAP3_PIN(GPMC_WAIT3, MODE1)
+#define OMAP3_DSS_DATA0_DSI_DX0			OMAP3_PIN(DSS_DATA0, MODE1)
+#define OMAP3_DSS_DATA1_DSI_DY0			OMAP3_PIN(DSS_DATA1, MODE1)
+#define OMAP3_DSS_DATA2_DSI_DX1			OMAP3_PIN(DSS_DATA2, MODE1)
+#define OMAP3_DSS_DATA3_DSI_DY1			OMAP3_PIN(DSS_DATA3, MODE1)
+#define OMAP3_DSS_DATA4_DSI_DX2			OMAP3_PIN(DSS_DATA4, MODE1)
+#define OMAP3_DSS_DATA5_DSI_DY2			OMAP3_PIN(DSS_DATA5, MODE1)
+#define OMAP3_DSS_DATA10_SDI_DAT1N		OMAP3_PIN(DSS_DATA10, MODE1)
+#define OMAP3_DSS_DATA11_SDI_DAT1P		OMAP3_PIN(DSS_DATA11, MODE1)
+#define OMAP3_DSS_DATA12_SDI_DAT2N		OMAP3_PIN(DSS_DATA12, MODE1)
+#define OMAP3_DSS_DATA13_SDI_DAT2P		OMAP3_PIN(DSS_DATA13, MODE1)
+#define OMAP3_DSS_DATA14_SDI_DAT3N		OMAP3_PIN(DSS_DATA14, MODE1)
+#define OMAP3_DSS_DATA15_SDI_DAT3P		OMAP3_PIN(DSS_DATA15, MODE1)
+#define OMAP3_DSS_DATA18_SDI_VSYNC		OMAP3_PIN(DSS_DATA18, MODE1)
+#define OMAP3_DSS_DATA19_SDI_HSYNC		OMAP3_PIN(DSS_DATA19, MODE1)
+#define OMAP3_DSS_DATA20_SDI_DEN		OMAP3_PIN(DSS_DATA20, MODE1)
+#define OMAP3_DSS_DATA21_SDI_STP		OMAP3_PIN(DSS_DATA21, MODE1)
+#define OMAP3_DSS_DATA22_SDI_CLKP		OMAP3_PIN(DSS_DATA22, MODE1)
+#define OMAP3_DSS_DATA23_SDI_CLKN		OMAP3_PIN(DSS_DATA23, MODE1)
+#define OMAP3_MMC1_CLK_MS_CLK			OMAP3_PIN(MMC1_CLK, MODE1)
+#define OMAP3_MMC1_CMD_MS_BS			OMAP3_PIN(MMC1_CMD, MODE1)
+#define OMAP3_MMC1_DAT0_MS_DAT0			OMAP3_PIN(MMC1_DAT0, MODE1)
+#define OMAP3_MMC1_DAT1_MS_DAT1			OMAP3_PIN(MMC1_DAT1, MODE1)
+#define OMAP3_MMC1_DAT2_MS_DAT2			OMAP3_PIN(MMC1_DAT2, MODE1)
+#define OMAP3_MMC1_DAT3_MS_DAT3			OMAP3_PIN(MMC1_DAT3, MODE1)
+#define OMAP3_MMC2_CLK_MCSPI3_CLK		OMAP3_PIN(MMC2_CLK, MODE1)
+#define OMAP3_MMC2_CMD_MCSPI3_SIMO		OMAP3_PIN(MMC2_CMD, MODE1)
+#define OMAP3_MMC2_DAT0_MCSPI3_SOMI		OMAP3_PIN(MMC2_DAT0, MODE1)
+#define OMAP3_MMC2_DAT2_MCSPI3_CS1		OMAP3_PIN(MMC2_DAT2, MODE1)
+#define OMAP3_MMC2_DAT3_MCSPI3_CS0		OMAP3_PIN(MMC2_DAT3, MODE1)
+#define OMAP3_MMC2_DAT4_MMC2_DIR_DAT0		OMAP3_PIN(MMC2_DAT4, MODE1)
+#define OMAP3_MMC2_DAT5_MMC2_DIR_DAT1		OMAP3_PIN(MMC2_DAT5, MODE1)
+#define OMAP3_MMC2_DAT6_MMC2_DIR_CMD		OMAP3_PIN(MMC2_DAT6, MODE1)
+#define OMAP3_MMC2_DAT7_MMC2_CLKIN		OMAP3_PIN(MMC2_DAT7, MODE1)
+#define OMAP3_MCBSP3_DX_UART2_CTS		OMAP3_PIN(MCBSP3_DX, MODE1)
+#define OMAP3_MCBSP3_DR_UART2_RTS		OMAP3_PIN(MCBSP3_DR, MODE1)
+#define OMAP3_MCBSP3_CLKX_UART2_TX		OMAP3_PIN(MCBSP3_CLKX, MODE1)
+#define OMAP3_MCBSP3_FSX_UART2_RX		OMAP3_PIN(MCBSP3_FSX, MODE1)
+#define OMAP3_UART2_CTS_MCBSP3_DX		OMAP3_PIN(UART2_CTS, MODE1)
+#define OMAP3_UART2_RTS_MCBSP3_DR		OMAP3_PIN(UART2_RTS, MODE1)
+#define OMAP3_UART2_TX_MCBSP3_CLKX		OMAP3_PIN(UART2_TX, MODE1)
+#define OMAP3_UART2_RX_MCBSP3_FSX		OMAP3_PIN(UART2_RX, MODE1)
+#define OMAP3_MCBSP1_CLKR_MCSPI4_CLK		OMAP3_PIN(MCBSP1_CLKR, MODE1)
+#define OMAP3_MCBSP1_DX_MCSPI4_SIMO		OMAP3_PIN(MCBSP1_DX, MODE1)
+#define OMAP3_MCBSP1_DR_MCSPI4_SOMI		OMAP3_PIN(MCBSP1_DR, MODE1)
+#define OMAP3_MCBSP1_FSX_MCSPI4_CS0		OMAP3_PIN(MCBSP1_FSX, MODE1)
+#define OMAP3_HDQ_SIO_SYS_ALTCLK		OMAP3_PIN(HDQ_SIO, MODE1)
+#define OMAP3_MCSPI1_CLK_MMC2_DAT4		OMAP3_PIN(MCSPI1_CLK, MODE1)
+#define OMAP3_MCSPI1_SIMO_MMC2_DAT5		OMAP3_PIN(MCSPI1_SIMO, MODE1)
+#define OMAP3_MCSPI1_SOMI_MMC2_DAT6		OMAP3_PIN(MCSPI1_SOMI, MODE1)
+#define OMAP3_MCSPI1_CS0_MMC2_DAT7		OMAP3_PIN(MCSPI1_CS0, MODE1)
+#define OMAP3_MCSPI2_SIMO_GPT9_PWM_EVT		OMAP3_PIN(MCSPI2_SIMO, MODE1)
+#define OMAP3_MCSPI2_SOMI_GPT10_PWM_EVT		OMAP3_PIN(MCSPI2_SOMI, MODE1)
+#define OMAP3_MCSPI2_CS0_GPT11_PWM_EVT		OMAP3_PIN(MCSPI2_CS0, MODE1)
+#define OMAP3_MCSPI2_CS1_GPT18_PWM_EVT		OMAP3_PIN(MCSPI2_CS1, MODE1)
+#define OMAP3_ETK_CLK_MCBSP5_CLKX		OMAP3_PIN(ETK_CLK, MODE1)
+#define OMAP3_ETK_D0_MCSPI3_SIMO		OMAP3_PIN(ETK_D0, MODE1)
+#define OMAP3_ETK_D1_MCSPI3_SOMI		OMAP3_PIN(ETK_D1, MODE1)
+#define OMAP3_ETK_D2_MCSPI3_CS0			OMAP3_PIN(ETK_D2, MODE1)
+#define OMAP3_ETK_D3_MCSPI3_CLK			OMAP3_PIN(ETK_D3, MODE1)
+#define OMAP3_ETK_D4_MCBSP5_DR			OMAP3_PIN(ETK_D4, MODE1)
+#define OMAP3_ETK_D5_MCBSP5_FSX			OMAP3_PIN(ETK_D5, MODE1)
+#define OMAP3_ETK_D6_MCBSP5_DX			OMAP3_PIN(ETK_D6, MODE1)
+#define OMAP3_ETK_D7_MCSPI3_CS1			OMAP3_PIN(ETK_D7, MODE1)
+#define OMAP3_ETK_D8_SYS_DRM_MSECURE		OMAP3_PIN(ETK_D8, MODE1)
+#define OMAP3_ETK_D9_SYS_SEC_IND		OMAP3_PIN(ETK_D9, MODE1)
+#define OMAP3_SAD2D_MCAD0_MAD2D_MCAD0		OMAP3_PIN(SAD2D_MCAD0, MODE1)
+#define OMAP3_SAD2D_MCAD1_MAD2D_MCAD1		OMAP3_PIN(SAD2D_MCAD1, MODE1)
+#define OMAP3_SAD2D_MCAD2_MAD2D_MCAD2		OMAP3_PIN(SAD2D_MCAD2, MODE1)
+#define OMAP3_SAD2D_MCAD3_MAD2D_MCAD3		OMAP3_PIN(SAD2D_MCAD3, MODE1)
+#define OMAP3_SAD2D_MCAD4_MAD2D_MCAD4		OMAP3_PIN(SAD2D_MCAD4, MODE1)
+#define OMAP3_SAD2D_MCAD5_MAD2D_MCAD5		OMAP3_PIN(SAD2D_MCAD5, MODE1)
+#define OMAP3_SAD2D_MCAD6_MAD2D_MCAD6		OMAP3_PIN(SAD2D_MCAD6, MODE1)
+#define OMAP3_SAD2D_MCAD7_MAD2D_MCAD7		OMAP3_PIN(SAD2D_MCAD7, MODE1)
+#define OMAP3_SAD2D_MCAD8_MAD2D_MCAD8		OMAP3_PIN(SAD2D_MCAD8, MODE1)
+#define OMAP3_SAD2D_MCAD9_MAD2D_MCAD9		OMAP3_PIN(SAD2D_MCAD9, MODE1)
+#define OMAP3_SAD2D_MCAD10_MAD2D_MCAD10		OMAP3_PIN(SAD2D_MCAD10, MODE1)
+#define OMAP3_SAD2D_MCAD11_MAD2D_MCAD11		OMAP3_PIN(SAD2D_MCAD11, MODE1)
+#define OMAP3_SAD2D_MCAD12_MAD2D_MCAD12		OMAP3_PIN(SAD2D_MCAD12, MODE1)
+#define OMAP3_SAD2D_MCAD13_MAD2D_MCAD13		OMAP3_PIN(SAD2D_MCAD13, MODE1)
+#define OMAP3_SAD2D_MCAD14_MAD2D_MCAD14		OMAP3_PIN(SAD2D_MCAD14, MODE1)
+#define OMAP3_SAD2D_MCAD15_MAD2D_MCAD15		OMAP3_PIN(SAD2D_MCAD15, MODE1)
+#define OMAP3_SAD2D_MCAD16_MAD2D_MCAD16		OMAP3_PIN(SAD2D_MCAD16, MODE1)
+#define OMAP3_SAD2D_MCAD17_MAD2D_MCAD17		OMAP3_PIN(SAD2D_MCAD17, MODE1)
+#define OMAP3_SAD2D_MCAD18_MAD2D_MCAD18		OMAP3_PIN(SAD2D_MCAD18, MODE1)
+#define OMAP3_SAD2D_MCAD19_MAD2D_MCAD19		OMAP3_PIN(SAD2D_MCAD19, MODE1)
+#define OMAP3_SAD2D_MCAD20_MAD2D_MCAD20		OMAP3_PIN(SAD2D_MCAD20, MODE1)
+#define OMAP3_SAD2D_MCAD21_MAD2D_MCAD21		OMAP3_PIN(SAD2D_MCAD21, MODE1)
+#define OMAP3_SAD2D_MCAD22_MAD2D_MCAD22		OMAP3_PIN(SAD2D_MCAD22, MODE1)
+#define OMAP3_SAD2D_MCAD23_MAD2D_MCAD23		OMAP3_PIN(SAD2D_MCAD23, MODE1)
+#define OMAP3_SAD2D_MCAD24_MAD2D_MCAD24		OMAP3_PIN(SAD2D_MCAD24, MODE1)
+#define OMAP3_SAD2D_MCAD25_MAD2D_MCAD25		OMAP3_PIN(SAD2D_MCAD25, MODE1)
+#define OMAP3_SAD2D_MCAD26_MAD2D_MCAD26		OMAP3_PIN(SAD2D_MCAD26, MODE1)
+#define OMAP3_SAD2D_MCAD27_MAD2D_MCAD27		OMAP3_PIN(SAD2D_MCAD27, MODE1)
+#define OMAP3_SAD2D_MCAD28_MAD2D_MCAD28		OMAP3_PIN(SAD2D_MCAD28, MODE1)
+#define OMAP3_SAD2D_MCAD29_MAD2D_MCAD29		OMAP3_PIN(SAD2D_MCAD29, MODE1)
+#define OMAP3_SAD2D_MCAD30_MAD2D_MCAD30		OMAP3_PIN(SAD2D_MCAD30, MODE1)
+#define OMAP3_SAD2D_MCAD31_MAD2D_MCAD31		OMAP3_PIN(SAD2D_MCAD31, MODE1)
+#define OMAP3_SAD2D_MCAD32_MAD2D_MCAD32		OMAP3_PIN(SAD2D_MCAD32, MODE1)
+#define OMAP3_SAD2D_MCAD33_MAD2D_MCAD33		OMAP3_PIN(SAD2D_MCAD33, MODE1)
+#define OMAP3_SAD2D_MCAD34_MAD2D_MCAD34		OMAP3_PIN(SAD2D_MCAD34, MODE1)
+#define OMAP3_SAD2D_MCAD35_MAD2D_MCAD35		OMAP3_PIN(SAD2D_MCAD35, MODE1)
+#define OMAP3_SAD2D_MCAD36_MAD2D_MCAD36		OMAP3_PIN(SAD2D_MCAD36, MODE1)
+#define OMAP3_SAD2D_DMAREQ2_UART1_DMA_TX	OMAP3_PIN(SAD2D_DMAREQ2, MODE1)
+#define OMAP3_SAD2D_DMAREQ3_UART1_DMA_RX	OMAP3_PIN(SAD2D_DMAREQ3, MODE1)
+#define OMAP3_SAD2D_MWRITE_MAD2D_SWRITE		OMAP3_PIN(SAD2D_MWRITE, MODE1)
+#define OMAP3_SAD2D_SWRITE_MAD2D_MWRITE		OMAP3_PIN(SAD2D_SWRITE, MODE1)
+#define OMAP3_SAD2D_MREAD_MAD2D_SREAD		OMAP3_PIN(SAD2D_MREAD, MODE1)
+#define OMAP3_SAD2D_SREAD_MAD2D_MREAD		OMAP3_PIN(SAD2D_SREAD, MODE1)
+#define OMAP3_SAD2D_MBUSFLAG_MAD2D_SBUSFLAG	OMAP3_PIN(SAD2D_MBUSFLAG, MODE1)
+#define OMAP3_SAD2D_SBUSFLAG_MAD2D_MBUSFLAG	OMAP3_PIN(SAD2D_SBUSFLAG, MODE1)
+#define OMAP3_I2C4_SCL_SYS_NVMODE1		OMAP3_PIN(I2C4_SCL, MODE1)
+#define OMAP3_I2C4_SDA_SYS_NVMODE2		OMAP3_PIN(I2C4_SDA, MODE1)
+#define OMAP3_SYS_BOOT4_MMC2_DIR_DAT2		OMAP3_PIN(SYS_BOOT4, MODE1)
+#define OMAP3_SYS_BOOT5_MMC2_DIR_DAT3		OMAP3_PIN(SYS_BOOT5, MODE1)
+
+#define OMAP3_GPMC_NCS4_MCBSP4_CLKX		OMAP3_PIN(GPMC_NCS4, MODE2)
+#define OMAP3_GPMC_NCS5_MCBSP4_DR		OMAP3_PIN(GPMC_NCS5, MODE2)
+#define OMAP3_GPMC_NCS6_MCBSP4_DX		OMAP3_PIN(GPMC_NCS6, MODE2)
+#define OMAP3_GPMC_NCS7_MCBSP4_FSX		OMAP3_PIN(GPMC_NCS7, MODE2)
+#define OMAP3_DSS_DATA0_UART1_CTS		OMAP3_PIN(DSS_DATA0, MODE2)
+#define OMAP3_DSS_DATA1_UART1_RTS		OMAP3_PIN(DSS_DATA1, MODE2)
+#define OMAP3_DSS_DATA4_UART3_RX_IRRX		OMAP3_PIN(DSS_DATA4, MODE2)
+#define OMAP3_DSS_DATA5_UART3_RX_IRTX		OMAP3_PIN(DSS_DATA5, MODE2)
+#define OMAP3_DSS_DATA6_UART1_TX		OMAP3_PIN(DSS_DATA6, MODE2)
+#define OMAP3_DSS_DATA7_UART1_RX		OMAP3_PIN(DSS_DATA7, MODE2)
+#define OMAP3_DSS_DATA18_MCSPI3_CLK		OMAP3_PIN(DSS_DATA18, MODE2)
+#define OMAP3_DSS_DATA19_MCSPI3_SIMO		OMAP3_PIN(DSS_DATA19, MODE2)
+#define OMAP3_DSS_DATA20_MCSPI3_SOMI		OMAP3_PIN(DSS_DATA20, MODE2)
+#define OMAP3_DSS_DATA21_MCSPI3_CS0		OMAP3_PIN(DSS_DATA21, MODE2)
+#define OMAP3_DSS_DATA22_MCSPI3_CS1		OMAP3_PIN(DSS_DATA22, MODE2)
+#define OMAP3_CAM_FLD_CAM_GLOBAL_RST		OMAP3_PIN(CAM_FLD, MODE2)
+#define OMAP3_CAM_D0_CSI2_DX2			OMAP3_PIN(CAM_D0, MODE2)
+#define OMAP3_CAM_D1_CSI2_DY2			OMAP3_PIN(CAM_D1, MODE2)
+#define OMAP3_CAM_WEN_CAM_SHUTTER		OMAP3_PIN(CAM_WEN, MODE2)
+#define OMAP3_MMC1_DAT4_SIM_IO			OMAP3_PIN(MMC1_DAT4, MODE2)
+#define OMAP3_MMC1_DAT5_SIM_CLK			OMAP3_PIN(MMC1_DAT5, MODE2)
+#define OMAP3_MMC1_DAT6_SIM_PWRCTRL		OMAP3_PIN(MMC1_DAT6, MODE2)
+#define OMAP3_MMC1_DAT7_SIM_RST			OMAP3_PIN(MMC1_DAT7, MODE2)
+#define OMAP3_MMC2_DAT5_CAM_GLOBAL_RST		OMAP3_PIN(MMC2_DAT5, MODE2)
+#define OMAP3_MMC2_DAT6_CAM_SHUTTER		OMAP3_PIN(MMC2_DAT6, MODE2)
+#define OMAP3_UART2_CTS_GPT9_PWM_EVT		OMAP3_PIN(UART2_CTS, MODE2)
+#define OMAP3_UART2_RTS_GPT10_PWM_EVT		OMAP3_PIN(UART2_RTS, MODE2)
+#define OMAP3_UART2_TX_GPT11_PWM_EVT		OMAP3_PIN(UART2_TX, MODE2)
+#define OMAP3_UART2_RX_GPT12_PWM_EVT		OMAP3_PIN(UART2_RX, MODE2)
+#define OMAP3_UART1_RX_MCBSP1_CLKR		OMAP3_PIN(UART1_RX, MODE2)
+#define OMAP3_MCBSP1_CLKR_SIM_CD		OMAP3_PIN(MCBSP1_CLKR, MODE2)
+#define OMAP3_MCBSP1_FSR_CAM_GLOBAL_RST		OMAP3_PIN(MCBSP1_FSR, MODE2)
+#define OMAP3_MCBSP1_DX_MCBSP3_DX		OMAP3_PIN(MCBSP1_DX, MODE2)
+#define OMAP3_MCBSP1_DR_MCBSP3_DR		OMAP3_PIN(MCBSP1_DR, MODE2)
+#define OMAP3_MCBSP_CLKS_CAM_SHUTTER		OMAP3_PIN(MCBSP_CLKS, MODE2)
+#define OMAP3_MCBSP1_FSX_MCBSP3_FSX		OMAP3_PIN(MCBSP1_FSX, MODE2)
+#define OMAP3_MCBSP1_CLKX_MCBSP3_CLKX		OMAP3_PIN(MCBSP1_CLKX, MODE2)
+#define OMAP3_HSUSB0_DATA0_UART3_TX_IRTX	OMAP3_PIN(HSUSB0_DATA0, MODE2)
+#define OMAP3_HSUSB0_DATA1_UART3_RX_IRRX	OMAP3_PIN(HSUSB0_DATA1, MODE2)
+#define OMAP3_HSUSB0_DATA2_UART3_RTS_SD		OMAP3_PIN(HSUSB0_DATA2, MODE2)
+#define OMAP3_HSUSB0_DATA3_UART3_CTS_RCTX	OMAP3_PIN(HSUSB0_DATA3, MODE2)
+#define OMAP3_HDQ_SIO_I2C2_SCCBE		OMAP3_PIN(HDQ_SIO, MODE2)
+#define OMAP3_MCSPI1_CS1_MMC3_CMD		OMAP3_PIN(MCSPI1_CS1, MODE2)
+#define OMAP3_MCSPI1_CS2_MMC3_CLK		OMAP3_PIN(MCSPI1_CS2, MODE2)
+#define OMAP3_MCSPI1_CS3_HSUSB2_TLL_DATA2	OMAP3_PIN(MCSPI1_CS3, MODE2)
+#define OMAP3_MCSPI2_CLK_HSUSB2_TLL_DATA7	OMAP3_PIN(MCSPI2_CLK, MODE2)
+#define OMAP3_MCSPI2_SIMO_HSUSB2_TLL_DATA4	OMAP3_PIN(MCSPI2_SIMO, MODE2)
+#define OMAP3_MCSPI2_SOMI_HSUSB2_TLL_DATA5	OMAP3_PIN(MCSPI2_SOMI, MODE2)
+#define OMAP3_MCSPI2_CS0_HSUSB2_TLL_DATA6	OMAP3_PIN(MCSPI2_CS0, MODE2)
+#define OMAP3_MCSPI2_CS1_HSUSB2_TLL_DATA3	OMAP3_PIN(MCSPI2_CS1, MODE2)
+#define OMAP3_ETK_CLK_MMC3_CLK			OMAP3_PIN(ETK_CLK, MODE2)
+#define OMAP3_ETK_CTL_MMC3_CMD			OMAP3_PIN(ETK_CTL, MODE2)
+#define OMAP3_ETK_D0_MMC3_DAT4			OMAP3_PIN(ETK_D0, MODE2)
+#define OMAP3_ETK_D3_MMC3_DAT3			OMAP3_PIN(ETK_D3, MODE2)
+#define OMAP3_ETK_D4_MMC3_DAT0			OMAP3_PIN(ETK_D4, MODE2)
+#define OMAP3_ETK_D5_MMC3_DAT1			OMAP3_PIN(ETK_D5, MODE2)
+#define OMAP3_ETK_D6_MMC3_DAT2			OMAP3_PIN(ETK_D6, MODE2)
+#define OMAP3_ETK_D7_MMC3_DAT7			OMAP3_PIN(ETK_D7, MODE2)
+#define OMAP3_ETK_D8_MMC3_DAT6			OMAP3_PIN(ETK_D8, MODE2)
+#define OMAP3_ETK_D9_MMC3_DAT5			OMAP3_PIN(ETK_D9, MODE2)
+#define OMAP3_ETK_D10_UART1_RX			OMAP3_PIN(ETK_D10, MODE2)
+#define OMAP3_SAD2D_DMAREQ0_UART2_DMA_TX	OMAP3_PIN(SAD2D_DMAREQ0, MODE2)
+#define OMAP3_SAD2D_DMAREQ1_UART2_DMA_RX	OMAP3_PIN(SAD2D_DMAREQ1, MODE2)
+
+#define OMAP3_GPMC_NCS4_GPT9_PWM_EVT		OMAP3_PIN(GPMC_NCS4, MODE3)
+#define OMAP3_GPMC_NCS5_GPT10_PWM_EVT		OMAP3_PIN(GPMC_NCS5, MODE3)
+#define OMAP3_GPMC_NCS6_GPT11_PWM_EVT		OMAP3_PIN(GPMC_NCS6, MODE3)
+#define OMAP3_GPMC_NCS7_GPT18_PWM_EVT		OMAP3_PIN(GPMC_NCS7, MODE3)
+#define OMAP3_DSS_DATA18_DSS_DATA0		OMAP3_PIN(DSS_DATA18, MODE3)
+#define OMAP3_DSS_DATA19_DSS_DATA1		OMAP3_PIN(DSS_DATA19, MODE3)
+#define OMAP3_DSS_DATA20_DSS_DATA2		OMAP3_PIN(DSS_DATA20, MODE3)
+#define OMAP3_DSS_DATA21_DSS_DATA3		OMAP3_PIN(DSS_DATA21, MODE3)
+#define OMAP3_DSS_DATA22_DSS_DATA4		OMAP3_PIN(DSS_DATA22, MODE3)
+#define OMAP3_DSS_DATA23_DSS_DATA5		OMAP3_PIN(DSS_DATA23, MODE3)
+#define OMAP3_MMC2_DAT4_MMC3_DAT0		OMAP3_PIN(MMC2_DAT4, MODE3)
+#define OMAP3_MMC2_DAT5_MMC3_DAT1		OMAP3_PIN(MMC2_DAT5, MODE3)
+#define OMAP3_MMC2_DAT6_MMC3_DAT2		OMAP3_PIN(MMC2_DAT6, MODE3)
+#define OMAP3_MMC2_DAT7_MMC3_DAT3		OMAP3_PIN(MMC2_DAT7, MODE3)
+#define OMAP3_UART1_RX_MCSPI4_CLK		OMAP3_PIN(UART1_RX, MODE3)
+#define OMAP3_HDQ_SIO_I2C3_SCCBE		OMAP3_PIN(HDQ_SIO, MODE3)
+#define OMAP3_MCSPI1_CS3_HSUSB2_DATA2		OMAP3_PIN(MCSPI1_CS3, MODE3)
+#define OMAP3_MCSPI2_CLK_HSUSB2_DATA7		OMAP3_PIN(MCSPI2_CLK, MODE3)
+#define OMAP3_MCSPI2_SIMO_HSUSB2_DATA4		OMAP3_PIN(MCSPI2_SIMO, MODE3)
+#define OMAP3_MCSPI2_SOMI_HSUSB2_DATA5		OMAP3_PIN(MCSPI2_SOMI, MODE3)
+#define OMAP3_MCSPI2_CS0_HSUSB2_DATA6		OMAP3_PIN(MCSPI2_CS0, MODE3)
+#define OMAP3_MCSPI2_CS1_HSUSB2_DATA3		OMAP3_PIN(MCSPI2_CS1, MODE3)
+#define OMAP3_ETK_CLK_HSUSB1_STP		OMAP3_PIN(ETK_CLK, MODE3)
+#define OMAP3_ETK_CTL_HSUSB1_CLK		OMAP3_PIN(ETK_CTL, MODE3)
+#define OMAP3_ETK_D0_HSUSB1_DATA0		OMAP3_PIN(ETK_D0, MODE3)
+#define OMAP3_ETK_D1_HSUSB1_DATA1		OMAP3_PIN(ETK_D1, MODE3)
+#define OMAP3_ETK_D2_HSUSB1_DATA2		OMAP3_PIN(ETK_D2, MODE3)
+#define OMAP3_ETK_D3_HSUSB1_DATA7		OMAP3_PIN(ETK_D3, MODE3)
+#define OMAP3_ETK_D4_HSUSB1_DATA4		OMAP3_PIN(ETK_D4, MODE3)
+#define OMAP3_ETK_D5_HSUSB1_DATA5		OMAP3_PIN(ETK_D5, MODE3)
+#define OMAP3_ETK_D6_HSUSB1_DATA6		OMAP3_PIN(ETK_D6, MODE3)
+#define OMAP3_ETK_D7_HSUSB1_DATA3		OMAP3_PIN(ETK_D7, MODE3)
+#define OMAP3_ETK_D8_HSUSB1_DIR			OMAP3_PIN(ETK_D8, MODE3)
+#define OMAP3_ETK_D9_HSUSB1_NXT			OMAP3_PIN(ETK_D9, MODE3)
+#define OMAP3_ETK_D10_HSUSB2_CLK		OMAP3_PIN(ETK_D10, MODE3)
+#define OMAP3_ETK_D11_HSUSB2_STP		OMAP3_PIN(ETK_D11, MODE3)
+#define OMAP3_ETK_D12_HSUSB2_DIR		OMAP3_PIN(ETK_D12, MODE3)
+#define OMAP3_ETK_D13_HSUSB2_NXT		OMAP3_PIN(ETK_D13, MODE3)
+#define OMAP3_ETK_D14_HSUSB2_DATA0		OMAP3_PIN(ETK_D14, MODE3)
+#define OMAP3_ETK_D15_HSUSB2_DATA1		OMAP3_PIN(ETK_D15, MODE3)
+#define OMAP3_SAD2D_DMAREQ0_MMC1_DMA_TX		OMAP3_PIN(SAD2D_DMAREQ0, MODE3)
+#define OMAP3_SAD2D_DMAREQ1_MMC1_DMA_RX		OMAP3_PIN(SAD2D_DMAREQ1, MODE3)
+#define OMAP3_SAD2D_DMAREQ2_UART3_DMA_TX	OMAP3_PIN(SAD2D_DMAREQ2, MODE3)
+#define OMAP3_SAD2D_DMAREQ3_UART3_DMA_RX	OMAP3_PIN(SAD2D_DMAREQ3, MODE3)
+
+#define OMAP3_GPMC_A1_GPIO_34		OMAP3_PIN(GPMC_A1, MODE4)
+#define OMAP3_GPMC_A2_GPIO_35		OMAP3_PIN(GPMC_A2, MODE4)
+#define OMAP3_GPMC_A3_GPIO_36		OMAP3_PIN(GPMC_A3, MODE4)
+#define OMAP3_GPMC_A4_GPIO_37		OMAP3_PIN(GPMC_A4, MODE4)
+#define OMAP3_GPMC_A5_GPIO_38		OMAP3_PIN(GPMC_A5, MODE4)
+#define OMAP3_GPMC_A6_GPIO_39		OMAP3_PIN(GPMC_A6, MODE4)
+#define OMAP3_GPMC_A7_GPIO_40		OMAP3_PIN(GPMC_A7, MODE4)
+#define OMAP3_GPMC_A8_GPIO_41		OMAP3_PIN(GPMC_A8, MODE4)
+#define OMAP3_GPMC_A9_GPIO_42		OMAP3_PIN(GPMC_A9, MODE4)
+#define OMAP3_GPMC_A10_GPIO_43		OMAP3_PIN(GPMC_A10, MODE4)
+#define OMAP3_GPMC_D8_GPIO_44		OMAP3_PIN(GPMC_D8, MODE4)
+#define OMAP3_GPMC_D9_GPIO_45		OMAP3_PIN(GPMC_D9, MODE4)
+#define OMAP3_GPMC_D10_GPIO_46		OMAP3_PIN(GPMC_D10, MODE4)
+#define OMAP3_GPMC_D11_GPIO_47		OMAP3_PIN(GPMC_D11, MODE4)
+#define OMAP3_GPMC_D12_GPIO_48		OMAP3_PIN(GPMC_D12, MODE4)
+#define OMAP3_GPMC_D13_GPIO_49		OMAP3_PIN(GPMC_D13, MODE4)
+#define OMAP3_GPMC_D14_GPIO_50		OMAP3_PIN(GPMC_D14, MODE4)
+#define OMAP3_GPMC_D15_GPIO_51		OMAP3_PIN(GPMC_D15, MODE4)
+#define OMAP3_GPMC_NCS1_GPIO_52		OMAP3_PIN(GPMC_NCS1, MODE4)
+#define OMAP3_GPMC_NCS2_GPIO_53		OMAP3_PIN(GPMC_NCS2, MODE4)
+#define OMAP3_GPMC_NCS3_GPIO_54		OMAP3_PIN(GPMC_NCS3, MODE4)
+#define OMAP3_GPMC_NCS4_GPIO_55		OMAP3_PIN(GPMC_NCS4, MODE4)
+#define OMAP3_GPMC_NCS5_GPIO_56		OMAP3_PIN(GPMC_NCS5, MODE4)
+#define OMAP3_GPMC_NCS6_GPIO_57		OMAP3_PIN(GPMC_NCS6, MODE4)
+#define OMAP3_GPMC_NCS7_GPIO_58		OMAP3_PIN(GPMC_NCS7, MODE4)
+#define OMAP3_GPMC_CLK_GPIO_59		OMAP3_PIN(GPMC_CLK, MODE4)
+#define OMAP3_GPMC_NBE0_CLE_GPIO_60	OMAP3_PIN(GPMC_NBE0_CLE, MODE4)
+#define OMAP3_GPMC_NBE1_GPIO_61		OMAP3_PIN(GPMC_NBE1, MODE4)
+#define OMAP3_GPMC_NWP_GPIO_62		OMAP3_PIN(GPMC_NWP, MODE4)
+#define OMAP3_GPMC_WAIT1_GPIO_63	OMAP3_PIN(GPMC_WAIT1, MODE4)
+#define OMAP3_GPMC_WAIT2_GPIO_64	OMAP3_PIN(GPMC_WAIT2, MODE4)
+#define OMAP3_GPMC_WAIT3_GPIO_65	OMAP3_PIN(GPMC_WAIT3, MODE4)
+#define OMAP3_DSS_PCLK_GPIO_66		OMAP3_PIN(DSS_PCLK, MODE4)
+#define OMAP3_DSS_HSYNC_GPIO_67		OMAP3_PIN(DSS_HSYNC, MODE4)
+#define OMAP3_DSS_VSYNC_GPIO_68		OMAP3_PIN(DSS_VSYNC, MODE4)
+#define OMAP3_DSS_ACBIAS_GPIO_69	OMAP3_PIN(DSS_ACBIAS, MODE4)
+#define OMAP3_DSS_DATA0_GPIO_70		OMAP3_PIN(DSS_DATA0, MODE4)
+#define OMAP3_DSS_DATA1_GPIO_71		OMAP3_PIN(DSS_DATA1, MODE4)
+#define OMAP3_DSS_DATA2_GPIO_72		OMAP3_PIN(DSS_DATA2, MODE4)
+#define OMAP3_DSS_DATA3_GPIO_73		OMAP3_PIN(DSS_DATA3, MODE4)
+#define OMAP3_DSS_DATA4_GPIO_74		OMAP3_PIN(DSS_DATA4, MODE4)
+#define OMAP3_DSS_DATA5_GPIO_75		OMAP3_PIN(DSS_DATA5, MODE4)
+#define OMAP3_DSS_DATA6_GPIO_76		OMAP3_PIN(DSS_DATA6, MODE4)
+#define OMAP3_DSS_DATA7_GPIO_77		OMAP3_PIN(DSS_DATA7, MODE4)
+#define OMAP3_DSS_DATA8_GPIO_78		OMAP3_PIN(DSS_DATA8, MODE4)
+#define OMAP3_DSS_DATA9_GPIO_79		OMAP3_PIN(DSS_DATA9, MODE4)
+#define OMAP3_DSS_DATA10_GPIO_80	OMAP3_PIN(DSS_DATA10, MODE4)
+#define OMAP3_DSS_DATA11_GPIO_81	OMAP3_PIN(DSS_DATA11, MODE4)
+#define OMAP3_DSS_DATA12_GPIO_82	OMAP3_PIN(DSS_DATA12, MODE4)
+#define OMAP3_DSS_DATA13_GPIO_83	OMAP3_PIN(DSS_DATA13, MODE4)
+#define OMAP3_DSS_DATA14_GPIO_84	OMAP3_PIN(DSS_DATA14, MODE4)
+#define OMAP3_DSS_DATA15_GPIO_85	OMAP3_PIN(DSS_DATA15, MODE4)
+#define OMAP3_DSS_DATA16_GPIO_86	OMAP3_PIN(DSS_DATA16, MODE4)
+#define OMAP3_DSS_DATA17_GPIO_87	OMAP3_PIN(DSS_DATA17, MODE4)
+#define OMAP3_DSS_DATA18_GPIO_88	OMAP3_PIN(DSS_DATA18, MODE4)
+#define OMAP3_DSS_DATA19_GPIO_89	OMAP3_PIN(DSS_DATA19, MODE4)
+#define OMAP3_DSS_DATA20_GPIO_90	OMAP3_PIN(DSS_DATA20, MODE4)
+#define OMAP3_DSS_DATA21_GPIO_91	OMAP3_PIN(DSS_DATA21, MODE4)
+#define OMAP3_DSS_DATA22_GPIO_92	OMAP3_PIN(DSS_DATA22, MODE4)
+#define OMAP3_DSS_DATA23_GPIO_93	OMAP3_PIN(DSS_DATA23, MODE4)
+#define OMAP3_CAM_HS_GPIO_94		OMAP3_PIN(CAM_HS, MODE4)
+#define OMAP3_CAM_VS_GPIO_95		OMAP3_PIN(CAM_VS, MODE4)
+#define OMAP3_CAM_XCLKA_GPIO_96		OMAP3_PIN(CAM_XCLKA, MODE4)
+#define OMAP3_CAM_PCLK_GPIO_97		OMAP3_PIN(CAM_PCLK, MODE4)
+#define OMAP3_CAM_FLD_GPIO_98		OMAP3_PIN(CAM_FLD, MODE4)
+#define OMAP3_CAM_D0_GPIO_99		OMAP3_PIN(CAM_D0, MODE4)
+#define OMAP3_CAM_D1_GPIO_100		OMAP3_PIN(CAM_D1, MODE4)
+#define OMAP3_CAM_D2_GPIO_101		OMAP3_PIN(CAM_D2, MODE4)
+#define OMAP3_CAM_D3_GPIO_102		OMAP3_PIN(CAM_D3, MODE4)
+#define OMAP3_CAM_D4_GPIO_103		OMAP3_PIN(CAM_D4, MODE4)
+#define OMAP3_CAM_D5_GPIO_104		OMAP3_PIN(CAM_D5, MODE4)
+#define OMAP3_CAM_D6_GPIO_105		OMAP3_PIN(CAM_D6, MODE4)
+#define OMAP3_CAM_D7_GPIO_106		OMAP3_PIN(CAM_D7, MODE4)
+#define OMAP3_CAM_D8_GPIO_107		OMAP3_PIN(CAM_D8, MODE4)
+#define OMAP3_CAM_D9_GPIO_108		OMAP3_PIN(CAM_D9, MODE4)
+#define OMAP3_CAM_D10_GPIO_109		OMAP3_PIN(CAM_D10, MODE4)
+#define OMAP3_CAM_D11_GPIO_110		OMAP3_PIN(CAM_D11, MODE4)
+#define OMAP3_CAM_XCLKB_GPIO_111	OMAP3_PIN(CAM_XCLKB, MODE4)
+#define OMAP3_CAM_WEN_GPIO_167		OMAP3_PIN(CAM_WEN, MODE4)
+#define OMAP3_CAM_STROBE_GPIO_126	OMAP3_PIN(CAM_STROBE, MODE4)
+#define OMAP3_CSI2_DX0_GPIO_112		OMAP3_PIN(CSI2_DX0, MODE4)
+#define OMAP3_CSI2_DY0_GPIO_113		OMAP3_PIN(CSI2_DY0, MODE4)
+#define OMAP3_CSI2_DX1_GPIO_114		OMAP3_PIN(CSI2_DX1, MODE4)
+#define OMAP3_CSI2_DY1_GPIO_115		OMAP3_PIN(CSI2_DY1, MODE4)
+#define OMAP3_MCBSP2_FSX_GPIO_116	OMAP3_PIN(MCBSP2_FSX, MODE4)
+#define OMAP3_MCBSP2_CLKX_GPIO_117	OMAP3_PIN(MCBSP2_CLKX, MODE4)
+#define OMAP3_MCBSP2_DR_GPIO_118	OMAP3_PIN(MCBSP2_DR, MODE4)
+#define OMAP3_MCBSP2_DX_GPIO_119	OMAP3_PIN(MCBSP2_DX, MODE4)
+#define OMAP3_MMC1_CLK_GPIO_120		OMAP3_PIN(MMC1_CLK, MODE4)
+#define OMAP3_MMC1_CMD_GPIO_121		OMAP3_PIN(MMC1_CMD, MODE4)
+#define OMAP3_MMC1_DAT0_GPIO_122	OMAP3_PIN(MMC1_DAT0, MODE4)
+#define OMAP3_MMC1_DAT1_GPIO_123	OMAP3_PIN(MMC1_DAT1, MODE4)
+#define OMAP3_MMC1_DAT2_GPIO_124	OMAP3_PIN(MMC1_DAT2, MODE4)
+#define OMAP3_MMC1_DAT3_GPIO_125	OMAP3_PIN(MMC1_DAT3, MODE4)
+#define OMAP3_MMC1_DAT4_GPIO_126	OMAP3_PIN(MMC1_DAT4, MODE4)
+#define OMAP3_MMC1_DAT5_GPIO_127	OMAP3_PIN(MMC1_DAT5, MODE4)
+#define OMAP3_MMC1_DAT6_GPIO_128	OMAP3_PIN(MMC1_DAT6, MODE4)
+#define OMAP3_MMC1_DAT7_GPIO_129	OMAP3_PIN(MMC1_DAT7, MODE4)
+#define OMAP3_MMC2_CLK_GPIO_130		OMAP3_PIN(MMC2_CLK, MODE4)
+#define OMAP3_MMC2_CMD_GPIO_131		OMAP3_PIN(MMC2_CMD, MODE4)
+#define OMAP3_MMC2_DAT0_GPIO_132	OMAP3_PIN(MMC2_DAT0, MODE4)
+#define OMAP3_MMC2_DAT1_GPIO_133	OMAP3_PIN(MMC2_DAT1, MODE4)
+#define OMAP3_MMC2_DAT2_GPIO_134	OMAP3_PIN(MMC2_DAT2, MODE4)
+#define OMAP3_MMC2_DAT3_GPIO_135	OMAP3_PIN(MMC2_DAT3, MODE4)
+#define OMAP3_MMC2_DAT4_GPIO_136	OMAP3_PIN(MMC2_DAT4, MODE4)
+#define OMAP3_MMC2_DAT5_GPIO_137	OMAP3_PIN(MMC2_DAT5, MODE4)
+#define OMAP3_MMC2_DAT6_GPIO_138	OMAP3_PIN(MMC2_DAT6, MODE4)
+#define OMAP3_MMC2_DAT7_GPIO_139	OMAP3_PIN(MMC2_DAT7, MODE4)
+#define OMAP3_MCBSP3_DX_GPIO_140	OMAP3_PIN(MCBSP3_DX, MODE4)
+#define OMAP3_MCBSP3_DR_GPIO_141	OMAP3_PIN(MCBSP3_DR, MODE4)
+#define OMAP3_MCBSP3_CLKX_GPIO_142	OMAP3_PIN(MCBSP3_CLKX, MODE4)
+#define OMAP3_MCBSP3_FSX_GPIO_143	OMAP3_PIN(MCBSP3_FSX, MODE4)
+#define OMAP3_UART2_CTS_GPIO_144	OMAP3_PIN(UART2_CTS, MODE4)
+#define OMAP3_UART2_RTS_GPIO_145	OMAP3_PIN(UART2_RTS, MODE4)
+#define OMAP3_UART2_TX_GPIO_146		OMAP3_PIN(UART2_TX, MODE4)
+#define OMAP3_UART2_RX_GPIO_147		OMAP3_PIN(UART2_RX, MODE4)
+#define OMAP3_UART1_TX_GPIO_148		OMAP3_PIN(UART1_TX, MODE4)
+#define OMAP3_UART1_RTS_GPIO_149	OMAP3_PIN(UART1_RTS, MODE4)
+#define OMAP3_UART1_CTS_GPIO_150	OMAP3_PIN(UART1_CTS, MODE4)
+#define OMAP3_UART1_RX_GPIO_151		OMAP3_PIN(UART1_RX, MODE4)
+#define OMAP3_MCBSP4_CLKX_GPIO_152	OMAP3_PIN(MCBSP4_CLKX, MODE4)
+#define OMAP3_MCBSP4_DR_GPIO_153	OMAP3_PIN(MCBSP4_DR, MODE4)
+#define OMAP3_MCBSP4_DX_GPIO_154	OMAP3_PIN(MCBSP4_DX, MODE4)
+#define OMAP3_MCBSP4_FSX_GPIO_155	OMAP3_PIN(MCBSP4_FSX, MODE4)
+#define OMAP3_MCBSP1_CLKR_GPIO_156	OMAP3_PIN(MCBSP1_CLKR, MODE4)
+#define OMAP3_MCBSP1_FSR_GPIO_157	OMAP3_PIN(MCBSP1_FSR, MODE4)
+#define OMAP3_MCBSP1_DX_GPIO_158	OMAP3_PIN(MCBSP1_DX, MODE4)
+#define OMAP3_MCBSP1_DR_GPIO_159	OMAP3_PIN(MCBSP1_DR, MODE4)
+#define OMAP3_MCBSP_CLKS_GPIO_160	OMAP3_PIN(MCBSP_CLKS, MODE4)
+#define OMAP3_MCBSP1_FSX_GPIO_161	OMAP3_PIN(MCBSP1_FSX, MODE4)
+#define OMAP3_MCBSP1_CLKX_GPIO_162	OMAP3_PIN(MCBSP1_CLKX, MODE4)
+#define OMAP3_UART3_CTS_RCTX_GPIO_163	OMAP3_PIN(UART3_CTS_RCTX, MODE4)
+#define OMAP3_UART3_RTS_SD_GPIO_164	OMAP3_PIN(UART3_RTS_SD, MODE4)
+#define OMAP3_UART3_RX_IRRX_GPIO_165	OMAP3_PIN(UART3_RX, MODE4)
+#define OMAP3_UART3_TX_IRTX_GPIO_166	OMAP3_PIN(UART3_TX, MODE4)
+#define OMAP3_HSUSB0_CLK_GPIO_120	OMAP3_PIN(HSUSB0_CLK, MODE4)
+#define OMAP3_HSUSB0_STP_GPIO_121	OMAP3_PIN(HSUSB0_STP, MODE4)
+#define OMAP3_HSUSB0_DIR_GPIO_122	OMAP3_PIN(HSUSB0_DIR, MODE4)
+#define OMAP3_HSUSB0_NXT_GPIO_124	OMAP3_PIN(HSUSB0_NXT, MODE4)
+#define OMAP3_HSUSB0_DATA0_GPIO_125	OMAP3_PIN(HSUSB0_DATA0, MODE4)
+#define OMAP3_HSUSB0_DATA1_GPIO_130	OMAP3_PIN(HSUSB0_DATA1, MODE4)
+#define OMAP3_HSUSB0_DATA2_GPIO_131	OMAP3_PIN(HSUSB0_DATA2, MODE4)
+#define OMAP3_HSUSB0_DATA3_GPIO_169	OMAP3_PIN(HSUSB0_DATA3, MODE4)
+#define OMAP3_HSUSB0_DATA4_GPIO_188	OMAP3_PIN(HSUSB0_DATA4, MODE4)
+#define OMAP3_HSUSB0_DATA5_GPIO_189	OMAP3_PIN(HSUSB0_DATA5, MODE4)
+#define OMAP3_HSUSB0_DATA6_GPIO_190	OMAP3_PIN(HSUSB0_DATA6, MODE4)
+#define OMAP3_HSUSB0_DATA7_GPIO_191	OMAP3_PIN(HSUSB0_DATA7, MODE4)
+#define OMAP3_I2C2_SCL_GPIO_168		OMAP3_PIN(I2C2_SCL, MODE4)
+#define OMAP3_I2C2_SDA_GPIO_183		OMAP3_PIN(I2C2_SDA, MODE4)
+#define OMAP3_I2C3_SCL_GPIO_184		OMAP3_PIN(I2C3_SCL, MODE4)
+#define OMAP3_I2C3_SDA_GPIO_185		OMAP3_PIN(I2C3_SDA, MODE4)
+#define OMAP3_HDQ_SIO_GPIO_170		OMAP3_PIN(HDQ_SIO, MODE4)
+#define OMAP3_MCSPI1_CLK_GPIO_171	OMAP3_PIN(MCSPI1_CLK, MODE4)
+#define OMAP3_MCSPI1_SIMO_GPIO_172	OMAP3_PIN(MCSPI1_SIMO, MODE4)
+#define OMAP3_MCSPI1_SOMI_GPIO_173	OMAP3_PIN(MCSPI1_SOMI, MODE4)
+#define OMAP3_MCSPI1_CS0_GPIO_174	OMAP3_PIN(MCSPI1_CS0, MODE4)
+#define OMAP3_MCSPI1_CS1_GPIO_175	OMAP3_PIN(MCSPI1_CS1, MODE4)
+#define OMAP3_MCSPI1_CS2_GPIO_176	OMAP3_PIN(MCSPI1_CS2, MODE4)
+#define OMAP3_MCSPI1_CS3_GPIO_177	OMAP3_PIN(MCSPI1_CS3, MODE4)
+#define OMAP3_MCSPI2_CLK_GPIO_178	OMAP3_PIN(MCSPI2_CLK, MODE4)
+#define OMAP3_MCSPI2_SIMO_GPIO_179	OMAP3_PIN(MCSPI2_SIMO, MODE4)
+#define OMAP3_MCSPI2_SOMI_GPIO_180	OMAP3_PIN(MCSPI2_SOMI, MODE4)
+#define OMAP3_MCSPI2_CS0_GPIO_181	OMAP3_PIN(MCSPI2_CS0, MODE4)
+#define OMAP3_MCSPI2_CS1_GPIO_182	OMAP3_PIN(MCSPI2_CS1, MODE4)
+#define OMAP3_SYS_NIRQ_GPIO_0		OMAP3_PIN(SYS_NIRQ, MODE4)
+#define OMAP3_SYS_CLKOUT2_GPIO_186	OMAP3_PIN(SYS_CLKOUT2, MODE4)
+#define OMAP3_ETK_CLK_GPIO_12		OMAP3_PIN(ETK_CLK, MODE4)
+#define OMAP3_ETK_CTL_GPIO_13		OMAP3_PIN(ETK_CTL, MODE4)
+#define OMAP3_ETK_D0_GPIO_14		OMAP3_PIN(ETK_D0, MODE4)
+#define OMAP3_ETK_D1_GPIO_15		OMAP3_PIN(ETK_D1, MODE4)
+#define OMAP3_ETK_D2_GPIO_16		OMAP3_PIN(ETK_D2, MODE4)
+#define OMAP3_ETK_D3_GPIO_17		OMAP3_PIN(ETK_D3, MODE4)
+#define OMAP3_ETK_D4_GPIO_18		OMAP3_PIN(ETK_D4, MODE4)
+#define OMAP3_ETK_D5_GPIO_19		OMAP3_PIN(ETK_D5, MODE4)
+#define OMAP3_ETK_D6_GPIO_20		OMAP3_PIN(ETK_D6, MODE4)
+#define OMAP3_ETK_D7_GPIO_21		OMAP3_PIN(ETK_D7, MODE4)
+#define OMAP3_ETK_D8_GPIO_22		OMAP3_PIN(ETK_D8, MODE4)
+#define OMAP3_ETK_D9_GPIO_23		OMAP3_PIN(ETK_D9, MODE4)
+#define OMAP3_ETK_D10_GPIO_24		OMAP3_PIN(ETK_D10, MODE4)
+#define OMAP3_ETK_D11_GPIO_25		OMAP3_PIN(ETK_D11, MODE4)
+#define OMAP3_ETK_D12_GPIO_26		OMAP3_PIN(ETK_D12, MODE4)
+#define OMAP3_ETK_D13_GPIO_27		OMAP3_PIN(ETK_D13, MODE4)
+#define OMAP3_ETK_D14_GPIO_28		OMAP3_PIN(ETK_D14, MODE4)
+#define OMAP3_ETK_D15_GPIO_29		OMAP3_PIN(ETK_D15, MODE4)
+#define OMAP3_SAD2D_SPINT_GPIO_187	OMAP3_PIN(SAD2D_SPINT, MODE4)
+#define OMAP3_SAD2D_FRINT_GPIO_32	OMAP3_PIN(SAD2D_FRINT, MODE4)
+#define OMAP3_SYS_CLKREQ_GPIO_1		OMAP3_PIN(SYS_CLKREQ, MODE4)
+#define OMAP3_SYS_NRESWARM_GPIO_30	OMAP3_PIN(SYS_NRESWARM, MODE4)
+#define OMAP3_SYS_BOOT0_GPIO_2		OMAP3_PIN(SYS_BOOT0, MODE4)
+#define OMAP3_SYS_BOOT1_GPIO_3		OMAP3_PIN(SYS_BOOT1, MODE4)
+#define OMAP3_SYS_BOOT2_GPIO_4		OMAP3_PIN(SYS_BOOT2, MODE4)
+#define OMAP3_SYS_BOOT3_GPIO_5		OMAP3_PIN(SYS_BOOT3, MODE4)
+#define OMAP3_SYS_BOOT4_GPIO_6		OMAP3_PIN(SYS_BOOT4, MODE4)
+#define OMAP3_SYS_BOOT5_GPIO_7		OMAP3_PIN(SYS_BOOT5, MODE4)
+#define OMAP3_SYS_BOOT6_GPIO_8		OMAP3_PIN(SYS_BOOT6, MODE4)
+#define OMAP3_SYS_OFF_MODE_GPIO_9	OMAP3_PIN(SYS_OFF_MODE, MODE4)
+#define OMAP3_SYS_CLKOUT1_GPIO_10	OMAP3_PIN(SYS_CLKOUT1, MODE4)
+#define OMAP3_JTAG_EMU0_GPIO_11		OMAP3_PIN(JTAG_EMU0, MODE4)
+#define OMAP3_JTAG_EMU1_GPIO_31		OMAP3_PIN(JTAG_EMU1, MODE4)
+
+#define OMAP3_DSS_PCLK_HW_DBG12			OMAP3_PIN(DSS_PCLK, MODE5)
+#define OMAP3_DSS_HSYNC_HW_DBG13		OMAP3_PIN(DSS_HSYNC, MODE5)
+#define OMAP3_DSS_DATA6_HW_DBG14		OMAP3_PIN(DSS_DATA6, MODE5)
+#define OMAP3_DSS_DATA7_HW_DBG15		OMAP3_PIN(DSS_DATA7, MODE5)
+#define OMAP3_DSS_DATA8_HW_DBG16		OMAP3_PIN(DSS_DATA8, MODE5)
+#define OMAP3_DSS_DATA9_HW_DBG17		OMAP3_PIN(DSS_DATA9, MODE5)
+#define OMAP3_CAM_HS_HW_DBG0			OMAP3_PIN(CAM_HS, MODE5)
+#define OMAP3_CAM_VS_HW_DBG1			OMAP3_PIN(CAM_VS, MODE5)
+#define OMAP3_CAM_PCLK_HW_DBG2			OMAP3_PIN(CAM_PCLK, MODE5)
+#define OMAP3_CAM_FLD_HW_DBG3			OMAP3_PIN(CAM_FLD, MODE5)
+#define OMAP3_CAM_D2_HW_DBG4			OMAP3_PIN(CAM_D2, MODE5)
+#define OMAP3_CAM_D3_HW_DBG5			OMAP3_PIN(CAM_D3, MODE5)
+#define OMAP3_CAM_D4_HW_DBG6			OMAP3_PIN(CAM_D4, MODE5)
+#define OMAP3_CAM_D5_HW_DBG7			OMAP3_PIN(CAM_D5, MODE5)
+#define OMAP3_CAM_D10_HW_DBG8			OMAP3_PIN(CAM_D10, MODE5)
+#define OMAP3_CAM_D11_HW_DBG9			OMAP3_PIN(CAM_D11, MODE5)
+#define OMAP3_CAM_WEN_HW_DBG10			OMAP3_PIN(CAM_WEN, MODE5)
+#define OMAP3_CAM_STROBE_HW_DBG11		OMAP3_PIN(CAM_STROBE, MODE5)
+#define OMAP3_MMC2_DAT5_HSUSB3_TLL_STP		OMAP3_PIN(MMC2_DAT5, MODE5)
+#define OMAP3_MMC2_DAT6_HSUSB3_TLL_DIR		OMAP3_PIN(MMC2_DAT6, MODE5)
+#define OMAP3_MMC2_DAT7_HSUSB3_TLL_NXT		OMAP3_PIN(MMC2_DAT7, MODE5)
+#define OMAP3_MCBSP3_DX_HSUSB3_TLL_DATA4	OMAP3_PIN(MCBSP3_DX, MODE5)
+#define OMAP3_MCBSP3_DR_HSUSB3_TLL_DATA5	OMAP3_PIN(MCBSP3_DR, MODE5)
+#define OMAP3_MCBSP3_CLKX_HSUSB3_TLL_DATA6	OMAP3_PIN(MCBSP3_CLKX, MODE5)
+#define OMAP3_MCBSP3_FSX_HSUSB3_TLL_DATA7	OMAP3_PIN(MCBSP3_FSX, MODE5)
+#define OMAP3_UART1_CTS_HSUSB3_TLL_CLK		OMAP3_PIN(UART1_CTS, MODE5)
+#define OMAP3_MCBSP4_CLKX_HSUSB3_TLL_DATA1	OMAP3_PIN(MCBSP4_CLKX, MODE5)
+#define OMAP3_MCBSP4_DR_HSUSB3_TLL_DATA0	OMAP3_PIN(MCBSP4_DR, MODE5)
+#define OMAP3_MCBSP4_DX_HSUSB3_TLL_DATA2	OMAP3_PIN(MCBSP4_DX, MODE5)
+#define OMAP3_MCBSP4_FSX_HSUSB3_TLL_DATA3	OMAP3_PIN(MCBSP4_FSX, MODE5)
+#define OMAP3_MCBSP_CLKS_UART1_CTS		OMAP3_PIN(MCBSP_CLKS, MODE5)
+#define OMAP3_MCSPI1_CS3_MM2_TXDAT		OMAP3_PIN(MCSPI1_CS3, MODE5)
+#define OMAP3_MCSPI2_CS1_MM2_TXEN_N		OMAP3_PIN(MCSPI2_CS1, MODE5)
+#define OMAP3_ETK_CLK_MM1_RXDP			OMAP3_PIN(ETK_CLK, MODE5)
+#define OMAP3_ETK_D0_MM1_RXRCV			OMAP3_PIN(ETK_D0, MODE5)
+#define OMAP3_ETK_D1_MM1_TXSE0			OMAP3_PIN(ETK_D1, MODE5)
+#define OMAP3_ETK_D2_MM1_TXDAT			OMAP3_PIN(ETK_D2, MODE5)
+#define OMAP3_ETK_D7_MM1_TXEN_N			OMAP3_PIN(ETK_D7, MODE5)
+#define OMAP3_ETK_D9_MM1_RXDM			OMAP3_PIN(ETK_D9, MODE5)
+#define OMAP3_ETK_D11_MM2_RXDP			OMAP3_PIN(ETK_D11, MODE5)
+#define OMAP3_ETK_D13_MM2_RXDM			OMAP3_PIN(ETK_D13, MODE5)
+#define OMAP3_ETK_D14_MM2_RXRCV			OMAP3_PIN(ETK_D14, MODE5)
+#define OMAP3_ETK_D15_MM2_TXSE0			OMAP3_PIN(ETK_D15, MODE5)
+
+#define OMAP3_MMC2_DAT5_MM3_RXDP	OMAP3_PIN(MMC2_DAT5, MODE6)
+#define OMAP3_MMC2_DAT7_MM3_RXDM	OMAP3_PIN(MMC2_DAT7, MODE6)
+#define OMAP3_MCBSP4_CLKX_MM3_TXSE0	OMAP3_PIN(MCBSP4_CLKX, MODE6)
+#define OMAP3_MCBSP4_DR_MM3_RXRCV	OMAP3_PIN(MCBSP4_DR, MODE6)
+#define OMAP3_MCBSP4_DX_MM3_TXDAT	OMAP3_PIN(MCBSP4_DX, MODE6)
+#define OMAP3_MCBSP4_FSX_MM3_TXEN_N	OMAP3_PIN(MCBSP4_FSX, MODE6)
+#define OMAP3_ETK_CLK_HSUSB1_TLL_STP	OMAP3_PIN(ETK_CLK, MODE6)
+#define OMAP3_ETK_CTL_HSUSB1_TLL_CLK	OMAP3_PIN(ETK_CTL, MODE6)
+#define OMAP3_ETK_D0_HSUSB1_TLL_DATA0	OMAP3_PIN(ETK_D0, MODE6)
+#define OMAP3_ETK_D1_HSUSB1_TLL_DATA1	OMAP3_PIN(ETK_D1, MODE6)
+#define OMAP3_ETK_D2_HSUSB1_TLL_DATA2	OMAP3_PIN(ETK_D2, MODE6)
+#define OMAP3_ETK_D3_HSUSB1_TLL_DATA7	OMAP3_PIN(ETK_D3, MODE6)
+#define OMAP3_ETK_D4_HSUSB1_TLL_DATA4	OMAP3_PIN(ETK_D4, MODE6)
+#define OMAP3_ETK_D5_HSUSB1_TLL_DATA5	OMAP3_PIN(ETK_D5, MODE6)
+#define OMAP3_ETK_D6_HSUSB1_TLL_DATA6	OMAP3_PIN(ETK_D6, MODE6)
+#define OMAP3_ETK_D7_HSUSB1_TLL_DATA3	OMAP3_PIN(ETK_D7, MODE6)
+#define OMAP3_ETK_D8_HSUSB1_TLL_DIR	OMAP3_PIN(ETK_D8, MODE6)
+#define OMAP3_ETK_D9_HSUSB1_TLL_NXT	OMAP3_PIN(ETK_D9, MODE6)
+#define OMAP3_ETK_D10_HSUSB2_TLL_CLK	OMAP3_PIN(ETK_D10, MODE6)
+#define OMAP3_ETK_D11_HSUSB2_TLL_STP	OMAP3_PIN(ETK_D11, MODE6)
+#define OMAP3_ETK_D12_HSUSB2_TLL_DIR	OMAP3_PIN(ETK_D12, MODE6)
+#define OMAP3_ETK_D13_HSUSB2_TLL_NXT	OMAP3_PIN(ETK_D13, MODE6)
+#define OMAP3_ETK_D14_HSUSB2_TLL_DATA0	OMAP3_PIN(ETK_D14, MODE6)
+#define OMAP3_ETK_D15_HSUSB2_TLL_DATA1	OMAP3_PIN(ETK_D15, MODE6)
+
+#endif
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index eb6e202..466df36 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -33,10 +33,21 @@
 #include <plat/control.h>
 #include <plat/mux.h>
 
+#include <mach/mux.h>
+
 #ifdef CONFIG_OMAP_MUX
 
 static struct omap_mux_cfg arch_mux_cfg;
 
+struct mux_pin {
+	unsigned long offset;
+	unsigned long config;
+};
+
+static struct mux_pin mux_table[MUX_PIN_MAX];
+
+#define mux_configured(p)	((p)->config != -1)
+
 static inline u16 omap_mux_read(u16 reg)
 {
 	if (cpu_is_omap24xx())
@@ -640,18 +651,140 @@ static int __init_or_module omap34xx_cfg_reg(const struct pin_config *cfg)
 #define omap34xx_cfg_reg	NULL
 #endif
 
+static int __init_or_module omap2_cfg_pin(unsigned long pin_cfg)
+{
+	static DEFINE_SPINLOCK(mux_spin_lock);
+	unsigned long flags;
+
+	int pin;
+	int cfg;
+	int reg;
+
+	pin = MUX_PIN(pin_cfg);
+	BUG_ON(pin >= MUX_PIN_MAX);
+	cfg = MUX_VAL(pin_cfg);
+
+	if (!mux_configured(&mux_table[pin]))
+		return -EINVAL;
+
+	reg = mux_table[pin].offset;
+
+	spin_lock_irqsave(&mux_spin_lock, flags);
+	omap_mux_write(cfg, reg);
+	mux_table[pin].config = cfg;
+	spin_unlock_irqrestore(&mux_spin_lock, flags);
+
+	return 0;
+}
+
+void __init omap2_mux_init_addr(struct omap_mux_addr_map *map, int reg_size)
+{
+	static DEFINE_SPINLOCK(mux_spin_lock);
+	unsigned long offset, flags;
+
+	struct omap_mux_addr_map *p;
+	int i;
+
+	spin_lock_irqsave(&mux_spin_lock, flags);
+
+	for (p = map; p->start != MUX_PIN_INVALID; p++) {
+		offset = p->offset;
+		i = p->start;
+
+		do {
+			mux_table[i].offset = offset;
+			mux_table[i].config = 0;
+			offset += reg_size; i++;
+		} while ((i <= p->end) && (p->end != -1));
+	}
+
+	spin_unlock_irqrestore(&mux_spin_lock, flags);
+}
+
+/* FIXME: add missing definitions for mux registers */
+static struct omap_mux_addr_map __initdata omap24xx_mux_addr_map[] = {
+	MUX_ADDR_X(GPMC_WAIT0,	GPMC_WAIT3,	0x09a),
+	MUX_ADDR_X(MMC_CLKO,	MMC_CLKI,	0x0f3),
+	MUX_ADDR_X(I2C1_SCL,	I2C2_SDA,	0x111),
+	MUX_ADDR_X(UART3_TX,	UART3_RX,	0x118),
+	MUX_ADDR_X(USB0_PUEN,	USB0_DAT,	0x11d),
+
+	MUX_ADDR(GPMC_NCS2,	0x08e),
+	MUX_ADDR(GPMC_NCS7,	0x093),
+	MUX_ADDR(SYS_NIRQ,	0x12c),
+	MUX_ADDR(SYS_CLKOUT,	0x137),
+
+	MUX_ADDR_END
+};
+
+static struct omap_mux_addr_map __initdata omap2430_mux_addr_map[] = {
+	MUX_ADDR_X(MCBSP1_CLKR,	MCBSP1_CLKX,	0x011A),
+
+	MUX_ADDR(HSUSB0_DATA3,		0x133),
+	MUX_ADDR(HSUSB0_DATA4,		0x134),
+	MUX_ADDR(HSUSB0_DATA5,		0x135),
+	MUX_ADDR(HSUSB0_DATA6,		0x136),
+	MUX_ADDR(HSUSB0_DATA2,		0x137),
+	MUX_ADDR(HSUSB0_DATA0,		0x138),
+	MUX_ADDR(HSUSB0_DATA1,		0x139),
+	MUX_ADDR(HSUSB0_CLK,		0x13A),
+	MUX_ADDR(HSUSB0_DIR,		0x13B),
+	MUX_ADDR(HSUSB0_STP,		0x13c),
+	MUX_ADDR(HSUSB0_NXT,		0x13D),
+	MUX_ADDR(HSUSB0_DATA7,		0x13E),
+
+	MUX_ADDR(MCBSP2_FSX_OFF,	0x012E),
+	MUX_ADDR(MCBSP2_CLX_OFF,	0x012F),
+	MUX_ADDR(MCBSP2_DX_OFF,		0x0130),
+	MUX_ADDR(MCBSP2_DR_OFF,		0x0131),
+	MUX_ADDR(MCBSP3_CLKX,		0x0103),
+	MUX_ADDR(MCBSP3_FSX,		0x0104),
+	MUX_ADDR(MCBSP3_DR,		0x0105),
+	MUX_ADDR(MCBSP3_DX,		0x0106),
+
+	MUX_ADDR(MCSPI1_CLK,		0x010F),
+	MUX_ADDR(MCSPI1_SIMO,		0x0110),
+	MUX_ADDR(MCSPI1_SOMI,		0x0111),
+	MUX_ADDR(MCSPI1_CS0,		0x0112),
+
+	MUX_ADDR_END
+};
+
+static struct omap_mux_addr_map __initdata omap34xx_mux_addr_map[] = {
+	MUX_ADDR_X(GPMC_A1,		SAD2D_MBUSFLAG,	0x07a),
+	MUX_ADDR_X(ETK_CLK,		ETK_D15,	0x5d8),
+	MUX_ADDR_X(I2C4_SCL,		JTAG_EMU1,	0xa00),
+	MUX_ADDR_X(SAD2D_SWAKEUP,	JTAG_TDO,	0xa4c),
+
+	MUX_ADDR_END
+};
+
 int __init omap2_mux_init(void)
 {
+	int i;
+
+	/* reset mux_table to INVALID state */
+	for (i = 0; i < ARRAY_SIZE(mux_table); i++)
+		mux_table[i].config = -1;
+
 	if (cpu_is_omap24xx()) {
+		omap2_mux_init_addr(omap24xx_mux_addr_map, 1);
+		if (cpu_is_omap2430())
+			omap2_mux_init_addr(omap2430_mux_addr_map, 1);
+
 		arch_mux_cfg.pins	= omap24xx_pins;
 		arch_mux_cfg.size	= OMAP24XX_PINS_SZ;
 		arch_mux_cfg.cfg_reg	= omap24xx_cfg_reg;
 	} else if (cpu_is_omap34xx()) {
+		omap2_mux_init_addr(omap34xx_mux_addr_map, 2);
+
 		arch_mux_cfg.pins	= omap34xx_pins;
 		arch_mux_cfg.size	= OMAP34XX_PINS_SZ;
 		arch_mux_cfg.cfg_reg	= omap34xx_cfg_reg;
 	}
 
+	arch_mux_cfg.cfg_pin = omap2_cfg_pin;
+
 	return omap_mux_register(&arch_mux_cfg);
 }
 
diff --git a/arch/arm/plat-omap/include/plat/mux.h b/arch/arm/plat-omap/include/plat/mux.h
index edc3ff9..d6314af 100644
--- a/arch/arm/plat-omap/include/plat/mux.h
+++ b/arch/arm/plat-omap/include/plat/mux.h
@@ -114,65 +114,6 @@
 	PU_PD_REG(NA, 0)		\
 },
 
-#define MUX_CFG_24XX(desc, reg_offset, mode,			\
-				pull_en, pull_mode, dbg)	\
-{								\
-	.name		= desc,					\
-	.debug		= dbg,					\
-	.mux_reg	= reg_offset,				\
-	.mask		= mode,					\
-	.pull_val	= pull_en,				\
-	.pu_pd_val	= pull_mode,				\
-},
-
-/* 24xx/34xx mux bit defines */
-#define OMAP2_PULL_ENA		(1 << 3)
-#define OMAP2_PULL_UP		(1 << 4)
-#define OMAP2_ALTELECTRICALSEL	(1 << 5)
-
-/* 34xx specific mux bit defines */
-#define OMAP3_INPUT_EN		(1 << 8)
-#define OMAP3_OFF_EN		(1 << 9)
-#define OMAP3_OFFOUT_EN		(1 << 10)
-#define OMAP3_OFFOUT_VAL	(1 << 11)
-#define OMAP3_OFF_PULL_EN	(1 << 12)
-#define OMAP3_OFF_PULL_UP	(1 << 13)
-#define OMAP3_WAKEUP_EN		(1 << 14)
-
-/* 34xx mux mode options for each pin. See TRM for options */
-#define	OMAP34XX_MUX_MODE0	0
-#define	OMAP34XX_MUX_MODE1	1
-#define	OMAP34XX_MUX_MODE2	2
-#define	OMAP34XX_MUX_MODE3	3
-#define	OMAP34XX_MUX_MODE4	4
-#define	OMAP34XX_MUX_MODE5	5
-#define	OMAP34XX_MUX_MODE6	6
-#define	OMAP34XX_MUX_MODE7	7
-
-/* 34xx active pin states */
-#define OMAP34XX_PIN_OUTPUT		0
-#define OMAP34XX_PIN_INPUT		OMAP3_INPUT_EN
-#define OMAP34XX_PIN_INPUT_PULLUP	(OMAP2_PULL_ENA | OMAP3_INPUT_EN \
-						| OMAP2_PULL_UP)
-#define OMAP34XX_PIN_INPUT_PULLDOWN	(OMAP2_PULL_ENA | OMAP3_INPUT_EN)
-
-/* 34xx off mode states */
-#define OMAP34XX_PIN_OFF_NONE           0
-#define OMAP34XX_PIN_OFF_OUTPUT_HIGH	(OMAP3_OFF_EN | OMAP3_OFFOUT_EN \
-						| OMAP3_OFFOUT_VAL)
-#define OMAP34XX_PIN_OFF_OUTPUT_LOW	(OMAP3_OFF_EN | OMAP3_OFFOUT_EN)
-#define OMAP34XX_PIN_OFF_INPUT_PULLUP	(OMAP3_OFF_EN | OMAP3_OFF_PULL_EN \
-						| OMAP3_OFF_PULL_UP)
-#define OMAP34XX_PIN_OFF_INPUT_PULLDOWN	(OMAP3_OFF_EN | OMAP3_OFF_PULL_EN)
-#define OMAP34XX_PIN_OFF_WAKEUPENABLE	OMAP3_WAKEUP_EN
-
-#define MUX_CFG_34XX(desc, reg_offset, mux_value) {		\
-	.name		= desc,					\
-	.debug		= 0,					\
-	.mux_reg	= reg_offset,				\
-	.mux_val	= mux_value				\
-},
-
 struct pin_config {
 	char 			*name;
 	const unsigned int 	mux_reg;
-- 
1.6.0.6


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [RFC PATCH 0/3] mux framework rework
  2009-10-28 13:07 [RFC PATCH 0/3] mux framework rework Mike Rapoport
                   ` (2 preceding siblings ...)
  2009-10-28 13:07 ` [PATCH 3/3] omap2: mux: implement encoded mux configuration Mike Rapoport
@ 2009-10-28 16:53 ` Tony Lindgren
  2009-10-29  9:46   ` Mike Rapoport
  3 siblings, 1 reply; 11+ messages in thread
From: Tony Lindgren @ 2009-10-28 16:53 UTC (permalink / raw)
  To: Mike Rapoport; +Cc: linux-omap

* Mike Rapoport <mike@compulab.co.il> [091028 06:17]:
> This is an attempt to start rework of the mux framework keeping as
> much backward compatibility as possible.
> The patch serie introduces a new mux configuration interface that
> follows the ideas of PXA MFP implementation ([1] and [2]).
> The mux configuration interface is implemented for OMAP3 and partially
> for OMAP2 processors.
> The OMAP2 implementation is far from being complete. Unfortunately I
> do not have OMAP2 docs, so I've added only configration for pins
> defined in omap24xx_pins table.
> 
> The older opam_cfg_reg interface is still present and can be used to
> avoid too many broken things in steps 2 & 3 as of Tony's plans ([3]).

Cool! I too have been working on this for past several days, but luckily
I've been working on the new mux data layout instead so far with some
help from Paul and Benoit.

So this should all come together quite nicely. I'll try to post some
patches as soon as the new mux data is working. I'll also take a close
look at your patches, it seems like they already separate the
mach-omap2 mux code nicely from what's needed for mach-omap1
(well, at least for 15xx).

The reason I think we need to redo all the mux data is because the new
setup has several shortcomings:

- All the mux registers on the newer omaps are in a single register
  for each signal instead of being scattered across multiple registers
  like on 15xx. So the enumeration is not needed, and we don't need
  to specify each signal.

- We badly need mux register to GPIO mapping for runtime muxing of GPIO
  pins for the idle modes

- For debugging, we need to see the pin status if CONFIG_DEBUG_FS
  is set

- For adding custom hardware on boards such as Beagle, we need to
  be able to override pins via /debugfs or via cmdline

- Grepping the code for the signal + ball + mux register combination
  is currently impossible

So I suggest we get rid of defining each mux mode separately, and
just define the register offsets from the mux base.

Then for the new omap_set_mux(), we should pass the register offset,
the desired value, and optional flags.

For the new mux data, I currently have something like the below just
to give an idea what I was thinking, maybe take a quick look at
that and see how that fits into what you had in mind?

arch/arm/mach-omap2/mux.h:

/**
 * struct omap_mux - data for omap mux register offset and it's value
 * @reg_offset:	mux register offset from the mux base
 * @gpio:	GPIO number
 * @muxnames:	available signal modes for a ball
 */
struct omap_mux {
	u16	reg_offset;
	u16	gpio;
#ifdef CONFIG_DEBUG_FS
	char	*muxnames[8];
	char	*balls[2];
#endif
};
...

arch/arm/mach-omap2/mux34xx.h:

/* 
 * OMAP3 CONTROL_PADCONF* register offsets for pin-muxing
 *
 * Extracted from the TRM.  Add 0x48002030 to these values to get the
 * absolute addresses.  The name in the macro is the mode-0 name of
 * the pin.  NOTE: These registers are 16-bits wide.
 */ 
#define OMAP3_CONTROL_PADCONF_SDRC_D0_OFFSET			0x000
#define OMAP3_CONTROL_PADCONF_SDRC_D1_OFFSET			0x002
#define OMAP3_CONTROL_PADCONF_SDRC_D2_OFFSET			0x004
#define OMAP3_CONTROL_PADCONF_SDRC_D3_OFFSET			0x006
#define OMAP3_CONTROL_PADCONF_SDRC_D4_OFFSET			0x008
...

arch/arm/mach-omap2/mux34xx.h:

#ifdef CONFIG_DEBUG_FS

#define _OMAP3_MUXENTRY(M0, g, m0, m1, m2, m3, m4, m5, m6, m7)		\
{									\
	.reg_offset	= (OMAP3_CONTROL_PADCONF_##M0##_OFFSET),	\
	.gpio		= (g),						\
	.muxnames	= { m0, m1, m2, m3, m4, m5, m6, m7 },		\
}

#else

#define _OMAP3_MUXENTRY(M0, g, m0, m1, m2, m3, m4, m5, m6, m7)		\
{									\
	.reg_offset	= (OMAP3_CONTROL_PADCONF_##M0##_OFFSET),	\
	.gpio		= (g),						\
}

#endif

/* 
 * OMAP3 CONTROL_PADCONF* register offsets for pin-muxing
 *
 * Extracted from the TRM.  Add 0x48002030 to these values to get the
 * absolute addresses.  The name in the macro is the mode-0 name of
 * the pin.  NOTE: These registers are 16-bits wide.
 */ 
#define OMAP3_CONTROL_PADCONF_SDRC_D0_OFFSET			0x000
#define OMAP3_CONTROL_PADCONF_SDRC_D1_OFFSET			0x002
#define OMAP3_CONTROL_PADCONF_SDRC_D2_OFFSET			0x004
#define OMAP3_CONTROL_PADCONF_SDRC_D3_OFFSET			0x006
#define OMAP3_CONTROL_PADCONF_SDRC_D4_OFFSET			0x008
...

/*
 * Superset of all mux modes, same as the CBC package
 */
struct omap_mux omap3_muxmodes[] = {
	_OMAP3_MUXENTRY(CAM_D0, 99,
		"cam_d0", NULL, NULL, NULL,
		"gpio_99", NULL, NULL, "safe_mode"),
	_OMAP3_MUXENTRY(CAM_D10, 109,
		"cam_d10", NULL, NULL, NULL,
		"gpio_109", "hw_dbg8", NULL, "safe_mode"),
	_OMAP3_MUXENTRY(CAM_D11, 110,
		"cam_d11", NULL, NULL, NULL,
		"gpio_110", "hw_dbg9", NULL, "safe_mode"),
	_OMAP3_MUXENTRY(CAM_D1, 100,
		"cam_d1", NULL, NULL, NULL,
		"gpio_100", NULL, NULL, "safe_mode"),
	_OMAP3_MUXENTRY(CAM_D2, 101,
		"cam_d2", NULL, NULL, NULL,
		"gpio_101", "hw_dbg4", NULL, "safe_mode"),
...
	{ .reg_offset = OMAP_MUX_TERMINATOR },
};
...

And this is what I was thinking for the new mux function:

int omap_set_mux(u16 val, u16 offset, int flags);

And then also have a function to initialize a whole struct omap_mux
array from each board-*.c files.

Regards,

Tony

> [1] Documentation/arm/pxa/mfp.txt
> [2] http://elinux.org/OMAP_wishlist#References
> [3] http://elinux.org/OMAP_wishlist#Initial_plans_.28from_Tony.2C_for_next_merge_window.29
> 
> Changes since commit 0bbf5337f2f2957775051a3caf60b66d3306c815
>   Tony Lindgren
>   	Fix compile for 1510 innovator
> 
> Mike Rapoport (3):
>   omap2: mux: intoduce omap_mux_{read,write}
>   omap: mux: add interface for encoded mux configration
>   omap2: mux: implement encoded mux configuration
> 
>  arch/arm/mach-omap2/include/mach/mux.h     |  452 +++++++++++++++
>  arch/arm/mach-omap2/include/mach/mux24xx.h |  128 ++++
>  arch/arm/mach-omap2/include/mach/mux34xx.h |  862 ++++++++++++++++++++++++++++
>  arch/arm/mach-omap2/mux.c                  |  158 +++++-
>  arch/arm/plat-omap/include/plat/mux.h      |   62 +--
>  arch/arm/plat-omap/mux.c                   |   17 +
>  6 files changed, 1614 insertions(+), 65 deletions(-)
>  create mode 100644 arch/arm/mach-omap2/include/mach/mux.h
>  create mode 100644 arch/arm/mach-omap2/include/mach/mux24xx.h
>  create mode 100644 arch/arm/mach-omap2/include/mach/mux34xx.h
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [RFC PATCH 0/3] mux framework rework
  2009-10-28 16:53 ` [RFC PATCH 0/3] mux framework rework Tony Lindgren
@ 2009-10-29  9:46   ` Mike Rapoport
  2009-10-29 15:43     ` Tony Lindgren
  0 siblings, 1 reply; 11+ messages in thread
From: Mike Rapoport @ 2009-10-29  9:46 UTC (permalink / raw)
  To: Tony Lindgren; +Cc: linux-omap



Tony Lindgren wrote:
> * Mike Rapoport <mike@compulab.co.il> [091028 06:17]:
>> This is an attempt to start rework of the mux framework keeping as
>> much backward compatibility as possible.
>> The patch serie introduces a new mux configuration interface that
>> follows the ideas of PXA MFP implementation ([1] and [2]).
>> The mux configuration interface is implemented for OMAP3 and partially
>> for OMAP2 processors.
>> The OMAP2 implementation is far from being complete. Unfortunately I
>> do not have OMAP2 docs, so I've added only configration for pins
>> defined in omap24xx_pins table.
>>
>> The older opam_cfg_reg interface is still present and can be used to
>> avoid too many broken things in steps 2 & 3 as of Tony's plans ([3]).
> 
> Cool! I too have been working on this for past several days, but luckily
> I've been working on the new mux data layout instead so far with some
> help from Paul and Benoit.
> 
> So this should all come together quite nicely. I'll try to post some
> patches as soon as the new mux data is working. I'll also take a close
> look at your patches, it seems like they already separate the
> mach-omap2 mux code nicely from what's needed for mach-omap1
> (well, at least for 15xx).

I'd be glad to get those patches even before the new mux data is working :)

> The reason I think we need to redo all the mux data is because the new
> setup has several shortcomings:
> 
> - All the mux registers on the newer omaps are in a single register
>   for each signal instead of being scattered across multiple registers
>   like on 15xx. So the enumeration is not needed, and we don't need
>   to specify each signal.
> 
> - We badly need mux register to GPIO mapping for runtime muxing of GPIO
>   pins for the idle modes
> 
> - For debugging, we need to see the pin status if CONFIG_DEBUG_FS
>   is set
> 
> - For adding custom hardware on boards such as Beagle, we need to
>   be able to override pins via /debugfs or via cmdline
> 
> - Grepping the code for the signal + ball + mux register combination
>   is currently impossible

Is it really necessary to have ball information? OMAP35x packages differ, so
having ball information may be misleading.

> So I suggest we get rid of defining each mux mode separately, and
> just define the register offsets from the mux base.
> 
> Then for the new omap_set_mux(), we should pass the register offset,
> the desired value, and optional flags.
> 
> For the new mux data, I currently have something like the below just
> to give an idea what I was thinking, maybe take a quick look at
> that and see how that fits into what you had in mind?
> 
> arch/arm/mach-omap2/mux.h:
> 
> /**
>  * struct omap_mux - data for omap mux register offset and it's value
>  * @reg_offset:	mux register offset from the mux base
>  * @gpio:	GPIO number
>  * @muxnames:	available signal modes for a ball
>  */
> struct omap_mux {
> 	u16	reg_offset;
> 	u16	gpio;
> #ifdef CONFIG_DEBUG_FS
> 	char	*muxnames[8];
> 	char	*balls[2];

Again, I do not quite understand what do we need the ball names for?

> #endif
> };
> ...
> 
> arch/arm/mach-omap2/mux34xx.h:
> 
> #ifdef CONFIG_DEBUG_FS
> 
> #define _OMAP3_MUXENTRY(M0, g, m0, m1, m2, m3, m4, m5, m6, m7)		\
> {									\
> 	.reg_offset	= (OMAP3_CONTROL_PADCONF_##M0##_OFFSET),	\
> 	.gpio		= (g),						\
> 	.muxnames	= { m0, m1, m2, m3, m4, m5, m6, m7 },		\
> }
> 
> #else
> 
> #define _OMAP3_MUXENTRY(M0, g, m0, m1, m2, m3, m4, m5, m6, m7)		\
> {									\
> 	.reg_offset	= (OMAP3_CONTROL_PADCONF_##M0##_OFFSET),	\
> 	.gpio		= (g),						\
> }
> 
> #endif
> 
> /* 
>  * OMAP3 CONTROL_PADCONF* register offsets for pin-muxing
>  *
>  * Extracted from the TRM.  Add 0x48002030 to these values to get the
>  * absolute addresses.  The name in the macro is the mode-0 name of
>  * the pin.  NOTE: These registers are 16-bits wide.
>  */ 
> #define OMAP3_CONTROL_PADCONF_SDRC_D0_OFFSET			0x000
> #define OMAP3_CONTROL_PADCONF_SDRC_D1_OFFSET			0x002
> #define OMAP3_CONTROL_PADCONF_SDRC_D2_OFFSET			0x004
> #define OMAP3_CONTROL_PADCONF_SDRC_D3_OFFSET			0x006
> #define OMAP3_CONTROL_PADCONF_SDRC_D4_OFFSET			0x008
> ...
> 
> /*
>  * Superset of all mux modes, same as the CBC package
>  */
> struct omap_mux omap3_muxmodes[] = {
> 	_OMAP3_MUXENTRY(CAM_D0, 99,
> 		"cam_d0", NULL, NULL, NULL,
> 		"gpio_99", NULL, NULL, "safe_mode"),
[ snip ]
> ...
> 	{ .reg_offset = OMAP_MUX_TERMINATOR },
> };
> ...
>
> 
> And this is what I was thinking for the new mux function:
> 
> int omap_set_mux(u16 val, u16 offset, int flags);

I have slightly different approach in mind. My idea was to have a table that
provides some mapping between pin and it's PADCONF offset. That table
initialization is CPU variant specific, so mapping for OMAP24XX will be
different from the mapping for OMAP2430 and OMAP35x. The mapping table is
indexed with enumeration that lists all configurable pins for all processor and
package variants.
Next, there are macros that encode the index and PADCONF value for each possible
pin configuration into u32, e.g.

#define OMAP3_CAM_D0		OMAP3_PIN(CAM_D0, MODE0)
#define OMAP3_CAM_D0_CSI2_DX2	OMAP3_PIN(CAM_D0, MODE2)
#define OMAP3_CAM_D0_GPIO_99	OMAP3_PIN(CAM_D0, MODE4)

And omap_cfg_pin (my name for omap_cfg_mux) takes the encoded mux configuration,
extracts from there the index into the mapping table and PADCONF value and
updates the PADCONF register.

My approach allows reusing the same code for setting mux configuration for OMAP2
 and OMAP3 (and probably OMAP4), and , apparently would use less memory that
your proposal. Another advantage of using encoded mux configuration is a
simplification of board-specific code. You can use an array with all pins
configured there and pass this array to, say, omap_cfg_pins:

unsigned long board_pins[] = {
	OMAP3_CAM_D0_GPIO_99,
	OMAP3_GPMC_WAIT3_GPIO_65,

	OMAP3_MCBSP2_FSX,
	OMAP3_MCBSP2_CLKX,
	OMAP3_MCBSP2_DR,
	OMAP3_MCBSP2_DX,
...
};

static void __init some_board_init(void)
{
...
	omap_cfg_pins(board_pins, ARRAY_SIZE(board_pins));
...
}

The drawbacks of using encoded mux configuration are
- limit maximal number of configurable pins by bitfield size in the encoding
- absence of pin <-> gpio mapping
- absence of nice debug strings :)

So, if you think that large "struct omap_mux omap_xxx_muxmodes" tables are
acceptable, I'd propose to go with "struct omap_mux" as you described it and add
some macros to allow simple interface for board-* files like the one above.

> And then also have a function to initialize a whole struct omap_mux
> array from each board-*.c files.
> 
> Regards,
> 
> Tony
> 
> 
>  
>> [1] Documentation/arm/pxa/mfp.txt
>> [2] http://elinux.org/OMAP_wishlist#References
>> [3] http://elinux.org/OMAP_wishlist#Initial_plans_.28from_Tony.2C_for_next_merge_window.29
>>
>> Changes since commit 0bbf5337f2f2957775051a3caf60b66d3306c815
>>   Tony Lindgren
>>   	Fix compile for 1510 innovator
>>
>> Mike Rapoport (3):
>>   omap2: mux: intoduce omap_mux_{read,write}
>>   omap: mux: add interface for encoded mux configration
>>   omap2: mux: implement encoded mux configuration
>>
>>  arch/arm/mach-omap2/include/mach/mux.h     |  452 +++++++++++++++
>>  arch/arm/mach-omap2/include/mach/mux24xx.h |  128 ++++
>>  arch/arm/mach-omap2/include/mach/mux34xx.h |  862 ++++++++++++++++++++++++++++
>>  arch/arm/mach-omap2/mux.c                  |  158 +++++-
>>  arch/arm/plat-omap/include/plat/mux.h      |   62 +--
>>  arch/arm/plat-omap/mux.c                   |   17 +
>>  6 files changed, 1614 insertions(+), 65 deletions(-)
>>  create mode 100644 arch/arm/mach-omap2/include/mach/mux.h
>>  create mode 100644 arch/arm/mach-omap2/include/mach/mux24xx.h
>>  create mode 100644 arch/arm/mach-omap2/include/mach/mux34xx.h
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

-- 
Sincerely yours,
Mike.


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [RFC PATCH 0/3] mux framework rework
  2009-10-29  9:46   ` Mike Rapoport
@ 2009-10-29 15:43     ` Tony Lindgren
  0 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2009-10-29 15:43 UTC (permalink / raw)
  To: Mike Rapoport; +Cc: linux-omap

* Mike Rapoport <mike@compulab.co.il> [091029 02:45]:
> 
> 
> Tony Lindgren wrote:
> > * Mike Rapoport <mike@compulab.co.il> [091028 06:17]:
> >> This is an attempt to start rework of the mux framework keeping as
> >> much backward compatibility as possible.
> >> The patch serie introduces a new mux configuration interface that
> >> follows the ideas of PXA MFP implementation ([1] and [2]).
> >> The mux configuration interface is implemented for OMAP3 and partially
> >> for OMAP2 processors.
> >> The OMAP2 implementation is far from being complete. Unfortunately I
> >> do not have OMAP2 docs, so I've added only configration for pins
> >> defined in omap24xx_pins table.
> >>
> >> The older opam_cfg_reg interface is still present and can be used to
> >> avoid too many broken things in steps 2 & 3 as of Tony's plans ([3]).
> > 
> > Cool! I too have been working on this for past several days, but luckily
> > I've been working on the new mux data layout instead so far with some
> > help from Paul and Benoit.
> > 
> > So this should all come together quite nicely. I'll try to post some
> > patches as soon as the new mux data is working. I'll also take a close
> > look at your patches, it seems like they already separate the
> > mach-omap2 mux code nicely from what's needed for mach-omap1
> > (well, at least for 15xx).
> 
> I'd be glad to get those patches even before the new mux data is working :)

Got it working mostly, still need to clean it a bit this morning.
 
> > The reason I think we need to redo all the mux data is because the new
> > setup has several shortcomings:
> > 
> > - All the mux registers on the newer omaps are in a single register
> >   for each signal instead of being scattered across multiple registers
> >   like on 15xx. So the enumeration is not needed, and we don't need
> >   to specify each signal.
> > 
> > - We badly need mux register to GPIO mapping for runtime muxing of GPIO
> >   pins for the idle modes
> > 
> > - For debugging, we need to see the pin status if CONFIG_DEBUG_FS
> >   is set
> > 
> > - For adding custom hardware on boards such as Beagle, we need to
> >   be able to override pins via /debugfs or via cmdline
> > 
> > - Grepping the code for the signal + ball + mux register combination
> >   is currently impossible
> 
> Is it really necessary to have ball information? OMAP35x packages differ, so
> having ball information may be misleading.

Well it's very handy for debugging, it's there only if CONFIG_DEBUG_FS
is set. Everything gets optimized out if CONFIG_OMAP_MUX is not set,
all the bloat is optimized out if CONFIG_DEBUG_FS is set. Or it could
be behind the CONFIG_OMAP_MUX_DEBUG that we already have.

BTW, I already got the all the three existing 34xx package types covered,
3630 still needs to be added.
 
> > So I suggest we get rid of defining each mux mode separately, and
> > just define the register offsets from the mux base.
> > 
> > Then for the new omap_set_mux(), we should pass the register offset,
> > the desired value, and optional flags.
> > 
> > For the new mux data, I currently have something like the below just
> > to give an idea what I was thinking, maybe take a quick look at
> > that and see how that fits into what you had in mind?
> > 
> > arch/arm/mach-omap2/mux.h:
> > 
> > /**
> >  * struct omap_mux - data for omap mux register offset and it's value
> >  * @reg_offset:	mux register offset from the mux base
> >  * @gpio:	GPIO number
> >  * @muxnames:	available signal modes for a ball
> >  */
> > struct omap_mux {
> > 	u16	reg_offset;
> > 	u16	gpio;
> > #ifdef CONFIG_DEBUG_FS
> > 	char	*muxnames[8];
> > 	char	*balls[2];
> 
> Again, I do not quite understand what do we need the ball names for?

Just debug info (if compiled in). We could allow muxing by ball name
if we wanted to.
 
> > #endif
> > };
> > ...
> > 
> > arch/arm/mach-omap2/mux34xx.h:
> > 
> > #ifdef CONFIG_DEBUG_FS
> > 
> > #define _OMAP3_MUXENTRY(M0, g, m0, m1, m2, m3, m4, m5, m6, m7)		\
> > {									\
> > 	.reg_offset	= (OMAP3_CONTROL_PADCONF_##M0##_OFFSET),	\
> > 	.gpio		= (g),						\
> > 	.muxnames	= { m0, m1, m2, m3, m4, m5, m6, m7 },		\
> > }
> > 
> > #else
> > 
> > #define _OMAP3_MUXENTRY(M0, g, m0, m1, m2, m3, m4, m5, m6, m7)		\
> > {									\
> > 	.reg_offset	= (OMAP3_CONTROL_PADCONF_##M0##_OFFSET),	\
> > 	.gpio		= (g),						\
> > }
> > 
> > #endif
> > 
> > /* 
> >  * OMAP3 CONTROL_PADCONF* register offsets for pin-muxing
> >  *
> >  * Extracted from the TRM.  Add 0x48002030 to these values to get the
> >  * absolute addresses.  The name in the macro is the mode-0 name of
> >  * the pin.  NOTE: These registers are 16-bits wide.
> >  */ 
> > #define OMAP3_CONTROL_PADCONF_SDRC_D0_OFFSET			0x000
> > #define OMAP3_CONTROL_PADCONF_SDRC_D1_OFFSET			0x002
> > #define OMAP3_CONTROL_PADCONF_SDRC_D2_OFFSET			0x004
> > #define OMAP3_CONTROL_PADCONF_SDRC_D3_OFFSET			0x006
> > #define OMAP3_CONTROL_PADCONF_SDRC_D4_OFFSET			0x008
> > ...
> > 
> > /*
> >  * Superset of all mux modes, same as the CBC package
> >  */
> > struct omap_mux omap3_muxmodes[] = {
> > 	_OMAP3_MUXENTRY(CAM_D0, 99,
> > 		"cam_d0", NULL, NULL, NULL,
> > 		"gpio_99", NULL, NULL, "safe_mode"),
> [ snip ]
> > ...
> > 	{ .reg_offset = OMAP_MUX_TERMINATOR },
> > };
> > ...
> >
> > 
> > And this is what I was thinking for the new mux function:
> > 
> > int omap_set_mux(u16 val, u16 offset, int flags);
> 
> I have slightly different approach in mind. My idea was to have a table that
> provides some mapping between pin and it's PADCONF offset. That table
> initialization is CPU variant specific, so mapping for OMAP24XX will be
> different from the mapping for OMAP2430 and OMAP35x. The mapping table is
> indexed with enumeration that lists all configurable pins for all processor and
> package variants.
> Next, there are macros that encode the index and PADCONF value for each possible
> pin configuration into u32, e.g.
> 
> #define OMAP3_CAM_D0		OMAP3_PIN(CAM_D0, MODE0)
> #define OMAP3_CAM_D0_CSI2_DX2	OMAP3_PIN(CAM_D0, MODE2)
> #define OMAP3_CAM_D0_GPIO_99	OMAP3_PIN(CAM_D0, MODE4)
> 
> And omap_cfg_pin (my name for omap_cfg_mux) takes the encoded mux configuration,
> extracts from there the index into the mapping table and PADCONF value and
> updates the PADCONF register.
> 
> My approach allows reusing the same code for setting mux configuration for OMAP2
>  and OMAP3 (and probably OMAP4), and , apparently would use less memory that
> your proposal. Another advantage of using encoded mux configuration is a
> simplification of board-specific code. You can use an array with all pins
> configured there and pass this array to, say, omap_cfg_pins:
> 
> unsigned long board_pins[] = {
> 	OMAP3_CAM_D0_GPIO_99,
> 	OMAP3_GPMC_WAIT3_GPIO_65,
> 
> 	OMAP3_MCBSP2_FSX,
> 	OMAP3_MCBSP2_CLKX,
> 	OMAP3_MCBSP2_DR,
> 	OMAP3_MCBSP2_DX,
> ...
> };
> 
> static void __init some_board_init(void)
> {
> ...
> 	omap_cfg_pins(board_pins, ARRAY_SIZE(board_pins));
> ...
> }
> 
> The drawbacks of using encoded mux configuration are
> - limit maximal number of configurable pins by bitfield size in the encoding
> - absence of pin <-> gpio mapping
> - absence of nice debug strings :)
> 
> So, if you think that large "struct omap_mux omap_xxx_muxmodes" tables are
> acceptable, I'd propose to go with "struct omap_mux" as you described it and add
> some macros to allow simple interface for board-* files like the one above.

OK, well let's play with it a bit and see what's the best way to go.

Currently all the tables are __initdata, and copied to a list for only
for pins that are set as GPIO (mode4), or flagged as dynamic from the
board-*.c file.

Regards,

Tony
 
> > And then also have a function to initialize a whole struct omap_mux
> > array from each board-*.c files.
> > 
> > Regards,
> > 
> > Tony
> > 
> > 
> >  
> >> [1] Documentation/arm/pxa/mfp.txt
> >> [2] http://elinux.org/OMAP_wishlist#References
> >> [3] http://elinux.org/OMAP_wishlist#Initial_plans_.28from_Tony.2C_for_next_merge_window.29
> >>
> >> Changes since commit 0bbf5337f2f2957775051a3caf60b66d3306c815
> >>   Tony Lindgren
> >>   	Fix compile for 1510 innovator
> >>
> >> Mike Rapoport (3):
> >>   omap2: mux: intoduce omap_mux_{read,write}
> >>   omap: mux: add interface for encoded mux configration
> >>   omap2: mux: implement encoded mux configuration
> >>
> >>  arch/arm/mach-omap2/include/mach/mux.h     |  452 +++++++++++++++
> >>  arch/arm/mach-omap2/include/mach/mux24xx.h |  128 ++++
> >>  arch/arm/mach-omap2/include/mach/mux34xx.h |  862 ++++++++++++++++++++++++++++
> >>  arch/arm/mach-omap2/mux.c                  |  158 +++++-
> >>  arch/arm/plat-omap/include/plat/mux.h      |   62 +--
> >>  arch/arm/plat-omap/mux.c                   |   17 +
> >>  6 files changed, 1614 insertions(+), 65 deletions(-)
> >>  create mode 100644 arch/arm/mach-omap2/include/mach/mux.h
> >>  create mode 100644 arch/arm/mach-omap2/include/mach/mux24xx.h
> >>  create mode 100644 arch/arm/mach-omap2/include/mach/mux34xx.h
> >>
> >> --
> >> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> >> the body of a message to majordomo@vger.kernel.org
> >> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > 
> 
> -- 
> Sincerely yours,
> Mike.
> 

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2009-10-29 20:30 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-28 13:07 [RFC PATCH 0/3] mux framework rework Mike Rapoport
2009-10-28 13:07 ` [PATCH 1/3] omap2: mux: intoduce omap_mux_{read,write} Mike Rapoport
2009-10-29 15:50   ` Tony Lindgren
2009-10-29 16:51     ` [PATCH 1/3] omap2: mux: intoduce omap_mux_{read,write}, v2 Tony Lindgren
2009-10-29 20:28       ` Mike Rapoport
2009-10-29 20:30         ` Tony Lindgren
2009-10-28 13:07 ` [PATCH 2/3] omap: mux: add interface for encoded mux configration Mike Rapoport
2009-10-28 13:07 ` [PATCH 3/3] omap2: mux: implement encoded mux configuration Mike Rapoport
2009-10-28 16:53 ` [RFC PATCH 0/3] mux framework rework Tony Lindgren
2009-10-29  9:46   ` Mike Rapoport
2009-10-29 15:43     ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox