summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)Author
2012-01-12Automatically merging tracking-igloo_kernel-other into ↵stable-linaro-ux500-3.1Lee Jones
merging-stable-linaro-ux500-3.1 Conflicting files:
2011-12-21ux500: Change to the u8500 wdtRobert MARKLUND
This will change to the u8500 wdt that uses a watchdog in the prcmu to detect hangs on the arm side. This is not enabled by default and will need a userspace deamon that enables it, configure it and kicks it from time to time. Change-Id: Ia4dc1b0d114797cd44e874f432d94a91669d28c8 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-12-20Revert "mach-ux500: musb: Now musb is always in OTG mode"Philippe Langlais
This reverts commit ac28162fc038d50e64ff2e81d64046be22533e0f.
2011-12-15ARM: 7185/1: perf: don't assign platform_device on unsupported CPUslinux-linaro-3.1-2011.12-1Will Deacon
In the unlikely case that a platform registers a PMU platform_device when running on a CPU that is unsupported by perf, we will encounter a NULL dereference when trying to assign the platform_device to the cpu_pmu structure. This patch checks that the CPU is supported by perf before assigning the platform_device. Reported-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> (cherry picked from commit 6bd054096dce061560cee0e016e292e588dc438f)
2011-12-15ARM: perf: check that we have a platform device when reserving PMUWill Deacon
Attempting to use a hardware counter on a platform with a supported PMU but where the platform_device (defining the interrupts) has not been registered results in a NULL pointer dereference. This patch fixes the problem by checking that we actually have a platform device registered before attempting to grab the interrupts. Reported-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> (cherry picked from commit e5a21327644adba32816f74a415114d11c57f2e9)
2011-12-15ARM: perf: initialise used_mask for fake PMU during validationWill Deacon
When validating an event group, we call pmu->get_event_idx for each group member in order to check that the group can be scheduled as a unit on an empty PMU. As a result of 3fc2c830 ("ARM: perf: remove event limit from pmu_hw_events"), the used_mask member of struct cpu_hw_events must be setup explicitly, something which we don't do for the fake cpu_hw_events used for validation. This patch sets up an empty used_mask for the fake validation cpu_hw_events, preventing NULL deferences when trying to get the event index. Reported-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> (cherry picked from commit bce34d14428d35d9a06ddc10cd46ecef311764c9)
2011-12-14ARM: exynos4: Add thermal sensor driver platform device supportAmit Daniel Kachhap
This patch adds necessary source definations needed for TMU driver and the platform device support. Signed-off-by: Amit Daniel Kachhap <amit.kachhap@linaro.org>
2011-12-14EXYNOS4210: Add Support for DVS LockJongpill Lee
Signed-off-by: Jongpill Lee <boyko.lee@samsung.com> Signed-off-by: SangWook Ju <sw.ju@samsung.com> Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2011-12-13ARM: oprofile: don't mark oprofile_arch_exit() with __exitNicolas Pitre
When the oprofile code is built into the kernel, the code marked with __exit is discarded at link time. This fails the build as oprofile_arch_exit() is referenced from oprofile_init() which is in a different section. Signed-off-by: Nicolas Pitre <nico@linaro.org>
2011-12-12Merge commit 'v3.1.5' into linaro-3.1Nicolas Pitre
2011-12-09ARM: 7161/1: errata: no automatic store buffer drainWill Deacon
commit 11ed0ba1754841316d4095478944300acf19acc3 upstream. This patch implements a workaround for PL310 erratum 769419. On revisions of the PL310 prior to r3p2, the Store Buffer does not automatically drain. This can cause normal, non-cacheable writes to be retained when the memory system is idle, leading to suboptimal I/O performance for drivers using coherent DMA. This patch adds an optional wmb() call to the cpu_idle loop. On systems with an outer cache, this causes an explicit flush of the store buffer. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Tested-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-09ARM: OMAP: PM: only register TWL with voltage layer when device is presentKevin Hilman
commit 46232a3622c6e33605906ee6690dfef372925f53 upstream. Current code registers voltage layer details for TWL PMIC even when a TWL has not been registered. Fix this to only register the TWL with voltage layer when the TWL PMIC is initialized by board-level code. Signed-off-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-09ARM: OMAP2: select ARM_AMBA if OMAP3_EMU is definedMing Lei
commit a8a6565c7615cab3608d75af95b5c8a3522cd7c4 upstream. This patch selects ARM_AMBA if OMAP3_EMU is defined because OC_ETM depends on ARM_AMBA, so fix the link failure[1]. [1], arch/arm/kernel/built-in.o: In function `etm_remove': /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:609: undefined reference to `amba_release_regions' arch/arm/kernel/built-in.o: In function `etb_remove': /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:409: undefined reference to `amba_release_regions' arch/arm/kernel/built-in.o: In function `etm_init': /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:640: undefined reference to `amba_driver_register' /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:646: undefined reference to `amba_driver_register' /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:648: undefined reference to `amba_driver_unregister' arch/arm/kernel/built-in.o: In function `etm_probe': /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:545: undefined reference to `amba_request_regions' /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:595: undefined reference to `amba_release_regions' arch/arm/kernel/built-in.o: In function `etb_probe': /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:347: undefined reference to `amba_request_regions' /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:392: undefined reference to `amba_release_regions' arch/arm/mach-omap2/built-in.o: In function `emu_init': /home/tom/git/omap/linux-2.6-omap/arch/arm/mach-omap2/emu.c:62: undefined reference to `amba_device_register' /home/tom/git/omap/linux-2.6-omap/arch/arm/mach-omap2/emu.c:63: undefined reference to `amba_device_register' make: *** [.tmp_vmlinux1] Error 1 making modules Signed-off-by: Ming Lei <tom.leiming@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-09ARM: OMAP: hwmod: Fix the addr space, irq, dma count APIssricharan
commit cc1b0765da6078b906772b79ff211b88cc0ae958 upstream. The address spaces, irqs and dma reqs count APIs return the number of corresponding entries in a hwmod including a additional null value or a -1 terminator in the structure introduced recently. More information here: - 212738a4: omap_hwmod: use a terminator record with omap_hwmod_mpu_irqs arrays - 78183f3f: omap_hwmod: use a null structure record to terminate omap_hwmod_addr_space arrays - bc614958: omap_hwmod: use a terminator record with omap_hwmod_dma_info arrays The issue with irqs and dma info was originally reported by Benoit Cousson. The devices which have multiple hwmods and use device_build_ss are broken with this, as their resources are populated with a extra null value, subsequently the probe fails. So fix the API not to include the array terminator in the count. Reported-by: Benoit Cousson <b-cousson@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimar@ti.com> Signed-off-by: sricharan <r.sricharan@ti.com> Signed-off-by: Benoit Cousson <b-cousson@ti.com> Cc: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-09ARM: OMAP: smartreflex: fix IRQ handling bugFelipe Balbi
commit 5a4f1844c2ba21f804d7729306d9b16eaeb724a8 upstream. Fix a bug which has been on this driver since it was added by the original commit 984aa6db which would never clear IRQSTATUS bits. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-09arm: mx28: fix bit operation in clock settingWolfram Sang
commit c2735391fbc68feae10d6d14e60956c8106e725f upstream. reg | (1 << clk->enable_shift) always evaluates to true. Switch it to & which makes much more sense. Same fix as 13be9f00 (ARM i.MX28: fix bit operation) at a different location. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-09ARM: pxa: fix inconsistent CONFIG_USB_PXA27XHaojian Zhuang
commit c0a39151a4055332897cba615623d3de2f3896df upstream. Since CONFIG_USB_GADGET_PXA27X and other macros are renamed to CONFIG_USB_PXA27X. Update them in arch/arm/mach-pxa and arch/arm/configs to keep consistent. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-08Merge branches 'mach-plat-3.1' and 'cg2900-3.1' into stable-linux-ux500-3.1linux-mainline-2011-12Philippe Langlais
2011-12-08mach-ux500: Fix snowball pins for buttonsRobert MARKLUND
Fix snowball pins for buttons also do the declaration the same way all the other decalrations are done. Moved the u9500 special GPIO swich to before board variant specific GPIO Change-Id: I9b25667d3ece4a49706b5c43c7cc7df5df3930e1 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-12-06Merge branch 'hsi' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'modem' into linux-stable-ux500-3.1Philippe Langlais
Conflicts: drivers/misc/Kconfig drivers/misc/Makefile drivers/staging/Makefile
2011-12-06Merge branch 'ste-multimedia-framework' into linux-stable-ux500-3.1Philippe Langlais
Conflicts: drivers/staging/Kconfig drivers/staging/Makefile
2011-12-06Merge branch 'wlan' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'st-mems-sensors' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'audio' into linux-stable-ux500-3.1Philippe Langlais
Conflicts: drivers/misc/Makefile
2011-12-06Merge branch 'security' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'video' into linux-stable-ux500-3.1Philippe Langlais
Conflicts: drivers/misc/Makefile
2011-12-06Merge branch 'hwmem' into linux-stable-ux500-3.1Philippe Langlais
Conflicts: drivers/misc/Makefile
2011-12-06Merge branch 'input' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'trace-debug' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'usb' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'storage-mmc' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'dma' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'gpio' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'mach-plat' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'core' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06mach-ux500: sensors: Add __init directive for mop500_sensors_init()Philippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-12-06ARM: U9500: HSI registers update to DB8500 V2 specPawel Szyszuk
ST-Ericsson Linux next: NA ST-Ericsson ID: 365681 ST-Ericsson FOSS-OUT ID: NA Change-Id: I396c2a4d44ded438308e358aa0ad976a397d4dd6 Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33224 Reviewed-by: Christopher BLAIR <chris.blair@stericsson.com> Reviewed-by: Derek MORTON <derek.morton@stericsson.com> Reviewed-by: Andrew LYNN <andrew.lynn@stericsson.com>
2011-12-06ARM: U8500: ST-E HSI: DMA burst and PIPE supportPawel Szyszuk
Added support for HSIR PIPELINED mode (also in drivers/hsi) Added DMA max burst (in DMA words) as a parameter in hsi.h DMA channel high priority set to TRUE for HSI ST-Ericsson ID: 356625 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Id842e61343ce5013992337db085fcbe91dd5b9f7 Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32180 Reviewed-by: Yann GAUTIER <yann.gautier@stericsson.com> Reviewed-by: Andrew LYNN <andrew.lynn@stericsson.com>
2011-12-06arch: arm: ST-E HSI controllerPhilippe Langlais
Change-Id: Ibe70431ede8a9707b37e3394c22beb9acc42d8cb Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com>
2011-12-06HSI: omap_ssi: Add OMAP SSI to the kernel configurationPhilippe Langlais
Add OMAP SSI device and driver to the kernel configuration Change-Id: I7f21d4016a98db6f53efcd03f9ffd176b8845d7c Signed-off-by: Carlos Chinea <carlos.chinea@nokia.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20577 Reviewed-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Tested-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Conflicts: arch/arm/mach-omap2/Makefile
2011-12-06HSI: omap_ssi: Introducing OMAP SSI driverCarlos Chinea
Introduces the OMAP SSI driver in the kernel. The Synchronous Serial Interface (SSI) is a legacy version of HSI. As in the case of HSI, it is mainly used to connect Application engines (APE) with cellular modem engines (CMT) in cellular handsets. It provides a multichannel, full-duplex, multi-core communication with no reference clock. The OMAP SSI block is capable of reaching speeds of 110 Mbit/s. Change-Id: Iea002a8f321cf66ab439552620af001206626ed6 Signed-off-by: Carlos Chinea <carlos.chinea@nokia.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20576 Reviewed-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Tested-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-12-06mach-ux500: For topic branches isolation, define Modem Loaders config flags herePhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-12-06u5500 : check for modem_itp in mloaderBibek Basu
collect the modem type info from bootargs and expose over sysfs ST-Ericsson ID: 337490 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: Ia705e168568a0be08409af792a04091d4e96a50a Signed-off-by: Bibek Basu <bibek.basu@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32480 Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
2011-12-06ux500-mbox: Proper shutdown of mailboxArun Murthy
Implement clean shutdown of mailbox, which includes, unmapping the io mapped memory, free the requested interrupt, reset all state machine and remove from list. A function has been added to reset the mailbox which will be used in case of MSR. ST-Ericsson Linux next: NA ST-Ericsson ID: 341807 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I1435345d155717a5276a7a5d74da84d3eeef7f61 Signed-off-by: Arun Murthy <arun.murthy@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32680 Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-12-06u5500 : modem irq updateBibek Basu
irq request flag should also be IRQF_NO_SUSPEND Signed-off-by: Bibek Basu <bibek.basu@stericsson.com> Change-Id: I6db0770c7cfd62ee0feab03553a315781177def8 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31000 Reviewed-by: Arun MURTHY <arun.murthy@stericsson.com>
2011-12-06ux500_ing05160_mailboxPD_0.1:Lockdeb correctness fix for modem_irqBibek Basu
Commit ID: Ib94dcbf6: U5500 : Lockdeb correctness fix for modem_irq Build and boot test only done for 8500 config Booting will only happend properly if used Initramfs Change-Id: I5da03baa7b8ee8f32de5712b7136442fbe2cec1c Signed-off-by: Bibek Basu <bibek.basu@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/28923
2011-12-06U8500 : driver for awaking modem on sim hot swap activityBibek Basu
This driver uses GPIO to detect SIM hot swap and uses Modem Access Framework to wake up modem. ST-Ericsson Linux next: 336280 ST-Ericsson ID: 329459 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ib4b1f67422317850f5d859ddf4c5e457f4cb616c Signed-off-by: Bibek Basu <bibek.basu@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23543 Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-12-06u8500: shrm: Move shrm to drivers/modemKumar Sanghvi
Moves shrm specific files from arch/arm/mach-ux500/mach/include and drivers/misc to include/linux/modem/shrm and drivers/modem/shrm respectively ST-Ericsson ID: CR329459 Change-Id: I3a08f83e5302429d51eb865ee1c5e4e0ec73e31b Signed-off-by: Kumar Sanghvi <kumar.sanghvi@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23980 Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-12-06u8500: shrm: Adapt to use Modem Access frameworkKumar Sanghvi
Removes calls to prcmu driver APIs. Uses the modem access framework to get/release access to modem. ST-Ericsson ID: CR329459 Change-Id: I7933c0b41863156820a6239ff2cb74e4ed26c3d7 Signed-off-by: Kumar Sanghvi <kumar.sanghvi@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23555 Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-25 06:54:03 +0000