aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-01-30Merge tag 'omap-cleanup-b-for-3.9' of ↵Tony Lindgren17-494/+710
git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.9/pm Several OMAP2+ power management fixes, optimizations, and cleanup. This series is a prerequisite for the functional powerdomain conversion series. Basic test logs for this branch are here: http://www.pwsan.com/omap/testlogs/pm_cleanup_fixes_3.9/20130129150017/
2013-01-30Merge tag 'omap-cleanup-a-for-3.9' of ↵Tony Lindgren32-1163/+292
git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.9/pm Remove some dead OMAP clock and device integration code and data. Also, clean up the way that the OMAP device integration code blocks WFI/WFE to use a consistent mechanism, controlled by a data flag. Basic test logs for this branch are here: http://www.pwsan.com/omap/testlogs/cleanup_a_3.9/20130126014242/
2013-01-30MIPS: Netlogic: Fix UP compilation on XLRJayachandran C1-1/+4
The commit 2a37b1a "MIPS: Netlogic: Move from u32 cpumask to cpumask_t" breaks uniprocessor compilation on XLR with: arch/mips/netlogic/xlr/setup.c: In function 'prom_init': arch/mips/netlogic/xlr/setup.c:196:6: error: unused variable 'i' Fix by defining 'i' only when CONFIG_SMP is defined. Signed-off-by: Jayachandran C <[email protected]> Patchwork: http://patchwork.linux-mips.org/patch/4760/ Signed-off-by: John Crispin <[email protected]> Signed-off-by: Ralf Baechle <[email protected]>
2013-01-30MIPS: AR71xx: Fix AR71XX_PCI_MEM_SIZEGabor Juhos1-1/+1
The base address of the PCI memory is 0x10000000 and the base address of the PCI configuration space is 0x17000000 on the AR71xx SoCs. The AR71XX_PCI_MEM_SIZE is defined as 0x08000000 which is wrong because that overlaps with the configuration space. This patch fixes the value of the AR71XX_PCI_MEM_SIZE constant, in order to avoid this resource conflicts. Signed-off-by: Gabor Juhos <[email protected]> Patchwork: http://patchwork.linux-mips.org/patch/4873/ Signed-off-by: John Crispin <[email protected]> Signed-off-by: Ralf Baechle <[email protected]>
2013-01-30MIPS: AR724x: Fix AR724X_PCI_MEM_SIZEGabor Juhos1-1/+1
The base address of the PCI memory is 0x10000000 and the base address of the PCI configuration space is 0x14000000 on the AR724x SoCs. The AR724X_PCI_MEM_SIZE is defined as 0x08000000 which is wrong because that overlaps with the configuration space. The patch fixes the value of the AR724X_PCI_MEM_SIZE constant, in order to avoid this resource conflicts. Signed-off-by: Gabor Juhos <[email protected]> Patchwork: http://patchwork.linux-mips.org/patch/4872/ Signed-off-by: John Crispin <[email protected]> Signed-off-by: Ralf Baechle <[email protected]>
2013-01-30MIPS: Lantiq: Fix cp0_perfcount_irq mappingJohn Crispin1-1/+1
The introduction of the OF support broke the cp0_perfcount_irq mapping. This resulted in oprofile not working anymore. Offending commit is : commit 3645da0276ae9f6938ff29b13904b803ecb68424 Author: John Crispin <[email protected]> Date: Tue Apr 17 10:18:32 2012 +0200 OF: MIPS: lantiq: implement irq_domain support Signed-off-by: Conor O'Gorman <[email protected]> Signed-off-by: John Crispin <[email protected]> Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/4875/ Signed-off-by: Ralf Baechle <[email protected]>
2013-01-30rtc: Add support of rtc-mv for MVEBU SoCsGregory CLEMENT1-1/+1
The Armada 370 and Armada XP Socs have the same controller that the one used in the orion platforms. This patch enables the selection of rtc-mv with mvebu platforms. Signed-off-by: Gregory CLEMENT <[email protected]> Acked-by: Andrew Lunn <[email protected]> Tested-by: Florian Fainelli <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-01-30ARM: Kirkwood: Support basic hotplug for PCI-EJason Gunthorpe1-7/+3
Unconditionally register the PCI-E bus, even if the link is currently down. When the link is brought up the bus can be scanned through /sys/bus/pci/rescan or otherwise. Since the HW has no interrupt for link up, userspace will have to take care of the timing. An earlier version of this was contingent on CONFIG_HOTPLUG, but that is being removed from the kernel. This also fixes printing the link up/down message to be displayed on one line (structured logging broke this?) Signed-off-by: Jason Gunthorpe <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-01-30Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/driversJason Cooper3-1/+5
fixes for v3.8-rc6 - add missing gpio interrupt lines to dove dt - fix bad logic for printing MPP error message on orion boards - build proper serial port driver after changing mvebu DT compatible property - This is a change to mvebu_defconfig that I wouldn't usually push out as a fix. However, the commit b24212f arm: mvebu: Use dw-apb-uart instead of ns16650 as UART driver changed the serial driver for the board in the dts file. without the patch I've included in this pull, users won't see any log messages.
2013-01-30samsung-laptop: Disable on EFI hardwareMatt Fleming1-0/+4
It has been reported that running this driver on some Samsung laptops with EFI can cause those machines to become bricked as detailed in the following report, https://bugs.launchpad.net/ubuntu-cdimage/+bug/1040557 There have also been reports of this driver causing Machine Check Exceptions on recent EFI-enabled Samsung laptops, https://bugzilla.kernel.org/show_bug.cgi?id=47121 So disable it if booting from EFI since this driver relies on grovelling around in the BIOS memory map which isn't going to work. Cc: Corentin Chary <[email protected]> Cc: Matthew Garrett <[email protected]> Cc: Colin Ian King <[email protected]> Cc: Steve Langasek <[email protected]> Cc: <[email protected]> Signed-off-by: Matt Fleming <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]>
2013-01-30efi: Make 'efi_enabled' a function to query EFI facilitiesMatt Fleming13-54/+79
Originally 'efi_enabled' indicated whether a kernel was booted from EFI firmware. Over time its semantics have changed, and it now indicates whether or not we are booted on an EFI machine with bit-native firmware, e.g. 64-bit kernel with 64-bit firmware. The immediate motivation for this patch is the bug report at, https://bugs.launchpad.net/ubuntu-cdimage/+bug/1040557 which details how running a platform driver on an EFI machine that is designed to run under BIOS can cause the machine to become bricked. Also, the following report, https://bugzilla.kernel.org/show_bug.cgi?id=47121 details how running said driver can also cause Machine Check Exceptions. Drivers need a new means of detecting whether they're running on an EFI machine, as sadly the expression, if (!efi_enabled) hasn't been a sufficient condition for quite some time. Users actually want to query 'efi_enabled' for different reasons - what they really want access to is the list of available EFI facilities. For instance, the x86 reboot code needs to know whether it can invoke the ResetSystem() function provided by the EFI runtime services, while the ACPI OSL code wants to know whether the EFI config tables were mapped successfully. There are also checks in some of the platform driver code to simply see if they're running on an EFI machine (which would make it a bad idea to do BIOS-y things). This patch is a prereq for the samsung-laptop fix patch. Cc: David Airlie <[email protected]> Cc: Corentin Chary <[email protected]> Cc: Matthew Garrett <[email protected]> Cc: Dave Jiang <[email protected]> Cc: Olof Johansson <[email protected]> Cc: Peter Jones <[email protected]> Cc: Colin Ian King <[email protected]> Cc: Steve Langasek <[email protected]> Cc: Tony Luck <[email protected]> Cc: Konrad Rzeszutek Wilk <[email protected]> Cc: Rafael J. Wysocki <[email protected]> Cc: <[email protected]> Signed-off-by: Matt Fleming <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]>
2013-01-30ARM: imx6q: support WAIT mode using cpuidleShawn Guo5-3/+102
Add WAIT mode (ARM core clock gating) support to imx6q cpuidle driver. As WAIT mode is broken on imx6q TO 1.0 and 1.1, it only enables the support for revision 1.2 with chicken bit set. Signed-off-by: Shawn Guo <[email protected]>
2013-01-30ARM: imx: move imx6q_cpuidle_driver into a separate fileShawn Guo4-12/+37
Move imx6q_cpuidle_driver into a separate file as more codes will be added when WAIT mode gets implemented as cpuidle. Signed-off-by: Shawn Guo <[email protected]>
2013-01-30ARM: imx: mask gpc interrupts initiallyShawn Guo1-0/+5
Mask gpc interrupts initially to avoid suspicious interrupts. Signed-off-by: Shawn Guo <[email protected]>
2013-01-30ARM: imx: return zero in case next event gets a large incrementShawn Guo1-1/+2
The return of v2_set_next_event() will lead to an infinite loop in tick_handle_oneshot_broadcast() - "goto again;" with imx6q WAIT mode (to be enabled). This happens because when global event did not expire any CPU local events, the broadcast device will be rearmed to a CPU local next_event, which could be far away from now and result in a max_delta_tick programming in set_next_event(). Fix the problem by detecting those next events with increments larger than 0x7fffffff, and simply return zero in that case. It leaves mx1_2_set_next_event() unchanged since only v2_set_next_event() will be running with imx6q WAIT mode support. Thanks Russell King for helping understand the problem. Signed-off-by: Shawn Guo <[email protected]>
2013-01-30Merge tag 'imx-cleanup-3.9' into imx6q-cpuidleShawn Guo24-1955/+11
2013-01-30Merge tag 'edac_for_3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bpLinus Torvalds2-4/+4
Pull EDAC fixlets from Borislav Petkov: "Two minor correctness fixlets from Dan Carpenter and Joe Perches each." * tag 'edac_for_3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: EDAC: Fix kcalloc argument order EDAC: Test correct variable in ->store function
2013-01-30Merge tag 'sound-3.8' of ↵Linus Torvalds12-48/+69
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull sound fixes from Takashi Iwai: - A collection of small ASoC driver fixes (error path fixes, register correction, regulator bypass mode fix, etc) - A few regression fixes and quirks of HD-audio (wrong page attributes for SG-buffer, Poulsbo/Oaktrail controller fix, digital mic fix for Acer, etc) - A fix for USB-audio UAC2 devices wrt FU length check * tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda - Fix non-snoop page handling ALSA: hda - Enable LPIB delay count for Poulsbo / Oaktrail ALSA: hda - fix inverted internal mic on Acer AOA150/ZG5 ALSA: usb-audio: fix invalid length check for RME and other UAC 2 devices ALSA: hda - Add a fixup for Packard-Bell desktop with ALC880 ASoC: wm_adsp: Release firmware on error ASoC: wm_adsp: Use GFP_DMA for things that may be DMAed ASoC: arizona: Use actual rather than desired BCLK when calculating LRCLK ASoC: wm2200: correct mixer values and text ASoC: MAINTAINERS: Update email address. ASoC: wm5110: Correct AEC loopback mask ASoC: wm5102: Correct AEC loopback mask ASoC: dapm: Fix sense of regulator bypass mode ASoC: fsl: fix multiple definition of init_module ASoC: arizona: Disable free-running mode on FLL1
2013-01-30EDAC: Fix kcalloc argument orderJoe Perches1-3/+3
First number, then size. Signed-off-by: Joe Perches <[email protected]> Cc: <[email protected]> Signed-off-by: Borislav Petkov <[email protected]>
2013-01-30EDAC: Test correct variable in ->store functionDan Carpenter1-1/+1
We're testing for ->show but calling ->store(). Signed-off-by: Dan Carpenter <[email protected]> Cc: [email protected] Signed-off-by: Borislav Petkov <[email protected]>
2013-01-30ARM: mach-shmobile: sh73a0: allow unplugging of CPU0Ulrich Hecht1-1/+1
sh73a0 deals fine with disabling any core, so we should permit it. Signed-off-by: Ulrich Hecht <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-30ARM: mach-shmobile: add shmobile_cpu_disable_any()Ulrich Hecht2-0/+7
Method to disable any core to be used on platforms where CPU0 does not need special treatment. Signed-off-by: Ulrich Hecht <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-30Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds21-158/+155
Pull drm fixes from Dave Airlie: "Intel, radeon and exynos fixes. Nothing too major or wierd: one dmar fix and a radeon cursor corruption, along with misc exynos fixes." * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (21 commits) drm/exynos: add check for the device power status drm/exynos: Make 'drm_hdmi_get_edid' static drm/exynos: fimd and ipp are broken on multiplatform drm/exynos: don't include plat/gpio-cfg.h drm/exynos: Remove "internal" interrupt handling drm/exynos: Add missing static specifiers in exynos_drm_rotator.c drm/exynos: Replace mdelay with usleep_range drm/exynos: Make ipp_handle_cmd_work static drm/exynos: Make g2d_userptr_get_dma_addr static drm/exynos: consider DMA_NONE flag to dmabuf import drm/exynos: free sg object if dma_map_sg is failed drm/exynos: added validation of edid for vidi connection drm/exynos: let drm handle edid allocations drm/radeon: Enable DMA_IB_SWAP_ENABLE on big endian hosts. drm/radeon: fix a rare case of double kfree radeon_display: Use pointer return error codes drm/radeon: fix cursor corruption on DCE6 and newer drm/i915: dump UTS_RELEASE into the error_state iommu/intel: disable DMAR for g4x integrated gfx drm/i915: GFX_MODE Flush TLB Invalidate Mode must be '1' for scanline waits ...
2013-01-30Merge tag 'for-linus-v3.8-rc6' of git://oss.sgi.com/xfs/xfsLinus Torvalds8-9/+47
Pull xfs bugfixes from Ben Myers: "Here are fixes for returning EFSCORRUPTED on probe of a non-xfs filesystem, the stack switch in xfs_bmapi_allocate, a crash in _xfs_buf_find, speculative preallocation as the filesystem nears ENOSPC, an unmount hang, a race with AIO, and a regression with xfs_fsr: - fix return value when filesystem probe finds no XFS magic, a regression introduced in 9802182. - fix stack switch in __xfs_bmapi_allocate by moving the check for stack switch up into xfs_bmapi_write. - fix oops in _xfs_buf_find by validating that the requested block is within the filesystem bounds. - limit speculative preallocation near ENOSPC. - fix an unmount hang in xfs_wait_buftarg by freeing the xfs_buf_log_item in xfs_buf_item_unlock. - fix a possible use after free with AIO. - fix xfs_swap_extents after removal of xfs_flushinval_pages, a regression introduced in commit fb59581404a." * tag 'for-linus-v3.8-rc6' of git://oss.sgi.com/xfs/xfs: xfs: Fix xfs_swap_extents() after removal of xfs_flushinval_pages() xfs: Fix possible use-after-free with AIO xfs: fix shutdown hang on invalid inode during create xfs: limit speculative prealloc near ENOSPC thresholds xfs: fix _xfs_buf_find oops on blocks beyond the filesystem end xfs: pull up stack_switch check into xfs_bmapi_write xfs: Do not return EFSCORRUPTED when filesystem probe finds no XFS magic
2013-01-30Merge branch 'for-linus' of ↵Linus Torvalds1-0/+12
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux Pull one s390 fix from Martin Schwidefsky: "Another transparent huge page fix, we need to define a s390 variant for pmdp_set_wrprotect to flush the TLB for the huge page correctly." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/thp: implement pmdp_set_wrprotect()
2013-01-30Merge tag 'pinctrl-fixes-rc6' of ↵Linus Torvalds7-94/+17
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl Pull pinctrl fixes from Linus Walleij: "This is a late pinctrl fix pull request, we had to revert out the pinctrl-single GPIO backend, because of, well, design issues. We're cooking a better thing for the next cycle. - Revert gpio request/free backend, new patch set in the works, will be for v3.9. Get this old cruft out before anyone hurts himself on it. - Kconfig buzz - Various compile warnings - MPP6 value for the Kirkwood" * tag 'pinctrl-fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: pinctrl: nomadik: nmk_prcm_gpiocr_get_mode may be unused pinctrl: exynos: don't mark probing functions as __init Revert "pinctrl: single: support gpio request and free" pinctrl: mvebu: fix MPP6 value for kirkwood driver pinctrl: mvebu: Fix compiler warnings pinctrl: pinctrl-mxs: Fix variables' definition type pinctrl: samsung: removing duplicated condition for PINCTRL_SAMSUNG
2013-01-29pinctrl: nomadik: nmk_prcm_gpiocr_get_mode may be unusedArnd Bergmann1-1/+1
nmk_prcm_gpiocr_get_mode is only needed for debugfs output at the moment, which can be compile-time disabled. Marking the function __maybe_unused still gives us compile-time coverage, but avoids a gcc warning. Without this patch, building nhk8815_defconfig results in: drivers/pinctrl/pinctrl-nomadik.c:676:12: warning: 'nmk_prcm_gpiocr_get_mode' defined but not used [-Wunused-function] Signed-off-by: Arnd Bergmann <[email protected]> Cc: Jean-Nicolas Graux <[email protected]> Cc: Srinidhi Kasagar <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2013-01-29pinctrl: exynos: don't mark probing functions as __initArnd Bergmann1-5/+5
Functions called from a driver probe() method must not be marked __init, because they may get called after the init phase is done, when the device shows up late, or because of deferred probing. Without this patch, building exynos_defconfig results in multiple warnings like: WARNING: drivers/pinctrl/built-in.o(.text+0x51bc): Section mismatch in reference from the function exynos5440_pinctrl_probe() to the function .init.text:exynos5440_gpiolib_register() The function exynos5440_pinctrl_probe() references the function __init exynos5440_gpiolib_register(). This is often because exynos5440_pinctrl_probe lacks a __init annotation or the annotation of exynos5440_gpiolib_register is wrong. Signed-off-by: Arnd Bergmann <[email protected]> Cc: Tomasz Figa <[email protected]> Acked-by: Kukjin Kim <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2013-01-29ARM: OMAP2+: powerdomain: fix whitespace, improve flag commentsPaul Walmsley4-40/+42
Fix some whitespace problems introduced by commit da03ce65b5431245b9cd20db3edaaa6b9f5c8dc1 ("OMAP3: powerdomain data: add voltage domains"). Also, improve the documentation for the struct powerdomain.flags field. Signed-off-by: Paul Walmsley <[email protected]> Cc: Kevin Hilman <[email protected]>
2013-01-29ARM: OMAP2+: clockdomain: convert existing atomic usecounts into ↵Paul Walmsley7-30/+92
spinlock-protected shorts/ints The atomic usecounts seem to be confusing, and are no longer needed since the operations that they are attached to really should take place under lock. Replace the atomic counters with simple integers, protected by the enclosing powerdomain spinlock. Signed-off-by: Paul Walmsley <[email protected]> Cc: Kevin Hilman <[email protected]>
2013-01-29ARM: OMAP2+: clockdomain: work on wkdep/sleepdep functionsPaul Walmsley3-167/+240
Split the clkdm_(add|del)_(wk|sleep)dep() functions into lockless and locking versions -- this will be needed in a subsequent patch. Also, while here, remove the leading underscore, since these are not currently static functions. And for functions that have kerneldoc-style comment blocks, but which are missing the initial '/**' tag, fix the tag to indicate that they are kerneldoc. Signed-off-by: Paul Walmsley <[email protected]>
2013-01-29ARM: OMAP2xxx: CM: remove autodep handlingPaul Walmsley1-29/+4
There's no need to preserve the autodep handling code in mach-omap2/cm2xxx.c, since no autodeps are defined for these chips. Hopefully they'll never be needed, but if in some future case they are, this code can be added back in. Signed-off-by: Paul Walmsley <[email protected]>
2013-01-29ARM: OMAP2+: powerdomain/clockdomain: add a per-powerdomain spinlockPaul Walmsley4-73/+176
Add a per-powerdomain spinlock. Use that instead of the clockdomain spinlock. Add pwrdm_lock()/pwrdm_unlock() functions to allow other code to acquire or release the powerdomain spinlock without reaching directly into the struct powerdomain. Signed-off-by: Paul Walmsley <[email protected]> Cc: Jean Pihet <[email protected]>
2013-01-29ARM: OMAP2+: PM/powerdomain: move omap_set_pwrdm_state() to powerdomain codePaul Walmsley4-92/+144
Move omap_set_pwrdm_state() from the PM code to the powerdomain code, and refactor it to split it up into several functions. A subsequent patch will rename it to conform with the existing powerdomain function names. This version includes some additional documentation, based on a suggestion from Jean Pihet. It also modifies omap_set_pwrdm_state() to not bail out early unless both the powerdomain current power state and the next power state are equal. (Previously it would terminate early if the next power state was equal to the target power state, which was insufficiently rigorous.) Signed-off-by: Paul Walmsley <[email protected]> Cc: Jean Pihet <[email protected]> Cc: Kevin Hilman <[email protected]> Cc: Tero Kristo <[email protected]>
2013-01-29ARM: OMAP2: PM/powerdomain: drop unnecessary pwrdm_wait_transition()Paul Walmsley3-28/+5
Drop an unnecessary pwrdm_wait_transition() from mach-omap2/pm.c - it's called by the subsequent pwrdm_state_switch(). Also get rid of pwrdm_wait_transition() in the powerdomain code - there's no longer any need to export this function. Signed-off-by: Paul Walmsley <[email protected]> Cc: Kevin Hilman <[email protected]>
2013-01-29ARM: OMAP2xxx: PM: clean up some crufty powerstate programming codePaul Walmsley1-20/+10
Don't attempt to put clockdomains to sleep; this should be handled by the clock framework. It should be enough to program the next-power-state, and then let the code in omap_pm_clkdms_setup() deal with the rest. Start out by programming the MPU and CORE powerdomains to stay ON. Then control the MPU and CORE powerdomain states directly in omap2_enter_full_retention() and omap2_enter_mpu_retention(). Not the most optimal way to do it, but certainly is the most conservative until OMAP2xxx PM is working again. Get rid of the open-coded PM_PWSTCTRL_MPU writes in omap2_enter_mpu_retention(); use the powerdomain code instead. Signed-off-by: Paul Walmsley <[email protected]> Cc: Kevin Hilman <[email protected]>
2013-01-29ARM: OMAP2+: clockdomain: add pwrdm_state_switch() call to clkdm_sleep()Paul Walmsley1-0/+1
In clkdm_sleep(), the powerdomain should be eligible to switch power states right after the call to the low-level clockdomain sleep function. We should have been tracking that with the pwrdm_state_switch() code, but we weren't, for whatever reason. Fix that. This resolves the "pwrdm state mismatch(cam_pwrdm) 3 != 0" that appears during the OMAP4460 Pandaboard-ES PM test, e.g. here: http://www.pwsan.com/omap/testlogs/test_v3.8-rc5/20130126003323/pm/4460pandaes/4460pandaes_log.txt Signed-off-by: Paul Walmsley <[email protected]> Cc: Tero Kristo <[email protected]>
2013-01-29ARM: OMAP2+: powerdomain: fix powerdomain trace integrationJean Pihet1-3/+4
Fix the trace in the case a power domain did not hit the desired state, as reported by Paul Walmsley. Reported-by: Paul Walmsley <[email protected]> Signed-off-by: Jean Pihet <[email protected]> [[email protected]: split this fix off from the patch "ARM: OMAP2+: PM debug: trace the functional power domains states"] Signed-off-by: Paul Walmsley <[email protected]>
2013-01-29ARM: OMAP4: MPUSS PM: remove unnecessary shim functions for powerdomain controlPaul Walmsley1-37/+7
The OMAP4 MPU subsystem power management code contains several unnecessary shim functions for powerdomain control; remove them. Signed-off-by: Paul Walmsley <[email protected]> Cc: Santosh Shilimkar <[email protected]> Cc: Kevin Hilman <[email protected]> Acked-by: Santosh Shilimkar <[email protected]>
2013-01-29ARM: OMAP3xxx: CPUIdle: optimize __omap3_enter_idle()Paul Walmsley1-13/+22
Avoid programming the MPU and CORE powerdomain next-power-state registers if those powerdomains will never enter low-power states (e.g., the state that people refer to as "C1"). To avoid making assumptions about CPUIdle states based on their order in the list, use a flag to mark CPUIdle states that don't enter powerdomain low-power states. Avoid a previous-power-state register read on the MPU powerdomain unless we know that the MPU was supposed to go OFF during the last state transition. Previous-power-state register reads can be very expensive, so it's worth avoiding these when possible. Since the CORE_L3 clockdomain can't go inactive unless the MPU is active, there's little point blocking autoidle on the CORE_L3 clockdomain in "C1" state, since we've programmed the MPU clockdomain to stay active. Remove the unnecessary code. Signed-off-by: Paul Walmsley <[email protected]> Cc: Kevin Hilman <[email protected]>
2013-01-29ARM: DT: tegra114: add pinmux DT entryLaxman Dewangan1-0/+6
Add DT entry for pinmux and drive configuration addresses. Signed-off-by: Laxman Dewangan <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
2013-01-29ARM: DT: tegra114: add GPIO DT entryLaxman Dewangan1-0/+17
Tegra114 has the GPIO controllers with 8 GPIO bank and each bank supports 32 pins. Add DT entry for GPIO controller. Tegra114 GPIO controller is compatible with Tegra30 GPIO controller driver. Signed-off-by: Laxman Dewangan <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
2013-01-29ARM: tegra114: select PINCTRL for Tegra114 SoCLaxman Dewangan1-0/+2
Select PINCTRL and PINCTRL_TEGRA114 for enabling Tegra114 pincontrol driver for Tegra114 SoC. Signed-off-by: Laxman Dewangan <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
2013-01-29ARM: tegra: add Tegra114 ARM_CPUIDLE_WFI_STATE supportJoseph Lo4-0/+73
Adding the generic ARM_CPUIDLE_WFI_STATE support for Tegra114. Signed-off-by: Joseph Lo <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
2013-01-29ARM: tegra: Add SMMU entry to Tegra114 DTHiroshi Doyu1-0/+11
Add SMMU entry. Signed-off-by: Hiroshi Doyu <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
2013-01-29Merge tag 'bcm2835-for-3.9-soc' of ↵Olof Johansson2-0/+37
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/soc From Stephen Warren: ARM: bcm2835: SoC driver updates The bcm2835 clock driver is enhanced to allow fixed clocks to be probed from device tree. A system power-off implementation is added. This branch is based on v3.8-rc3. * tag 'bcm2835-for-3.9-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi: ARM: bcm2835: add a pm_power_off implementation clk: bcm2835: probe for fixed-clock in device tree Signed-off-by: Olof Johansson <[email protected]>
2013-01-29x86, efi: remove attribute check from setup_efi_pciMaarten Lankhorst1-3/+0
It looks like the original commit that copied the rom contents from efi always copied the rom, and the fixup in setup_efi_pci from commit 886d751a2ea99a160 ("x86, efi: correct precedence of operators in setup_efi_pci") broke that. This resulted in macbook pro's no longer finding the rom images, and thus not being able to use the radeon card any more. The solution is to just remove the check for now, and always copy the rom if available. Reported-by: Vitaly Budovski <[email protected]> Cc: Dan Carpenter <[email protected]> Cc: Seth Forshee <[email protected]> Acked-by: Matthew Garrett <[email protected]> Cc: Bjorn Helgaas <[email protected]> Cc: Sasha Levin <[email protected]> Signed-off-by: Maarten Lankhorst <[email protected]> Signed-off-by: Matt Fleming <[email protected]>
2013-01-29Merge tag 'davinci-for-v3.9/soc' of ↵Olof Johansson11-24/+117
git://gitorious.org/linux-davinci/linux-davinci into next/soc From Sekhar Nori: DaVinci SoC changes for v3.9 This pull request: 1) Fixes a bug with the way SPI devices were registered on DA850 2) Adds support for DSP clock and resetting the DSP on DA850 3) Fixes checkpatch issue with some existing files. * tag 'davinci-for-v3.9/soc' of git://gitorious.org/linux-davinci/linux-davinci: ARM: davinci: da850: add dsp clock definition ARM: davinci: psc: introduce reset API ARM: davinci: psc.c: change pr_warning() to pr_warn() ARM: davinci: devices-da8xx.c: change pr_warning() to pr_warn() ARM: davinci: da8xx_register_spi() should not register SPI board info Signed-off-by: Olof Johansson <[email protected]>
2013-01-29ALSA: hda - Fix non-snoop page handlingTakashi Iwai1-14/+26
For non-snoop mode, we fiddle with the page attributes of CORB/RIRB and the position buffer, but also the ring buffers. The problem is that the current code blindly assumes that the buffer is contiguous. However, the ring buffers may be SG-buffers, thus a wrong vmapped address is passed there, leading to Oops. This patch fixes the handling for SG-buffers. Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=800701 Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-29Merge branch 'soc' of ↵Olof Johansson18-70/+485
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc From Simon Horman, a series of SoC updates for shmobile. * 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7779: scif .irqs used SCIx_IRQ_MUXED() ARM: mach-shmobile: sh73a0: Initialise MMCIF using DT ARM: mach-shmobile: sh73a0: Minimal setup using DT ARM: mach-shmobile: sh73a0: Allow initialisation of GIC by DT ARM: SH-Mobile: sh73a0: Add CPU Hotplug ARM: SH-Mobile: sh73a0: Secondary CPUs handle own SCU flags ARM: shmobile: r8a7740: Add CPU sleep suspend ARM: shmobile: sh73a0: Add CPU sleep suspend ARM: shmobile: add function declarations for sh7372 DT helper functions ARM: sh7372: fix cache clean / invalidate order ARM: sh7372: add clock lookup entries for DT-based devices ARM: mach-shmobile: sh73a0 external IRQ wake update ARM: shmobile: sh73a0: fixup div4_clks bitmap ARM: shmobile: r8a7740: add TMU timer support ARM: shmobile: Remove duplicate inclusion of dma-mapping.h in setup-r8a7740.c Signed-off-by: Olof Johansson <[email protected]> Fix trivial conflict in board_bcm due to Simon resolving the same conflict with one less line of whitespace. Keeping end result common with what we already have in arm-soc. Conflicts: arch/arm/mach-bcm/board_bcm.c