Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

d9fbd9a2 · Linus Torvalds <[email protected]> · 2009-09-24 17:06:51 -07:00

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits)
  ARM: 5719/1: [AT91] Fix AC97 breakage
  ARM: 5721/1: MMCI enable the use of a regulator
  ARM: 5720/1: Move MMCI header to amba include dir
  ARM: 5718/1: Sane busids for RealView board components
  ARM: 5715/1: Make kprobes unregistration SMP safe
  ARM: 5711/1: locomo.c: CodingStyle cleanups
  ARM: 5710/1: at91: add AC97 support to at91sam9rl and at91sam9rlek board
  ARM: 5709/1: at91: add AC97 support to at91sam9g45 series and at91sam9m10g45ek board
  ARM: 5621/1: at91/dmaengine: integration of at_hdmac driver in at91sam9g45 series
  ARM: 5620/1: at91/dmaengine: integration of at_hdmac driver in at91sam9rl
  ARM: Add support for checking access permissions on prefetch aborts
  ARM: Separate out access error checking
  ARM: Ensure correct might_sleep() check in pagefault path
  ARM: Update page fault handling for new OOM techniques
  ARM: Provide definitions and helpers for decoding the FSR register
  ARM: 5712/1: SA1100: initialise spinlock in DMA code
  ARM: s3c: fix check of index into s3c_gpios[]
  ARM: spitz: fix touchscreen max presure
  ARM: STMP3xxx: deallocation with negative index of descriptors[]
  Thumb-2: Correctly handle undefined instructions in the kernel
  ...

Commit: d9fbd9a2cd5ac1b286a7d7cdb1a180ce1edaee2f
Parents: f25f60be · baea7b94

Merge commit. Changes below are compared with the first parent: f25f60be.

Changes

153 files changed · +7834 −3746

File	Status	Add	Del	Content
Documentation/arm/tcm.txt	added	+145	−0	View file
MAINTAINERS	modified	+7	−3	View file
arch/arm/Kconfig	modified	+5	−0	View file
arch/arm/common/locomo.c	modified	+7	−10	View file
arch/arm/common/vic.c	modified	+1	−0	View file
arch/arm/configs/littleton_defconfig	deleted	+0	−783	View before deletion
arch/arm/configs/pxa3xx_defconfig	added	+1332	−0	View file
arch/arm/configs/xcep_defconfig	added	+1129	−0	View file
arch/arm/configs/zylonite_defconfig	deleted	+0	−736	View before deletion
arch/arm/include/asm/atomic.h	modified	+7	−19	View file
arch/arm/include/asm/cache.h	modified	+1	−1	View file
arch/arm/include/asm/cputype.h	modified	+9	−1	View file
arch/arm/include/asm/tcm.h	added	+31	−0	View file
arch/arm/include/asm/unified.h	modified	+4	−0	View file
arch/arm/kernel/Makefile	modified	+1	−0	View file
arch/arm/kernel/entry-armv.S	modified	+11	−8	View file
arch/arm/kernel/entry-header.S	modified	+14	−0	View file
arch/arm/kernel/kprobes.c	modified	+17	−2	View file
arch/arm/kernel/setup.c	modified	+2	−0	View file
arch/arm/kernel/tcm.c	added	+246	−0	View file
arch/arm/kernel/tcm.h	added	+17	−0	View file
arch/arm/kernel/vmlinux.lds.S	modified	+57	−0	View file
arch/arm/lib/copy_page.S	modified	+8	−8	View file
arch/arm/mach-at91/at91cap9_devices.c	modified	+5	−5	View file
arch/arm/mach-at91/at91sam9g45_devices.c	modified	+104	−0	View file
arch/arm/mach-at91/at91sam9rl_devices.c	modified	+102	−0	View file
arch/arm/mach-at91/board-cap9adk.c	modified	+1	−1	View file
arch/arm/mach-at91/board-neocore926.c	modified	+1	−1	View file
arch/arm/mach-at91/board-sam9m10g45ek.c	modified	+10	−0	View file
arch/arm/mach-at91/board-sam9rlek.c	modified	+10	−0	View file
arch/arm/mach-integrator/integrator_cp.c	modified	+2	−2	View file
arch/arm/mach-pxa/Kconfig	modified	+36	−0	View file
arch/arm/mach-pxa/Makefile	modified	+4	−0	View file
arch/arm/mach-pxa/balloon3.c	added	+361	−0	View file
arch/arm/mach-pxa/clock.h	modified	+0	−1	View file
arch/arm/mach-pxa/cm-x270.c	modified	+104	−42	View file
arch/arm/mach-pxa/cm-x300.c	modified	+12	−59	View file
arch/arm/mach-pxa/colibri-pxa300.c	modified	+1	−0	View file
arch/arm/mach-pxa/colibri-pxa320.c	modified	+33	−0	View file
arch/arm/mach-pxa/colibri-pxa3xx.c	modified	+48	−4	View file
arch/arm/mach-pxa/corgi.c	modified	+136	−97	View file
arch/arm/mach-pxa/csb726.c	modified	+5	−49	View file
arch/arm/mach-pxa/devices.c	modified	+27	−0	View file
arch/arm/mach-pxa/devices.h	modified	+2	−0	View file
arch/arm/mach-pxa/e740.c	modified	+0	−1	View file
arch/arm/mach-pxa/e750.c	modified	+0	−1	View file
arch/arm/mach-pxa/em-x270.c	modified	+30	−15	View file
arch/arm/mach-pxa/eseries.c	modified	+2	−37	View file
arch/arm/mach-pxa/gumstix.c	modified	+4	−1	View file
arch/arm/mach-pxa/hx4700.c	modified	+24	−41	View file
arch/arm/mach-pxa/idp.c	modified	+4	−1	View file
arch/arm/mach-pxa/imote2.c	modified	+3	−0	View file
arch/arm/mach-pxa/include/mach/balloon3.h	added	+134	−0	View file
arch/arm/mach-pxa/include/mach/colibri.h	modified	+6	−0	View file
arch/arm/mach-pxa/include/mach/entry-macro.S	modified	+9	−16	View file
arch/arm/mach-pxa/include/mach/hardware.h	modified	+17	−0	View file
arch/arm/mach-pxa/include/mach/irda.h	modified	+2	−0	View file
arch/arm/mach-pxa/include/mach/irqs.h	modified	+39	−3	View file
arch/arm/mach-pxa/include/mach/mfp.h	modified	+1	−300	View file
arch/arm/mach-pxa/include/mach/mmc.h	modified	+5	−0	View file
arch/arm/mach-pxa/include/mach/palmtc.h	added	+86	−0	View file
arch/arm/mach-pxa/include/mach/palmtx.h	modified	+5	−0	View file
arch/arm/mach-pxa/include/mach/pxa3xx-regs.h	modified	+2	−2	View file
arch/arm/mach-pxa/include/mach/pxafb.h	modified	+2	−1	View file
arch/arm/mach-pxa/include/mach/regs-intc.h	modified	+11	−0	View file
arch/arm/mach-pxa/include/mach/uncompress.h	modified	+1	−1	View file
arch/arm/mach-pxa/irq.c	modified	+7	−1	View file
arch/arm/mach-pxa/littleton.c	modified	+5	−38	View file
arch/arm/mach-pxa/lubbock.c	modified	+11	−7	View file
arch/arm/mach-pxa/magician.c	modified	+11	−48	View file
arch/arm/mach-pxa/mainstone.c	modified	+10	−6	View file
arch/arm/mach-pxa/mioa701.c	modified	+15	−69	View file
arch/arm/mach-pxa/palmld.c	modified	+43	−100	View file
arch/arm/mach-pxa/palmt5.c	modified	+7	−104	View file
arch/arm/mach-pxa/palmtc.c	added	+436	−0	View file
arch/arm/mach-pxa/palmte2.c	modified	+6	−104	View file
arch/arm/mach-pxa/palmtx.c	modified	+123	−102	View file
arch/arm/mach-pxa/palmz72.c	modified	+8	−108	View file
arch/arm/mach-pxa/pcm990-baseboard.c	modified	+52	−15	View file
arch/arm/mach-pxa/poodle.c	modified	+9	−71	View file
arch/arm/mach-pxa/pxa2xx.c	modified	+1	−0	View file
arch/arm/mach-pxa/pxa300.c	modified	+2	−0	View file
arch/arm/mach-pxa/pxa320.c	modified	+2	−0	View file
arch/arm/mach-pxa/pxa930.c	modified	+18	−1	View file
arch/arm/mach-pxa/spitz.c	modified	+139	−99	View file
arch/arm/mach-pxa/tosa.c	modified	+12	−79	View file
arch/arm/mach-pxa/treo680.c	modified	+33	−126	View file
arch/arm/mach-pxa/trizeps4.c	modified	+4	−0	View file
arch/arm/mach-pxa/xcep.c	added	+187	−0	View file
arch/arm/mach-pxa/zylonite.c	modified	+3	−0	View file
arch/arm/mach-realview/core.c	modified	+12	−12	View file
arch/arm/mach-realview/core.h	modified	+2	−2	View file
arch/arm/mach-realview/realview_eb.c	modified	+20	−20	View file
arch/arm/mach-realview/realview_pb1176.c	modified	+20	−20	View file
arch/arm/mach-realview/realview_pb11mp.c	modified	+20	−20	View file
arch/arm/mach-realview/realview_pba8.c	modified	+20	−20	View file
arch/arm/mach-realview/realview_pbx.c	modified	+20	−20	View file
arch/arm/mach-s3c2410/Kconfig	modified	+5	−0	View file
arch/arm/mach-s3c2412/Kconfig	modified	+3	−0	View file
arch/arm/mach-s3c2440/Kconfig	modified	+6	−0	View file
arch/arm/mach-s3c6400/Kconfig	modified	+1	−0	View file
arch/arm/mach-s3c6410/Kconfig	modified	+1	−0	View file
arch/arm/mach-sa1100/dma.c	modified	+1	−1	View file
arch/arm/mach-u300/Kconfig	modified	+12	−0	View file
arch/arm/mach-u300/Makefile	modified	+3	−0	View file
arch/arm/mach-u300/core.c	modified	+12	−2	View file
arch/arm/mach-u300/dummyspichip.c	added	+290	−0	View file
arch/arm/mach-u300/gpio.c	modified	+0	−13	View file
arch/arm/mach-u300/i2c.c	added	+43	−0	View file
arch/arm/mach-u300/i2c.h	added	+23	−0	View file
arch/arm/mach-u300/include/mach/memory.h	modified	+8	−0	View file
arch/arm/mach-u300/include/mach/syscon.h	modified	+113	−7	View file
arch/arm/mach-u300/mmc.c	modified	+20	−2	View file
arch/arm/mach-u300/padmux.c	modified	+352	−43	View file
arch/arm/mach-u300/padmux.h	modified	+24	−4	View file
arch/arm/mach-u300/spi.c	added	+124	−0	View file
arch/arm/mach-u300/spi.h	added	+26	−0	View file
arch/arm/mach-u300/timer.c	modified	+15	−0	View file
arch/arm/mach-versatile/core.c	modified	+2	−2	View file
arch/arm/mach-versatile/versatile_pb.c	modified	+2	−2	View file
arch/arm/mm/Kconfig	modified	+5	−0	View file
arch/arm/mm/fault.c	modified	+62	−48	View file
arch/arm/mm/init.c	modified	+8	−0	View file
arch/arm/plat-pxa/dma.c	modified	+264	−17	View file
arch/arm/plat-pxa/include/plat/mfp.h	modified	+71	−2	View file
arch/arm/plat-pxa/mfp.c	modified	+3	−0	View file
arch/arm/plat-s3c/gpio.c	modified	+1	−1	View file
arch/arm/plat-s3c64xx/dma.c	modified	+3	−3	View file
arch/arm/plat-s3c64xx/include/plat/dma-plat.h	modified	+1	−1	View file
arch/arm/plat-s3c64xx/include/plat/irqs.h	modified	+9	−1	View file
arch/arm/plat-s3c64xx/s3c6400-clock.c	modified	+5	−3	View file
arch/arm/plat-stmp3xxx/dma.c	modified	+1	−1	View file
arch/arm/tools/mach-types	modified	+16	−4	View file
drivers/i2c/busses/Kconfig	modified	+2	−2	View file
drivers/mmc/host/mmci.c	modified	+86	−23	View file
drivers/mmc/host/mmci.h	modified	+2	−1	View file
drivers/mmc/host/pxamci.c	modified	+93	−11	View file
drivers/net/irda/pxaficp_ir.c	modified	+41	−6	View file
drivers/pcmcia/Makefile	modified	+1	−0	View file
drivers/pcmcia/pxa2xx_base.c	modified	+11	−7	View file
drivers/pcmcia/pxa2xx_palmtc.c	added	+230	−0	View file
drivers/rtc/rtc-pxa.c	modified	+15	−12	View file
drivers/rtc/rtc-sa1100.c	modified	+13	−10	View file
drivers/serial/pxa.c	modified	+14	−6	View file
drivers/spi/amba-pl022.c	modified	+4	−4	View file
drivers/spi/pxa2xx_spi.c	modified	+16	−14	View file
drivers/usb/host/ohci-pxa27x.c	modified	+19	−11	View file
drivers/video/backlight/da903x_bl.c	modified	+12	−8	View file
drivers/video/pxafb.c	modified	+19	−13	View file
arch/arm/include/asm/mach/mmc.h → include/linux/amba/mmci.h	renamed	+5	−4	View file
include/linux/amba/pl022.h	modified	+4	−4	View file
include/linux/fb.h	modified	+1	−0	View file
sound/arm/pxa2xx-ac97.c	modified	+11	−9	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/arm/tcm.txt

View file

diff --git a/Documentation/arm/tcm.txt b/Documentation/arm/tcm.txt
new file mode 100644
index 0000000..074f4be
--- /dev/null
+++ b/Documentation/arm/tcm.txt
@@ -0,0 +1,145 @@
+ARM TCM (Tightly-Coupled Memory) handling in Linux
+----
+Written by Linus Walleij <[email protected]>
+
+Some ARM SoC:s have a so-called TCM (Tightly-Coupled Memory).
+This is usually just a few (4-64) KiB of RAM inside the ARM
+processor.
+
+Due to being embedded inside the CPU The TCM has a
+Harvard-architecture, so there is an ITCM (instruction TCM)
+and a DTCM (data TCM). The DTCM can not contain any
+instructions, but the ITCM can actually contain data.
+The size of DTCM or ITCM is minimum 4KiB so the typical
+minimum configuration is 4KiB ITCM and 4KiB DTCM.
+
+ARM CPU:s have special registers to read out status, physical
+location and size of TCM memories. arch/arm/include/asm/cputype.h
+defines a CPUID_TCM register that you can read out from the
+system control coprocessor. Documentation from ARM can be found
+at http://infocenter.arm.com, search for "TCM Status Register"
+to see documents for all CPUs. Reading this register you can
+determine if ITCM (bit 0) and/or DTCM (bit 16) is present in the
+machine.
+
+There is further a TCM region register (search for "TCM Region
+Registers" at the ARM site) that can report and modify the location
+size of TCM memories at runtime. This is used to read out and modify
+TCM location and size. Notice that this is not a MMU table: you
+actually move the physical location of the TCM around. At the
+place you put it, it will mask any underlying RAM from the
+CPU so it is usually wise not to overlap any physical RAM with
+the TCM. The TCM memory exists totally outside the MMU and will
+override any MMU mappings.
+
+Code executing inside the ITCM does not "see" any MMU mappings
+and e.g. register accesses must be made to physical addresses.
+
+TCM is used for a few things:
+
+- FIQ and other interrupt handlers that need deterministic
+  timing and cannot wait for cache misses.
+
+- Idle loops where all external RAM is set to self-refresh
+  retention mode, so only on-chip RAM is accessible by
+  the CPU and then we hang inside ITCM waiting for an
+  interrupt.
+
+- Other operations which implies shutting off or reconfiguring
+  the external RAM controller.
+
+There is an interface for using TCM on the ARM architecture
+in <asm/tcm.h>. Using this interface it is possible to:
+
+- Define the physical address and size of ITCM and DTCM.
+
+- Tag functions to be compiled into ITCM.
+
+- Tag data and constants to be allocated to DTCM and ITCM.
+
+- Have the remaining TCM RAM added to a special
+  allocation pool with gen_pool_create() and gen_pool_add()
+  and provice tcm_alloc() and tcm_free() for this
+  memory. Such a heap is great for things like saving
+  device state when shutting off device power domains.
+
+A machine that has TCM memory shall select HAVE_TCM in
+arch/arm/Kconfig for itself, and then the
+rest of the functionality will depend on the physical
+location and size of ITCM and DTCM to be defined in
+mach/memory.h for the machine. Code that needs to use
+TCM shall #include <asm/tcm.h> If the TCM is not located
+at the place given in memory.h it will be moved using
+the TCM Region registers.
+
+Functions to go into itcm can be tagged like this:
+int __tcmfunc foo(int bar);
+
+Variables to go into dtcm can be tagged like this:
+int __tcmdata foo;
+
+Constants can be tagged like this:
+int __tcmconst foo;
+
+To put assembler into TCM just use
+.section ".tcm.text" or .section ".tcm.data"
+respectively.
+
+Example code:
+
+#include <asm/tcm.h>
+
+/* Uninitialized data */
+static u32 __tcmdata tcmvar;
+/* Initialized data */
+static u32 __tcmdata tcmassigned = 0x2BADBABEU;
+/* Constant */
+static const u32 __tcmconst tcmconst = 0xCAFEBABEU;
+
+static void __tcmlocalfunc tcm_to_tcm(void)
+{
+	int i;
+	for (i = 0; i < 100; i++)
+		tcmvar ++;
+}
+
+static void __tcmfunc hello_tcm(void)
+{
+	/* Some abstract code that runs in ITCM */
+	int i;
+	for (i = 0; i < 100; i++) {
+		tcmvar ++;
+	}
+	tcm_to_tcm();
+}
+
+static void __init test_tcm(void)
+{
+	u32 *tcmem;
+	int i;
+
+	hello_tcm();
+	printk("Hello TCM executed from ITCM RAM\n");
+
+	printk("TCM variable from testrun: %u @ %p\n", tcmvar, &tcmvar);
+	tcmvar = 0xDEADBEEFU;
+	printk("TCM variable: 0x%x @ %p\n", tcmvar, &tcmvar);
+
+	printk("TCM assigned variable: 0x%x @ %p\n", tcmassigned, &tcmassigned);
+
+	printk("TCM constant: 0x%x @ %p\n", tcmconst, &tcmconst);
+
+	/* Allocate some TCM memory from the pool */
+	tcmem = tcm_alloc(20);
+	if (tcmem) {
+		printk("TCM Allocated 20 bytes of TCM @ %p\n", tcmem);
+		tcmem[0] = 0xDEADBEEFU;
+		tcmem[1] = 0x2BADBABEU;
+		tcmem[2] = 0xCAFEBABEU;
+		tcmem[3] = 0xDEADBEEFU;
+		tcmem[4] = 0x2BADBABEU;
+		for (i = 0; i < 5; i++)
+			printk("TCM tcmem[%d] = %08x\n", i, tcmem[i]);
+		tcm_free(tcmem, 20);
+	}
+}

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index e797c4d..c450f3a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -683,7 +683,7 @@ S:	Maintained
 ARM/INTEL IXP4XX ARM ARCHITECTURE
 M:	Imre Kaloz <[email protected]>
 M:	Krzysztof Halasa <[email protected]>
-L:	[email protected]
+L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
 F:	arch/arm/mach-ixp4xx/
 
@@ -740,18 +740,22 @@ M:	Dmitry Eremin-Solenikov <[email protected]>
 M:	Dirk Opfer <[email protected]>
 S:	Maintained
 
-ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT
-M:	Marek Vasut <[email protected]>
+ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
+P:	Marek Vasut
+M:	[email protected]
+L:	[email protected]
 W:	http://hackndev.com
 S:	Maintained
 
 ARM/PALM TREO 680 SUPPORT
 M:	Tomas Cech <[email protected]>
+L:	[email protected]
 W:	http://hackndev.com
 S:	Maintained
 
 ARM/PALMZ72 SUPPORT
 M:	Sergey Lapin <[email protected]>
+L:	[email protected]
 W:	http://hackndev.com
 S:	Maintained
 

arch/arm/Kconfig

View file

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d778a69..1c4119c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -46,6 +46,10 @@ config GENERIC_CLOCKEVENTS_BROADCAST
 	depends on GENERIC_CLOCKEVENTS
 	default y if SMP && !LOCAL_TIMERS
 
+config HAVE_TCM
+	bool
+	select GENERIC_ALLOCATOR
+
 config NO_IOPORT
 	bool
 
@@ -649,6 +653,7 @@ config ARCH_U300
 	bool "ST-Ericsson U300 Series"
 	depends on MMU
 	select CPU_ARM926T
+	select HAVE_TCM
 	select ARM_AMBA
 	select ARM_VIC
 	select GENERIC_TIME

arch/arm/common/locomo.c

View file

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index 2293f0c..bd36c77 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -865,6 +865,7 @@ void locomo_gpio_set_dir(struct device *dev, unsigned int bits, unsigned int dir
 
 	spin_unlock_irqrestore(&lchip->lock, flags);
 }
+EXPORT_SYMBOL(locomo_gpio_set_dir);
 
 int locomo_gpio_read_level(struct device *dev, unsigned int bits)
 {
@@ -882,6 +883,7 @@ int locomo_gpio_read_level(struct device *dev, unsigned int bits)
 	ret &= bits;
 	return ret;
 }
+EXPORT_SYMBOL(locomo_gpio_read_level);
 
 int locomo_gpio_read_output(struct device *dev, unsigned int bits)
 {
@@ -899,6 +901,7 @@ int locomo_gpio_read_output(struct device *dev, unsigned int bits)
 	ret &= bits;
 	return ret;
 }
+EXPORT_SYMBOL(locomo_gpio_read_output);
 
 void locomo_gpio_write(struct device *dev, unsigned int bits, unsigned int set)
 {
@@ -920,6 +923,7 @@ void locomo_gpio_write(struct device *dev, unsigned int bits, unsigned int set)
 
 	spin_unlock_irqrestore(&lchip->lock, flags);
 }
+EXPORT_SYMBOL(locomo_gpio_write);
 
 static void locomo_m62332_sendbit(void *mapbase, int bit)
 {
@@ -1084,13 +1088,12 @@ void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int 
 
 	spin_unlock_irqrestore(&lchip->lock, flags);
 }
+EXPORT_SYMBOL(locomo_m62332_senddata);
 
 /*
  *	Frontlight control
  */
 
-static struct locomo *locomo_chip_driver(struct locomo_dev *ldev);
-
 void locomo_frontlight_set(struct locomo_dev *dev, int duty, int vr, int bpwf)
 {
 	unsigned long flags;
@@ -1182,11 +1185,13 @@ int locomo_driver_register(struct locomo_driver *driver)
 	driver->drv.bus = &locomo_bus_type;
 	return driver_register(&driver->drv);
 }
+EXPORT_SYMBOL(locomo_driver_register);
 
 void locomo_driver_unregister(struct locomo_driver *driver)
 {
 	driver_unregister(&driver->drv);
 }
+EXPORT_SYMBOL(locomo_driver_unregister);
 
 static int __init locomo_init(void)
 {
@@ -1208,11 +1213,3 @@ module_exit(locomo_exit);
 MODULE_DESCRIPTION("Sharp LoCoMo core driver");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("John Lenz <[email protected]>");
-
-EXPORT_SYMBOL(locomo_driver_register);
-EXPORT_SYMBOL(locomo_driver_unregister);
-EXPORT_SYMBOL(locomo_gpio_set_dir);
-EXPORT_SYMBOL(locomo_gpio_read_level);
-EXPORT_SYMBOL(locomo_gpio_read_output);
-EXPORT_SYMBOL(locomo_gpio_write);
-EXPORT_SYMBOL(locomo_m62332_senddata);

arch/arm/common/vic.c

View file

diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 920ced0..f232941 100644
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -22,6 +22,7 @@
 #include <linux/list.h>
 #include <linux/io.h>
 #include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/amba/bus.h>
 
 #include <asm/mach/irq.h>

arch/arm/configs/littleton_defconfig

View before deletion

diff --git a/arch/arm/configs/littleton_defconfig b/arch/arm/configs/littleton_defconfig
deleted file mode 100644
index 1db4969..0000000
--- a/arch/arm/configs/littleton_defconfig
+++ /dev/null
@@ -1,783 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24-rc5
-# Fri Dec 21 11:06:19 2007
-#
-CONFIG_ARM=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_TIME=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_MMU=y
-# CONFIG_NO_IOPORT is not set
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ZONE_DMA=y
-CONFIG_ARCH_MTD_XIP=y
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-# CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CGROUPS is not set
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_FAIR_USER_SCHED=y
-# CONFIG_FAIR_CGROUP_SCHED is not set
-CONFIG_SYSFS_DEPRECATED=y
-# CONFIG_RELAY is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL=y
-# CONFIG_EMBEDDED is not set
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_KMOD is not set
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
-# CONFIG_BLK_DEV_BSG is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-
-#
-# System Type
-#
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS7500 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CO285 is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_PNX4008 is not set
-CONFIG_ARCH_PXA=y
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_OMAP is not set
-
-#
-# Intel PXA2xx/PXA3xx Implementations
-#
-
-#
-# Supported PXA3xx Processor Variants
-#
-CONFIG_CPU_PXA300=y
-CONFIG_CPU_PXA310=y
-# CONFIG_CPU_PXA320 is not set
-# CONFIG_ARCH_LUBBOCK is not set
-# CONFIG_MACH_LOGICPD_PXA270 is not set
-# CONFIG_MACH_MAINSTONE is not set
-# CONFIG_ARCH_PXA_IDP is not set
-# CONFIG_PXA_SHARPSL is not set
-# CONFIG_MACH_TRIZEPS4 is not set
-# CONFIG_MACH_EM_X270 is not set
-# CONFIG_MACH_ZYLONITE is not set
-CONFIG_MACH_LITTLETON=y
-# CONFIG_MACH_ARMCORE is not set
-CONFIG_PXA3xx=y
-CONFIG_PXA_SSP=y
-
-#
-# Boot options
-#
-
-#
-# Power management
-#
-
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_XSC3=y
-CONFIG_CPU_32v5=y
-CONFIG_CPU_ABRT_EV5T=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_IO_36=y
-
-#
-# Processor Features
-#
-# CONFIG_ARM_THUMB is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_BPREDICT_DISABLE is not set
-# CONFIG_OUTER_CACHE is not set
-CONFIG_IWMMXT=y
-
-#
-# Bus support
-#
-# CONFIG_PCI_SYSCALL is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_PCCARD is not set
-
-#
-# Kernel Features
-#
-CONFIG_TICK_ONESHOT=y
-# CONFIG_NO_HZ is not set
-# CONFIG_HIGH_RES_TIMERS is not set
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_PREEMPT=y
-CONFIG_HZ=100
-CONFIG_AEABI=y
-CONFIG_OABI_COMPAT=y
-# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4096
-# CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_ALIGNMENT_TRAP=y
-
-#
-# Boot options
-#
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs nfsroot=192.168.1.100:/nfsroot/ ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on console=ttyS2,38400 mem=64M"
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_KEXEC is not set
-
-#
-# CPU Frequency scaling
-#
-# CONFIG_CPU_FREQ is not set
-
-#
-# Floating point emulation
-#
-
-#
-# At least one emulation must be selected
-#
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_NWFPE_XP is not set
-# CONFIG_FPE_FASTFPE is not set
-
-#
-# Userspace binary formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Power management options
-#
-# CONFIG_PM is not set
-CONFIG_SUSPEND_UP_POSSIBLE=y
-
-#
-# Networking
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set