07 Nov, 2011
1 commit
-
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
Revert "tracing: Include module.h in define_trace.h"
irq: don't put module.h into irq.h for tracking irqgen modules.
bluetooth: macroize two small inlines to avoid module.h
ip_vs.h: fix implicit use of module_get/module_put from module.h
nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
include: replace linux/module.h with "struct module" wherever possible
include: convert various register fcns to macros to avoid include chaining
crypto.h: remove unused crypto_tfm_alg_modname() inline
uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
pm_runtime.h: explicitly requires notifier.h
linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
miscdevice.h: fix up implicit use of lists and types
stop_machine.h: fix implicit use of smp.h for smp_processor_id
of: fix implicit use of errno.h in include/linux/of.h
of_platform.h: delete needless include
acpi: remove module.h include from platform/aclinux.h
miscdevice.h: delete unnecessary inclusion of module.h
device_cgroup.h: delete needless include
net: sch_generic remove redundant use of
net: inet_timewait_sock doesnt need
...Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
- drivers/media/dvb/frontends/dibx000_common.c
- drivers/media/video/{mt9m111.c,ov6650.c}
- drivers/mfd/ab3550-core.c
- include/linux/dmaengine.h
01 Nov, 2011
1 commit
-
These files all make use of one of the EXPORT_SYMBOL variants
or the THIS_MODULE macro. So they will needSigned-off-by: Paul Gortmaker
20 Oct, 2011
1 commit
-
Otherwise we can't do generic map_io as we currently rely on
static mappings that work only because of arch_ioremap.Acked-by: Nicolas Pitre
Reviewed-by: Santosh Shilimkar
Tested-by: Santosh Shilimkar
Signed-off-by: Tony Lindgren
10 Jul, 2011
1 commit
-
The warm reset function was still using the obsolete API.
Replace it by the new one and move the file to the proper c file.Change the function names to stick to the file convention as
suggested by Paul Walmsley :
prm_xxx -> prminst_xxxSigned-off-by: Benoit Cousson
Cc: Paul Walmsley
Cc: Rajendra Nayak
Signed-off-by: Paul Walmsley
28 Jan, 2011
1 commit
-
This adds a clean method to allow platforms to hook into the reset
code if they require to.Signed-off-by: Russell King
Signed-off-by: Tony Lindgren
23 Dec, 2010
1 commit
-
This patch adds comments on precaution to be taken if Global Warm reset is
used as the means to trigger system reset.Signed-off-by: Vishwanath BS
[paul@pwsan.com: fixed typos, one mentioned by Sanjeev]
Signed-off-by: Paul Walmsley
Cc: Sanjeev Premi
22 Dec, 2010
9 commits
-
Now that OMAP4-specific PRCM functions have been added, distinguish the
existing OMAP2/3-specific PRCM functions by prefixing them with "omap2_".This patch should not result in any functional change.
Signed-off-by: Paul Walmsley
Cc: Kevin Hilman
Cc: Jarkko Nikula
Cc: Peter Ujfalusi
Cc: Liam Girdwood
Cc: Mark Brown
Tested-by: Santosh Shilimkar
Tested-by: Rajendra Nayak -
Move the OMAP4 global software reset function to the OMAP4-specific
prm44xx.c file, where it belongs. Part of the long-term process of
moving all of the direct PRCM register writes into lower-layer code.Also add OCP barriers on OMAP2/3/4 to reduce the chance that the MPU
will continue executing while the system is supposed to be resetting
itself.Signed-off-by: Paul Walmsley
Tested-by: Santosh Shilimkar
Tested-by: Rajendra Nayak -
In some ways, the OMAP4 PRCM register layout is quite different than
the OMAP2/3 PRCM register layout. For example, on OMAP2/3, from a
register layout point of view, all CM instances were located in the CM
subsystem, and all PRM instances were located in the PRM subsystem.
OMAP4 changes this. Now, for example, some CM instances, such as
WKUP_CM and EMU_CM, are located in the system PRM subsystem. And a
"local PRCM" exists for the MPU - this PRCM combines registers that
would normally appear in both CM and PRM instances, but uses its own
register layout which matches neither the OMAP2/3 PRCM layout nor the
OMAP4 PRCM layout.To try to deal with this, introduce some new functions, omap4_cminst*
and omap4_prminst*. The former is to be used when writing to a CM
instance register (no matter what subsystem or hardware module it
exists in), and the latter, similarly, with PRM instance registers.
To determine which "PRCM partition" to write to, the functions take a
PRCM instance ID argument. Subsequent patches add these partition IDs
to the OMAP4 powerdomain and clockdomain definitions.As far as I can see, there's really no good way to handle these types
of register access inconsistencies. This patch seemed like the least
bad approach.Moving forward, the long-term goal is to remove all direct PRCM
register access from the PM code. PRCM register access should go
through layers such as the powerdomain and clockdomain code that can
hide the details of how to interact with the specific hardware
variant.While here, rename cm4xxx.c to cm44xx.c to match the naming convention
of the other OMAP4 PRCM files.Thanks to Santosh Shilimkar , Rajendra Nayak
, and Benoît Cousson for some comments.Signed-off-by: Paul Walmsley
Cc: Benoît Cousson
Cc: Rajendra Nayak
Cc: Santosh Shilimkar -
The OMAP3 PRM module is in the WKUP powerdomain, which is always
powered when the chip is powered, so it shouldn't be necessary to save
and restore those PRM registers. Remove the PRM register save/restore
code, which should save several microseconds during off-mode
entry/exit, since PRM register accesses are relatively slow.While doing so, move the CM register save/restore code into
CM-specific code. The CM module has been distinct from the PRM module
since 2430.This patch includes some minor changes to pm34xx.c.
Signed-off-by: Paul Walmsley
Cc: Kevin Hilman
Cc: Rajendra Nayak
Cc: Tero Kristo
Cc: Kalle Jokiniemi
Reviewed-by: Kevin Hilman
Tested-by: Kevin Hilman
Tested-by: Santosh Shilimkar
Tested-by: Rajendra Nayak -
In preparation for adding OMAP4-specific PRCM accessor/mutator
functions, split the existing OMAP2/3 PRCM code into OMAP2/3-specific
files. Most of what was in mach-omap2/{cm,prm}.{c,h} has now been
moved into mach-omap2/{cm,prm}2xxx_3xxx.{c,h}, since it was
OMAP2xxx/3xxx-specific.This process also requires the #includes in each of these files to be
changed to reference the new file name. As part of doing so, add some
comments into plat-omap/sram.c and plat-omap/mcbsp.c, which use
"sideways includes", to indicate that these users of the PRM/CM includes
should not be doing so.Thanks to Felipe Contreras for comments on this
patch.Signed-off-by: Paul Walmsley
Cc: Jarkko Nikula
Cc: Peter Ujfalusi
Cc: Liam Girdwood
Cc: Omar Ramirez Luna
Acked-by: Omar Ramirez Luna
Cc: Felipe Contreras
Acked-by: Felipe Contreras
Cc: Greg Kroah-Hartman
Acked-by: Mark Brown
Reviewed-by: Kevin Hilman
Tested-by: Kevin Hilman
Tested-by: Rajendra Nayak
Tested-by: Santosh Shilimkar -
Back in the OMAP2/3 PRCM interface days, the macros that referred to
the offsets of individual PRM/CM instances from the top of the PRM/CM
hardware modules were incorrectly suffixed with "_MOD". (They should
have been suffixed with something like "_INST" or "_INSTANCE".) These
days, now that we have better contact with the OMAP hardware people,
we know that this naming is wrong. And in fact in OMAP4, there are
actual hardware module offsets inside the instances, so the incorrect
naming gets confusing very quickly for anyone who knows the hardware.Fix this naming for OMAP4, before things get too far along, by
changing "_MOD" to "_INST" on the end of these macros. So, for
example, OMAP4430_CM2_INSTR_MOD becomes OMAP4430_CM2_INSTR_INST.This unfortunately creates quite a large diff, but it is a
straightforward rename. This patch should not result in any
functional changes.The autogeneration scripts have been updated accordingly.
Signed-off-by: Paul Walmsley
Cc: Benoît Cousson
Cc: Rajendra Nayak
Cc: Santosh Shilimkar
Reviewed-by: Kevin Hilman
Tested-by: Kevin Hilman
Tested-by: Santosh Shilimkar
Tested-by: Rajendra Nayak -
Split the existing cm44xx.h file into cm1_44xx.h and cm2_44xx.h files
so they match their underlying OMAP hardware modules. Add clockdomain
offset information.Add header files for the MPU local PRCM, prcm_mpu44xx.h, and for the
SCRM, scrm44xx.h. SCRM register offsets still need to be added; TI
should do this.Move the "_MOD" macros out of the prcm-common.h header file, into the
header file of the hardware module that they belong to. For example,
OMAP4430_PRM_*_MOD macros have been moved into the prm44xx.h header.Adjust #includes of all files that used the old PRCM header file names
to point to the new filenames.The autogeneration scripts have been updated accordingly.
Signed-off-by: Paul Walmsley
Cc: Benoît Cousson
Cc: Rajendra Nayak
Reviewed-by: Kevin Hilman
Tested-by: Kevin Hilman
Tested-by: Rajendra Nayak
Tested-by: Santosh Shilimkar -
For some reason, the PRCM context save/restore code also saves and
restores a single System Control Module register,
CONTROL_PADCONF_SYS_NIRQ. This is probably just an error -- the
register should be handled by SCM code -- so this patch moves it
there.If this register really does need to be saved and restored before the
rest of the PRCM registers, the code to do so should live in the SCM
code, and the PM code should call this separate function. This
register pertains to devices with a stacked modem, so this patch is
unlikely to affect most OMAP devices out there.Signed-off-by: Paul Walmsley
Cc: Kevin Hilman
Reviewed-by: Kevin Hilman
Tested-by: Kevin Hilman
Tested-by: Santosh Shilimkar
Tested-by: Rajendra Nayak -
Get rid of the open-coded scratchpad write in mach-omap2/prcm.c and
replace it with an actual API, omap3_ctrl_write_boot_mode(). While
there, get rid of the gratuitous omap_writel().There's not much documentation available for what should wind up in
the scratchpad here, so more documentation would be appreciated.
Also, at some point, we should formalize our treatment of the scratchpad;
right now, accesses to the scratchpad are not well-documented.Signed-off-by: Paul Walmsley
Reviewed-by: Kevin Hilman
Tested-by: Kevin Hilman
Tested-by: Santosh Shilimkar
09 Oct, 2010
2 commits
-
Only OMAP2+ platforms have the System Control Module (SCM) IP block.
In the past, we've kept the SCM header file in plat-omap. This has
led to abuse - device drivers including it; includes being added that
create implicit dependencies on OMAP2+ builds; etc.In response, move the SCM headers into mach-omap2/.
As part of this, remove the direct SCM access from the OMAP UDC
driver. It was clearly broken. The UDC code needs an indepth review for
use on OMAP2+ chips.Signed-off-by: Paul Walmsley
Cc: Cory Maccarrone
Cc: Kyungmin Park -
This patch fixes sparse warnings due to non declaration of
static structures and variables.Sparse warning logs fixed:
arch/arm/mach-omap2/control.c:88:6: warning: symbol 'omap3_secure_ram_storage' was not declared. Should it be static?
n
arch/arm/mach-omap2/timer-gp.c:50:22: warning: symbol 'gptimer_wakeup' was not declared. Should it be static?
arch/arm/mach-omap2/timer-gp.c:240:18: warning: symbol 'omap_timer' was not declared. Should it be static?
arch/arm/mach-omap2/prcm.c:121:24: warning: symbol 'prcm_context' was not declared. Should it be static?
arch/arm/mach-omap2/mux2420.c:510:29: warning: symbol 'omap2420_pop_ball' was not declared. Should it be static?
arch/arm/mach-omap2/mux2430.c:589:29: warning: symbol 'omap2430_pop_ball' was not declared. Should it be static?
arch/arm/mach-omap2/mux34xx.c:934:28: warning: symbol 'omap3_cus_subset' was not declared. Should it be static?
arch/arm/mach-omap2/mux34xx.c:1080:29: warning: symbol 'omap3_cus_ball' was not declared. Should it be static?
arch/arm/mach-omap2/mux34xx.c:1272:28: warning: symbol 'omap3_cbb_subset' was not declared. Should it be static?
arch/arm/mach-omap2/mux34xx.c:1393:29: warning: symbol 'omap3_cbb_ball' was not declared. Should it be static?
arch/arm/mach-omap2/mux34xx.c:1603:28: warning: symbol 'omap36xx_cbp_subset' was not declared. Should it be static?
arch/arm/mach-omap2/mux34xx.c:1821:29: warning: symbol 'omap36xx_cbp_ball' was not declared. Should it be static?
arch/arm/mach-omap2/pm-debug.c:165:15: warning: symbol 'pm_dbg_dir' was not declared. Should it be static?
arch/arm/mach-omap2/board-omap3evm.c:587:30: warning: symbol 'ads7846_config' was not declared. Should it be static?
arch/arm/mach-omap2/board-omap3evm.c:606:23: warning: symbol 'omap3evm_spi_board_info' was not declared. Should it be static?
arch/arm/mach-omap2/board-rx51-sdram.c:46:25: warning: symbol 'rx51_sdrc_params' was not declared. Should it be static?
arch/arm/mach-omap2/board-rx51-sdram.c:211:25: warning: symbol 'rx51_get_sdram_timings' was not declared. Should it be static?
arch/arm/mach-omap2/board-omap3touchbook.c:64:15: warning: symbol 'touchbook_revision' was not declared. Should it be static?
arch/arm/mach-omap2/board-am3517evm.c:350:24: warning: symbol 'am3517_evm_dss_device' was not declared. Should it be static?
arch/arm/mach-omap2/board-omap3stalker.c:567:23: warning: symbol 'omap3stalker_spi_board_info' was not declared. Should it be static?Signed-off-by: Manjunath Kondaiah G
Cc: linux-arm-kernel@lists.infradead.org
Cc: Nishanth Menon
Signed-off-by: Tony Lindgren
22 Sep, 2010
2 commits
-
Since OMAP4 is using an absolute address, the current PRM accessors
are not useable.
OMAP4 adaptation for these API are currently ongoing, so define temp
version until the proper ones are defined.Signed-off-by: Benoit Cousson
Signed-off-by: Paul Walmsley
Tested-by: Kevin Hilman -
OMAP4 platform has different register bits for Warm and Cold Resets.
Write one into appropriate bits.Signed-off-by: Rajeev Kulkarni
Cc: Leed Aguilar
[b-cousson@ti.com: Change the define with the proper one from omap4 headers]
Signed-off-by: Benoit Cousson
Signed-off-by: Paul Walmsley
Tested-by: Kevin Hilman
21 May, 2010
1 commit
-
Fix all of the remaining PRCM register shift/bitmask macros that did not
use the _SHIFT/_MASK suffixes to use them. This makes the use of these
macros consistent. It is intended to reduce error, as code can be inspected
visually by reviewers to ensure that bitshifts and bitmasks are used in
the appropriate places.Signed-off-by: Paul Walmsley
Cc: Kevin Hilman
31 Mar, 2010
1 commit
-
This patch fixes usage of bitwise OR in if conditions, and instead
uses logical OR.Signed-off-by: Rajendra Nayak
Cc: Abhijit Pagare
Cc: Tony Lindgren
Signed-off-by: Paul Walmsley
12 Mar, 2010
1 commit
-
This patch follows the commit be093beb608edf821b45fe00a8a080fb5c6ed4af
by Russell King:OMAP wishes to pass state to the boot loader upon reboot in order
to instruct it whether to wait for USB-based reflashing or not.
There is already a facility to do this via the reboot() syscall,
except we ignore the string passed to machine_restart().The patch adds the missing parameter to omap1_arch_reset() and
omap_prcm_arch_reset(), and modifies the latter to pass the reboot
command parameter to the boot loader instead of reboot mode (which is
for kernel internal use only and cannot be modified by the userspace).Signed-off-by: Aaro Koskinen
Signed-off-by: Tony Lindgren
25 Feb, 2010
3 commits
-
- missing return in omap_prcm_get_reset_sources()
- potential use of uninitialized variable in omap_prcm_arch_reset()Signed-off-by: Kevin Hilman
Signed-off-by: Paul Walmsley -
Current implementation defines clock idle state indicators based on the
cpu information (cpu_is_omap24xx() or cpu_is_omap34xx()) in a system wide
manner. This patch extends the find_idlest() function in clkops to pass
back the idle state indicator for that clock, thus allowing idle state
indicators to be defined on a per clock basis if required.This is specifically needed on AM35xx devices as the new IPSS clocks
indicates the idle status (0 is idle, 1 is ready) in a way just
opposite to how its handled in OMAP3 (0 is ready, 1 is idle).Signed-off-by: Ranjith Lohithakshan
[paul@pwsan.com: updated to apply after commit 98c45457 et seq.]
Signed-off-by: Paul Walmsley
24 Feb, 2010
1 commit
-
This is a clean-up patch towards dynamic allocation of IO space
instead of using harcoded macros to calculate virtual addresses.Also update the sdrc, prcm and control module to allocate
iospace dynamicallySigned-off-by: Santosh Shilimkar
Reviewed-by: Kevin Hilman
Reviewed-by: Paul Walmsley
Signed-off-by: Tony Lindgren
30 Jan, 2010
1 commit
-
omap2_clk_prepare_for_reboot() is only applicable to OMAP2xxx chips,
so rename it to omap2xxx_clk_prepare_for_reboot() and only call it when
running on OMAP2xxx chips. Remove the old stub in the OMAP3 clock code.Signed-off-by: Paul Walmsley
27 Jan, 2010
3 commits
-
Move clockdomain wakeup dependency and sleep dependency data
structures from the powerdomain layer to the clockdomain layer, where
they belong. These dependencies were originally placed in the
powerdomain layer due to unclear documentation; however, it is clear
now that these dependencies are between clockdomains. For OMAP2/3,
this is not such a big problem, but for OMAP4 this needs to be fixed.Thanks to Benoît Cousson for his advice on this
patch.Signed-off-by: Paul Walmsley
Cc: Benoît Cousson -
Here the ".clkstctrl_reg" field is added to the clockdomain stucture
as the module offsets for OMAP4 do not map one to one for powerdomains
and clockdomains as it used to for OMAP3. Hence we need to use absolute
addresses to access the control registers. Some of the clock domains have
modules falling in the address space of PRM partition. Hence necessitating
the use of absolute adresses.Signed-off-by: Abhijit Pagare
Signed-off-by: Paul Walmsley
Cc: Benoit Cousson
Cc: Rajendra Nayak -
Module offsets were same for OMAP2 and OMAP3 while they differ for OMAP4.
Hence we need different macros for identifying platform specific offsets.Signed-off-by: Abhijit Pagare
Signed-off-by: Paul Walmsley
Cc: Benoit Cousson
Cc: Rajendra Nayak
21 Jan, 2010
1 commit
-
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
Signed-off-by: Kevin Hilman
12 Dec, 2009
3 commits
-
This patch fixes the PRM and CM base addresses and adds
a new CM2 base address for OMAP4Signed-off-by: Rajendra Nayak
Signed-off-by: Paul Walmsley
Cc: Benoit Cousson -
Fix loop bailout off-by-one bugs reported by Juha Leppänen
.This second version incorporates comments from Russell King
. A new macro, 'omap_test_timeout', has
been created, with cleaner code, and existing code has been converted
to use it.Signed-off-by: Paul Walmsley
Cc: Juha Leppänen
Cc: Russell King -
Device drivers and loadable modules should not be calling these
prm_* and cm_* functions, so stop exporting them. Only core code
and device driver integration code (in arch/arm/*omap*) should
call these functions.Signed-off-by: Paul Walmsley
12 Nov, 2009
3 commits
-
The reboot mode can be communicated to a bootloader (or the
kernel itself) with a scratchpad register. This functionality
is especially useful, if userspace is allowed to change
the reboot mode.Signed-off-by: Juha Yrjola
Signed-off-by: Tony Lindgren
Signed-off-by: Kevin Hilman -
CM_CLKSEL1_PLL_IVA2 is not saved/restored currently. This patch is
adding save and restore for it.Signed-off-by: Jouni Hogander
Signed-off-by: Kevin Hilman -
Add context save and restore for PRCM module to support off-mode.
Additional registers (CM_CLKSEL4, CM_CLKEN, CM_CLKEN2) added by Tero
Kristo.Missing CM_CLKEN_PLL_IVA2 register added by Kalle Jokiniemi.
Signed-off-by: Rajendra Nayak
Signed-off-by: Tero Kristo
Signed-off-by: Kalle Jokiniemi
Signed-off-by: Kevin Hilman
21 Oct, 2009
1 commit
-
Move the remaining headers under plat-omap/include/mach
to plat-omap/include/plat. Also search and replace the
files using these headers to include using the right path.This was done with:
#!/bin/bash
mach_dir_old="arch/arm/plat-omap/include/mach"
plat_dir_new="arch/arm/plat-omap/include/plat"
headers=$(cd $mach_dir_old && ls *.h)
omap_dirs="arch/arm/*omap*/ \
drivers/video/omap \
sound/soc/omap"
other_files="drivers/leds/leds-ams-delta.c \
drivers/mfd/menelaus.c \
drivers/mfd/twl4030-core.c \
drivers/mtd/nand/ams-delta.c"for header in $headers; do
old="#include
25 Jul, 2009
1 commit
-
Some OMAP2/3 hardware modules have CM_IDLEST attributes that are not
handled by the current omap2_wait_clock_ready() code. In preparation
for patches that fix the unusual devices, rename the function
omap2_wait_clock_ready() to omap2_wait_module_ready() and split it
into three parts:1. A clkops-specific companion clock return function (by default,
omap2_clk_dflt_find_companion())2. A clkops-specific CM_IDLEST register address and bit shift return
function (by default, omap2_clk_dflt_find_idlest())3. Code to wait for the CM to indicate that the module is ready
(omap2_cm_wait_idlest())Clocks can now specify their own custom find_companion() and find_idlest()
functions; used in subsequent patches.Signed-off-by: Paul Walmsley
07 Aug, 2008
1 commit
-
This just leaves include/asm-arm/plat-* to deal with.
Signed-off-by: Russell King
