Commit 70c494c3 authored by Tony Lindgren's avatar Tony Lindgren

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: default avatarFelipe 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: default avatarTony Lindgren <tony@atomide.com>
parent a619ca9c
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <plat/board-ams-delta.h> #include <plat/board-ams-delta.h>
#include <linux/platform_data/keypad-omap.h> #include <linux/platform_data/keypad-omap.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/ams-delta-fiq.h> #include <mach/ams-delta-fiq.h>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/tc.h> #include <plat/tc.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/flash.h> #include <plat/flash.h>
#include <plat/fpga.h> #include <plat/fpga.h>
#include <linux/platform_data/keypad-omap.h> #include <linux/platform_data/keypad-omap.h>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <mach/usb.h> #include <mach/usb.h>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/dma.h> #include <plat/dma.h>
#include <plat/tc.h> #include <plat/tc.h>
#include <plat/irda.h> #include <plat/irda.h>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/tc.h> #include <plat/tc.h>
#include <linux/platform_data/keypad-omap.h> #include <linux/platform_data/keypad-omap.h>
#include <plat/dma.h> #include <plat/dma.h>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/flash.h> #include <plat/flash.h>
#include <plat/fpga.h> #include <plat/fpga.h>
#include <plat/tc.h> #include <plat/tc.h>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/mmc.h> #include <plat/mmc.h>
#include <plat/clock.h> #include <plat/clock.h>
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/flash.h> #include <plat/flash.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/tc.h> #include <plat/tc.h>
#include <mach/hardware.h> #include <mach/hardware.h>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/flash.h> #include <plat/flash.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/tc.h> #include <plat/tc.h>
#include <plat/dma.h> #include <plat/dma.h>
#include <plat/irda.h> #include <plat/irda.h>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <plat/led.h> #include <plat/led.h>
#include <plat/flash.h> #include <plat/flash.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/dma.h> #include <plat/dma.h>
#include <plat/tc.h> #include <plat/tc.h>
#include <plat/irda.h> #include <plat/irda.h>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/flash.h> #include <plat/flash.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/dma.h> #include <plat/dma.h>
#include <plat/tc.h> #include <plat/tc.h>
#include <plat/irda.h> #include <plat/irda.h>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/tc.h> #include <plat/tc.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/fpga.h> #include <plat/fpga.h>
#include <plat/flash.h> #include <plat/flash.h>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/flash.h> #include <plat/flash.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/dma.h> #include <plat/dma.h>
#include <plat/irda.h> #include <plat/irda.h>
#include <plat/tc.h> #include <plat/tc.h>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <plat/board-voiceblue.h> #include <plat/board-voiceblue.h>
#include <plat/flash.h> #include <plat/flash.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/tc.h> #include <plat/tc.h>
#include <mach/hardware.h> #include <mach/hardware.h>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/tc.h> #include <plat/tc.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/dma.h> #include <plat/dma.h>
#include <plat/mmc.h> #include <plat/mmc.h>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
*/ */
#include <plat/i2c.h> #include <plat/i2c.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/cpu.h> #include <plat/cpu.h>
void __init omap1_i2c_mux_pins(int bus_id) void __init omap1_i2c_mux_pins(int bus_id)
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <asm/tlb.h> #include <asm/tlb.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/tc.h> #include <plat/tc.h>
#include <plat/dma.h> #include <plat/dma.h>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <asm/leds.h> #include <asm/leds.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <plat/mux.h> #include <mach/mux.h>
#include "leds.h" #include "leds.h"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <plat/dma.h> #include <plat/dma.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/asoc-ti-mcbsp.h>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <plat/mux.h> #include <mach/mux.h>
#ifdef CONFIG_OMAP_MUX #ifdef CONFIG_OMAP_MUX
...@@ -451,6 +451,56 @@ static int __init_or_module omap1_cfg_reg(const struct pin_config *cfg) ...@@ -451,6 +451,56 @@ static int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
#endif #endif
} }
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);
int __init omap1_mux_init(void) int __init omap1_mux_init(void)
{ {
if (cpu_is_omap7xx()) { if (cpu_is_omap7xx()) {
...@@ -468,4 +518,8 @@ int __init omap1_mux_init(void) ...@@ -468,4 +518,8 @@ int __init omap1_mux_init(void)
return omap_mux_register(&arch_mux_cfg); return omap_mux_register(&arch_mux_cfg);
} }
#endif #else
#define omap_mux_init() do {} while(0)
#define omap_cfg_reg(x) do {} while(0)
#endif /* CONFIG_OMAP_MUX */
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#include <plat/clock.h> #include <plat/clock.h>
#include <plat/sram.h> #include <plat/sram.h>
#include <plat/tc.h> #include <plat/tc.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/dma.h> #include <plat/dma.h>
#include <plat/dmtimer.h> #include <plat/dmtimer.h>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/fpga.h> #include <plat/fpga.h>
#include "pm.h" #include "pm.h"
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <mach/usb.h> #include <mach/usb.h>
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/io.h> #include <linux/io.h>
#include <plat/mux.h>
#include <plat/clock.h> #include <plat/clock.h>
#include "soc.h" #include "soc.h"
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <plat/mmc.h> #include <plat/mmc.h>
#include <plat/omap-pm.h> #include <plat/omap-pm.h>
#include <plat/mux.h>
#include <plat/omap_device.h> #include <plat/omap_device.h>
#include "mux.h" #include "mux.h"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# Common support # Common support
obj-y := common.o sram.o clock.o dma.o mux.o fb.o counter_32k.o obj-y := common.o sram.o clock.o dma.o fb.o counter_32k.o
obj-m := obj-m :=
obj-n := obj-n :=
obj- := obj- :=
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <plat/mux.h>
#include <plat/i2c.h> #include <plat/i2c.h>
#include <plat/omap-pm.h> #include <plat/omap-pm.h>
#include <plat/omap_device.h> #include <plat/omap_device.h>
......
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/pm_qos.h> #include <linux/pm_qos.h>
#include <plat/mux.h>
#define DRIVER_NAME "omap_uart" #define DRIVER_NAME "omap_uart"
/* /*
......
/*
* 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 */
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include <plat/mmc.h> #include <plat/mmc.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <plat/dma.h> #include <plat/dma.h>
#include <plat/mux.h>
#include <plat/fpga.h> #include <plat/fpga.h>
#define OMAP_MMC_REG_CMD 0x00 #define OMAP_MMC_REG_CMD 0x00
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/sizes.h> #include <asm/sizes.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/tc.h> #include <plat/tc.h>
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <mach/omap7xx.h> /* OMAP7XX_IO_CONF registers */ #include <mach/omap7xx.h> /* OMAP7XX_IO_CONF registers */
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <plat/fpga.h> #include <plat/fpga.h>
#include <mach/hardware.h> #include <mach/hardware.h>
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <plat/dma.h> #include <plat/dma.h>
#include <plat/mux.h>
#include "musb_core.h" #include "musb_core.h"
#include "tusb6010.h" #include "tusb6010.h"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <plat/mux.h> #include <mach/mux.h>
#include <mach/usb.h> #include <mach/usb.h>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <linux/platform_data/omap1_bl.h> #include <linux/platform_data/omap1_bl.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <plat/mux.h> #include <mach/mux.h>
#define OMAPBL_MAX_INTENSITY 0xff #define OMAPBL_MAX_INTENSITY 0xff
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <plat/mux.h> #include <mach/mux.h>
#include "omapfb.h" #include "omapfb.h"
static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment