Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: OMAP1: Make plat/mux.h omap1 only

Browse Source 
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>
This commit is contained in:
Tony Lindgren 2012-09-19 10:46:56 -07:00
parent a619ca9c4a
commit 70c494c312
38 changed files with 85 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap1/board-ams-delta.c
View File

@ -37,7 +37,7 @@
#include <plat/board-ams-delta.h>
#include <linux/platform_data/keypad-omap.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <mach/hardware.h>
#include <mach/ams-delta-fiq.h>

2
arch/arm/mach-omap1/board-fsample.c
View File

@ -28,7 +28,7 @@
#include <asm/mach/map.h>
#include <plat/tc.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/flash.h>
#include <plat/fpga.h>
#include <linux/platform_data/keypad-omap.h>

2
arch/arm/mach-omap1/board-generic.c
View File

@ -22,7 +22,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <mach/usb.h>

2
arch/arm/mach-omap1/board-h2.c
View File

@ -37,7 +37,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/dma.h>
#include <plat/tc.h>
#include <plat/irda.h>

2
arch/arm/mach-omap1/board-h3.c
View File

@ -39,7 +39,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/tc.h>
#include <linux/platform_data/keypad-omap.h>
#include <plat/dma.h>

2
arch/arm/mach-omap1/board-innovator.c
View File

@ -31,7 +31,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/flash.h>
#include <plat/fpga.h>
#include <plat/tc.h>

2
arch/arm/mach-omap1/board-nokia770.c
View File

@ -28,7 +28,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/mmc.h>
#include <plat/clock.h>

2
arch/arm/mach-omap1/board-osk.c
View File

@ -47,7 +47,7 @@
#include <asm/mach/map.h>
#include <plat/flash.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/tc.h>
#include <mach/hardware.h>

2
arch/arm/mach-omap1/board-palmte.c
View File

@ -35,7 +35,7 @@
#include <asm/mach/map.h>
#include <plat/flash.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/tc.h>
#include <plat/dma.h>
#include <plat/irda.h>

2
arch/arm/mach-omap1/board-palmtt.c
View File

@ -35,7 +35,7 @@
#include <plat/led.h>
#include <plat/flash.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/dma.h>
#include <plat/tc.h>
#include <plat/irda.h>

2
arch/arm/mach-omap1/board-palmz71.c
View File

@ -37,7 +37,7 @@
#include <asm/mach/map.h>
#include <plat/flash.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/dma.h>
#include <plat/tc.h>
#include <plat/irda.h>

2
arch/arm/mach-omap1/board-perseus2.c
View File

@ -29,7 +29,7 @@
#include <asm/mach/map.h>
#include <plat/tc.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/fpga.h>
#include <plat/flash.h>

2
arch/arm/mach-omap1/board-sx1.c
View File

@ -35,7 +35,7 @@
#include <asm/mach/map.h>
#include <plat/flash.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/dma.h>
#include <plat/irda.h>
#include <plat/tc.h>

2
arch/arm/mach-omap1/board-voiceblue.c
View File

@ -33,7 +33,7 @@
#include <plat/board-voiceblue.h>
#include <plat/flash.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/tc.h>
#include <mach/hardware.h>

2
arch/arm/mach-omap1/devices.c
View File

@ -20,7 +20,7 @@
#include <asm/mach/map.h>
#include <plat/tc.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/dma.h>
#include <plat/mmc.h>

2
arch/arm/mach-omap1/i2c.c
View File

@ -20,7 +20,7 @@
*/
#include <plat/i2c.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/cpu.h>
void __init omap1_i2c_mux_pins(int bus_id)

0
arch/arm/plat-omap/include/plat/mux.h → arch/arm/mach-omap1/include/mach/mux.h
View File

2
arch/arm/mach-omap1/io.c
View File

@ -16,7 +16,7 @@
#include <asm/tlb.h>
#include <asm/mach/map.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/tc.h>
#include <plat/dma.h>

2
arch/arm/mach-omap1/leds.c
View File

@ -11,7 +11,7 @@
#include <asm/leds.h>
#include <asm/mach-types.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include "leds.h"

2
arch/arm/mach-omap1/mcbsp.c
View File

@ -20,7 +20,7 @@
#include <linux/slab.h>
#include <plat/dma.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/cpu.h>
#include <linux/platform_data/asoc-ti-mcbsp.h>

58
arch/arm/mach-omap1/mux.c
View File

@ -29,7 +29,7 @@
#include <mach/hardware.h>
#include <plat/mux.h>
#include <mach/mux.h>
#ifdef CONFIG_OMAP_MUX
@ -451,6 +451,56 @@ static int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
#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)
{
if (cpu_is_omap7xx()) {
@ -468,4 +518,8 @@ int __init omap1_mux_init(void)
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 */

2
arch/arm/mach-omap1/pm.c
View File

@ -53,7 +53,7 @@
#include <plat/clock.h>
#include <plat/sram.h>
#include <plat/tc.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/dma.h>
#include <plat/dmtimer.h>

2
arch/arm/mach-omap1/serial.c
View File

@ -22,7 +22,7 @@
#include <asm/mach-types.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/fpga.h>
#include "pm.h"

2
arch/arm/mach-omap1/usb.c
View File

@ -26,7 +26,7 @@
#include <asm/irq.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <mach/usb.h>

1
arch/arm/mach-omap2/common.c
View File

@ -17,7 +17,6 @@
#include <linux/clk.h>
#include <linux/io.h>
#include <plat/mux.h>
#include <plat/clock.h>
#include "soc.h"

1
arch/arm/mach-omap2/hsmmc.c
View File

@ -19,7 +19,6 @@
#include <plat/mmc.h>
#include <plat/omap-pm.h>
#include <plat/mux.h>
#include <plat/omap_device.h>
#include "mux.h"

2
arch/arm/plat-omap/Makefile
View File

@ -3,7 +3,7 @@
#
# 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-n :=
obj- :=

1
arch/arm/plat-omap/i2c.c
View File

@ -32,7 +32,6 @@
#include <linux/clk.h>
#include <mach/irqs.h>
#include <plat/mux.h>
#include <plat/i2c.h>
#include <plat/omap-pm.h>
#include <plat/omap_device.h>

2
arch/arm/plat-omap/include/plat/omap-serial.h
View File

@ -21,8 +21,6 @@
#include <linux/device.h>
#include <linux/pm_qos.h>
#include <plat/mux.h>
#define DRIVER_NAME "omap_uart"
/*

90
arch/arm/plat-omap/mux.c
View File

@ -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 */

1
drivers/mmc/host/omap.c
View File

@ -36,7 +36,6 @@
#include <plat/mmc.h>
#include <asm/gpio.h>
#include <plat/dma.h>
#include <plat/mux.h>
#include <plat/fpga.h>
#define OMAP_MMC_REG_CMD 0x00

2
drivers/pcmcia/omap_cf.c
View File

@ -24,7 +24,7 @@
#include <asm/io.h>
#include <asm/sizes.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/tc.h>

2
drivers/spi/spi-omap-uwire.c
View File

@ -52,7 +52,7 @@
#include <asm/io.h>
#include <asm/mach-types.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <mach/omap7xx.h> /* OMAP7XX_IO_CONF registers */

2
drivers/usb/host/ohci-omap.c
View File

@ -24,7 +24,7 @@
#include <asm/io.h>
#include <asm/mach-types.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <plat/fpga.h>
#include <mach/hardware.h>

1
drivers/usb/musb/tusb6010_omap.c
View File

@ -17,7 +17,6 @@
#include <linux/dma-mapping.h>
#include <linux/slab.h>
#include <plat/dma.h>
#include <plat/mux.h>
#include "musb_core.h"
#include "tusb6010.h"

2
drivers/usb/otg/isp1301_omap.c
View File

@ -36,7 +36,7 @@
#include <asm/irq.h>
#include <asm/mach-types.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include <mach/usb.h>

2
drivers/video/backlight/omap1_bl.c
View File

@ -30,7 +30,7 @@
#include <linux/platform_data/omap1_bl.h>
#include <mach/hardware.h>
#include <plat/mux.h>
#include <mach/mux.h>
#define OMAPBL_MAX_INTENSITY 0xff

2
drivers/video/omap/lcd_osk.c
View File

@ -24,7 +24,7 @@
#include <linux/platform_device.h>
#include <asm/gpio.h>
#include <plat/mux.h>
#include <mach/mux.h>
#include "omapfb.h"
static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)