aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* libata-sff: make BMDMA optionalTejun Heo2010-05-25
| | | | | | | | | | | | | | | | | | | | | Make BMDMA optional depending on new config variable CONFIG_ATA_BMDMA. In Kconfig, drivers are grouped into five groups - non-SFF native, SFF w/ custom DMA interface, SFF w/ BMDMA, PIO-only SFF, and generic fallback / legacy ones. Kconfig and Makefile are reorganized according to the groups and ordered alphabetically inside each group. ata_ioports.bmdma_addr and ata_port.bmdma_prd[_dma] are put into CONFIG_ATA_BMDMA, as are all bmdma related ops, variables and functions. This increase the binary size slightly when BMDMA is enabled but on both native-only and PIO-only configurations the size is slightly reduced. Either way, the size difference is insignificant. This change is more meaningful to signify the separation between SFF and BMDMA and as a tool to verify the separation. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
* libata-sff: kill dummy BMDMA ops from sata_qstor and pata_octeon_cfTejun Heo2010-05-25
| | | | | | | | | Now that SFF and BMDMA are completely separate, sata_qstor and pata_octeon_cf which inherit from ata_sff_port_ops don't need to worry about BMDMA ops being called. Kill the dummy BMDMA ops. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
* libata-sff: separate out BMDMA initTejun Heo2010-05-25
| | | | | | | | | Separate out ata_pci_bmdma_prepare_host() and ata_pci_bmdma_init_one() from their SFF counterparts. SFF ones no longer try to initialize BMDMA or set PCI master. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
* libata-sff: separate out BMDMA irq handlerTejun Heo2010-05-25
| | | | | | | | | | | | | | | | | | Separate out BMDMA irq handler from SFF irq handler. The misnamed host_intr() functions are renamed to ata_sff_port_intr() and ata_bmdma_port_intr(). Common parts are factored into __ata_sff_port_intr() and __ata_sff_interrupt() and used by sff and bmdma interrupt routines. All BMDMA drivers now use ata_bmdma_interrupt() or ata_bmdma_port_intr() while all non-BMDMA SFF ones use ata_sff_interrupt() or ata_sff_port_intr(). For now, ata_pci_sff_init_one() uses ata_bmdma_interrupt() as it's used by both SFF and BMDMA drivers. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
* libata-sff: ata_sff_irq_clear() is BMDMA specificTejun Heo2010-05-25
| | | | | | | | | | | | | ata_sff_irq_clear() is BMDMA specific. Rename it to ata_bmdma_irq_clear(), move it to ata_bmdma_port_ops and make ->sff_irq_clear() optional. Note: ata_bmdma_irq_clear() is actually only needed by ata_piix and possibly by sata_sil. This should be moved to respective low level drivers later. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
* sata_mv: drop unncessary EH callback resettingTejun Heo2010-05-25
| | | | | | | | | Now that BMDMA EH ops are separated out from SFF ops, mv5_ops doesn't have to explicitly reset ->error_handler() and ->post_internal_cmd(). Drop them. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
* Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-05-25
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-24
| |\
| | * ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel ↵Alexander Holler2010-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | 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-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-20
| | | | | | | | | | | | | | | | | | | | | | | | 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-24
| |\ \
| | * \ Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into ↵Russell King2010-05-24
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devel-stable Conflicts: arch/arm/Kconfig
| | | * | ARM: s3c6400_defconfig: Add NAND driverBen Dooks2010-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-20
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-20
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-25 19:09:06 -0500