aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-03-09Merge branch 'omap-l3-for-next' of ↵Tony Lindgren9-2/+1165
git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into omap-for-linus
2011-03-09OMAP2/3: VENC hwmod: add OCPIF_SWSUP_IDLE flag to interfacePaul Walmsley3-0/+3
According to the hwmod interface data, the DSS submodule "VENC" uses a clock, "dss_54m_fck"/"dss_tv_fck", which the PRCM cannot autoidle. By default, the hwmod code assumes that interface clocks can be autoidled by the PRCM. When the interface clock can't be autoidled by the PRCM, those interfaces must be marked with the OCPIF_SWSUP_IDLE flag. Otherwise, the "interface clock" will always have a non-zero use count, and the device won't enter idle. This problem was observed on N8x0. Fix the immediate problem by marking the VENC interface with the OCPIF_SWSUP_IDLE flag. But it's not clear that "dss_54m_fck"/"dss_tv_fck" is really the correct interface clock for VENC. It may be that the VENC interface should use a hardware-autoidling interface clock. This is the situation on OMAP4, which uses "l3_div_ck" as the VENC interface clock, which can be autoidled by the PRCM. Clarification from TI is needed. Problem found and patch tested on N8x0 by Tony Lindgren <[email protected]>. Signed-off-by: Paul Walmsley <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Senthilvadivu Guruswamy <[email protected]> Cc: Sumit Semwal <[email protected]> Cc: Kevin Hilman <[email protected]> Cc: Benoît Cousson <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-03-09OMAP4: l3: Introduce l3-interconnect error handling driverSantosh Shilimkar3-0/+386
The driver provides the information regarding the ocp errors that gets logged in the interconnect. The error information gives the detail regarding the target that was attempted to be accessed and its corresponding address. Signed-off-by: sricharan <[email protected]> Signed-off-by: Santosh Shilimkar <[email protected]> Acked-by: Benoit Cousson <[email protected]>
2011-03-09OMAP4: Initialise the l3 device with the hwmod data.sricharan1-0/+32
The l3 interconnect device is build with all the data required to handle the error logging. The data is extracted from the hwmod data base. Signed-off-by: Santosh Shilimkar <[email protected]> Signed-off-by: sricharan <[email protected]> Acked-by: Benoit Cousson <[email protected]>
2011-03-09OMAP4: hwmod_data: Add address space and irq in L3 hwmod.sricharan1-0/+38
Add the address spaces, irqs of the l3 interconnect to the hwmod data. The hwmod change is aligned with Benoit Cousson. Signed-off-by: Santosh Shilimkar <[email protected]> Signed-off-by: sricharan <[email protected]> Acked-by: Benoit Cousson <[email protected]>
2011-03-09OMAP3: l3: Introduce l3-interconnect error handling driverFelipe Balbi3-0/+655
The driver provides the information regarding the ocp errors that gets logged in the interconnect.The error info provides the details regarding the master or the target that generated the error, type of error and the corresponding address. The stack dump is also provided. Signed-off-by: sricharan <[email protected]> [[email protected]: Enhacements, major cleanup and made it functional] Signed-off-by: Santosh Shilimkar <[email protected]> [[email protected]: Driver design changes as per OMAP4 version] Signed-off-by: Felipe Balbi <[email protected]> [[email protected]: Initial version of the driver] Acked-by: Benoit Cousson <[email protected]>
2011-03-09OMAP3: devices: Initialise the l3 device with the hwmod data.sricharan1-0/+32
The l3 interconnect device is build with all the data required to handle the error logging. The data is extracted from the hwmod database. Signed-off-by: sricharan <[email protected]> Signed-off-by: Santosh Shilimkar <[email protected]> Acked-by: Benoit Cousson <[email protected]>
2011-03-09OMAP3: hwmod_data: Add address space and irq in L3 hwmod.sricharan2-2/+22
Add the address spaces, irqs of the l3 interconnect to the hwmod data. The hwmod changes are aligned with Benoit Cousson. Signed-off-by: sricharan <[email protected]> Signed-off-by: Santosh Shilimkar <[email protected]> Acked-by: Benoit Cousson <[email protected]>
2011-03-08audio : AM3517 : Adding i2c info for AIC23 codecAbhilash Vadakkepat Koyamangalath1-0/+3
The i2c_board_info entry supporting AIC23 codec was added into the i2c2 bus. Signed-off-by: Abhilash K V <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-03-08OMAP1: McBSP: fix build break for non-multi-OMAP1 configsPaul Walmsley1-6/+12
Commit 3cf32bba8ca0e0052ca41d74d455a5805b7fea85 ("OMAP: McBSP: Convert McBSP to platform device model") breaks compilation with non-multi-OMAP1 configs: CC arch/arm/mach-omap1/mcbsp.o arch/arm/mach-omap1/mcbsp.c: In function 'omap1_mcbsp_init': arch/arm/mach-omap1/mcbsp.c:384: warning: dereferencing 'void *' pointer arch/arm/mach-omap1/mcbsp.c:387: error: invalid use of void expression arch/arm/mach-omap1/mcbsp.c:390: warning: dereferencing 'void *' pointer arch/arm/mach-omap1/mcbsp.c:393: error: invalid use of void expression Fix by avoiding NULL dereferences. Signed-off-by: Paul Walmsley <[email protected]> Cc: Kishon Vijay Abraham I <[email protected]> Cc: Tony Lindgren <[email protected]> Acked-by: Jarkko Nikula <[email protected]> [[email protected]: updated description not to remove unnecessary branch name] Signed-off-by: Tony Lindgren <[email protected]>
2011-03-04Revert "OMAP4: hwmod data: Prevent timer1 to be reset and idle during init"Benoit Cousson1-1/+0
The following commit: 38698be: OMAP2+: clockevent: set up GPTIMER clockevent hwmod right before timer init Fixed properly the issue with early init for the timer1 So reverts commit 3b03b58dab847883e6b9a431558c7d8e43fa94c6 that is now generated a warning at boot time. Signed-off-by: Benoit Cousson <[email protected]> Reviewed-by: Paul Walmsley <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-03-02Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and ↵Tony Lindgren54-1200/+2627
'devel-hsmmc' into omap-for-linus Conflicts: arch/arm/mach-omap2/omap_hwmod_44xx_data.c
2011-03-02Merge branch 'devel-cleanup' into omap-for-linusTony Lindgren359-3127/+3662
Conflicts: arch/arm/mach-omap2/timer-gp.c
2011-03-02mfd: twl4030_codec: Remove unused and duplicate audio_mclk fieldsIlkka Koskinen1-2/+0
audio_mclk can be queried from mfd driver. Therefore, it is not needed in twl4030_codec_audio_data or in twl4030_codec_vibra_data anymore. Signed-off-by: Ilkka Koskinen <[email protected]> Acked-by: Peter Ujfalusi <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Samuel Ortiz <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-03-02omap: Remove unnecessary twl4030_codec_audio settings from board filesIlkka Koskinen10-30/+10
twl4030_codec_audio and twl4030_codec_vibra_data has unused field. In order to remove it, corresponding settings needs to be removed from board files. Signed-off-by: Ilkka Koskinen <[email protected]> Acked-by: Peter Ujfalusi <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-03-02omap: rx51: Add support for vibraIlkka Koskinen1-0/+9
Add support for vibra Signed-off-by: Ilkka Koskinen <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-03-02omap: panda: Add TI-ST driver supportGuy Eilam1-0/+11
Added the KIM (Kernel initialization module for the Shared Transport driver) device entry in the board file Only the Blutooth enable GPIO is set for now Signed-off-by: Guy Eilam <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-03-02ldp: Fix regulator mapping for ads7846 TS controllerTony Lindgren1-0/+21
On the OMAP3430LDP board, the ads7846 touchscreen controller is powered by VAUX1 regulator (supplying 3.0v). Fix this mapping in the board file, and hence prevent the ads7846 driver init to fail with the below error.. ads7846 spi1.0: unable to get regulator: -19 Signed-off-by: Rajendra Nayak <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-03-02arm: omap: fix section mismatch warningMing Lei1-1/+1
WARNING: arch/arm/plat-omap/built-in.o(.data+0x6d4): Section mismatch in reference from the variable omap_driver to the function .init.text:omap_cpu_init() The variable omap_driver references the function __init omap_cpu_init() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, Signed-off-by: Ming Lei <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-03-01Linux 2.6.38-rc7Linus Torvalds1-1/+1
2011-03-01Revert "TPM: Long default timeout fix"Linus Torvalds1-6/+4
This reverts commit c4ff4b829ef9e6353c0b133b7adb564a68054979. Ted Ts'o reports: "TPM is working for me so I can log into employer's network in 2.6.37. It broke when I tried 2.6.38-rc6, with the following relevant lines from my dmesg: [ 11.081627] tpm_tis 00:0b: 1.2 TPM (device-id 0x0, rev-id 78) [ 25.734114] tpm_tis 00:0b: Operation Timed out [ 78.040949] tpm_tis 00:0b: Operation Timed out This caused me to get suspicious, especially since the _other_ TPM commit in 2.6.38 had already been reverted, so I tried reverting commit c4ff4b829e: "TPM: Long default timeout fix". With this commit reverted, my TPM on my Lenovo T410 is once again working." Requested-and-tested-by: Theodore Ts'o <[email protected]> Acked-by: Rajiv Andrade <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-03-01OMAP: hsmmc: Rename the device and driverKishore Kadiyala17-54/+54
Modifying the device & driver name from "mmci-omap-hs" to "omap_hsmmc". Signed-off-by: Kishore Kadiyala <[email protected]> Acked-by: Benoit Cousson<[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-03-01OMAP: adapt hsmmc to hwmod frameworkKishore Kadiyala4-338/+200
OMAP2420 platform consists of mmc block as in omap1 and not the hsmmc block as present in omap2430, omap3, omap4 platforms. Removing all base address macro defines except keeping one for OMAP2420 and adapting only hsmmc device registration and driver to hwmod framework. Changes involves: 1) Remove controller reset in devices.c which is taken care of by hwmod framework. 2) Using omap-device layer to register device and utilizing data from hwmod data file for base address, dma channel number, Irq_number, device attribute. 3) Update the driver to use dev_attr to find whether controller supports dual volt cards Signed-off-by: Paul Walmsley <[email protected]> Signed-off-by: Kishore Kadiyala <[email protected]> Reviewed-by: Balaji T K <[email protected]> Cc: Benoit Cousson <[email protected]> CC: Kevin Hilman <[email protected]> Cc: Tony Lindgren <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-03-01OMAP: hsmmc: Move mux configuration to hsmmc.cKishore Kadiyala2-83/+84
Moving the definition of mux setting API from devices.c to hsmmc.c and renaming it from "omap2_mmc_mux" to "omap_hsmmc_mux". Also calling "omap_hsmmc_mux" from omap2_hsmmc_init. Signed-off-by: Kishore Kadiyala <[email protected]> Cc: Chris Ball <[email protected] Cc: Tony Lindgren <[email protected] Signed-off-by: Tony Lindgren <[email protected]>
2011-03-01OMAP: hwmod data: Add dev_attr and use in the host driverKishore Kadiyala4-0/+29
Add a device attribute to hwmod data of omap2430, omap3, omap4. Currently the device attribute holds information regarding dual volt MMC card support by the controller which will be later passed to the host driver via platform data. Signed-off-by: Kevin Hilman <[email protected]> Signed-off-by: Kishore Kadiyala <[email protected]> Acked-by: Benoit Cousson<[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-03-01OMAP4: hwmod data: enable HSMMCAnand Gadiyar1-5/+5
Enabling hsmmc hwmod for OMAP4 Signed-off-by: Anand Gadiyar <[email protected]> Signed-off-by: Kishore Kadiyala <[email protected]> Acked-by: Benoit Cousson<[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-03-01OMAP3: hwmod data: Add HSMMCPaul Walmsley2-0/+213
Update the omap3 hwmod data with the HSMMC info. Signed-off-by: Paul Walmsley <[email protected]> Signed-off-by: Kevin Hilman <[email protected]> Signed-off-by: Rajendra Nayak <[email protected]> Signed-off-by: Kishore Kadiyala <[email protected]> Cc: Benoit Cousson <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-03-01OMAP2430: hwmod data: Add HSMMCPaul Walmsley1-0/+148
Update the omap2430 hwmod data with the HSMMC info. Signed-off-by: Paul Walmsley <[email protected]> Signed-off-by: Kevin Hilman <[email protected]> Signed-off-by: Rajendra Nayak <[email protected] Signed-off-by: Kishore Kadiyala <[email protected]> Cc: Benoit Cousson <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-03-01omap: mmc: split out init for 2420Anand Gadiyar3-33/+61
The MMC controller on the OMAP2420 is different from those on the OMAP2430, OMAP3 and OMAP4 families - all of the latter are identical. The one on the OMAP2420 is closer to that on OMAP1 chips. Currently, the n8x0 is the only OMAP2420 platform supported in mainline which registers the MMC controller. Upcoming changes to register the controllers using hwmod data are potentially invasive. To reduce the risk, separate out the 2420 controller registration from the common init function and update its only user. Also seperating out mux settings for OMAP2420. Signed-off-by: Anand Gadiyar <[email protected]> Signed-off-by: Kishore Kadiyala <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Madhusudhan Chikkature <[email protected]> Cc: Chris Ball <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-02-28omap: omap3evm: add support for the WL12xx WLAN module to the omap3evmEyal Reizer1-10/+22
This patch is again current omap-for-linus branch Adds platform initialization for working with the WLAN module attached to the omap3evm. The patch includes MMC2 initialization, SDIO and control pins muxing and platform device registration. Signed-off-by: Eyal Reizer <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2011-02-28Merge branch 'hwmon-for-linus' of ↵Linus Torvalds2-0/+2
git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: hwmon: (adt7411) add MODULE_DEVICE_TABLE hwmon: (ad7414) add MODULE_DEVICE_TABLE
2011-02-28fs/block_dev.c: fix new kernel-doc warningRandy Dunlap1-0/+1
Fix new kernel-doc warning in fs/block_dev.c: Warning(fs/block_dev.c:937): No description found for parameter 'kill_dirty' Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-02-28ACPI: Fix build for CONFIG_NET unsetRafael J. Wysocki3-20/+29
Several ACPI drivers fail to build if CONFIG_NET is unset, because they refer to things depending on CONFIG_THERMAL that in turn depends on CONFIG_NET. However, CONFIG_THERMAL doesn't really need to depend on CONFIG_NET, because the only part of it requiring CONFIG_NET is the netlink interface in thermal_sys.c. Put the netlink interface in thermal_sys.c under #ifdef CONFIG_NET and remove the dependency of CONFIG_THERMAL on CONFIG_NET from drivers/thermal/Kconfig. Signed-off-by: Rafael J. Wysocki <[email protected]> Acked-by: Randy Dunlap <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Len Brown <[email protected]> Cc: Stephen Rothwell <[email protected]> Cc: Luming Yu <[email protected]> Cc: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-02-28Merge branch 'hwmod_clockevent_2.6.39' of git://git.pwsan.com/linux-2.6 into ↵Tony Lindgren9-62/+2045
omap-for-linus
2011-02-28Merge branch 'drm-fixes' of ↵Linus Torvalds3-3/+7
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: fix unsigned vs signed comparison issue in modeset ctl ioctl. drm/nv50-nvc0: make sure vma is definitely unmapped when destroying bo
2011-02-28Merge branch 'omap-fixes-for-linus' of ↵Linus Torvalds8-15/+31
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: omap4: prcm: Fix the CPUx clockdomain offsets OMAP2+: clocksource: fix crash on boot when !CONFIG_OMAP_32K_TIMER OMAP2/3: clock: fix fint calculation for DPLL_FREQSEL OMAP2+: mailbox: fix lookups for multiple mailboxes OMAP2420: mailbox: fix IVA vs DSP IRQ numbering mach-omap2: smartreflex: world-writable debugfs voltage files mach-omap2: pm: world-writable debugfs timer files mach-omap2: mux: world-writable debugfs files
2011-02-28Merge branches 'perf-fixes-for-linus', 'x86-fixes-for-linus' and ↵Linus Torvalds7-10/+30
'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf timechart: Fix max number of cpus perf timechart: Fix black idle boxes in the title perf hists: Print number of samples, not the period sum * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Use u32 instead of long to set reset vector back to 0 * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: clockevents: Prevent oneshot mode when broadcast device is periodic
2011-02-28Merge branch 'for-linus' of ↵Linus Torvalds3-10/+55
git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: fix truncate after open fuse: fix hang of single threaded fuseblk filesystem
2011-02-28OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linusPaul Walmsley1-1/+7
On non-OMAP2 and non-OMAP3 kernel configs, turn omap2_sdrc_init() into a no-op. Otherwise, compilation breaks on an OMAP4-only config with the current omap-for-linus branch: arch/arm/mach-omap2/built-in.o: In function `omap2_init_common_devices': ../mach-omap2/io.c:421: undefined reference to `omap2_sdrc_init' Thanks to Sergei Shtylyov <[email protected]> for suggesting the use of a empty static inline function rather than a macro. Signed-off-by: Paul Walmsley <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Sergei Shtylyov <[email protected]> [[email protected]: updated not to use __init for inline omap2_sdrc_init] Signed-off-by: Tony Lindgren <[email protected]>
2011-02-28Merge branch 'upstream-linus' of ↵Linus Torvalds3-13/+28
git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: ocfs2: Check heartbeat mode for kernel stacks only Ocfs2/refcounttree: Fix a bug for refcounttree to writeback clusters in a right number. ocfs2: Fix estimate of necessary credits for mkdir
2011-02-28Merge branch 'for-linus' of ↵Linus Torvalds19-27/+52
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: eukrea-tlv320: fix platform_name ASoC: correct pxa AC97 DAI names ALSA: hda - Add support for new IDT 92HD98 and 92HD99 codecs ALSA: HDA: Add ideapad quirk for two Dell machines ALSA: HDA: Add a new Conexant codec 506e (20590) ALSA: usb-audio: fix oops due to cleanup race when disconnecting ASoC: Hook wm_hubs micbiases up to CLK_SYS ASoC: Correct definition of WM8903_VMID_RES_5K ASoC: Fix WM8958 default microphone detection argument ordering ALSA: HDA: Fix mic initialization in VIA auto parser ALSA: fix one memory leak in sound jack
2011-02-28mm: <asm-generic/pgtable.h> must include <linux/mm_types.h>Ben Hutchings1-0/+2
Commit e2cda3226481 ("thp: add pmd mangling generic functions") replaced some macros in <asm-generic/pgtable.h> with inline functions. If the functions are to be defined (not all architectures need them) then struct vm_area_struct must be defined first. So include <linux/mm_types.h>. Fixes a build failure seen in Debian: CC [M] drivers/media/dvb/mantis/mantis_pci.o In file included from arch/arm/include/asm/pgtable.h:460, from drivers/media/dvb/mantis/mantis_pci.c:25: include/asm-generic/pgtable.h: In function 'ptep_test_and_clear_young': include/asm-generic/pgtable.h:29: error: dereferencing pointer to incomplete type Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-02-28OMAP2+: clockevent: set up GPTIMER clockevent hwmod right before timer initPaul Walmsley1-1/+6
Set up the GPTIMER hwmod used for the clockevent source immediately before it is used. This avoids the need to set up all of the hwmods until the boot process is further along. (In general, we want to defer as much as possible until late in the boot process.) This second version fixes a bug pointed out by Santosh Shilimkar <[email protected]>, that would cause the kernel to use an incorrect timer hwmod name if the selected GPTIMER was not 1 or 12 - thanks Santosh. Also, Tarun Kanti DebBarma <[email protected]> pointed out that the original patch did not apply cleanly; this has now been fixed. Signed-off-by: Paul Walmsley <[email protected]> Cc: Benoît Cousson <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Kevin Hilman <[email protected]> Cc: Santosh Shilimkar <[email protected]> Acked-by: Santosh Shilimkar <[email protected]> Cc: Tarun Kanti DebBarma <[email protected]>
2011-02-28OMAP2+: hwmod: add ability to setup individual hwmodsPaul Walmsley2-7/+58
Add omap_hwmod_setup_one(), which is intended for use early in boot to selectively setup the hwmods needed for system clocksources and clockevents, and any other hwmod that is needed in early boot. omap_hwmod_setup_all() can then be called later in the boot process. The point is to minimize the amount of code that needs to be run early. Signed-off-by: Paul Walmsley <[email protected]> Cc: Benoît Cousson <[email protected]> Cc: Kevin Hilman <[email protected]> Cc: Santosh Shilimkar <[email protected]> Cc: Tony Lindgren <[email protected]>
2011-02-28OMAP2+: hwmod: ignore attempts to re-setup a hwmodPaul Walmsley1-8/+11
Previously, if a hwmod had already been set up, and the code attempted to set up the hwmod again, an error would be returned. This is not really useful behavior if we wish to allow the OMAP core code to setup the hwmods needed for the Linux clocksources and clockevents before the rest of the hwmods are setup. So, instead of generating errors, just ignore the attempt to re-setup the hwmod. Signed-off-by: Paul Walmsley <[email protected]> Cc: Benoît Cousson <[email protected]> Cc: Kevin Hilman <[email protected]>
2011-02-28OMAP2+: hwmod: find MPU initiator hwmod during in _register()Paul Walmsley1-8/+15
Move the code that looks for the MPU initiator hwmod to run during the individual hwmod _register() function. (Previously, it ran after all hwmods were registered in the omap_hwmod_late_init() function.) This is done so code can late-initialize a few individual hwmods -- for example, for the system timer -- before the entire set of hwmods is initialized later in boot via omap_hwmod_late_init(). Signed-off-by: Paul Walmsley <[email protected]> Cc: Benoît Cousson <[email protected]> Cc: Kevin Hilman <[email protected]>
2011-02-28OMAP2+: hwmod: rename some init functionsPaul Walmsley7-25/+24
Rename omap_hwmod_init() to omap_hwmod_register(). Rename omap_hwmod_late_init() to omap_hwmod_setup_all(). Also change all of the callers to reflect the new names. While here, update some copyrights. Suggested by Tony Lindgren <[email protected]>. N.B. The comment in mach-omap2/serial.c may no longer be correct, given recent changes in init order. Signed-off-by: Paul Walmsley <[email protected]> Cc: Benoît Cousson <[email protected]> Cc: Kevin Hilman <[email protected]> Cc: Tony Lindgren <[email protected]>
2011-02-28OMAP2+: hwmod: allow multiple calls to omap_hwmod_init()Paul Walmsley1-19/+10
There's no longer any reason why we should prevent multiple calls to omap_hwmod_init(). It is now simply used to register an array of hwmods. This should allow a subset of hwmods (e.g., hwmods handling the system clocksource and clockevents) to be registered earlier than the remaining mass of hwmods. Signed-off-by: Paul Walmsley <[email protected]> Cc: Benoît Cousson <[email protected]> Cc: Kevin Hilman <[email protected]>
2011-02-28x86: Use u32 instead of long to set reset vector back to 0Don Zickus1-1/+1
A customer of ours, complained that when setting the reset vector back to 0, it trashed other data and hung their box. They noticed when only 4 bytes were set to 0 instead of 8, everything worked correctly. Mathew pointed out: | | We're supposed to be resetting trampoline_phys_low and | trampoline_phys_high here, which are two 16-bit values. | Writing 64 bits is definitely going to overwrite space | that we're not supposed to be touching. | So limit the area modified to u32. Signed-off-by: Don Zickus <[email protected]> Acked-by: Matthew Garrett <[email protected]> Cc: <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2011-02-28perf timechart: Fix max number of cpusThomas Renninger1-3/+3
Currently numcpus is determined in pid_put_sample which is only called on sched_switch/sched_wakeup sample processing. On a machine with a lot cpus I often saw the last cpu missing. Check for (max) numcpus on every event happening and in the beginning. -> fixes the issue for me. Signed-off-by: Thomas Renninger <[email protected]> Cc: Arjan van de Ven <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: [email protected] LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.