On Thu, Oct 29, 2009 at 6:51 PM, Tony Lindgren <tony@xxxxxxxxxxx> wrote: > * Tony Lindgren <tony@xxxxxxxxxxx> [091029 08:50]: >> * Mike Rapoport <mike@xxxxxxxxxxxxxx> [091028 06:17]: >> > Signed-off-by: Mike Rapoport <mike@xxxxxxxxxxxxxx> >> > --- >> > 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@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html