summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1
Commit message (Collapse)AuthorAgeFilesLines
* omap: Fix wrong jtag_id for 850Angelo Arrifano2009-09-241-1/+1
| | | | | | | | | | | | | | | Original message: The previous value of the jtag_id was set for the omap730. For the omap850, this value is different, and this was causing autodetection to fail. Reported-by: Cory Maccarrone <darkstar6262@gmail.com> Angelo Arrifano <miknix@gmail.com> Alistair Buxton <a.j.buxton@gmail.com> Signed-off-by: Angelo Arrifano <miknix@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* OMAP1: AMS_DELTA: add modem supportJanusz Krzysztofik2009-08-281-0/+38
| | | | | | | | | | | | | | This patch adds support for modem device found on Amstrad E3 (Delta) board. Based on earlier patch by Jonathan McDowell, available at http://the.earth.li/pub/e3/2.6.19/ams-delta-modem.patch. Modified after Ladislav Michl's arch/arm/mach-omap1/board-voiceblue.c. This patch is dependent on 8250 driver changes getting accepted upstream: http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=7053133124d5cdf207c1168c7a0c582a18e12ea7 Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Signed-off-by: Tony Lindgren <tony@atomide.com>
* OMAP: UART: drop OMAP_TAG_UART, enable all UARTs, auto-disabled on idleKalle Valo2009-08-2814-76/+0
| | | | | | | | | | | | | | | | OMAP tags are deprecrated so drop them. Drop UART config data which decides which UARTs to enable during boot. This is no longer necessary since serial core code disables clocks after inactivity. Background: with new UART idle code, all on-chip UARTs are idled using a configurable inactivity timer (default 5 seconds.) After the inactivity timer, UART clocks are disabled automatically. Signed-off-by: Kalle Valo <kalle.valo@iki.fi> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* OMAP: Remove ifdefs for io.hTony Lindgren2009-08-281-3/+3
| | | | | | Remove ifdefs for io.h Signed-off-by: Tony Lindgren <tony@atomide.com>
* OMAP: Remove OMAP_IO_ADDRESS, use OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS insteadTony Lindgren2009-08-285-14/+14
| | | | | | | | | | | Search and replace OMAP_IO_ADDRESS with OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS, and convert omap_read/write into a functions instead of a macros. Also rename OMAP_MPUIO_VBASE to OMAP1_MPUIO_VBASE. In the long run, most code should use ioremap + __raw_read/write instead. Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: includecheck fix: mach-omap1/mcbsp.cJaswinder Singh Rajput2009-07-251-1/+0
| | | | | | | | | | | fix the following 'make includecheck' warning: arch/arm/mach-omap1/mcbsp.c: mach/irqs.h is included more than once. Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> Acked-by: Eduardo Valentin <eduardo.valentin@nokia.com> Acked-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* OMAP1: remove duplicated #includeHuang Weiyi2009-06-231-1/+0
| | | | | | | Remove duplicated #include in arch/arm/mach-omap1/board-nokia770.c. Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* OMAP1: Fix N770 MMC supportAndrew de Quincey2009-06-231-0/+2
| | | | | | | | | | | | | | | | Some of the N770's MMC configuration options seem to have been dropped. This patch adds them back in again. Note that only the .ocr_mask change was /critical/, but I've added the .max_freq setting back as well, as the original sources had it. Can anyone confirm if this is unnecessary? Secondly, there is support in the original code for a 4wire/higher speed mode. As I don't have the requisite N770 hardware (I think it was a rev2 N770?) to test this, I can't really add it back. Signed-off-by: Andrew de Quincey <adq@lidskialf.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
* OMAP1: Fix compilation of arch/arm/mach-omap1/mailbox.cJonathan McDowell2009-06-231-1/+1
| | | | | | | | | | | This fixes the positioning of " in MODULE_AUTHOR, which is currently causing a build failure on latest git with CONFIG_OMAP_MBOX_FWK=m; the original breakage appears to date from the end of last year in a5abbbe52b7e89a7633319c5417bd4331f7ac8ed Signed-Off-By: Jonathan McDowell <noodles@earth.li> Acked-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* Merge branch 'omap-upstream' into for-nextTony Lindgren2009-05-283-1/+17
|\ | | | | | | | | Conflicts: arch/arm/mach-omap2/Makefile
| * ARM: OMAP1: Make 770 LCD workAndrew de Quincey2009-05-281-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make 770 LCD work by adding clk_add_alias(). Also remove the old unused functions. Note that the clk_add_alias() could probably be moved to arch/arm/clkdev.c later on. Cc: linux-fbdev-devel@lists.sourceforge.net Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net> Signed-off-by: Imre Deak <imre.deak@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com
| * ARM: OMAP1: Misc clean-upTony Lindgren2009-05-253-1/+5
| | | | | | | | | | | | | | Remove unnecessary Kconfig line and allow compile of MBOX_FWK. Also allow building USB on Nokia 770. Signed-off-by: Tony Lindgren <tony@atomide.com>
* | OMAP1: PM: update and decouple from OMAP2/3 PM coreKevin Hilman2009-05-284-84/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update OMAP1-specific PM infrastructure. This is a sync of what is in linux-omap for OMAP1. This mostly de-couples OMAP1 PM from OMAP2/3 PM and renames things accordingly, and removes omap2/3 specific code from OMAP1 specific headers. Original OMAP1 decoupling patch for OMAP PM branch by Paul Walmsley. Cc: Paul Walmsley <paul@pwsan.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | OMAP2/3: PM: push core PM code from linux-omapKevin Hilman2009-05-281-0/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is to sync the core linux-omap PM code with mainline. This code has evolved and been used for a while the linux-omap tree, but the attempt here is to finally get this into mainline. Following this will be a series of patches from the 'PM branch' of the linux-omap tree to add full PM hardware support from the linux-omap tree. Much of this PM core code was written by Jouni Hogander with significant contributions from Paul Walmsley as well as many others from Nokia, Texas Instruments and linux-omap community. Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com> Cc: Paul Walmsley <paul@pwsan.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | OMAP2xxx clock: rename clk_init_one() to clk_preinit()Paul Walmsley2009-05-121-1/+1
|/ | | | | | Rename clk_init_one() to clk_preinit() to distinguish its function from clk_init() and the individual struct clk init functions. Signed-off-by: Paul Walmsley <paul@pwsan.com>
* Merge branch 'omap-clock-fixes' into omap-fixesTony Lindgren2009-04-241-2/+2
|\
| * OMAP1: clock: Typo fix for clock in omap1Arun KS2009-04-231-2/+2
| | | | | | | | | | | | | | Typo error when requesting for clock for dsp in omap1 Signed-off-by: Arun KS <arunks@mistralsolutions.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
* | ARM: OMAP1: Fix mmc_set_power GPIO usageLadislav Michl2009-04-232-10/+2
| | | | | | | | | | | | | | Simple simplification... Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | ARM: OMAP1: Simplify board-h2 MMC setupLadislav Michl2009-04-231-10/+4
| | | | | | | | | | | | | | Simplify board-h2 MMC setup Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | ARM: OMAP: Remove old dead gpio expander codeTony Lindgren2009-04-231-101/+0
| | | | | | | | | | | | | | | | This should be done with GPIO calls. Patches against the mainline tree welcome to add the necessary working functionality back. Signed-off-by: Tony Lindgren <tony@atomide.com>
* | clocksource: pass clocksource to read() callbackMagnus Damm2009-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass clocksource pointer to the read() callback for clocksources. This allows us to share the callback between multiple instances. [hugh@veritas.com: fix powerpc build of clocksource pass clocksource mods] [akpm@linux-foundation.org: cleanup] Signed-off-by: Magnus Damm <damm@igel.co.jp> Acked-by: John Stultz <johnstul@us.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | [ARM] omap: fix omap1 clock usecount decrement bugRussell King2009-04-061-10/+11
|/ | | | | | Same fix as per a7f8c59, but for OMAP1 instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* trivial: fix typos/grammar errors in Kconfig textsMatt LaPlante2009-03-301-1/+1
| | | | | | Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* Merge branch 'for-next' of ↵Russell King2009-03-2526-48/+293
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
| * ARM: OMAP: get rid of OMAP_TAG_USB, v2Felipe Balbi2009-03-2312-23/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMAP_TAGS should vanish soon since they're not generic arm tags. Most of them can be converted to a platform_data or parsed from a command line like e.g. serial tag. For OMAP_TAG_USB we just let boards call omap_usb_init() passing a pointer to omap_usb_config. Patch updated by Tony for mainline, basically make n770 and h4 compile. Also folded in a fix for OSK by David Brownell <dbrownell@users.sourceforge.net>. Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * [OMAP850] Build system changesZebediah C. McClure2009-03-231-6/+17
| | | | | | | | | | | | | | Build system changes. Signed-off-by: Zebediah C. McClure <zmc@lurian.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * [OMAP850] IRQ related changesZebediah C. McClure2009-03-231-2/+17
| | | | | | | | | | | | | | IRQ related changes. Signed-off-by: Zebediah C. McClure <zmc@lurian.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * [OMAP850] Changes to base IO subsystem, v2Zebediah C. McClure2009-03-233-0/+54
| | | | | | | | | | | | | | Changes to base IO subsystem. Signed-off-by: Zebediah C. McClure <zmc@lurian.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * [OMAP850] Add base support for omap850 cpuZebediah C. McClure2009-03-231-1/+3
| | | | | | | | | | | | | | Add base support for omap850 cpu. Signed-off-by: Zebediah C. McClure <zmc@lurian.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: No need to include board-palm*.h from hardware.hTony Lindgren2009-03-235-0/+34
| | | | | | | | | | | | | | Move the defines to the associated board file and remove the now unnecessary header files. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: No need to include board-osk.h from hardware.hTony Lindgren2009-03-231-0/+14
| | | | | | | | | | | | | | Move the defines to the board file and remove the now unnecessary header file. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: No need to include board-innovator.h from hardware.hTony Lindgren2009-03-231-0/+3
| | | | | | | | | | | | | | | | | | Move the defines to the board file and remove the now unnecessary header file. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: No need to include board-h3.h from hardware.hTony Lindgren2009-03-233-0/+42
| | | | | | | | | | | | | | Also move board-h3.h to mach-omap1. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: No need to include board-h2.h from hardware.hTony Lindgren2009-03-233-0/+45
| | | | | | | | | | | | | | Also move board-h2.h to mach-omap1. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: No need to include board-perseus2.h or board-fsample.h from ↵Tony Lindgren2009-03-231-1/+33
| | | | | | | | | | | | | | | | | | hardware.h Move defines to the board file and remove the now unnecessary headers. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap mailbox: fix empty struct device for omap1Hiroshi DOYU2009-03-232-15/+16
| | | | | | | | | | Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
* | [ARM] omap: arrange for clock recalc methods to return the rateRussell King2009-02-142-25/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | linux-omap source commit 33d000c99ee393fe2042f93e8422f94976d276ce introduces a way to "dry run" clock changes before they're committed. However, this involves putting logic to handle this into each and every recalc function, and unfortunately due to the caching, led to some bugs. Solve both of issues by making the recalc methods always return the clock rate for the clock, which the caller decides what to do with. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] omap: create a proper tree of clocksRussell King2009-02-082-5/+5
| | | | | | | | | | | | | | | | | | | | | | Traditionally, we've tracked the parent/child relationships between clk structures by setting the child's parent member to point at the upstream clock. As a result, when decending the tree, we have had to scan all clocks to find the children. Avoid this wasteful scanning by keeping a list of the clock's children. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] omap: Fix omap1 clock issuesTony Lindgren2009-02-082-87/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes booting, and is a step toward fixing things properly: - Make enable_reg u32 instead of u16 [rmk: virtual addresses are void __iomem *, not u32] - Get rid of VIRTUAL_IO_ADDRESS for clocks - Use __raw_read/write instead of omap_read/write for clock registers This patch adds a bunch of compile warnings until omap1 clock also uses offsets. linux-omap source commit is 9d1dff8638c9e96a401e1885f9948662e9ff9636. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] omap: spi: arrange for omap_uwire to use connection IDRussell King2009-02-081-0/+1
| | | | | | | | | | | | | | | | ... which now means no driver requests the "armxor_ck" clock directly. Also, fix the error handling for clk_get(), ensuring that we propagate the error returned from clk_get(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] omap: i2c: remove conditional ick clocksRussell King2009-02-081-0/+1
| | | | | | | | | | | | | | | | | | By providing a dummy ick for OMAP1510 and OMAP310, we avoid having SoC conditional clock information in i2c-omap.c. Also, fix the error handling by making sure we propagate the error returned via clk_get(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] omap: i2c: use short connection idsRussell King2009-02-081-2/+2
| | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] omap: mcbsp: convert to use fck/ick clocks directlyRussell King2009-02-082-20/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | Rather than introducing a special 'mcbsp_clk' with code behind it in mach-omap*/mcbsp.c to handle the SoC specifics, arrange for the mcbsp driver to be like any other driver. mcbsp requests its fck and ick clocks directly, and the SoC specific code deals with selecting the correct clock. There is one oddity to deal with - OMAP1 fiddles with the DSP clocks and DSP reset, so we move this to the two callback functions. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] omap: MMC: provide a dummy ick for OMAP1Russell King2009-02-081-0/+2
| | | | | | | | | | | | Eliminate the OMAP1 vs OMAP2 clock knowledge in the MMC driver. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] omap: MMC: convert clocks to match by devid and conidRussell King2009-02-081-2/+2
| | | | | | | | | | | | | | | | Convert OMAP MMC driver to match clocks using the device ID and a connection ID rather than a clock name. This allows us to eliminate the OMAP1/OMAP2 differences for the function clock. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] omap: watchdog: provide a dummy ick for OMAP1Russell King2009-02-081-0/+2
| | | | | | | | | | | | Eliminate the OMAP1 vs OMAP2 clock knowledge in the watchdog driver. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] omap: watchdog: convert clocks to match by devid and conidRussell King2009-02-081-1/+1
| | | | | | | | | | | | | | This eliminates the need for separate OMAP24xx and OMAP34xx clock requesting code sections. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] omap: provide a dummy clock nodeRussell King2009-02-081-0/+20
| | | | | | | | | | | | | | | | By providing a dummy clock node, we can eliminate the SoC conditional clock handing in the OMAP drivers, moving this knowledge out of the driver and into the machine clock support code. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] omap: convert OMAP1 to use clkdevRussell King2009-02-082-155/+126
| | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] omap: handle RATE_CKCTL via .set_rate/.round_rate methodsRussell King2009-02-082-63/+71
| | | | | | | | | | | | | | | | | | | | It makes no sense to have the CKCTL rate selection implemented as a flag and a special exception in the top level set_rate/round_rate methods. Provide CKCTL set_rate/round_rate methods, and use these for where ever RATE_CKCTL is used and they're not already overridden. This allows us to remove the RATE_CKCTL flag. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
View Lorry Controller Status