Re: [PATCH] ARCH: OMAP: Fixing MUX_CFG_34XX macro.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



* David Cohen <dacohen@xxxxxxxxx> [080206 08:37]:
> On Feb 6, 2008 11:13 AM, Felipe Balbi <me@xxxxxxxxxxxxxxx> wrote:
> > Hi,
> >
> >
> > On Wed, 6 Feb 2008 11:00:36 -0400, "David Cohen" <dacohen@xxxxxxxxx> wrote:
> > > Hi Balbi,
> > >
> > > On Feb 6, 2008 7:40 AM, Felipe Balbi <me@xxxxxxxxxxxxxxx> wrote:
> > >> Hi,
> > >>
> > >>
> > >> On Wed,  6 Feb 2008 02:55:39 -0400, David Cohen <dacohen@xxxxxxxxx>
> > > wrote:
> > >> > If CONFIG_OMAP_MUX_DEBUG and CONFIG_OMAP_MUX_WARNING are not set, the
> > >> debug
> > >> > member is not declared on pin_config struct and should not be used on
> > >> > MUX_CFG_34XX macro.
> > >> >
> > >> > Signed-off-by: David Cohen <david.cohen@xxxxxxxxxxx>
> > >> > ---
> > >> >  include/asm-arm/arch-omap/mux.h |    8 ++++++++
> > >> >  1 files changed, 8 insertions(+), 0 deletions(-)
> > >> >
> > >> > diff --git a/include/asm-arm/arch-omap/mux.h
> > >> > b/include/asm-arm/arch-omap/mux.h
> > >> > index e5a96c3..fbdc6e5 100644
> > >> > --- a/include/asm-arm/arch-omap/mux.h
> > >> > +++ b/include/asm-arm/arch-omap/mux.h
> > >> > @@ -166,12 +166,20 @@
> > >> >  #define OMAP34XX_PIN_OFF_INPUT_PULLDOWN      (OMAP3_OFF_EN |
> > >> > OMAP3_OFF_PULL_EN)
> > >> >  #define OMAP34XX_PIN_OFF_WAKEUPENABLE        OMAP3_WAKEUP_EN
> > >> >
> > >> > +#if  defined(CONFIG_OMAP_MUX_DEBUG) ||
> > > defined(CONFIG_OMAP_MUX_WARNINGS)
> > >> >  #define MUX_CFG_34XX(desc, reg_offset, mux_value){           \
> > >> >       .name           = desc,                                 \
> > >> >       .debug          = 0,                                    \
> > >> >       .mux_reg        = reg_offset,                           \
> > >> >       .mux_val        = mux_value                             \
> > >> >  },
> > >> > +#else
> > >> > +#define MUX_CFG_34XX(desc, reg_offset, mux_value){           \
> > >> > +     .name           = desc,                                 \
> > >> > +     .mux_reg        = reg_offset,                           \
> > >> > +     .mux_val        = mux_value                             \
> > >> > +},
> > >> > +#endif
> > >>
> > >> I'd rather:
> > >>
> > >> diff --git a/include/asm-arm/arch-omap/mux.h
> > >> b/include/asm-arm/arch-omap/mux.h
> > >> index e5a96c3..1a996a7 100644
> > >> --- a/include/asm-arm/arch-omap/mux.h
> > >> +++ b/include/asm-arm/arch-omap/mux.h
> > >> @@ -195,10 +195,8 @@ struct pin_config {
> > >>         const unsigned char pu_pd_val;
> > >>  #endif
> > >>
> > >> -#if    defined(CONFIG_OMAP_MUX_DEBUG) ||
> > > defined(CONFIG_OMAP_MUX_WARNINGS)
> > >>         unsigned char debug;
> > >>         const char *mux_reg_name;
> > >> -#endif
> > >>
> > >>  }
> > >>
> > >> since these fields are not used if debug and warning are not selected.
> > >> Leaving them in the structure would also allow
> > >> us to propose a patch for turning on and off mux debug on runtime,
> > >> something that I really like.
> > >>
> > >> What do you say?
> > >
> > > But mux is done at boot time. I don't think you'll need to change it
> > > after that. Some times it's not even the kernel who did it, but
> > > bootloader earlier.
> >
> > Hmm... true!
> > Well, but two char fields won't increase the size of the structure that
> > much and they're being
> > used only on debugging purposes.
> >
> > Let's see what others say.
> 
> More opinions are always welcome.
> But I'm not adding #ifdefs into pin_config struct. I'm just fixing
> MUX_CFG_34XX to not reference debug fields when it doesn't exist.

Well David's fix is the right one, but needs to be done also for 15XX
and 730 at least.

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

[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux