renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 09:13:55 +08:00
Code

This branch contains mostly scripted changes to make omap

Browse Source 
header files local where possible to get us closer to supporting
 the ARM single zImage. After these changes mach includes are
 pretty much out of the way for omap2+, but still lots of manual
 work remains to sort through the remaining plat includes.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJQW5i3AAoJEBvUPslcq6Vzhf0P/295RFraSeKbgT0cc0GhjDsk
 a30tqn2B1yAKZcuoe9kAr7MR55pA5wm7C6neBsu0+DqrZZ7v5sczl6kkb4415fbb
 IgHZVL7ggeCKQaC2bq2bdbUSur2fj2uuIJoy5h6rfZFV5uuPeKggXI4PqrdgiBX9
 Y8C+dTzNpWLG7evoREs0E8yzFnSh1OKizcxXzCvYhCM6ObjlQVpePnSs/tpxd0mw
 4qmYc5QYTs7MEUzTxoyntQAYhE5vmTpLW4VrblWf/pCF2XnpIhn1I+sA8h4dte+i
 txYJaLmouz5a7YNiEEFYztSsjhOWH3tJ5nxLZjcLm8IOlMM11zMaeCr+G0j18288
 /ZMHNHdiwVk4RiG8WNk+gr0SM7nOEoqNsdMrIAmVt7P0QSasCBiZx/zh8JhmkNlX
 XBsUvAOXmx8k4coF4ZCJ3E/aoxQBTZozbS1m0YrnRHkWJoexfXhXPp05uPFnJTQ0
 bg6V6A12J9EWnHDAwN5JSkQCL35LR9+3KkxYnMZcq03Q2cfrQSyML0UYLTVPBKYa
 cDyRAyuWooho6k5hyJiaCP6B1U/UzC5JGRz7XQ6bwweGbEgzGVjnW/EF/IJp7sGo
 PzSRtb2WovCFNTywBhLLEnuHB+pKOvnflRn5KrNWkJfp5VDIzgaleMFBS98kn/tI
 +ekNhimXe/QAsWzvq99q
 =TZVo
 -----END PGP SIGNATURE-----

Merge tag 'omap-cleanup-local-headers-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

From Tony Lindgren:
This branch contains mostly scripted changes to make omap
header files local where possible to get us closer to supporting
the ARM single zImage. After these changes mach includes are
pretty much out of the way for omap2+, but still lots of manual
work remains to sort through the remaining plat includes.

* tag 'omap-cleanup-local-headers-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (26 commits)
  ARM: OMAP2+: Make omap4-keypad.h local
  ARM: OMAP2+: Make l4_3xxx.h local
  ARM: OMAP2+: Make l4_2xxx.h local
  ARM: OMAP2+: Make l3_3xxx.h local
  ARM: OMAP2+: Make l3_2xxx.h local
  ARM: OMAP1: Move irda.h from plat to mach
  ARM: OMAP2+: Make hdq1w.h local
  ARM: OMAP2+: Make gpmc-smsc911x.h local
  ARM: OMAP2+: Make gpmc-smc91x.h local
  ARM: OMAP1: Move flash.h from plat to mach
  ARM: OMAP2+: Make debug-devices.h local
  ARM: OMAP1: Move board-voiceblue.h from plat to mach
  ARM: OMAP1: Move board-sx1.h from plat to mach
  ARM: OMAP2+: Make omap-wakeupgen.h local
  ARM: OMAP2+: Make omap-secure.h local
  ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local
  ARM: OMAP2+: Make ctrl_module_pad_wkup_44xx.h local
  ARM: OMAP2+: Make ctrl_module_pad_core_44xx.h local
  ARM: OMAP2+: Make ctrl_module_core_44xx.h local
  ARM: OMAP2+: Make board-rx51.h local
  ...
This commit is contained in:
Olof Johansson 2012-09-20 20:27:06 -07:00
commit b97ba3ab4e
109 changed files with 159 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap1/ams-delta-fiq-handler.S
View File

@ -16,7 +16,7 @@
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <plat/board-ams-delta.h>
#include <mach/board-ams-delta.h>
#include <mach/irqs.h>
#include <mach/ams-delta-fiq.h>

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

@ -19,7 +19,7 @@
#include <linux/module.h>
#include <linux/io.h>
#include <plat/board-ams-delta.h>
#include <mach/board-ams-delta.h>
#include <asm/fiq.h>

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

@ -35,9 +35,9 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/board-ams-delta.h>
#include <mach/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>

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

@ -28,8 +28,8 @@
#include <asm/mach/map.h>
#include <plat/tc.h>
#include <plat/mux.h>
#include <plat/flash.h>
#include <mach/mux.h>
#include <mach/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>

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

@ -37,12 +37,12 @@
#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>
#include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h>
#include <plat/flash.h>
#include <mach/flash.h>
#include <mach/hardware.h>
#include <mach/usb.h>

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

@ -39,11 +39,11 @@
#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>
#include <plat/flash.h>
#include <mach/flash.h>
#include <mach/hardware.h>
#include <mach/irqs.h>

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

@ -31,8 +31,8 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/mux.h>
#include <plat/flash.h>
#include <mach/mux.h>
#include <mach/flash.h>
#include <plat/fpga.h>
#include <plat/tc.h>
#include <linux/platform_data/keypad-omap.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>

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

@ -46,8 +46,8 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/flash.h>
#include <plat/mux.h>
#include <mach/flash.h>
#include <mach/mux.h>
#include <plat/tc.h>
#include <mach/hardware.h>

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

@ -34,11 +34,11 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/flash.h>
#include <plat/mux.h>
#include <mach/flash.h>
#include <mach/mux.h>
#include <plat/tc.h>
#include <plat/dma.h>
#include <plat/irda.h>
#include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h>
#include <mach/hardware.h>

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

@ -34,11 +34,11 @@
#include <asm/mach/map.h>
#include <plat/led.h>
#include <plat/flash.h>
#include <plat/mux.h>
#include <mach/flash.h>
#include <mach/mux.h>
#include <plat/dma.h>
#include <plat/tc.h>
#include <plat/irda.h>
#include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h>
#include <mach/hardware.h>

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

@ -36,11 +36,11 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/flash.h>
#include <plat/mux.h>
#include <mach/flash.h>
#include <mach/mux.h>
#include <plat/dma.h>
#include <plat/tc.h>
#include <plat/irda.h>
#include <mach/irda.h>
#include <linux/platform_data/keypad-omap.h>
#include <mach/hardware.h>

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

@ -29,9 +29,9 @@
#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>
#include <mach/flash.h>
#include <mach/hardware.h>

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

@ -17,7 +17,7 @@
#include <mach/hardware.h>
#include <plat/mmc.h>
#include <plat/board-sx1.h>
#include <mach/board-sx1.h>
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)

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

@ -34,12 +34,12 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/flash.h>
#include <plat/mux.h>
#include <mach/flash.h>
#include <mach/mux.h>
#include <plat/dma.h>
#include <plat/irda.h>
#include <mach/irda.h>
#include <plat/tc.h>
#include <plat/board-sx1.h>
#include <mach/board-sx1.h>
#include <mach/hardware.h>
#include <mach/usb.h>

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

@ -31,9 +31,9 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/board-voiceblue.h>
#include <plat/flash.h>
#include <plat/mux.h>
#include <mach/board-voiceblue.h>
#include <mach/flash.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/flash.c
View File

@ -11,7 +11,7 @@
#include <linux/mtd/map.h>
#include <plat/tc.h>
#include <plat/flash.h>
#include <mach/flash.h>
#include <mach/hardware.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/board-ams-delta.h → arch/arm/mach-omap1/include/mach/board-ams-delta.h
View File

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

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

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

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

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

5
arch/arm/mach-omap1/include/mach/smp.h
View File

@ -1,5 +0,0 @@
/*
* arch/arm/mach-omap1/include/mach/smp.h
*/
#include <plat/smp.h>

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>

2
arch/arm/mach-omap2/am35xx-emac.c
View File

@ -19,7 +19,7 @@
#include <linux/davinci_emac.h>
#include <asm/system.h>
#include <plat/omap_device.h>
#include <mach/am35xx.h>
#include "am35xx.h"
#include "control.h"
#include "am35xx-emac.h"

0
arch/arm/mach-omap2/include/mach/am35xx.h → arch/arm/mach-omap2/am35xx.h
View File

2
arch/arm/mach-omap2/board-2430sdp.c
View File

@ -36,7 +36,7 @@
#include "common.h"
#include <plat/gpmc.h>
#include <plat/usb.h>
#include <plat/gpmc-smc91x.h>
#include "gpmc-smc91x.h"
#include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h>

2
arch/arm/mach-omap2/board-3430sdp.c
View File

@ -37,7 +37,7 @@
#include <video/omapdss.h>
#include <video/omap-panel-tfp410.h>
#include <plat/gpmc-smc91x.h>
#include "gpmc-smc91x.h"
#include "board-flash.h"
#include "mux.h"

2
arch/arm/mach-omap2/board-3630sdp.c
View File

@ -17,7 +17,7 @@
#include <asm/mach/arch.h>
#include "common.h"
#include <plat/gpmc-smc91x.h>
#include "gpmc-smc91x.h"
#include <plat/usb.h>
#include <mach/board-zoom.h>

2
arch/arm/mach-omap2/board-4430sdp.c
View File

@ -36,7 +36,7 @@
#include "common.h"
#include <plat/usb.h>
#include <plat/mmc.h>
#include <plat/omap4-keypad.h>
#include "omap4-keypad.h"
#include <video/omapdss.h>
#include <video/omap-panel-nokia-dsi.h>
#include <video/omap-panel-picodlp.h>

2
arch/arm/mach-omap2/board-am3517evm.c
View File

@ -27,7 +27,7 @@
#include <linux/mmc/host.h>
#include <linux/platform_data/gpio-omap.h>
#include <mach/am35xx.h>
#include "am35xx.h"
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>

2
arch/arm/mach-omap2/board-cm-t35.c
View File

@ -64,7 +64,7 @@
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
#include <linux/smsc911x.h>
#include <plat/gpmc-smsc911x.h>
#include "gpmc-smsc911x.h"
static struct omap_smsc911x_platform_data cm_t35_smsc911x_cfg = {
.id = 0,

2
arch/arm/mach-omap2/board-cm-t3517.c
View File

@ -43,7 +43,7 @@
#include <linux/platform_data/mtd-nand-omap2.h>
#include <plat/gpmc.h>
#include <mach/am35xx.h>
#include "am35xx.h"
#include "mux.h"
#include "control.h"

2
arch/arm/mach-omap2/board-devkit8000.c
View File

@ -32,7 +32,7 @@
#include <linux/regulator/machine.h>
#include <linux/i2c/twl.h>
#include <mach/id.h>
#include "id.h"
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>

2
arch/arm/mach-omap2/board-h4.c
View File

@ -34,7 +34,7 @@
#include <plat/menelaus.h>
#include <plat/dma.h>
#include <plat/gpmc.h>
#include <plat/debug-devices.h>
#include "debug-devices.h"
#include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h>

2
arch/arm/mach-omap2/board-igep0020.c
View File

@ -192,7 +192,7 @@ static void __init igep_flash_init(void) {}
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
#include <linux/smsc911x.h>
#include <plat/gpmc-smsc911x.h>
#include "gpmc-smsc911x.h"
static struct omap_smsc911x_platform_data smsc911x_cfg = {
.cs = IGEP2_SMSC911X_CS,

2
arch/arm/mach-omap2/board-ldp.c
View File

@ -38,7 +38,7 @@
#include <plat/gpmc.h>
#include <mach/board-zoom.h>
#include <plat/usb.h>
#include <plat/gpmc-smsc911x.h>
#include "gpmc-smsc911x.h"
#include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h>

2
arch/arm/mach-omap2/board-omap3evm.c
View File

@ -118,7 +118,7 @@ static void __init omap3_evm_get_revision(void)
}
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
#include <plat/gpmc-smsc911x.h>
#include "gpmc-smsc911x.h"
static struct omap_smsc911x_platform_data smsc911x_cfg = {
.cs = OMAP3EVM_SMSC911X_CS,

2
arch/arm/mach-omap2/board-omap3logic.c
View File

@ -34,7 +34,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/gpmc-smsc911x.h>
#include "gpmc-smsc911x.h"
#include <plat/gpmc.h>
#include <plat/sdrc.h>
#include <plat/usb.h>

2
arch/arm/mach-omap2/board-omap3stalker.c
View File

@ -60,7 +60,7 @@
#include "common-board-devices.h"
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
#include <plat/gpmc-smsc911x.h>
#include "gpmc-smsc911x.h"
#define OMAP3STALKER_ETHR_START 0x2c000000
#define OMAP3STALKER_ETHR_SIZE 1024

2
arch/arm/mach-omap2/board-overo.c
View File

@ -114,7 +114,7 @@ static inline void __init overo_ads7846_init(void) { return; }
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
#include <linux/smsc911x.h>
#include <plat/gpmc-smsc911x.h>
#include "gpmc-smsc911x.h"
static struct omap_smsc911x_platform_data smsc911x_cfg = {
.id = 0,

4
arch/arm/mach-omap2/board-rx51-peripherals.c
View File

@ -33,9 +33,9 @@
#include "common.h"
#include <plat/dma.h>
#include <plat/gpmc.h>
#include <plat/gpmc-smc91x.h>
#include "gpmc-smc91x.h"
#include <mach/board-rx51.h>
#include "board-rx51.h"
#include <sound/tlv320aic3x.h>
#include <sound/tpa6130a2-plat.h>

2
arch/arm/mach-omap2/board-rx51-video.c
View File

@ -19,7 +19,7 @@
#include <plat/vram.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <mach/board-rx51.h>
#include "board-rx51.h"
#include "mux.h"

0
arch/arm/mach-omap2/include/mach/board-rx51.h → arch/arm/mach-omap2/board-rx51.h
View File

2
arch/arm/mach-omap2/board-zoom-debugboard.c
View File

@ -18,7 +18,7 @@
#include <linux/regulator/machine.h>
#include <plat/gpmc.h>
#include <plat/gpmc-smsc911x.h>
#include "gpmc-smsc911x.h"
#include <mach/board-zoom.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"

8
arch/arm/mach-omap2/control.h
View File

@ -16,10 +16,10 @@
#ifndef __ARCH_ARM_MACH_OMAP2_CONTROL_H
#define __ARCH_ARM_MACH_OMAP2_CONTROL_H
#include <mach/ctrl_module_core_44xx.h>
#include <mach/ctrl_module_wkup_44xx.h>
#include <mach/ctrl_module_pad_core_44xx.h>
#include <mach/ctrl_module_pad_wkup_44xx.h>
#include "ctrl_module_core_44xx.h"
#include "ctrl_module_wkup_44xx.h"
#include "ctrl_module_pad_core_44xx.h"
#include "ctrl_module_pad_wkup_44xx.h"
#include "am33xx.h"

0
arch/arm/mach-omap2/include/mach/ctrl_module_core_44xx.h → arch/arm/mach-omap2/ctrl_module_core_44xx.h
View File

0
arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h → arch/arm/mach-omap2/ctrl_module_pad_core_44xx.h
View File

0
arch/arm/mach-omap2/include/mach/ctrl_module_pad_wkup_44xx.h → arch/arm/mach-omap2/ctrl_module_pad_wkup_44xx.h
View File

0
arch/arm/mach-omap2/include/mach/ctrl_module_wkup_44xx.h → arch/arm/mach-omap2/ctrl_module_wkup_44xx.h
View File

0
arch/arm/plat-omap/include/plat/debug-devices.h → arch/arm/mach-omap2/debug-devices.h
View File

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

@ -27,7 +27,7 @@
#include <plat/dma.h>
#include <plat/omap_hwmod.h>
#include <plat/omap_device.h>
#include <plat/omap4-keypad.h>
#include "omap4-keypad.h"
#include "soc.h"
#include "common.h"

2
arch/arm/mach-omap2/gpmc-smc91x.c
View File

@ -18,7 +18,7 @@
#include <linux/smc91x.h>
#include <plat/gpmc.h>
#include <plat/gpmc-smc91x.h>
#include "gpmc-smc91x.h"
#include "soc.h"

0
arch/arm/plat-omap/include/plat/gpmc-smc91x.h → arch/arm/mach-omap2/gpmc-smc91x.h
View File

2
arch/arm/mach-omap2/gpmc-smsc911x.c
View File

@ -21,7 +21,7 @@
#include <linux/smsc911x.h>
#include <plat/gpmc.h>
#include <plat/gpmc-smsc911x.h>
#include "gpmc-smsc911x.h"
static struct resource gpmc_smsc911x_resources[] = {
[0] = {

0
arch/arm/plat-omap/include/plat/gpmc-smsc911x.h → arch/arm/mach-omap2/gpmc-smsc911x.h
View File

2
arch/arm/mach-omap2/hdq1w.c
View File

@ -29,7 +29,7 @@
#include <plat/omap_hwmod.h>
#include <plat/omap_device.h>
#include <plat/hdq1w.h>
#include "hdq1w.h"
#include "common.h"

0
arch/arm/plat-omap/include/plat/hdq1w.h → arch/arm/mach-omap2/hdq1w.h
View File

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/mach-omap2/id.c
View File

@ -23,7 +23,7 @@
#include "common.h"
#include <mach/id.h>
#include "id.h"
#include "soc.h"
#include "control.h"

0
arch/arm/mach-omap2/include/mach/id.h → arch/arm/mach-omap2/id.h
View File

5
arch/arm/mach-omap2/include/mach/smp.h
View File

@ -1,5 +0,0 @@
/*
* arch/arm/mach-omap2/include/mach/smp.h
*/
#include <plat/smp.h>

0
arch/arm/plat-omap/include/plat/l3_2xxx.h → arch/arm/mach-omap2/l3_2xxx.h
View File

0
arch/arm/plat-omap/include/plat/l3_3xxx.h → arch/arm/mach-omap2/l3_3xxx.h
View File

0
arch/arm/plat-omap/include/plat/l4_2xxx.h → arch/arm/mach-omap2/l4_2xxx.h
View File

0
arch/arm/plat-omap/include/plat/l4_3xxx.h → arch/arm/mach-omap2/l4_3xxx.h
View File

2
arch/arm/mach-omap2/omap-hotplug.c
View File

@ -20,7 +20,7 @@
#include <linux/io.h>
#include <asm/cacheflush.h>
#include <mach/omap-wakeupgen.h>
#include "omap-wakeupgen.h"
#include "common.h"

2
arch/arm/mach-omap2/omap-secure.c
View File

@ -19,7 +19,7 @@
#include <asm/memblock.h>
#include <plat/omap-secure.h>
#include <mach/omap-secure.h>
#include "omap-secure.h"
static phys_addr_t omap_secure_memblock_base;

0
arch/arm/mach-omap2/include/mach/omap-secure.h → arch/arm/mach-omap2/omap-secure.h
View File

4
arch/arm/mach-omap2/omap-smp.c
View File

@ -24,8 +24,8 @@
#include <asm/hardware/gic.h>
#include <asm/smp_scu.h>
#include <mach/omap-secure.h>
#include <mach/omap-wakeupgen.h>
#include "omap-secure.h"
#include "omap-wakeupgen.h"
#include <asm/cputype.h>
#include "soc.h"

4
arch/arm/mach-omap2/omap-wakeupgen.c
View File

@ -27,8 +27,8 @@
#include <asm/hardware/gic.h>
#include <mach/omap-wakeupgen.h>
#include <mach/omap-secure.h>
#include "omap-wakeupgen.h"
#include "omap-secure.h"
#include "soc.h"
#include "omap4-sar-layout.h"

0
arch/arm/mach-omap2/include/mach/omap-wakeupgen.h → arch/arm/mach-omap2/omap-wakeupgen.h
View File

2
arch/arm/mach-omap2/omap4-common.c
View File

@ -29,7 +29,7 @@
#include <plat/omap-secure.h>
#include <plat/mmc.h>
#include <mach/omap-wakeupgen.h>
#include "omap-wakeupgen.h"
#include "soc.h"
#include "common.h"

0
arch/arm/plat-omap/include/plat/omap4-keypad.h → arch/arm/mach-omap2/omap4-keypad.h
View File

4
arch/arm/mach-omap2/omap_hwmod_2420_data.c
View File

@ -19,8 +19,8 @@
#include <plat/serial.h>
#include <plat/i2c.h>
#include <plat/dmtimer.h>
#include <plat/l3_2xxx.h>
#include <plat/l4_2xxx.h>
#include "l3_2xxx.h"
#include "l4_2xxx.h"
#include <plat/mmc.h>
#include "omap_hwmod_common_data.h"

2
arch/arm/mach-omap2/omap_hwmod_2430_data.c
View File

@ -21,7 +21,7 @@
#include <plat/i2c.h>
#include <plat/dmtimer.h>
#include <plat/mmc.h>
#include <plat/l3_2xxx.h>
#include "l3_2xxx.h"
#include "soc.h"
#include "omap_hwmod_common_data.h"

2
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
View File

@ -13,7 +13,7 @@
#include <plat/serial.h>
#include <plat/dma.h>
#include <plat/common.h>
#include <plat/hdq1w.h>
#include "hdq1w.h"
#include "omap_hwmod_common_data.h"

4
arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
View File

@ -15,8 +15,8 @@
#include <plat/omap_hwmod.h>
#include <plat/serial.h>
#include <plat/l3_2xxx.h>
#include <plat/l4_2xxx.h>
#include "l3_2xxx.h"
#include "l4_2xxx.h"
#include "omap_hwmod_common_data.h"

6
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
View File

@ -20,15 +20,15 @@
#include <plat/omap_hwmod.h>
#include <plat/dma.h>
#include <plat/serial.h>
#include <plat/l3_3xxx.h>
#include <plat/l4_3xxx.h>
#include "l3_3xxx.h"
#include "l4_3xxx.h"
#include <plat/i2c.h>
#include <plat/mmc.h>
#include <linux/platform_data/asoc-ti-mcbsp.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <plat/dmtimer.h>
#include <mach/am35xx.h>
#include "am35xx.h"
#include "soc.h"
#include "omap_hwmod_common_data.h"

2
arch/arm/mach-omap2/sleep44xx.S
View File

@ -14,7 +14,7 @@
#include <asm/memory.h>
#include <asm/hardware/cache-l2x0.h>
#include <mach/omap-secure.h>
#include "omap-secure.h"
#include "common.h"
#include "omap44xx.h"

2
arch/arm/mach-omap2/usb-musb.c
View File

@ -28,7 +28,7 @@
#include <plat/usb.h>
#include <plat/omap_device.h>
#include <mach/am35xx.h>
#include "am35xx.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"
/*

8
arch/arm/plat-omap/include/plat/param.h
View File

@ -1,8 +0,0 @@
/*
* arch/arm/plat-omap/include/mach/param.h
*
*/
#ifdef CONFIG_OMAP_32K_TIMER_HZ
#define HZ CONFIG_OMAP_32K_TIMER_HZ
#endif

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

2
drivers/input/serio/ams_delta_serio.c
View File

@ -27,7 +27,7 @@
#include <linux/module.h>
#include <asm/mach-types.h>
#include <plat/board-ams-delta.h>
#include <mach/board-ams-delta.h>
#include <mach/ams-delta-fiq.h>

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/mtd/nand/ams-delta.c
View File

@ -29,7 +29,7 @@
#include <asm/io.h>
#include <asm/sizes.h>
#include <plat/board-ams-delta.h>
#include <mach/board-ams-delta.h>
#include <mach/hardware.h>

Some files were not shown because too many files have changed in this diff Show More