On Tue, Jun 26, 2012 at 11:51:45AM +0200, Jan Luebbe wrote:
> Signed-off-by: Jan Luebbe <[email protected]>
> ---
> +++ b/arch/arm/mach-davinci/mux.c
> @@ -0,0 +1,78 @@
> +/*
> + * Utility to set the DAVINCI MUX register from a table in mux.h
> + *
> + * Author: Vladimir Barinov, MontaVista Software, Inc. <[email protected]>
> + *
> + * Based on linux/arch/arm/plat-omap/mux.c:
> + * Copyright (C) 2003 - 2005 Nokia Corporation
> + *
> + * Written by Tony Lindgren
> + *
> + * 2007 (c) MontaVista Software, Inc. This file is licensed under
> + * the terms of the GNU General Public License version 2. This program
> + * is licensed "as is" without any warranty of any kind, whether express
> + * or implied.
> + *
> + * Copyright (C) 2008 Texas Instruments.
> + */
> +
> +#include <config.h>
> +#include <common.h>
> +#include <errno.h>
> +#include <io.h>
> +
> +#include <mach/da8xx.h>
> +#include <mach/mux.h>
> +
> +static void *pinmux_base = (void*)DA8XX_SYSCFG0_BASE + 0x120;
> +
> +/*
> + * Sets the DAVINCI MUX register
> + */
> +int davinci_cfg_reg(const struct mux_config *cfg)
> +{
> + unsigned int reg_orig = 0, reg = 0;
> + unsigned int mask, warn = 0;
> +
> + /* Update the mux register in question */
> + if (cfg->mask) {
> + unsigned tmp1, tmp2;
> +
> + reg_orig = readl(pinmux_base + cfg->mux_reg);
> +
> + mask = (cfg->mask << cfg->mask_offset);
> + tmp1 = reg_orig & mask;
> + reg = reg_orig & ~mask;
> +
> + tmp2 = (cfg->mode << cfg->mask_offset);
> + reg |= tmp2;
> +
> + if (tmp1 != tmp2)
> + warn = 1;
Does this 'warn' mean that this function actually changes something? If
yes, the variable should better be named 'changed'.
> +
> + writel(reg, pinmux_base + cfg->mux_reg);
> + }
> +
> + if (warn) {
> +#ifdef DEBUG
> + printk("MUX: setting register %s in %s (0x%08x) = 0x%08x ->
> 0x%08x\n", cfg->name,
> + cfg->mux_reg_name, (unsigned int)pinmux_base +
> cfg->mux_reg, reg_orig, reg);
> +#endif
You can just use the debug() function without ifdefs.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
