Tony Lindgren [Thu, 21 Jan 2010 02:25:07 +0000 (18:25 -0800)]
Linux-omap rebuilt: pm fixes from kevin merged
$ git checkout -b tmp-rebuild-
1264040700 linus
$ git merge -m "Merge omap-fixes" omap-fixes
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge for-next" for-next
$ git merge -m "Merge cbus" cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1264040700
To view the changes since the last rebuild, please do
$ git diff
91b999eef63ae0d94ef6d1eb99d93284a2b3e48b..
69b2ad517f2e87c463ecd5bc599c6abe75a3b83a arch/arm/*omap*/
Tony Lindgren [Thu, 21 Jan 2010 02:25:03 +0000 (18:25 -0800)]
Merge cbus
Tony Lindgren [Thu, 21 Jan 2010 02:25:02 +0000 (18:25 -0800)]
Merge for-next
Tony Lindgren [Thu, 21 Jan 2010 02:25:01 +0000 (18:25 -0800)]
Merge omap-testing
vikram pandita [Thu, 21 Jan 2010 02:24:17 +0000 (18:24 -0800)]
omap: zoom3: enable ehci support
Zoom3 board has omap3630 EHCI port2 connected to a ULPI phy.
GPIO_64 is connected to the PHY reset pin.
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Cc: Gadiyar, Anand <gadiyar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
vikram pandita [Thu, 21 Jan 2010 02:24:17 +0000 (18:24 -0800)]
omap: serial: fix coding style indentaion
No logical code change
Fix coding style indentaion as per checkpatch.pl
Fix multi-line comment style reported by Nishanth Menon
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Cc: Menon, Nishanth <nm@ti.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Lesly A M [Thu, 21 Jan 2010 02:24:17 +0000 (18:24 -0800)]
omap3: pm: Add T2 Keypad as a wakeup source
Changes for setting the padconf value for sys_nirq line which is
connected to T2 INTR1. This will fix the T2 keypad wakeup.
Signed-off-by: Lesly A M <x0080970@ti.com>
Signed-off-by: Teerth Reddy <teerth@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Sriram [Thu, 21 Jan 2010 02:24:16 +0000 (18:24 -0800)]
ARCH OMAP : enable ARCH_HAS_HOLES_MEMORYMODEL for OMAP
OMAP platforms(like OMAP3530) include DSP or other co-processors
for media acceleration. when carving out memory for the
accelerators we can end up creating a hole in the memory map
of sort:
<kernel memory><hole(memory for accelerator)><kernel memory>
To handle such a memory configuration ARCH_HAS_HOLES_MEMORYMODEL
has to be enabled. For further information refer discussion at:
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg15262.html.
Signed-off-by: Sriramakrishnan <srk@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 21 Jan 2010 02:24:16 +0000 (18:24 -0800)]
omap: Clean-up for omap_mux_init
Get rid of the ifdeffery in omap_mux_init by creating
omap_mux_init_package and omap_mux_init_signals functions.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ladislav Michl [Thu, 21 Jan 2010 02:24:16 +0000 (18:24 -0800)]
MTD: remove no longer used OMAP flash map
All OMAP boards are now using physmap-flash.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ladislav Michl [Thu, 21 Jan 2010 02:24:15 +0000 (18:24 -0800)]
omap: convert boards to use physmap-flash
Convert OMAP based boards to use physmap-flash. Refreshed against today's
Linux omap kernel tree
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 21 Jan 2010 02:21:01 +0000 (18:21 -0800)]
Merge branch 'omap-fixes' into omap-fixes-for-linus
Tony Lindgren [Thu, 21 Jan 2010 02:20:47 +0000 (18:20 -0800)]
Merge branch 'pm-fixes' of /linux/kernel/git/khilman/linux-omap-pm into omap-fixes-for-linus
Sergio Aguirre [Thu, 14 Jan 2010 17:01:15 +0000 (11:01 -0600)]
PM debug: Fix warning when no CONFIG_DEBUG_FS
Fix following warning when CONFIG_DEBUG_FS wasn't selected:
arch/arm/mach-omap2/pm-debug.c:57: warning: 'pm_dbg_init' declared 'static' but never defined
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Subramani Venkatesh [Tue, 22 Dec 2009 09:37:50 +0000 (15:07 +0530)]
OMAP3: PM: DSS PM_WKEN to refill DMA
Currently, DSS does not wakeup when there is a DMA request. DSS wake
up event must be enabled so that the DMA request to refill the FIFO
will wake up the CORE domain.
Signed-off-by: Subramani Venkatesh <subramani.venkatesh@windriver.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Kevin Hilman [Thu, 24 Sep 2009 23:35:48 +0000 (16:35 -0700)]
OMAP: timekeeping: time should not stop during suspend
During suspend, the kernel timekeeping subsystem is shut down. Before
suspend and upon resume, it uses a weak function
read_persistent_clock() to determine the amount of time that elapsed
during suspend.
This function was not implemented on OMAP, so from the timekeeping
subsystem perspective (and thus userspace as well) it appeared that no
time elapsed during suspend.
This patch uses the 32k sync timer as a the persistent clock.
NOTE: This does *NOT* fully handle wrapping of the 32k sync timer, so
more than one wrapping of the 32k sync timer during suspend may
cause problems. Also note there are not interrupts when the 32k
sync timer wraps, so something else has to be done.
Reported-by: Jon Hunter <jon-hunter@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Tero Kristo [Tue, 17 Nov 2009 16:34:53 +0000 (18:34 +0200)]
OMAP3: PM: Force write last pad config register into save area
Due to OMAP3 erratas 1.157, 1.185 the save of the last pad register
(ETK_D14 and ETK_D15) can fail sometimes when there is simultaneous
OCP access to the SCM register area. Fixed by writing the last
register to the save area.
Also, optimized the delay loop for the HW save to include an udelay(1),
which limits the number of unnecessary HW accesses to SCM register area
during the save.
Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
Acked-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Roel Kluin [Wed, 16 Dec 2009 16:22:04 +0000 (17:22 +0100)]
OMAP: omap3_pm_get_suspend_state() error ignored in pwrdm_suspend_get()
val is an u64 pointer, we need an int to check the error.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Peter Ujfalusi [Thu, 26 Nov 2009 13:18:50 +0000 (15:18 +0200)]
OMAP3: PM: Enable wake-up from McBSP2, 3 and 4 modules
Wake-up from McBSP ports are needed, especially when the THRESHOLD
dma mode is in use for audio playback.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Manjunatha GK [Mon, 16 Nov 2009 14:46:52 +0000 (20:16 +0530)]
OMAP3: PM debug: fix build error when !CONFIG_DEBUG_FS
The PM debug code fails to build on when CONFIG_DEBUG_FS is not
enabled.
Build error log:
arch/arm/mach-omap2/built-in.o: In function `omap_sram_idle':
arch/arm/mach-omap2/pm34xx.c:449: undefined reference to `pm_dbg_regset_save'
arch/arm/mach-omap2/pm34xx.c:460: undefined reference to `pm_dbg_regset_save'
arch/arm/mach-omap2/built-in.o: In function `configure_vc':
arch/arm/mach-omap2/pm34xx.c:1237: undefined reference to `pm_dbg_regset_init'
arch/arm/mach-omap2/pm34xx.c:1238: undefined reference to `pm_dbg_regset_init'
make: *** [.tmp_vmlinux1] Error 1
This patch fixes the above errors.
Kernel booting is tested on omap zoom2 and zoom3 boards.
Signed-off-by: Manjunatha GK <manjugk@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Sripathy, Vishwanath [Mon, 16 Nov 2009 11:11:40 +0000 (16:41 +0530)]
OMAP3: PM: Removing redundant and potentially dangerous PRCM configration
As part of Core domain context restoration while coming out of off mode
there are some registers being restored which are not required to be restored.
ROM code will have restored them already. Overwriting some of them can have
potential side effect. Eg: CM_CLKEN_PLL register should not be written while dpll is locked.
Tested on OMAP 3430 SDP for suspend/resume and off mode with sleep_while_idle enabled.
Signed-off-by: Vishwanath BS <vishwanath.bs@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Tero Kristo [Thu, 12 Nov 2009 10:07:20 +0000 (12:07 +0200)]
OMAP3: Fixed ARM aux ctrl register save/restore
Current value is stored on SDRAM and it is written back during wakeup.
Previously a static value of 0x72 was written there.
Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
Acked-by: Thara Gopinath <thara@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Tero Kristo [Mon, 26 Oct 2009 13:10:40 +0000 (15:10 +0200)]
OMAP3: CPUidle: Fixed timer resolution
Previously used u32 as temporary data storage that wraps around at 4.294s.
Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Sanjeev Premi [Mon, 2 Nov 2009 14:53:38 +0000 (20:23 +0530)]
OMAP3: PM: Remove duplicate code blocks
This patch removes code blocks that are repeated
in function prcm_setup_regs().
Signed-off-by: Sanjeev Premi <premi@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Tero Kristo [Fri, 23 Oct 2009 16:03:50 +0000 (19:03 +0300)]
OMAP3: PM: Disable interrupt controller AUTOIDLE before WFI
OMAP interrupt controller goes to unknown state when there is right
combination of l3,l4 sleep/wake-up transitions, l4 autoidle in
interrupt controller and some interrupt. When this happens, interrupts
are not delivered to ARM anymore and ARM will remain in WFI (wait for
interrupt) until interrupt controller is forced to wake-up
(i.e. lauterbach).
Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Tero Kristo [Fri, 23 Oct 2009 16:03:49 +0000 (19:03 +0300)]
OMAP3: PM: Enable system control module autoidle
Enable the auto-idle feature of the SCM block to save some additional
power.
Signed-off-by: Mika Westerberg <ext-mika.1.westerberg@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Tero Kristo [Fri, 23 Oct 2009 16:03:48 +0000 (19:03 +0300)]
OMAP3: PM: Ack pending interrupts before entering suspend
Suspending drivers may still generate interrupts just before their suspend is
completed. Any pending interrupts here will prevent sleep.
Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Tony Lindgren [Thu, 21 Jan 2010 01:34:29 +0000 (17:34 -0800)]
Merge branch 'for_2.6.33rc_d' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
Olof Johansson [Wed, 20 Jan 2010 22:39:29 +0000 (22:39 +0000)]
omap: Enable GPMC clock in gpmc_init
Don't assume that gpmc_l3_clk is on, enable it before touching
configuration registers.
Note that the current code assumes that this clock is always
enabled. We are already setting smart idle and L3 autogating
for GPMC clock in gpmc_init.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 20 Jan 2010 21:32:34 +0000 (13:32 -0800)]
Linux-omap rebuilt: clock fixes merged
$ git checkout -b tmp-rebuild-
1264023127 linus
$ git merge -m "Merge omap-fixes" omap-fixes
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge for-next" for-next
$ git merge -m "Merge cbus" cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1264023127
To view the changes since the last rebuild, please do
$ git diff
af4d95835608bca858fb2f65b1aaec5438db1311..
8b7cb99fcb6e2649fb3411710e2bc9e3e4ef7b55 arch/arm/*omap*/
Tony Lindgren [Wed, 20 Jan 2010 21:32:18 +0000 (13:32 -0800)]
Merge cbus
Tony Lindgren [Wed, 20 Jan 2010 21:32:15 +0000 (13:32 -0800)]
Merge for-next
Tony Lindgren [Wed, 20 Jan 2010 21:32:12 +0000 (13:32 -0800)]
Merge omap-testing
vikram pandita [Wed, 20 Jan 2010 21:11:35 +0000 (13:11 -0800)]
omap: zoom3: enable ehci support
Zoom3 board has omap3630 EHCI port2 connected to a ULPI phy.
GPIO_64 is connected to the PHY reset pin.
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Cc: Gadiyar, Anand <gadiyar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
vikram pandita [Wed, 20 Jan 2010 21:11:35 +0000 (13:11 -0800)]
omap: serial: fix coding style indentaion
No logical code change
Fix coding style indentaion as per checkpatch.pl
Fix multi-line comment style reported by Nishanth Menon
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Cc: Menon, Nishanth <nm@ti.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Lesly A M [Wed, 20 Jan 2010 21:11:35 +0000 (13:11 -0800)]
omap3: pm: Add T2 Keypad as a wakeup source
Changes for setting the padconf value for sys_nirq line which is
connected to T2 INTR1. This will fix the T2 keypad wakeup.
Signed-off-by: Lesly A M <x0080970@ti.com>
Signed-off-by: Teerth Reddy <teerth@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Sriram [Wed, 20 Jan 2010 21:11:34 +0000 (13:11 -0800)]
ARCH OMAP : enable ARCH_HAS_HOLES_MEMORYMODEL for OMAP
OMAP platforms(like OMAP3530) include DSP or other co-processors
for media acceleration. when carving out memory for the
accelerators we can end up creating a hole in the memory map
of sort:
<kernel memory><hole(memory for accelerator)><kernel memory>
To handle such a memory configuration ARCH_HAS_HOLES_MEMORYMODEL
has to be enabled. For further information refer discussion at:
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg15262.html.
Signed-off-by: Sriramakrishnan <srk@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 20 Jan 2010 21:11:34 +0000 (13:11 -0800)]
omap: Clean-up for omap_mux_init
Get rid of the ifdeffery in omap_mux_init by creating
omap_mux_init_package and omap_mux_init_signals functions.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ladislav Michl [Wed, 20 Jan 2010 21:11:34 +0000 (13:11 -0800)]
MTD: remove no longer used OMAP flash map
All OMAP boards are now using physmap-flash.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ladislav Michl [Wed, 20 Jan 2010 21:11:33 +0000 (13:11 -0800)]
omap: convert boards to use physmap-flash
Convert OMAP based boards to use physmap-flash. Refreshed against today's
Linux omap kernel tree
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 20 Jan 2010 21:10:24 +0000 (13:10 -0800)]
Merge branch 'omap-fixes' into omap-fixes-for-linus
Tony Lindgren [Wed, 20 Jan 2010 21:09:09 +0000 (13:09 -0800)]
Merge branch 'for_2.6.33rc_d' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
Paul Walmsley [Wed, 20 Jan 2010 00:30:55 +0000 (17:30 -0700)]
OMAP1 clock: fix for "BUG: spinlock lockup on CPU#0"
Commit
52650505fbf3a6ab851c801f54e73e76c55ab8da caused clock initialization
to fail on OMAP1 with "BUG: spinlock lockup on CPU#0" -- this is because
omap1_select_table_rate() and omap1_round_to_table_rate() call clk_get_rate()
with the clockfw spinlock held. Fix by accessing the rate directly from
the internal clock framework functions.
Thanks to Tony Lindgren <tony@atomide.com> for reporting and testing the fix.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Rajendra Nayak [Wed, 20 Jan 2010 00:30:55 +0000 (17:30 -0700)]
OMAP4: clocks: Fix the clksel_rate struct DPLL divs
For all DPLL's the valid dividers are same as the values
to be programmed in the register. 0 is an invalid value.
The changes are generated by updating the script which autogenerates
the file modifed in the patch.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Rajendra Nayak [Wed, 20 Jan 2010 00:30:54 +0000 (17:30 -0700)]
OMAP4: PRCM: Fix the base address for CHIRONSS reg defines
The CHIRONSS has its own local PRCM module and the register defines
need to use the CHIRONSS base and not the PRM base.
The changes are generated by updating the script which autogenerates
the file modifed in the patch.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tony Lindgren [Wed, 20 Jan 2010 02:20:18 +0000 (18:20 -0800)]
Linux-omap rebuilt: fixes merged for cpu detection
$ git checkout -b tmp-rebuild-
1263954011 linus
$ git merge -m "Merge omap-fixes" omap-fixes
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge for-next" for-next
$ git merge -m "Merge cbus" cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1263954011
To view the changes since the last rebuild, please do
$ git diff
670e35de2586c06463c59ba9bfdcfac2d28cbece..
0e2d0b5fc3510552f15c4108d2db328f54c74356 arch/arm/*omap*/
Tony Lindgren [Wed, 20 Jan 2010 02:20:14 +0000 (18:20 -0800)]
Merge cbus
Tony Lindgren [Wed, 20 Jan 2010 02:20:13 +0000 (18:20 -0800)]
Merge for-next
Tony Lindgren [Wed, 20 Jan 2010 02:20:12 +0000 (18:20 -0800)]
Merge omap-testing
vikram pandita [Thu, 14 Jan 2010 02:10:34 +0000 (18:10 -0800)]
omap: zoom3: enable ehci support
Zoom3 board has omap3630 EHCI port2 connected to a ULPI phy.
GPIO_64 is connected to the PHY reset pin.
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Cc: Gadiyar, Anand <gadiyar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
vikram pandita [Thu, 14 Jan 2010 02:10:34 +0000 (18:10 -0800)]
omap: serial: fix coding style indentaion
No logical code change
Fix coding style indentaion as per checkpatch.pl
Fix multi-line comment style reported by Nishanth Menon
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Cc: Menon, Nishanth <nm@ti.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Lesly A M [Thu, 14 Jan 2010 02:10:33 +0000 (18:10 -0800)]
omap3: pm: Add T2 Keypad as a wakeup source
Changes for setting the padconf value for sys_nirq line which is
connected to T2 INTR1. This will fix the T2 keypad wakeup.
Signed-off-by: Lesly A M <x0080970@ti.com>
Signed-off-by: Teerth Reddy <teerth@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Sriram [Thu, 14 Jan 2010 02:10:33 +0000 (18:10 -0800)]
ARCH OMAP : enable ARCH_HAS_HOLES_MEMORYMODEL for OMAP
OMAP platforms(like OMAP3530) include DSP or other co-processors
for media acceleration. when carving out memory for the
accelerators we can end up creating a hole in the memory map
of sort:
<kernel memory><hole(memory for accelerator)><kernel memory>
To handle such a memory configuration ARCH_HAS_HOLES_MEMORYMODEL
has to be enabled. For further information refer discussion at:
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg15262.html.
Signed-off-by: Sriramakrishnan <srk@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 20 Jan 2010 02:17:50 +0000 (18:17 -0800)]
omap: Clean-up for omap_mux_init
Get rid of the ifdeffery in omap_mux_init by creating
omap_mux_init_package and omap_mux_init_signals functions.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ladislav Michl [Wed, 20 Jan 2010 02:17:49 +0000 (18:17 -0800)]
MTD: remove no longer used OMAP flash map
All OMAP boards are now using physmap-flash.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ladislav Michl [Wed, 20 Jan 2010 02:17:49 +0000 (18:17 -0800)]
omap: convert boards to use physmap-flash
Convert OMAP based boards to use physmap-flash. Refreshed against today's
Linux omap kernel tree
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Roel Kluin [Thu, 14 Jan 2010 02:10:29 +0000 (18:10 -0800)]
OMAP: dma_chan[lch_head].flag & OMAP_DMA_ACTIVE tested twice in omap_dma_unlink_lch()
The same flag and bits were tested twice.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 19 Jan 2010 23:40:26 +0000 (15:40 -0800)]
omap3: Fix cpu detection
We need to set the omap_chip.oc carefully for the clocks to work.
To fix this, set the omap_chip.oc in omap3_check_features() based
on the CONTROL_IDCODE and silicon revision registers.
Also add handling for 34xx es3.1.2 as es3.1 for now.
Fixes booting on at least overo board.
Based on an earlier patch by Paul Walmsley <paul@pwsan.com>.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 19 Jan 2010 23:15:24 +0000 (15:15 -0800)]
omap: Fix functions for dynamic remuxing of pins
Make the omap_mux_read and write available for board code,
and rename omap_mux_set_board_signals into omap_mux_write_array.
Also add the related prototypes and comments into mux.h.
In some cases we want to change the signals dynamically,
mostly for power management.
Note that we cannot use the signal names as they are set
__init to save memory.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 20 Jan 2010 02:17:07 +0000 (18:17 -0800)]
omap: Fix cmdline muxing
Looks like cmdline muxing got broken at some point when we
decided to limit muxing to __init code. Currently omap_mux_entry
list is not yet initialized when we try to initialize cmdline
muxing.
Fix this by calling omap_mux_init_list() before calling
omap_mux_set_cmdline_signals().
Reported-by: Philip Balister <philip@balister.org>
Tested-by: Philip Balister <philip@balister.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Roel Kluin [Tue, 19 Jan 2010 13:14:15 +0000 (13:14 +0000)]
USB: musb: don't dereference NULL tusb_dma indma_controller_destroy()
Test whether tusb_dma is not NULL before dereferencing
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ajay Kumar Gupta [Tue, 19 Jan 2010 13:14:14 +0000 (13:14 +0000)]
usb: host: ehci: adding regulator framework in ehci-omap.cdriver
OMAP3 has three HS USB ports so it can have three different regulator
for each PHY connected to each port.
Currently these regulators are assumed to be optional and driver doesn't
fail but continue with the initialization if it doesn't get any regulators.
Regulator supply names has to be mapped in board files as 'hsusbN' where
'N' is port number and can be {0, 1 ,2}.
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ajay Kumar Gupta [Tue, 19 Jan 2010 13:14:13 +0000 (13:14 +0000)]
usb: host: ehci: fix missing kfree in remove path also
Added missing kfree() in ehci_hcd_omap_remove().
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ajay Kumar Gupta [Tue, 19 Jan 2010 13:14:12 +0000 (13:14 +0000)]
usb: musb: Add 'extvbus' in musb_hdrc_platform_data
Some of the board might use external Vbus power supply on musb
interface which would require to program ULPI_BUSCONTROL register.
Adding 'extvbus' flag which can be set from such boards which will
be checked at musb driver files before programming ULPI_BUSCONTROL.
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ajay Kumar Gupta [Tue, 19 Jan 2010 13:14:11 +0000 (13:14 +0000)]
usb: musb: save dynfifo in musb struct
Save dynamic FIFO read only information for later uses during
musb_save/restore_context functions.
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Arnaud Mandy [Tue, 19 Jan 2010 13:14:10 +0000 (13:14 +0000)]
usb: musb: handle irqs in the order dictated by programmingguide
MUSB's programming guide dictates how we should handle its
irqs and in which order. Follow that.
Signed-off-by: Arnaud Mandy <ext-arnaud.2.mandy@nokia.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Bryan Wu [Tue, 19 Jan 2010 13:14:09 +0000 (13:14 +0000)]
usb: musb: clean up commit 'workaround Blackfin FIFO anomalies'
The version applied had a few comments which are now
done.
Thanks to Sergei for pointing out.
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Swaminathan S [Tue, 19 Jan 2010 13:14:08 +0000 (13:14 +0000)]
usb: musb: Fix cppi_channel_abort() function to handle Txabort correctly
This patch fixes the Tx abort/teardown logic. We now wait for the teardown
completion interrupt and acknowledge the same by setting the tx_complete
register to 0.
This change is needed to ensure that abort processing works on DM365 platform.
Without this change after completion of abort processing the system is
overwhelmed with continuous stream of abort interrupts.
This change has been tested on all CPPI3.x platforms (DM644x, DM646x, DM35x,
DM36x).
Signed-off-by: Swaminathan S <swami.iyer@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Swaminathan S [Tue, 19 Jan 2010 13:14:07 +0000 (13:14 +0000)]
usb: musb: workaround toggle bug when doing bulk transferafter isoc
This patch implements the work around for a Mentor controller related
bug where it's observed a BULK Tx toggle error on the bus when a
BULK IO gets scheduled on an endpoint that was earlier used for
handling ISOC transaction and needed to start on 1 toggle. When such
a situation arises even if the TXCSR toggle bits are programmed
correctly by the musb driver the data gets transmitted with 0 toggle
which leads to toggle error on the bus and the BULK transaction fails.
In case of MSC write, the device gets reset by the Host.
This Mentor bug is observed on almost all Mentor versions (1.3, 1.5,
1.8). Confirmed on DM644x, DM355, DM365, OMAPL13x platforms.
Signed-off-by: Swaminathan S <swami.iyer@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Anand Gadiyar [Tue, 19 Jan 2010 13:14:06 +0000 (13:14 +0000)]
[PATCH/USB,
MUSB DMA_INTR register may sometimes read zero when infact there
was a pending interrupt. Workaround this by reading the DMA_COUNT
values for all enabled channels when this condition occurs.
Flag these channels as the ones needing to be serviced.
Additionally, the absence of a debug print meant we would never
catch a spurious DMA interrupt in MUSB. So this patch adds a
debug print in the IRQ handler.
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Ajay Kumar Gupta <ajay.gupta@ti.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Vikram Pandita <vikram.pandita@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Anand Gadiyar [Tue, 19 Jan 2010 13:14:05 +0000 (13:14 +0000)]
usb: musb: hsdma: add wrapper for reading DMA count
Add a wrapper for reading the DMA count register, analogous
to the one for writing to this register.
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Vikram Pandita <vikram.pandita@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ajay Kumar Gupta [Tue, 19 Jan 2010 13:14:04 +0000 (13:14 +0000)]
USB: musb: Add new fifo table for a OMAP3 errata
We have observed MSC data read corruption when USB LAN device is
also connected and it's interface is up.
Silicon team has confirmed an errata where in all the active
transfers should use FIFO space either in first 8K or next 8K.
So far we have observed the issue in above use case scenario.
As a workaround to it, adding a new FIFO config (5) fitting well
within first 8K which can be used for such use cases.
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Acked-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Felipe Balbi [Tue, 19 Jan 2010 13:14:03 +0000 (13:14 +0000)]
USB: musb: remove some of the never defined defines
just makes the musb init code a bit cleaner.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Felipe Balbi [Tue, 19 Jan 2010 13:14:02 +0000 (13:14 +0000)]
USB: musb: move to sysfs_groups
it's easier to keep up and add more sysfs entries
as necessary.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Felipe Balbi [Tue, 19 Jan 2010 13:14:01 +0000 (13:14 +0000)]
USB: musb: move two printk to dev_err
trivial cleanup, no functional changes.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Felipe Balbi [Tue, 19 Jan 2010 13:14:00 +0000 (13:14 +0000)]
USB: musb: use resource_size()
it makes ioremap() usage looks cleaner.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Russell King [Wed, 20 Jan 2010 00:30:52 +0000 (17:30 -0700)]
OMAP3: clock: Remove unnecessarily .init initializers from OMAP3 clocks
The first thing that omap2_init_clksel_parent() does is check for
a non-zero .clksel field in the struct clk. Therefore, it is
pointless calling this function on clocks where the clksel field
is unset.
Remove init calls to omap2_init_clksel_parent() on clocks without
a clksel field.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Thara Gopinath [Wed, 20 Jan 2010 00:30:51 +0000 (17:30 -0700)]
OMAP3: hwmod: Adding flag to prevent caching of sysconfig register.
In the current implementation the sysconfig value is read into
_sysc_cache once and an actual update to the sysconfig register
happens only if the new value paased is differnt from the one in _sysc_cache.
_sysc_cache is updated only if _HWMOD_SYSCONFIG_LOADED is not set.
This can lead to the follwing issue if off mode is enabled in modules
which employs "always-retore" mechanism of context save and restore.
a. The module sets the sysconfig register through omap_device_enable.
Here _sysc_cache is updated with the value written to the sysconfig
register and left.
b. The power domain containig the module enters off mode and the
module context is lost.
c. The module in use becomes active and calls omap_device_enable to
enable itself. Here a read of sysconfig register does not happen
as _HWMOD_SYSCONFIG_LOADED flag is set. The value to be written
to the sysconfig register will be same as the one written in step a.
Since _sysc_cache reflects the previous written value an update
of the sysconfig register does not happen.
This means in modules which employs "always-restore" mechanism
after off , the sysconfig regsiters will never get updated.
This patch introduces a flag SYSC_NO_CACHE which if set ensures that the
sysconfig register is always read into _sysc_cache before an update is
attempted.
This flags need to be set only by modules which does not do a context save
but re-initializes the registers every time the module is accessed. This
includes modules like i2c, smartreflex etc.
Signed-off-by: Thara Gopinath <thara@ti.com>
[paul@pwsan.com: tweaked to apply on a different head, added flag comment]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tony Lindgren [Tue, 19 Jan 2010 23:18:23 +0000 (15:18 -0800)]
arm: Update comments in cacheflush.h and remove unnecessary V6 and V7 comments
The comments in cacheflush.h should follow what's in
struct cpu_cache_fns. The comments for V6 and V7 are
unnecessary.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 19 Jan 2010 23:18:22 +0000 (15:18 -0800)]
arm: Fix cpu_proc_fin() for proc-v7.S and make kexec work
The comments in arm_machine_restart() suggest that cpu_proc_fin()
will clean and disable cache and turn off interrupts. This does
not seem to be implemented for proc-v7.S, implement it the same
way as for proc-v6.S.
This also makes kexec work for v7. Note that a related TLB and
branch traget flush patch is also needed to avoid kexec
"crc error".
Note that there are still some issues that seem to be related
to L2 cache being on and causing occasional uncompress "crc error"
with kexec. Anyways, this gets kexec mostly working on V7 for now.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 19 Jan 2010 23:18:22 +0000 (15:18 -0800)]
arm: Flush TLB entries in setup_mm_for_reboot()
We need to do that if we tinker with the MMU entries.
This fixes the occasional bug with kexec where the new
fails to uncompress with "crc error". Most likely at
least kexec on v6 and v7 need this fix.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 19 Jan 2010 23:18:22 +0000 (15:18 -0800)]
arm: Fix DCC console for v7
Without this patch arch/arm/compressed/head.S defaults to generic
DCC code that does not work for v7.
For more information on the v7 DCC, see Cortex-A8 TRM
"12.11.1 Debug communications channel".
To use it with post 2.6.33-rc1 or later, you need to have:
CONFIG_DEBUG_LL=y
ONFIG_DEBUG_ICEDCC=y
CONFIG_EARLY_PRINTK=y
Earlier kernels need commit
93fd03a8c6728b58879f8af20ffd55d9c32a778b
backported.
Tested on omap3430.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 19 Jan 2010 23:18:21 +0000 (15:18 -0800)]
ARM: Fix uncompress code compile for different defines of flush(void)
Because of the include of the decompress_inflate.c file from
boot/compress/misc.c, there are different flush() defines:
In file included from arch/arm/boot/compressed/misc.c:249:
arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:138:29: error: macro "flush" passed 2 arguments, but takes just 0
Fix this by removing the define of flush() in misc.c for
CONFIG_DEBUG_ICEDCC as it's already defined in mach/uncompress.h,
and that is being included unconditionally.
Also use a static inline function instead of define
for mach-mxc and mach-gemini to avoid similar bug
for those platforms.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 14 Jan 2010 02:11:01 +0000 (18:11 -0800)]
Linux-omap rebuilt: updated to -rc4
$ git checkout -b tmp-rebuild-
1263435052 linus
$ git merge -m "Merge omap-fixes" omap-fixes
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge for-next" for-next
$ git merge -m "Merge cbus" cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1263435052
To view the changes since the last rebuild, please do
$ git diff
6d1ee3221f2f1125298a92b77e815556bc11c24f..
f84bd29c74be5f6fa2dafb2aca8f4dba918d5da8 arch/arm/*omap*/
Tony Lindgren [Thu, 14 Jan 2010 02:10:56 +0000 (18:10 -0800)]
Merge cbus
Tony Lindgren [Thu, 14 Jan 2010 02:10:55 +0000 (18:10 -0800)]
Merge for-next
Tony Lindgren [Thu, 14 Jan 2010 02:10:54 +0000 (18:10 -0800)]
Merge omap-testing
vikram pandita [Thu, 14 Jan 2010 02:10:34 +0000 (18:10 -0800)]
omap: zoom3: enable ehci support
Zoom3 board has omap3630 EHCI port2 connected to a ULPI phy.
GPIO_64 is connected to the PHY reset pin.
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Cc: Gadiyar, Anand <gadiyar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
vikram pandita [Thu, 14 Jan 2010 02:10:34 +0000 (18:10 -0800)]
omap: serial: fix coding style indentaion
No logical code change
Fix coding style indentaion as per checkpatch.pl
Fix multi-line comment style reported by Nishanth Menon
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Cc: Menon, Nishanth <nm@ti.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Lesly A M [Thu, 14 Jan 2010 02:10:33 +0000 (18:10 -0800)]
omap3: pm: Add T2 Keypad as a wakeup source
Changes for setting the padconf value for sys_nirq line which is
connected to T2 INTR1. This will fix the T2 keypad wakeup.
Signed-off-by: Lesly A M <x0080970@ti.com>
Signed-off-by: Teerth Reddy <teerth@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Sriram [Thu, 14 Jan 2010 02:10:33 +0000 (18:10 -0800)]
ARCH OMAP : enable ARCH_HAS_HOLES_MEMORYMODEL for OMAP
OMAP platforms(like OMAP3530) include DSP or other co-processors
for media acceleration. when carving out memory for the
accelerators we can end up creating a hole in the memory map
of sort:
<kernel memory><hole(memory for accelerator)><kernel memory>
To handle such a memory configuration ARCH_HAS_HOLES_MEMORYMODEL
has to be enabled. For further information refer discussion at:
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg15262.html.
Signed-off-by: Sriramakrishnan <srk@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 14 Jan 2010 02:10:33 +0000 (18:10 -0800)]
omap: Clean-up for omap_mux_init
Get rid of the ifdeffery in omap_mux_init by creating
omap_mux_init_package and omap_mux_init_signals functions.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ladislav Michl [Thu, 14 Jan 2010 02:10:33 +0000 (18:10 -0800)]
MTD: remove no longer used OMAP flash map
All OMAP boards are now using physmap-flash.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ladislav Michl [Thu, 14 Jan 2010 02:10:32 +0000 (18:10 -0800)]
omap: convert boards to use physmap-flash
Convert OMAP based boards to use physmap-flash. Refreshed against today's
Linux omap kernel tree
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Roel Kluin [Thu, 14 Jan 2010 02:10:29 +0000 (18:10 -0800)]
OMAP: dma_chan[lch_head].flag & OMAP_DMA_ACTIVE tested twice in omap_dma_unlink_lch()
The same flag and bits were tested twice.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 14 Jan 2010 02:10:29 +0000 (18:10 -0800)]
omap: Fix cmdline muxing
Looks like cmdline muxing got broken at some point when we
decided to limit muxing to __init code. Currently omap_mux_entry
list is not yet initialized when we try to initialize cmdline
muxing.
Fix this by calling omap_mux_init_list() before calling
omap_mux_set_cmdline_signals().
Reported-by: Philip Balister <philip@balister.org>
Tested-by: Philip Balister <philip@balister.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Francisco Alecrim [Thu, 14 Jan 2010 02:10:02 +0000 (18:10 -0800)]
fix compile for tahvo-usb.c
drivers/cbus/tahvo-usb.c:138: undefined reference to 'usb_bus_start_enum'
usb_bus_start_enum only exported if USB_OTG enabled
Signed-off-by: Francisco Alecrim <francisco.alecrim@openbossa.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Francisco Alecrim [Thu, 14 Jan 2010 02:10:02 +0000 (18:10 -0800)]
n8x0_defconfig: active cbus, retu-wd and omap-wd
It's critical for correct n8x0 operation. Device turn power-off after some
seconds without these options.
Signed-off-by: Francisco Alecrim <alecrim@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Felipe Balbi [Thu, 14 Jan 2010 02:10:02 +0000 (18:10 -0800)]
cbus: add platform_data to pass gpios
also add the platform_data to the related
board files.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Felipe Balbi [Thu, 14 Jan 2010 02:10:01 +0000 (18:10 -0800)]
cbus: move to platform_driver
also add the platform_device to 770 and n8x0 board files.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>