Paul Walmsley [Thu, 2 Aug 2007 18:10:19 +0000 (12:10 -0600)]
omap2 clock: Cleanup in clksel-related code; add sys_clkout2 divisor handling
Convert omap2_get_clksel to use void __iomem *. Add
omap2_divisor_to_clksel(), to convert clock divisors into appropriate
register bit field values. Use non-shifted register bit field masks
in clksel code, rather than masks that have been preshifted down to
bit 0 -- this simplifies existing code and facilitates the use of
symbolic constants from the recent PRCM cleanup. Also add code to
properly handle divisors for sys_clkout2 on OMAP2420. Previously
this clock's divisor settings were ignored.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:18 +0000 (12:10 -0600)]
omap2 clock: From: Paul Walmsley <paul@pwsan.com> Subject:
Clean up omap2_clk_set_parent() by bailing out early if the clock is not
parent-selectable.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:17 +0000 (12:10 -0600)]
omap2 clock: return -EINVAL if no clock enable code; fix dpll_ck enable
If the clock framework can't figure out how to enable a clock, return
-EINVAL to indicate that the clock cannot be enabled. Previously the
code returned 0, which indicated success.
Also fix the "clock.c: Enable for dpll_ck without enable code" boot
warning by marking dpll_ck as ALWAYS_ENABLED. This is not technically
true, since the DPLL can be bypassed; but since we currently have no
software infrastructure to control it directly, ALWAYS_ENABLED is a
sufficient fiction for dpll_ck.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:16 +0000 (12:10 -0600)]
omap2 clock: omap2 clock.c: Consolidate wait-for-lock code
omap2 clock.c contains two nearly identical wait-for-clock-enable routines.
Consolidate them into one omap2_wait_clock_ready() function.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:15 +0000 (12:10 -0600)]
omap2 clock: convert PARENT_CONTROLS_CLOCK into a clock flag
The clock framework currently uses a magic value in struct clk
.enable_bit to indicate that the clock's parent controls enabling and
disabling the clock. There's no need to use this type of in-band
special value when there's already a good means to indicate binary
clock parameters: the clock flags field. This patch converts the
existing PARENT_CONTROLS_CLOCK code to use a clock flag.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:14 +0000 (12:10 -0600)]
omap2 clock: vlynq_fck is missing clksel divider code
vlynq_fck is a clksel clock. But omap2_clk_set_parent() is missing
the code to divide its parent's rate down appropriately when vlynq_fck
is set to use a core_ck parent.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:13 +0000 (12:10 -0600)]
omap2 clock: fix some clocks incorrectly marked as present on OMAP2430
Several clocks are marked as present on OMAP2430, even though they are
2420-only. Drop CLOCK_IN_OMAP243X from those clocks' flags.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:12 +0000 (12:10 -0600)]
omap2 clock: use symbolic constants in clock.h rate_offset/src_offset fields
Convert most of the magic numbers remaining in mach-omap2/clock.h to
symbolic constants. This primarily affects the src_offset/rate_offset
fields.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:11 +0000 (12:10 -0600)]
omap2 clock: move SDRC-related code from clock.c to memory.c
The clock framework contains two functions, omap2_dll_force_needed()
and omap2_reprogram_sdrc(), which are SDRC code, not really clock
code. So, move these functions to memory.c.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:10 +0000 (12:10 -0600)]
omap2 clock: clean up dss2_fck clock flags
dss2_fck is not a fixed-rate clock; its rate is dependent on its parent's
rate. So, drop the .rate assignment and drop the RATE_FIXED clock flag.
It also is a leaf clock - no clocks have it as a parent - so it can't
propagate its rate anywhere. So, drop the RATE_PROPAGATES and fix the
recalc function pointer accordingly.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:09 +0000 (12:10 -0600)]
omap2 clock: get rid of sleep_ck
According to the 2420 TRM rev J, SLEEP_CLK doesn't have any registers
or bits associated with it, so it's outside software control. It's
also a leaf clock - no software-controllable clocks use it as a
parent. There's nothing we can do with it in software. So, drop it.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:08 +0000 (12:10 -0600)]
omap2 clock: drop unnecessary variable in omap2_clk_round_rate()
Drop an unnecessary variable, valid_rate, in omap2_clk_round_rate().
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:07 +0000 (12:10 -0600)]
omap2 clock: fix CodingStyle issues
Clean up some CodingStyle non-conformances in clock.c.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:06 +0000 (12:10 -0600)]
omap2 clock: vlynq_fck recalc should be clksel, not followparent
vlynq_fck is a clksel clock, so its rate is equal to its parent's
rate, divided by whichever divisor is selected. But its definition in
clock.h specifies omap2_followparent_recalc() as its rate calculation
code, which sets the clock's rate to that of its parent without
accounting for any divisor. Fix to use omap2_clksel_recalc() instead.
omap2_clksel_recalc() is also missing the appropriate special case to
divide the vlynq_fck rate down; add this in.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:05 +0000 (12:10 -0600)]
omap2 clock: fix clksel divisor bug
For clksel clocks, omap2_clk_set_rate() incorrectly divides the parent
clock's rate by the actual bits of the register field, rather than the
translated divisor value. This happens to work for most clksel
clocks, since the register bit fields are equal to the divisor values.
But for some clocks, such as sys_clkout, the code gets the resulting
rate wrong.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:04 +0000 (12:10 -0600)]
omap2 clock: fix incorrect rate calculation for osc_ck, sys_ck
omap2_get_crystal_rate() calculates osc_ck and sys_ck rates
incorrectly. osc_ck runs at the same rate as the external clock
source. Also, sys_ck's rate derives from osc_ck's rate, divided (not
multiplied) by PRCM_CLKSRC_CTRL:SYSCLKDIV.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Paul Walmsley [Thu, 2 Aug 2007 18:10:03 +0000 (12:10 -0600)]
omap2 clock: drop meaningless RATE_CKCTLs
Drop the RATE_CKCTL clock flag from iva1_mpu_int_ifck, gfx_ick, ssi_l4_ick,
and dss_ick. These clocks are not source-selectable, which is the practical
meaning of RATE_CKCTL in the 2420 clock framework.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kevin Hilman [Mon, 30 Jul 2007 22:55:28 +0000 (15:55 -0700)]
ARM: OMAP: 2430SDP: turn off secondary LCD backlight on boot
There is not yet any driver for the secondary LCD, so turn off
the backlight on boot.
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kevin Hilman [Tue, 31 Jul 2007 18:18:37 +0000 (11:18 -0700)]
ARM: OMAP: twl4030: make power_companion_init static
This is not used outside twl4030, make it static.
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Syed Mohammed, Khasim [Thu, 26 Jul 2007 00:19:49 +0000 (19:19 -0500)]
To Cleanup TWL-Core driver
Patch to cleanup few spellings in TWL4030 Core and export TWLGPIO APIs
Signed-off-by: Syed Mohammed Khasim <x0khasim@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kevin Hilman [Tue, 24 Jul 2007 23:47:16 +0000 (16:47 -0700)]
ARM: OMAP: fix suspend for twl4030
Use competions instead of manually setting scheduler state.
daemonize kernel thread and set PF_NOFREEZE.
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Hiroshi DOYU [Mon, 30 Jul 2007 11:04:05 +0000 (14:04 +0300)]
ARM: OMAP: Add MMU TWL support for omap1
Table Walking Logic(TWL) is supported in omap1.
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Hiroshi DOYU [Mon, 30 Jul 2007 11:04:04 +0000 (14:04 +0300)]
ARM: OMAP: Fix Unbalanced enable for IRQ in omap mailbox
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Hiroshi DOYU [Mon, 30 Jul 2007 11:04:03 +0000 (14:04 +0300)]
DSPGW: Use ALIGN macro instead of homemade one
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Hiroshi DOYU [Mon, 30 Jul 2007 11:04:02 +0000 (14:04 +0300)]
DSPGW: Use kfifo APIs instead of homemade ones
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Hiroshi DOYU [Fri, 10 Aug 2007 09:17:43 +0000 (02:17 -0700)]
Add kfifo_get_to_user to copy data to userland directly
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Hiroshi DOYU [Mon, 30 Jul 2007 11:04:00 +0000 (14:04 +0300)]
DSPGW: Remove CONFIG_OMAP_DSP_TASK_MULTIOPEN
This MULTIOPEN feature should always be enabled.
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Hiroshi DOYU [Mon, 30 Jul 2007 11:03:59 +0000 (14:03 +0300)]
ARM: OMAP: Fix omap mmu framework for omap1
DSPGW specific part
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Hiroshi DOYU [Mon, 30 Jul 2007 11:03:58 +0000 (14:03 +0300)]
ARM: OMAP: Fix omap mmu framework for omap1
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Fri, 10 Aug 2007 07:46:34 +0000 (00:46 -0700)]
MMC: Remove extra diviso increase
As noted by Kyungmin Park, the divisor calculation has
an unnecessary increase.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Andrzej Zaborowski [Mon, 4 Jun 2007 14:14:01 +0000 (16:14 +0200)]
TSC210x driver using the SPI framework.
This is a rework of the TSC2102 driver from linux-omap-2.6 taking TSC2101
into account with the goal of using only a single driver.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 9 Aug 2007 10:52:31 +0000 (03:52 -0700)]
musb_hdrc: Set tusb host max VBUS to 100mA
Set tusb host max VBUS to 100mA
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 7 Aug 2007 13:10:44 +0000 (06:10 -0700)]
musb_hdrc: Fix clock usage for suspend
At least tusb implements set_clock(), and in that
case clk_disable() gets called twice. Do not call
clk_disable() if set_clock() is implemented.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 7 Aug 2007 12:20:06 +0000 (05:20 -0700)]
musb_hdrc: Fixes for OPT HS A tests
If RESUME is cleared too soon, OPT HS A 6.8 tests will fail.
This patch removes the check for RESUME bit before SUSPEND
is set, and makes virthub sleep until RESUME has been held
for 20 ms. Additionally virthub waits after clearing RESUME
to allow musb to start generating SOFs before RESET.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 7 Aug 2007 12:20:00 +0000 (05:20 -0700)]
ARM: OMAP: Warn on disabling clocks with no users
Instead of BUG(), warn on disabling clocks with no users.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Mon, 6 Aug 2007 12:44:03 +0000 (05:44 -0700)]
Merge omap-upstream
Merge branches 'master' and 'omap-upstream'
Conflicts:
arch/arm/Kconfig
arch/arm/boot/compressed/head.S
arch/arm/configs/omap_h2_1610_defconfig
arch/arm/configs/omap_osk_5912_defconfig
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-apollon-keys.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-n800-audio.c
arch/arm/mach-omap2/board-n800-dsp.c
arch/arm/mach-omap2/board-n800-usb.c
arch/arm/mach-omap2/board-n800.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/irq.c
arch/arm/mach-omap2/memory.c
arch/arm/mach-omap2/mux.c
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/sleep.S
arch/arm/mm/proc-v7.S
arch/arm/plat-omap/Makefile
arch/arm/plat-omap/common.c
arch/arm/plat-omap/timer32k.c
drivers/char/watchdog/omap_wdt.c
drivers/i2c/chips/Makefile
drivers/i2c/chips/menelaus.c
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/spi/omap2_mcspi.c
drivers/video/omap/Kconfig
drivers/video/omap/Makefile
drivers/video/omap/blizzard.c
drivers/video/omap/dispc.c
drivers/video/omap/lcd_inn1510.c
drivers/video/omap/lcd_inn1610.c
drivers/video/omap/lcd_palmte.c
drivers/video/omap/lcd_palmtt.c
drivers/video/omap/lcd_palmz71.c
drivers/video/omap/lcd_sx1.c
drivers/video/omap/lcdc.c
drivers/video/omap/omapfb_main.c
drivers/video/omap/rfbi.c
drivers/video/omap/sossi.c
include/asm-arm/arch-omap/board-2430sdp.h
include/asm-arm/arch-omap/eac.h
include/asm-arm/arch-omap/gpio.h
include/asm-arm/arch-omap/hardware.h
include/asm-arm/arch-omap/io.h
include/asm-arm/arch-omap/menelaus.h
include/asm-arm/arch-omap/mmc.h
include/asm-arm/arch-omap/omap24xx.h
include/asm-arm/arch-omap/onenand.h
include/asm-arm/arch-omap/pm.h
include/linux/input.h
kernel/printk.c
Kyungmin Park [Thu, 8 Mar 2007 04:12:28 +0000 (13:12 +0900)]
ARM: OMAP: Add apollon gpio keys using gpio-keys input
Add apollon gpio keys using gpio-keys input
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Trilok Soni [Tue, 6 Feb 2007 21:20:34 +0000 (13:20 -0800)]
ARM: OMAP: Replace mach-omap/omap2 with mach-omap2
Update board Apollon with correct file path.
Signed-off-by: Trilok Soni <soni.trilok@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kai Svahn [Fri, 26 Jan 2007 20:39:48 +0000 (12:39 -0800)]
ARM: OMAP: Merge board specific files from N800 tree
This patch merges board specific files from N800 tree.
Nokia has published the files at:
http://repository.maemo.org/pool/maemo3.0/free/source/
kernel-source-rx-34_2.6.18.orig.tar.gz
kernel-source-rx-34_2.6.18-osso29.diff.gz
Signed-off-by: Kai Svahn <kai.svahn@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kyungmin Park [Fri, 26 Jan 2007 00:25:48 +0000 (16:25 -0800)]
ARM: OMAP: cleanup apollon board
- Add etherent gpmc handling
- Remove unused mux setting
- Add MMC switch pin comments
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 7 Dec 2006 21:58:17 +0000 (13:58 -0800)]
ARM: OMAP: Sync H4 board init with linux-omap
This patch syncs H4 board init with linux-omap tree.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Komal Shah [Thu, 7 Dec 2006 01:14:11 +0000 (17:14 -0800)]
ARM: OMAP: Fix typo in board-h4.h
Replace OMAP1610 with OMAP2420.
Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
David Brownell [Thu, 7 Dec 2006 01:14:06 +0000 (17:14 -0800)]
ARM: OMAP: USB peripheral support on H4
H4 has two peripheral ports, one for "download" and one for OTG.
The one to use is selected through Kconfig.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kevin Hilman [Wed, 21 Mar 2007 00:07:50 +0000 (17:07 -0700)]
ARM: OMAP: Fix PRCM base register usage for 243x
The PRCM base register is different on 242x and 243x. Use
the #ifdef'd #define from omap24xx.h instead of the locally
defined one.
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Jarkko Nikula [Thu, 29 Mar 2007 20:04:17 +0000 (16:04 -0400)]
ARM: OMAP: Device init for OMAP24xx Enhanced Audio Controller
Device init for OMAP24xx Enhanced Audio Controller
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kevin Hilman [Tue, 20 Mar 2007 18:19:32 +0000 (14:19 -0400)]
ARM: OMAP: 243x: Add mappings for SDRC and SMS
Add mappings for SDRC ans SMS so that omap2_memory_init() works on the
2430. This also allows the mpurate= command-line option to work.
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kai Svahn [Fri, 26 Jan 2007 21:05:41 +0000 (13:05 -0800)]
ARM: OMAP: Merge PM code from N800 tree
This patch merges omap2 PM code from N800 tree.
Patch adds support for sleep while idle for omap2
and handy serial console debbugging code. It also
moves code from pm-domain.c to pm.c.
This code can be used as a base for developing
power management for all omap24xx boards.
Signed-off-by: Kai Svahn <kai.svahn@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kai Svahn [Fri, 26 Jan 2007 21:14:34 +0000 (13:14 -0800)]
ARM: OMAP: Merge driver headers from N800 tree
This patch merges omap specific driver headers from
N800 tree.
Signed-off-by: Kai Svahn <kai.svahn@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kai Svahn [Fri, 26 Jan 2007 20:29:40 +0000 (12:29 -0800)]
ARM: OMAP: Merge gpmc changes from N800 tree
This patch merges gpmc changes from N800 tree
and adds gpmc_get_fclk_period() to gpmc.h.
Signed-off-by: Kai Svahn <kai.svahn@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
David Brownell [Thu, 7 Dec 2006 22:03:49 +0000 (14:03 -0800)]
ARM: OMAP: TUSB EVM init
Add init support for the TUSB6010 EVM board, as connected to H4.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 7 Dec 2006 22:01:29 +0000 (14:01 -0800)]
ARM: OMAP: Tabify mux.c
Tabify mux.c, no functional changes.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Syed Mohammed Khasim [Thu, 7 Dec 2006 01:14:05 +0000 (17:14 -0800)]
ARM: OMAP: Add minimal OMAP2430 support
This patch adds minimal OMAP2430 support to get the kernel booting on 2430SDP.
Signed-off-by: Syed Mohammed Khasim <x0khasim@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
David Brownell [Thu, 7 Dec 2006 01:14:03 +0000 (17:14 -0800)]
ARM: OMAP: abstract debug card setup (smc, leds)
Additional cleanup for debug boards on H2/P2/H3/H4: move the init
code that's not board-specific into a new file where it can be easily
shared between all the different boards (avoiding code duplication,
and making it easier to support more devices). Make H4 use that.
This should be easy to drop in to the OMAP1 boards using these debug
cards; the only difference seems to be that the p2 does an extra reset
of the smc using the fpga (probably all boards could do that, if it's
necessary) and doesn't use the gpio mux or request APIs.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
David Brownell [Thu, 7 Dec 2006 01:13:55 +0000 (17:13 -0800)]
ARM: OMAP: omap2/gpmc updates
GPMC updates:
- bugfixes: wrong/missing flags, omitted write, wrong test
- don't map memory segments starting at zero
- improve debug messaging
- export gpmc_get_fclk_perio]d() since it's needed to calc timings
- expect gpmc_cs_set_timings() caller to have initialized sync vs async
Note that this API is glitchy; likely the best fix would be to add
a member to "struct gpmc_timings" to hold GPMC_CONFIG1, since that
holds one key aspect of the GPMC timings (the gpmc_fclk divisor,
and sync vs. async == whether that divisor matters).
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
David Brownell [Thu, 7 Dec 2006 01:13:54 +0000 (17:13 -0800)]
ARM: OMAP: omap2/memory.c compile fixes
Remove some conflicting declarations in omap2/memory.c so that the
file builds again.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kyungmin Park [Thu, 7 Dec 2006 01:13:53 +0000 (17:13 -0800)]
ARM: OMAP: Board Apollon update, fix boot
Update Apollon board init to initialize NAND, USB,
and LEDs. Also configure GPMC memory for smc91x Ethernet.
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Juha Yrjola [Thu, 7 Dec 2006 01:13:50 +0000 (17:13 -0800)]
ARM: OMAP: Optimize INTC register accesses and enable autoidling
Use virtual addresses directly instead of physical addresses to
avoid having to recalculate the virtual address with every
register access.
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Juha Yrjola [Thu, 7 Dec 2006 01:13:46 +0000 (17:13 -0800)]
ARM: OMAP2: Place SMS and SDRC into smart idle mode
Place SMS and SDRC into smart idle mode
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Eduardo Valentin [Tue, 3 Apr 2007 18:59:27 +0000 (14:59 -0400)]
ARM: OMAP: H2 lcd updates for SPI framework
This is an updated patch to fix lcd for H2 board. It uses platform_data
field to pass spi_device to lcd driver.
Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Imre Deak [Wed, 14 Mar 2007 15:52:42 +0000 (17:52 +0200)]
ARM: OMAP: TSC2101: add platform init / registration to board files
H2 / H3 boards use this chip, update their board files.
Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Imre Deak [Tue, 6 Mar 2007 16:20:00 +0000 (18:20 +0200)]
ARM: OMAP: N770: add missing LCD, LCD controller, touchscreen device registration
These were left out from the board file when merging these drivers,
add them here.
Call GPIO init from the board file as well, since the platform device init
code uses the GPIO API.
Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
David Brownell [Fri, 26 Jan 2007 00:24:01 +0000 (16:24 -0800)]
ARM: OMAP: osk+mistral backlight, power, board specific
Mistral-specific:
- Add PWL-driven LCD backlight device
- Apply power to the board even when the LCD isn't configured; things
like EEPROM, temperature sensor, and wakeup switch depend on it.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Fri, 8 Dec 2006 00:32:55 +0000 (16:32 -0800)]
ARM: OMAP: Add omap osk defconfig
Add omap osk defconfig
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Fri, 8 Dec 2006 00:22:18 +0000 (16:22 -0800)]
ARM: OMAP: Update omap h2 defconfig
Update omap h2 defconfig
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 7 Dec 2006 21:58:17 +0000 (13:58 -0800)]
ARM: OMAP: Sync board specific files with linux-omap
This patch syncs omap board specific files with linux-omap tree.
Patch consists mostly of driver updates done in linux-omap
tree for drivers not yet in mainline kernel.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Vladimir Ananiev [Thu, 7 Dec 2006 01:14:08 +0000 (17:14 -0800)]
ARM: OMAP: Basic support for siemens sx1
This adds basic support for Siemens SX1. More patches are available,
with video driver, mixer, and serial ports working. That is enough to
do gsm calls with right userland.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Marek Vasut [Thu, 7 Dec 2006 01:14:07 +0000 (17:14 -0800)]
ARM: OMAP: Palm Tungsten|T support
This patch adds board file and necessary includes for Palm Tungsten|T.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Andrzej Zaborowski [Thu, 7 Dec 2006 01:13:58 +0000 (17:13 -0800)]
ARM: OMAP: Register tsc2102 on Palm Tungsten E
Add palmte board config bits for TSC2102 controlled devices. This will
enable touchscreen, audio and APM code to report battery level.
If there are other boards at some point that use a TSC2102, similar
code can be used.
Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Marek Vasut [Thu, 7 Dec 2006 01:13:57 +0000 (17:13 -0800)]
ARM: OMAP: PalmZ71 support
Palmz71 specific things - board file.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Jonathan McDowell [Thu, 7 Dec 2006 01:13:52 +0000 (17:13 -0800)]
ARM: OMAP: Add support for Amstrad Delta keypad
This adds support for the keypad on the top of the Amstrad Delta. It's
just a standard omap-keypad so all we need to do is add the keypad
layout and platform data to the board definition file.
Signed-off-by: Jonathan McDowell <noodles@earth.li>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Andrzej Zaborowski [Thu, 7 Dec 2006 01:13:51 +0000 (17:13 -0800)]
ARM: OMAP: Palm Tungsten E board update
General update of the board file for Palm Tungsten E. Registers the
platform devices contained in the PDA (ROM chip, keypad, infra-red)
and updates the configuration for USB and MMC, whose config values
were previously guessed in most cases due to lack of documentation
(and now are confirmed by a number of users). Macros for GPIO pins are
moved to a file in include/asm-arm/arch-omap.
Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Imre Deak [Mon, 5 Mar 2007 15:34:05 +0000 (17:34 +0200)]
ARM: OMAP: add SoSSI clock (remove manual checking of SoSSI state from idle)
The SoSSI driver should already take care of this by enabling / disabling
its clock when necessary, so this legacy callout from the PM idle code
is not needed any more.
Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Imre Deak [Mon, 5 Mar 2007 15:22:58 +0000 (17:22 +0200)]
ARM: OMAP: add SoSSI clock
This is needed, so that disabling the SoSSI clock during idle can
be prevented.
Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
David Brownell [Mon, 11 Dec 2006 22:14:11 +0000 (14:14 -0800)]
ARM: OMAP: omap camera builds again; Mistral init and mux
Support the camera connector on the OSK Mistral add-on board:
- define muxing for both camera controllers
- mux both of them for Mistral
- teach ov9640 glue about mistral powerup/powerdown
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Marek Vasut [Thu, 7 Dec 2006 01:13:55 +0000 (17:13 -0800)]
ARM: OMAP: Enable DSP clocks for McBSP on omap310
This patch enables some clock on omap310.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Juha Yrjola [Thu, 7 Dec 2006 01:13:49 +0000 (17:13 -0800)]
ARM: OMAP: Enable serial idling and wakeup features
Enable serial idling and wakeup features
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Juha Yrjola [Thu, 7 Dec 2006 01:13:47 +0000 (17:13 -0800)]
ARM: OMAP2: Force APLLs always active
The APLLs are most efficiently idled by hardware.
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Dirk Behme [Fri, 26 Jan 2007 00:26:46 +0000 (16:26 -0800)]
ARM: OMAP: H3 workqueue fixes
Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
David Brownell [Mon, 2 Apr 2007 19:48:10 +0000 (12:48 -0700)]
ARM: OMAP: OSK led fixes
Bugfixes for the OSK led support:
- Fix Kconfig merge glitches: Mistral handles idle and timer leds just fine
- Fix pm_suspend() runtime botch: can't sleep, so can't touch tps65010 leds
Improvements:
- Switch sense of Mistral idle led, so idle == off
Probably the TPS65010 leds should be handled only by the "new led" API.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
David Brownell [Mon, 2 Apr 2007 19:45:50 +0000 (12:45 -0700)]
ARM: OMAP: fix OMAP1 dmtimer build warning
Remove the OMAP1 version of omap_dm_timer_get_fclk(), and its associated
compile-time warning. It would only BUG() if called, while it's only
called on OMAP2.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kevin Hilman [Wed, 16 May 2007 15:52:05 +0000 (08:52 -0700)]
ARM: OMAP: Fix 32k timer unsupported one-shot mode
Fix unsupported one-shot mode in set_mode hook.
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Linus Torvalds [Sat, 4 Aug 2007 02:49:55 +0000 (19:49 -0700)]
Linux 2.6.23-rc2
Linus Torvalds [Fri, 3 Aug 2007 22:16:33 +0000 (15:16 -0700)]
Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fixes for the SLB shadow buffer code
[POWERPC] Fix a compile warning in powermac/feature.c
[POWERPC] Fix a compile warning in pci_32.c
[POWERPC] Fix parse_drconf_memory() for 64-bit start addresses
[POWERPC] Fix num_cpus calculation in smp_call_function_map()
[POWERPC] ps3: Fix section mismatch in ps3/setup.c
[POWERPC] spufs: Fix affinity after introduction of node_allowed() calls
[POWERPC] Fix special PTE code for secondary hash bucket
[POWERPC] Expand RPN field to 34 bits when using 64k pages
Al Viro [Thu, 2 Aug 2007 18:21:30 +0000 (19:21 +0100)]
fix s2io regression
* wrong argument passed to pci_unmap_single() on failure
exit paths
* leak in the same area
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Fri, 3 Aug 2007 22:08:55 +0000 (15:08 -0700)]
Merge git://git.infradead.org/~dwmw2/mtd-2.6.23
* git://git.infradead.org/~dwmw2/mtd-2.6.23:
[MTD] Makefile fix for mtdsuper
Linus Torvalds [Fri, 3 Aug 2007 22:08:30 +0000 (15:08 -0700)]
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
Don't compile the PMU power driver on 64-bit PowerPC
Linus Torvalds [Fri, 3 Aug 2007 22:07:10 +0000 (15:07 -0700)]
Merge /pub/scm/linux/kernel/git/lethal/sh-2.6.23
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23:
sh: fix defconfigs for sh7751r boards
sh: fix cf support on r2d boards
sh: update r2d defconfig
sh: update snapgear defconfig.
sh: Fix SH-X3 FPU exception handling.
sh: Fix pgd mismatch from cached TTB in unhandled fault.
sh: Don't include fault-nommu on SH-2/SH-2A.
sh: Fix irqflags tracing for SH-3/4 nommu.
sh: Fix lockdep debugging oops on SH-3/4.
Oleg Nesterov [Fri, 3 Aug 2007 21:04:41 +0000 (01:04 +0400)]
Kill some obsolete sub-thread-ptrace stuff
There is a couple of subtle checks which were needed to handle ptracing from
the same thread group. This was deprecated a long ago, imho this code just
complicates the understanding.
And, the "->parent->signal->flags & SIGNAL_GROUP_EXIT" check in exit_notify()
is not right. SIGNAL_GROUP_EXIT can mean exec(), not exit_group(). This means
ptracer can lose a ptraced zombie on exec(). Minor problem, but still the bug.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Daniel Ritz [Fri, 3 Aug 2007 14:07:43 +0000 (16:07 +0200)]
serial: fix 8250 early console setup
the early setup function serial8250_console_early_setup() can be called
from non __init code (eg. hotpluggable serial ports like serial_cs) so
remove the __init from the call chain to avoid crashes.
Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Cc: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Fri, 3 Aug 2007 21:58:08 +0000 (14:58 -0700)]
Merge branch 'master' of /linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Fix O_CLOEXEC values.
[SPARC32]: Fix modular build of floppy driver.
[SOUND] CS4231 SBus: Two fixes.
[CG6]: fix memory size detection
[SPARC64]: Add missing dma_sync_single_range_for_*().
Linus Torvalds [Fri, 3 Aug 2007 21:57:41 +0000 (14:57 -0700)]
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[TCP]: DSACK signals data receival, be conservative
[TCP]: Also handle snd_una changes in tcp_cwnd_down
[TIPC]: Fix two minor sparse warnings.
[TIPC]: Make function tipc_nameseq_subscribe static.
[PF_KEY]: Fix ipsec not working in 2.6.23-rc1-git10
[TCP]: Invoke tcp_sendmsg() directly, do not use inet_sendmsg().
[IPV4] route.c: mostly kmalloc + memset conversion to k[cz]alloc
[IPV4] raw.c: kmalloc + memset conversion to kzalloc
[NETFILTER] nf_conntrack_l3proto_ipv4_compat.c: kmalloc + memset conversion to kzalloc
[NETFILTER] nf_conntrack_expect.c: kmalloc + memset conversion to kzalloc
[NET]: Removal of duplicated include net/wanrouter/wanmain.c
SCTP: remove useless code in function sctp_init_cause
SCTP: drop SACK if ctsn is not less than the next tsn of assoc
SCTP: IPv4 mapped addr not returned in SCTPv6 accept()
SCTP: IPv4 mapped addr not returned in SCTPv6 accept()
sctp: fix shadow symbol in net/sctp/tsnmap.c
sctp: try to fix readlock
sctp: remove shadowed symbols
sctp: move global declaration to header file.
sctp: make locally used function static
Linus Torvalds [Fri, 3 Aug 2007 21:47:07 +0000 (14:47 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: fw-core: make two variables static
firewire: fw-ohci: dma_free_coherent needs IRQs enabled
firewire: fw-sbp2: set correct maximum payload (fixes CardBus adapters)
ieee1394: sbp2: more correct Kconfig dependencies
ieee1394: revert "sbp2: enforce 32bit DMA mapping"
David S. Miller [Fri, 3 Aug 2007 21:24:17 +0000 (14:24 -0700)]
[SPARC]: Fix O_CLOEXEC values.
The one choosen by asm-generic/fcntl.h is not appropriate
for this platform.
Noticed by Ulrich Drepper.
Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller [Thu, 2 Aug 2007 07:19:14 +0000 (00:19 -0700)]
[SPARC32]: Fix modular build of floppy driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Georg Chini [Thu, 2 Aug 2007 04:55:58 +0000 (21:55 -0700)]
[SOUND] CS4231 SBus: Two fixes.
Remove unnecessary sbus_dma_reset function and change sbus_dma_enable
to avoid occasional system crashes when stopping recording.
Signed-off-by: Georg Chini <georg.chini@triaton-webhosting.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Krzysztof Helt [Thu, 2 Aug 2007 04:39:32 +0000 (21:39 -0700)]
[CG6]: fix memory size detection
This patch fixes memory size detection on the CG6 card.
The 1MB TGX card has dblbuf property set to 0.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller [Wed, 1 Aug 2007 03:43:17 +0000 (20:43 -0700)]
[SPARC64]: Add missing dma_sync_single_range_for_*().
Reported by Andrew Morton.
Signed-off-by: David S. Miller <davem@davemloft.net>
Satyam Sharma [Fri, 3 Aug 2007 02:57:13 +0000 (08:27 +0530)]
[MTD] Makefile fix for mtdsuper
We want drivers/mtd/{mtdcore, mtdsuper, mtdpart}.c to be built and linked
into the same mtd.ko module. Fix the Makefile to ensure this, and remove
duplicate MODULE_ declarations in mtdpart.c, as mtdcore.c already has them.
Signed-off-by: Satyam Sharma <satyam@infradead.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Michael Neuling [Fri, 3 Aug 2007 01:55:39 +0000 (11:55 +1000)]
[POWERPC] Fixes for the SLB shadow buffer code
On a machine with hardware 64kB pages and a kernel configured for a
64kB base page size, we need to change the vmalloc segment from 64kB
pages to 4kB pages if some driver creates a non-cacheable mapping in
the vmalloc area. However, we never updated with SLB shadow buffer.
This fixes it. Thanks to paulus for finding this.
Also added some write barriers to ensure the shadow buffer contents
are always consistent.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Segher Boessenkool [Wed, 1 Aug 2007 15:41:14 +0000 (01:41 +1000)]
[POWERPC] Fix a compile warning in powermac/feature.c
...by using the pci_get API instead of the deprecated old stuff.
Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
git.openpandora.org / pandora-kernel.git / log