aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [ARM] Off-by-one in arch/arm/common/icst*Eric Sesterhenn2006-09-27
| | | | | | | | | | | hi, a quick find -iname \*.[ch] | xargs grep "> ARRAY_SIZE(", revealed these in the icst drivers. If i == ARRAY_SIZE, we get past the idx2s array. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3864/1: Refactore sharpsl_pmDirk Opfer2006-09-27
| | | | | | | | This patch adds another hook into sharpsl_pm to notify the machine specific driver immediately after resume. This is needed to support the Sharp SL-6000 (Tosa). Signed-off-by: Dirk Opfer <Dirk@Opfer-Online.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3863/1: Add Locomo SPI DeviceDirk Opfer2006-09-27
| | | | | | | | The Locomo chip has a SPI interface which is used for SD/MMC cards (only collie). This patch adds the definition for the SPI device inside the Locomo chip. Signed-off-by: Dirk Opfer <Dirk@Opfer-Online.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3847/2: Convert LOMOMO to use struct device for GPIOsRichard Purdie2006-09-27
| | | | | | | | | | Convert LOMOMO to use struct device * for GPIOs instead of struct locomo_dev. This enables access to the GPIOs from code which is not a locomo device itself (such as audio). Access for gpio 31 is removed for error handling (no such hardware exists). Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream ↵Russell King2006-09-27
|\ | | | | | | into devel
| * ARM: OMAP: Remove common pm.cTony Lindgren2006-09-25
| | | | | | | | | | | | There is now separate pm.c for OMAP1 and OMAP2. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Sync clocks with linux-omap treeTony Lindgren2006-09-25
| | | | | | | | | | | | | | Mostly clean up CONFIG_OMAP_RESET_CLOCKS. Also includes a patch from Imre Deak to make McSPI clocks use id. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * [PATCH] ARM: OMAP: Check gpio_fck not gpio_ickKomal Shah2006-09-25
| | | | | | | | | | | | | | Check gpio_fck not gpio_ick. Signed-off-by: Komal Shah <komal_shah802003@yahoo.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Sync DMA with linux-omap treeTony Lindgren2006-09-25
| | | | | | | | | | | | | | | | This patch syncs OMAP DMA code with linux-omap tree. Mostly allow changing DMA callback function and set OMAP2 specific transfer mode. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP2: Make sure peripherals can be accessed after clk_enableJuha Yrjola2006-09-25
| | | | | | | | | | | | | | | | Some peripherals seem to need additional delay until they can actually be accessed after enabling their FCLK and ICLK. Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP2: Keep both APLLs active during bootupJuha Yrjola2006-09-25
| | | | | | | | | | | | | | | | | | Enabling and disabling the 54 MHz and 96 MHz APLLs can happen unnecessarily often during bootup. Make sure they're kept enabled during init. Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Add sanity check to clk_disableJuha Yrjola2006-09-25
| | | | | | | | | | | | | | BUG() if the clock use count is already zero. Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: GPIO: IRQSTATUS2 workaround for retention stateHiroshi DOYU2006-09-25
| | | | | | | | | | | | | | | | | | | | | | | | | | In OMAP2420, an incoming GPIO interrupt always sets both GPIO_IRQSTATUS1 and GPIO_IRQSTATUS2, even if the relevant bit is disabled in GPIO_IRQENABLE1/2 and DSP doesn't use GPIO at all. GPIO_IRQSTATUS1 is for MPU and GPIO_IRQSTATUS2 is for DSP. If IRQSTATUS is set, this will prevent the system from going to idle state. This patch also clears IRQSTATUS2 to avoid the above situation. Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com> Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Fix typo for 24xx GPIO resumeTony Lindgren2006-09-25
| | | | | | | | | | | | Fix typo for 24xx GPIO resume Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: OMAP2 dmtimer power management supportJuha Yrjola2006-09-25
| | | | | | | | | | | | | | | | GPT1 will be set into non-posted mode, and the wakeup register is set for all timers. Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Add support for forcing osc_ck onJuha Yrjola2006-09-25
| | | | | | | | | | | | | | | | | | Some boards might use the oscillator clock for powering external peripherals. Add support for making sure osc_ck stays active even when trying to go to sleep. Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Add enable/disable functions for dmtimerTimo Teras2006-09-25
| | | | | | | | | | | | | | | | Add enable/disable functions which effectively control the GPT iclk and fclk. Signed-off-by: Timo Teras <timo.teras@solidboot.com> Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Remove Remove superfluous/recursive locking for GPIODavid Brownell2006-09-25
| | | | | | | | | | | | | | Remove Remove superfluous/recursive locking for GPIO Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Fix spinlock recursion for dyntickTony Lindgren2006-09-25
| | | | | | | | | | | | | | Fix spinlock recursion for dyntick. Modified version based on Imre Deak's earlier patch. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Remove IVA IRQ bankKomal Shah2006-09-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ARM11 can't access the IVA interrupt controller from IVA slave port. From Richard Woodruff: "The 0x40000000 is an IVA-ARM7 local bus address. The IVA-INTC is NOT accessible through the IVA-L3-Slave Port. The current TRM does say this directly and indirectly in a few spots and in figures." Signed-off-by: Komal Shah <komal_shah802003@yahoo.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Reset GPIO irq state after free_irq()Tony Lindgren2006-09-25
| | | | | | | | | | | | This is needed to reset GPIO after free_irq(). Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Add write memory barriers to OMAP2 clock codeJuha Yrjola2006-09-25
| | | | | | | | | | | | | | | | | | | | After adjusting clock parameters, OMAP2 CPUs need a memory barrier to make sure the changes go into effect immediately. Otherwise bad things will happen if we try to access the peripheral whose clock is just being enabled. Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Fix OMAP2 clock.c typoSamuel Ortiz2006-09-25
| | | | | | | | | | | | | | | | | | A forgotten parenthesis in clock.c caused the PLL stabilization loop to not be executed correctly. Signed-off-by: Samuel Ortiz <samuel.ortiz@solidboot.com> Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Use GPT iclk only when neededTimo Teras2006-09-25
| | | | | | | | | | | | | | | | | | | | This patch makes the OMAP2 dmtimers module using the interface clocks only while the registers are accessed (except GPT1 which has iclk enabled all the time). Signed-off-by: Timo Teras <timo.teras@solidboot.com> Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: DMA source and destination addresses are unsignedTony Lindgren2006-09-25
| | | | | | | | | | | | Also export some omap24xx specific DMA functions. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP2: Dynamic allocator for GPMC memory spaceImre Deak2006-09-25
| | | | | | | | | | | | | | | | | | | | | | | | | | Add support for assigning memory regions dynamically to peripherals attached to GPMC interface. Platform specific code should now call gpmc_cs_request to get a free GPMC memory region instead of using a fixed address. Make the H4 and Apollon platform initialization use the new API. Signed-off-by: Imre Deak <imre.deak@solidboot.com> Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Add some extra #defines for Amstrad DeltaJonathan McDowell2006-09-25
| | | | | | | | | | | | | | | | | | | | This patch adds some further #defines regarding GPIOs and latch bits for the Amstrad Delta; the drivers that use them will be submitted at a later date but there's no reason not to have the information already there and available for use. Signed-off-by: Jonathan McDowell <noodles@earth.li> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Fix OMAP1 compilation after MPUIO check changeJonathan McDowell2006-09-25
| | | | | | | | | | | | | | | | | | The recent MPUIO range change fix breaks compilation if CONFIG_ARCH_OMAP24XX isn't defined; it should be OMAP_MAX_GPIO_LINES not MAX_GPIO_LINES I believe. This one liner fixes it. Signed-off-by: Jonathan McDowell <noodles@earth.li> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: mux: add config for 16xx SPI pinsMark Howell2006-09-25
| | | | | | | | | | | | | | | | | | This patch adds pin mux info for the SPI master/slave interface on OMAP16xx. Data from OMAP 1611/1612 TRM and errata. Works for me on my 1611/H2 with current git kernel. Signed-off-by: Mark Howell <mhowell@northlink.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Sleep is prevented when no LCD is attachedImre Deak2006-09-25
| | | | | | | | | | | | | | | | | | We have to make sure that the LCD DMA external destination bit is cleared by default, otherwise OMAP won't sleep. Signed-off-by: Imre Deak <imre.deak@solidboot.com> Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: GPIO: fix MPUIO checkImre Deak2006-09-25
| | | | | | | | | | | | | | | | | | - MPUIO doesn't exist on OMAP2 - no error was returned for too big MPUIO numbers Signed-off-by: Imre Deak <imre.deak@solidboot.com> Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Remove sys_ck and sys_clkout from McBSP for 24xxTony Lindgren2006-09-25
| | | | | | | | | | | | | | McBSP does not need sys_ck or sys_clkout. If the devices connected to McBSP need sys_clkout, they need to request it. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Apollon MMC supportKyungmin Park2006-09-25
| | | | | | | | | | | | | | | | | | | | Apollon board MMC supports on OMAP2 TODO: We have to check MMC on H4 Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: 2420 boot BUG(): failure to map SRAMKevin Hilman2006-09-25
| | | | | | | | | | | | | | | | | | ARM: OMAP: Fix SRAM static mapping for EMU devices. Fix SRAM static mapping for EMU devices. Signed-off-by: Kevin Hilman <khilman@deeprooted.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Added OMAP24xx camera IRQ definitionSamuel Ortiz2006-09-25
| | | | | | | | | | | | Signed-off-by: Samuel Ortiz <samuel.ortiz@solidboot.com> Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: timer32k: fix tick count calculation when reprogrammingImre Deak2006-09-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reprogramming takes places before putting the CPU into idle mode if the dynamic tick option is enabled. The timer is then set to expire at the next pending timer event. Because some time has already passed since the last reported jiffy we have to wait less than the time specified in jiffies. Also make sure we don't set a load value of 0 whose outcome is unspecified according to the TRM. Signed-off-by: Imre Deak <imre.deak@solidboot.com> Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Avoid sleeping during arch_resetTony Lindgren2006-09-25
| | | | | | | | | | | | | | If we call clk_get() from arch_reset we get ugly messages before reboot. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * [PATCH] pata_pdc2027x iomem annotationsAl Viro2006-09-24
| | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] fix idiocy in asd_init_lseq_mdp()Al Viro2006-09-24
| | | | | | | | | | | | | | | | | | | | | | To whoever had written that code: a) priority of >> is higher than that of & b) priority of typecast is higher than that of any binary operator c) learn the fscking C Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] SCSI gfp_t annotationsAl Viro2006-09-24
| | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] wrong thing iounmapped (qla3xxx)Al Viro2006-09-24
| | | | | | | | | | | | | | | | | | | | | | | | ql3xxx_probe() does ioremap and stores result in ->mem_map_registers. On failure exit it does iounmap() of the same thing. OTOH, ql3xxx_remove() does iounmap() of ->mmap_virt_base which is (a) never assigned and (b) never used other than in that iounmap() call. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] qla3xxx iomem annotationsAl Viro2006-09-24
| | | | | | | | | | | | | | the driver is still shite, though... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] Revert ABI-breaking change in /procMatthew Wilcox2006-09-24
| | | | | | | | | | | | | | | | | | | | | | | | Some user tools parse /proc/scsi/scsi, so we can't yet change the names. Change the existing ones back to their old names, and add an admonition to not make the same mistake that I did. Andrew Morton reports that this was breaking YDL 4.1 userspace. Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * Merge git://git.infradead.org/~dwmw2/khdrs-2.6Linus Torvalds2006-09-24
| |\ | | | | | | | | | | | | * git://git.infradead.org/~dwmw2/khdrs-2.6: Don't remove $(INSTALL_HDR_PATH)/install before headers_install.
| | * Don't remove $(INSTALL_HDR_PATH)/install before headers_install.David Woodhouse2006-09-24
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | [PATCH] missing include (free_irq() use)Al Viro2006-09-24
| | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] NULL noise removalAl Viro2006-09-24
| | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] fix iptables __user misannotationsAl Viro2006-09-24
| | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] netlabel gfp annotationsAl Viro2006-09-24
| | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] libata won't build on SUN4Al Viro2006-09-24
| | | | | | | | | | | | | | | | | | | | | marked as such... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>