aboutsummaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/crypto-2.6Herbert Xu2010-05-261757-38182/+89906
|\
| * Merge branch 'alpha-next' of ↵Linus Torvalds2010-05-254-62/+42
| |\ | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6 * 'alpha-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6: alpha: simplify and optimize sched_find_first_bit alpha: invoke oom-killer from page fault Convert alpha to use clocksources instead of arch_gettimeoffset
| | * alpha: simplify and optimize sched_find_first_bitMatt Turner2010-05-261-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search only the first 100 bits instead of 140, saving a couple instructions. The resulting code is about 1/3 faster (40K ticks/1000 iterations down to 30K ticks/1000 iterations). Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ingo Molnar <mingo@elte.hu> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: linux-alpha@vger.kernel.org Acked-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Matt Turner <mattst88@gmail.com>
| | * alpha: invoke oom-killer from page faultNick Piggin2010-05-261-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As explained in commit 1c0fe6e3bd, we want to call the architecture independent oom killer when getting an unexplained OOM from handle_mm_fault, rather than simply killing current. [mattst88: kill now unused 'survive' label] Cc: linux-alpha@vger.kernel.org Cc: Richard Henderson <rth@twiddle.net> Cc: linux-arch@vger.kernel.org Acked-by: David Rientjes <rientjes@google.com> Signed-off-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Nick Piggin <npiggin@suse.de>
| | * Convert alpha to use clocksources instead of arch_gettimeoffsetJohn Stultz2010-05-262-42/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alpha has a tsc like rpcc counter that it uses to manage time. This can be converted to an actual clocksource instead of utilizing the arch_gettimeoffset method that is really only there for legacy systems with no continuous counter. Further cleanups could be made if alpha converted to the clockevent model. CC: Thomas Gleixner <tglx@linutronix.de> CC: Richard Henderson <rth@twiddle.net> Acked-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Tested-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Signed-off-by: Matt Turner <mattst88@gmail.com> Signed-off-by: John Stultz <johnstul@us.ibm.com>
| * | driver core: add devname module aliases to allow module on-demand auto-loadingKay Sievers2010-05-251-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds: alias: devname:<name> to some common kernel modules, which will allow the on-demand loading of the kernel module when the device node is accessed. Ideally all these modules would be compiled-in, but distros seems too much in love with their modularization that we need to cover the common cases with this new facility. It will allow us to remove a bunch of pretty useless init scripts and modprobes from init scripts. The static device node aliases will be carried in the module itself. The program depmod will extract this information to a file in the module directory: $ cat /lib/modules/2.6.34-00650-g537b60d-dirty/modules.devname # Device nodes to trigger on-demand module loading. microcode cpu/microcode c10:184 fuse fuse c10:229 ppp_generic ppp c108:0 tun net/tun c10:200 dm_mod mapper/control c10:235 Udev will pick up the depmod created file on startup and create all the static device nodes which the kernel modules specify, so that these modules get automatically loaded when the device node is accessed: $ /sbin/udevd --debug ... static_dev_create_from_modules: mknod '/dev/cpu/microcode' c10:184 static_dev_create_from_modules: mknod '/dev/fuse' c10:229 static_dev_create_from_modules: mknod '/dev/ppp' c108:0 static_dev_create_from_modules: mknod '/dev/net/tun' c10:200 static_dev_create_from_modules: mknod '/dev/mapper/control' c10:235 udev_rules_apply_static_dev_perms: chmod '/dev/net/tun' 0666 udev_rules_apply_static_dev_perms: chmod '/dev/fuse' 0666 A few device nodes are switched to statically allocated numbers, to allow the static nodes to work. This might also useful for systems which still run a plain static /dev, which is completely unsafe to use with any dynamic minor numbers. Note: The devname aliases must be limited to the *common* and *single*instance* device nodes, like the misc devices, and never be used for conceptually limited systems like the loop devices, which should rather get fixed properly and get a control node for losetup to talk to, instead of creating a random number of device nodes in advance, regardless if they are ever used. This facility is to hide the mess distros are creating with too modualized kernels, and just to hide that these modules are not compiled-in, and not to paper-over broken concepts. Thanks! :) Cc: Greg Kroah-Hartman <gregkh@suse.de> Cc: David S. Miller <davem@davemloft.net> Cc: Miklos Szeredi <miklos@szeredi.hu> Cc: Chris Mason <chris.mason@oracle.com> Cc: Alasdair G Kergon <agk@redhat.com> Cc: Tigran Aivazian <tigran@aivazian.fsnet.co.uk> Cc: Ian Kent <raven@themaw.net> Signed-Off-By: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-05-25167-3817/+5804
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits) ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900 ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline ARM: 6140/1: silence a bogus sparse warning in unwind.c ARM: mach-at91: duplicated include ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup ARM: SPEAR6xx: remove duplicated #include ARM: s3c6400_defconfig: Add NAND driver ARM: s3c6400_defconfig: enable sound as modules ARM: s3c6400_defconfig: enable power management ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34 ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34 ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34 ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34 ...
| | * Merge branch 'master' into develRussell King2010-05-2418-25/+41
| | |\
| | | * ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel ↵Alexander Holler2010-05-242-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmdline Add an option to force usage of the in-kernel cmdline even if the boot loader passes another command string to the kernel. Useful if someone cannot or don't want to change the command-line options of the boot loader but is able to change the kernel. Signed-off-by: Alexander Holler <holler@ahsoftware.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: 6140/1: silence a bogus sparse warning in unwind.cAlexander Shishkin2010-05-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for compiler which is supposed to miscompile unwind tables clearly has nothing to do with sparse (which does not define necessary macros anyway), so simply silence it. Signed-off-by: Alexander Shishkin <virtuoso@slind.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: mach-at91: duplicated includeAndrea Gelmini2010-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | arch/arm/mach-at91/board-sam9m10g45ek.c: mach/hardware.h is included more than once Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanupAndrea Gelmini2010-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | arch/arm/nwfpe/fpsr.h:33: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanupAndrea Gelmini2010-05-241-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arch/arm/mach-shark/pci.c:19: ERROR: trailing statements should be on next line arch/arm/mach-shark/pci.c:20: ERROR: trailing statements should be on next line arch/arm/mach-shark/pci.c:21: ERROR: trailing statements should be on next line arch/arm/mach-shark/pci.c:24: WARNING: externs should be avoided in .c files arch/arm/mach-shark/pci.c:28: WARNING: please, no space before tabs Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanupAndrea Gelmini2010-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | arch/arm/nwfpe/ChangeLog:75: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanupAndrea Gelmini2010-05-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arch/arm/mach-sa1100/leds.c:21: ERROR: code indent should use tabs where possible arch/arm/mach-sa1100/leds.c:21: WARNING: please, no space before tabs arch/arm/mach-sa1100/leds.c:22: ERROR: code indent should use tabs where possible arch/arm/mach-sa1100/leds.c:22: WARNING: please, no space before tabs arch/arm/mach-sa1100/leds.c:24: ERROR: code indent should use tabs where possible arch/arm/mach-sa1100/leds.c:24: WARNING: please, no space before tabs Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanupAndrea Gelmini2010-05-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arch/arm/mach-h720x/common.h:17: WARNING: space prohibited between function name and open parenthesis '(' arch/arm/mach-h720x/common.h:23: WARNING: space prohibited between function name and open parenthesis '(' Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanupAndrea Gelmini2010-05-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | arch/arm/mach-footbridge/ebsa285-pci.c:22: ERROR: switch and case should be at the same indent Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanupAndrea Gelmini2010-05-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | arch/arm/mach-clps711x/Makefile.boot:2: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanupAndrea Gelmini2010-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | arch/arm/boot/bootp/bootp.lds:22: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: SPEAR6xx: remove duplicated #includeHuang Weiyi2010-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicated #include('s) in arch/arm/mach-spear6xx/spear6xx.c Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: Continue removing useless bootmem.h includesRussell King2010-05-233-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch those which have been missed by 6262c92f because they were submitted via other routes. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: 6139/1: ARMv7: Use the Inner Shareable I-cache on MPSantosh Shilimkar2010-05-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the flush_cache_all for ARMv7 SMP.It was missing from commit b8349b569aae661dea9d59d7d2ee587ccea3336c Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Cc: <stable@kernel.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * ARM: 6135/1: mx21/devices: fix USBOTG resourceWolfram Sang2010-05-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It got a typo from 988addf82e4c03739375279de73929580a2d4a6a. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: <stable@kernel.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | Merge branch 'devel-stable' into develRussell King2010-05-24146-3791/+5701
| | |\ \
| | | * \ Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into ↵Russell King2010-05-24116-3664/+4784
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devel-stable Conflicts: arch/arm/Kconfig
| | | | * | ARM: s3c6400_defconfig: Add NAND driverBen Dooks2010-05-231-1/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the NAND driver to the list of inbuilt devices. Signed-of-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: s3c6400_defconfig: enable sound as modulesBen Dooks2010-05-231-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ASoC/ALSA configuration for s3c6400_defconfig as modules Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: s3c6400_defconfig: enable power managementBen Dooks2010-05-231-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable power management in the default build Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34Ben Dooks2010-05-231-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the s5pv210_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34Ben Dooks2010-05-231-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the s5pc110_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34Ben Dooks2010-05-231-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the s5p6442_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34Ben Dooks2010-05-231-17/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the s5p6440_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34Ben Dooks2010-05-231-34/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the s3c6400_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34Ben Dooks2010-05-231-317/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the s3c2410_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: s5pc100_defconfig: change ARCH_S5PC1XX to ARCH_S5PC100Ben Dooks2010-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixup the defconfig post the latest moves, so ARCH_S5PC1XX becomes ARCH_S5PC100 which is sufficient to get the system building. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: S5PC100: Fixup merge problemsBen Dooks2010-05-234-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Between problems with Kconfig and merging commits from several different sources, it seems the s5pc100 build's move from plat-s5pc11 has had a few problems. Since I do not have the trees to rebuild this quickly, the easiest thing is to simply fix the errors found once the s5pc100_defconfig actually builds. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: S5PC100: DMA: Add platform devices for PL330 DMACsJassi Brar2010-05-234-0/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Samsung's Soc S5PC100 has three PL330 DMACs. First is dedicated for Memory->Memory data transfer while the other two meant for data transfer with peripherals. Define and add latter two PL330 DMACs as platform devices on the S5PC100 platform. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: S5PC100: Fix definition of IRQ_EINT()Ben Dooks2010-05-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somewhere during the latest platform cleanups the IRQ_EINT definition got broken, so fix it by replacing it in <mach/irqs.h> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: SAMSUNG: fix suspend/resume on if some GPIO banks not presentPinkava J2010-05-231-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When saving GPIOs during suspend/resume we need skip missing GPIO banks, not trying get corresponding chip again and again in infinite loop. Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz> [ben-linux@fluff.org: shorten subject] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: S3C64XX: PM: Synchronise wakeup mask on suspendBen Dooks2010-05-202-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new wakeup mask synchronisation code to set the relevant wakeup mask bits. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: SAMSUNG: Add support for interrupt wakeup-sourcesBen Dooks2010-05-204-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for wakeup-mask style interrupts that share a single mask register for various different interrupts. This registers a set of interrupt->bit mappings and the register they belong to. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: SAMSUNG: Make ADC client SMP safeBen Dooks2010-05-201-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change local_irq disable calls to use spinlocks to ensure that the ADC driver data is protected against multiple access.. Note, this does not protect the client's data, and the client should ensure it does not make multiple calls to the ADC driver. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: S5P6440: Add locking to GPIO callsBen Dooks2010-05-201-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the new locking calls to ensure that these are always exclusively accessing the GPIO registers. Fixes a possible race between two threads modifying the same GPIO bank, Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: S5PV210: Add temporary <mach/regs-fb.h>Ben Dooks2010-05-201-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add temporary <mach/regs-fb.h> until the new framebuffer driver can be merged. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: S5PV210: Fixup ADC device changeBen Dooks2010-05-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the ADC device is touched only if S3C_DEV_ADC is selected. Fixes: arch/arm/mach-s5pv210/built-in.o: In function `s5pv210_map_io': /home/kgene/bjdooks/arch/arm/mach-s5pv210/cpu.c:92: undefined reference to `s3c_device_adc' Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: SAMSUNG: Fixup merge problemBen Dooks2010-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixup merge which re-introduced the setup-i2c0 helper Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: SAMSUNG: Fixup convert arm to arch_gettimeoffset()Ben Dooks2010-05-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixup commit 5cfc8ee0bb5134e1204e1ec5843e164f24315021 which introduced ARCH_USES_GETTIMEOFFSET but missed out several S5P architectures. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | ARM: Merge for-2635-4/onenandBen Dooks2010-05-2019-12/+368
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'for-2635-4/onenand' into for-2635-4/partial2 Conflicts: arch/arm/mach-s5pc100/cpu.c arch/arm/mach-s5pc100/include/mach/map.h arch/arm/mach-s5pv210/Makefile
| | | | | * | ARM: SAMSUNG: Add platform support code for OneNAND controllerMarek Szyprowski2010-05-2019-0/+320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds setup code for Samsung OneNAND controller driver. The driver needs to be aware on which SoC it is running, so the actual device id is being changed in cpu init code. S3C64xx SoCs have 2 OneNAND controllers while S5PC100 and S5PC110 has only one. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> [ben-linux@fluff.org: sort map.h entries] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | * | | ARM: Merge for-2635-4/watchdogBen Dooks2010-05-2015-26/+66
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'for-2635-4/watchdog' into for-2635-4/partial2 Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c arch/arm/mach-s5p6440/Kconfig arch/arm/mach-s5p6440/include/mach/map.h arch/arm/mach-s5p6440/mach-smdk6440.c arch/arm/mach-s5pv210/Kconfig arch/arm/mach-s5pv210/include/mach/map.h arch/arm/mach-s5pv210/mach-smdkv210.c