diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-19 10:46:56 -0700 | 
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-20 14:54:57 -0700 | 
| commit | 70c494c3122fb3d53518aea53c8cf5d61cad909a (patch) | |
| tree | 5f3c174d13ad2e459a73902f0d7162d3473e612c /arch/arm/plat-omap/mux.c | |
| parent | a619ca9c4a132472adce3b8d11d0fdafa91ae9dd (diff) | |
| download | olio-linux-3.10-70c494c3122fb3d53518aea53c8cf5d61cad909a.tar.xz olio-linux-3.10-70c494c3122fb3d53518aea53c8cf5d61cad909a.zip  | |
ARM: OMAP1: Make plat/mux.h omap1 only
We are moving omap2+ to use the device tree based pinctrl-single.c
and will be removing the old mux framework. This will remove the
omap1 specific parts from plat-omap.
Acked-by: Felipe Balbi <balbi@ti.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-usb@vger.kernel.org
Cc: linux-pcmcia@lists.infradead.org
Cc: spi-devel-general@lists.sourceforge.net
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/mux.c')
| -rw-r--r-- | arch/arm/plat-omap/mux.c | 90 | 
1 files changed, 0 insertions, 90 deletions
diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c deleted file mode 100644 index fd0d3aad00e..00000000000 --- a/arch/arm/plat-omap/mux.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - * linux/arch/arm/plat-omap/mux.c - * - * Utility to set the Omap MUX and PULL_DWN registers from a table in mux.h - * - * Copyright (C) 2003 - 2008 Nokia Corporation - * - * Written by Tony Lindgren - * - * 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 - * - */ -#include <linux/module.h> -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/io.h> -#include <linux/spinlock.h> - -#include <asm/system.h> - -#include <plat/cpu.h> -#include <plat/mux.h> - -#ifdef CONFIG_OMAP_MUX - -static struct omap_mux_cfg *mux_cfg; - -int __init omap_mux_register(struct omap_mux_cfg *arch_mux_cfg) -{ -	if (!arch_mux_cfg || !arch_mux_cfg->pins || arch_mux_cfg->size == 0 -			|| !arch_mux_cfg->cfg_reg) { -		printk(KERN_ERR "Invalid pin table\n"); -		return -EINVAL; -	} - -	mux_cfg = arch_mux_cfg; - -	return 0; -} - -/* - * Sets the Omap MUX and PULL_DWN registers based on the table - */ -int __init_or_module omap_cfg_reg(const unsigned long index) -{ -	struct pin_config *reg; - -	if (!cpu_class_is_omap1()) { -		printk(KERN_ERR "mux: Broken omap_cfg_reg(%lu) entry\n", -				index); -		WARN_ON(1); -		return -EINVAL; -	} - -	if (mux_cfg == NULL) { -		printk(KERN_ERR "Pin mux table not initialized\n"); -		return -ENODEV; -	} - -	if (index >= mux_cfg->size) { -		printk(KERN_ERR "Invalid pin mux index: %lu (%lu)\n", -		       index, mux_cfg->size); -		dump_stack(); -		return -ENODEV; -	} - -	reg = &mux_cfg->pins[index]; - -	if (!mux_cfg->cfg_reg) -		return -ENODEV; - -	return mux_cfg->cfg_reg(reg); -} -EXPORT_SYMBOL(omap_cfg_reg); -#else -#define omap_mux_init() do {} while(0) -#define omap_cfg_reg(x)	do {} while(0) -#endif	/* CONFIG_OMAP_MUX */  |