summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2013-10-14Merge tag 'omap-for-v3.13/quirk-signed' of ↵Kevin Hilman
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt From Tony Lindgren: Changes needed to prepare for making omap3 device tree only: - Always build in board-generic, and add pdata quirks and auxdata support for it so we have all the pdata related quirks in the same place. - Merge of the drivers/pinctrl changes that are needed for PM to continue working on omap3 and also needed for other omaps eventually. The three pinctrl related patches have been acked by Linus Walleij and are pulled into both the pinctrl tree and this branch. - Few defconfig related changes for drivers needed. * tag 'omap-for-v3.13/quirk-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (523 commits) ARM: configs: omap2plus_defconfig: enable dwc3 and dependencies ARM: OMAP2+: Add WLAN modules and of_serial to omap2plus_defconfig ARM: OMAP2+: Run make savedefconfig on omap2plus_defconfig to shrink it ARM: OMAP2+: Add minimal 8250 support for GPMC ARM: OMAP2+: Use pdata quirks for wl12xx for omap3 evm and zoom3 ARM: OMAP: Move DT wake-up event handling over to use pinctrl-single-omap ARM: OMAP2+: Add support for auxdata pinctrl: single: Add support for auxdata pinctrl: single: Add support for wake-up interrupts pinctrl: single: Prepare for supporting SoC specific features ARM: OMAP2+: igep0020: use display init from dss-common ARM: OMAP2+: pdata-quirks: add legacy display init for IGEPv2 board +Linux 3.12-rc4 Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-14Merge tag 'socfpga-dts-updates-for-v3.13' of ↵Kevin Hilman
git://git.rocketboards.org/linux-socfpga-next into next/dt From Dinh Nguyen: Updates to dts file structure for Altera's SOCFPGA * Does not include any new bindings or bindings change * Add dts file for a SOCFPGA with an Arria V FPGA * Add a clocks property for the TWD timer * Add support for Terasic SocKit Board which has Cyclone5 FPGA * From Steffen Trumtrar: "This series includes some minor cleanups (indentation and clock labels) and reorders the socfpga dts hierarchy from: socfpga.dtsi -> socfpga_$board.dts -> socfpga_$otherboard.dts to socfpga.dtsi -> socfpga_cyclone5.dtsi --> socfpga_cyclone5_$board.dts --> socfpga_cyclone5_$otherboard.dts " * tag 'socfpga-dts-updates-for-v3.13' of git://git.rocketboards.org/linux-socfpga-next: dts: socfpga: Add support for Altera's SOCFPGA Arria V board ARM: socfpga: dts: fix s2f_* clock name ARM: socfpga: dts: cleanup indentation ARM: socfpga: dts: Add support for terasic SoCkit ARM: socfpga: dts: Move common nodes to cyclone5 dtsi arm: socfpga: Add clock for smp_twd timer Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-14Merge branch 'renesas/dt2' into next/dtKevin Hilman
From Simon Horman: * renesas/dt2: (21 commits) ARM: shmobile: bockw: fixup ether node naming ARM: shmobile: r8a7779: add irqpin default status on DTSI ARM: shmobile: marzen: fixup SMSC IRQ number on DTS ARM: shmobile: bockw: add SMSC support on DTS ARM: shmobile: r8a7778: add renesas_intc_irqpin support on DTSI ARM: shmobile: r8a7791 SMP device tree node ARM: shmobile: r8a7791 Arch timer device tree node ARM: shmobile: r8a7791 IRQC device tree node ARM: shmobile: armadillo800eva-reference: add SDHI and MMCIF interfaces ARM: shmobile: armadillo-reference: Add PWM backlight node to DT ARM: shmobile: r8a73a4: add a DT node for the DMAC ARM: shmobile: r8a7790: add I2C DT nodes ARM: shmobile: only enable used I2C interfaces in DT on all Renesas boards ARM: shmobile: r8a7778: add usb phy power control function ARM: shmobile: r8a7778: add USBHS clock ARM: shmobile: r8a7791 CMT support ARM: shmobile: r8a7791 SCIF support ARM: shmobile: Initial r8a7791 SoC support ARM: shmobile: r8a7778: add SSI/SRU clock support ARM: shmobile: r8a7790: Add DU and LVDS clocks ... Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-11ARM: configs: omap2plus_defconfig: enable dwc3 and dependenciesFelipe Balbi
DWC3 enables USB3 functionality for OMAP5 boards, it's safe to enable those drivers in omap2plus_defconfig. Signed-off-by: Felipe Balbi <balbi@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com> [tony@atomide.com: updated against other defconfig changes] Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-11ARM: OMAP2+: Add WLAN modules and of_serial to omap2plus_defconfigTony Lindgren
Many boards have either WL12XX or MWIFIEX, so let's build modules for those by default. This also makes it easier to test WLAN on pandaboard to avoid regressions like we had with the move to device tree based booting. And at least the zoom boards need the of_serial for the UARTs connected to the GPMC bus. Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-11ARM: OMAP2+: Run make savedefconfig on omap2plus_defconfig to shrink itTony Lindgren
We can save few tens of lines this way, and it is easier to generate minimal patches against omap2plus_defconfig. Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-11ARM: OMAP2+: Add minimal 8250 support for GPMCTony Lindgren
Just initialize things using the bootloader timings like we've been doing for the legacy booting too. It should be possible to patch in the GPMC timings for the based on the TL16CP743C/TL16C754C manual at: http://www.ti.com/lit/ds/slls644g/slls644g.pdf Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-11ARM: OMAP2+: Use pdata quirks for wl12xx for omap3 evm and zoom3Tony Lindgren
As the wl12xx bindings are still pending, this way we can get things working for omap3 evm and zoom platforms. Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-10ARM: OMAP: Move DT wake-up event handling over to use pinctrl-single-omapTony Lindgren
Now pinctrl-single-omap can handle the wake-up events for us now as long as the events are configured in the .dts files. Done in collaboration with Roger Quadros <rogerq@ti.com>. Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: Grygorii Strashko <grygorii.strashko@ti.com> Cc: Prakash Manjunathappa <prakash.pm@ti.com> Cc: Roger Quadros <rogerq@ti.com> Cc: Haojian Zhuang <haojian.zhuang@linaro.org> Cc: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Kevin Hilman <khilman@linaro.org> Tested-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-10ARM: OMAP2+: Add support for auxdataTony Lindgren
For few things we're still going to be needing platform data for device tree based drivers. Let's set up auxdata handling and do it in pdata-quirks.c so we have all the legacy calls in one place. Reviewed-by: Kevin Hilman <khilman@linaro.org> Tested-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-10Merge tag 'pinctrl-single-for-linus-for-v3.13-signed' into omap-for-v3.13/quirkTony Lindgren
Changes to pinctrl-single to allow handling the wake-up interrupts that most omaps have in each pinctrl register. As I need these merged also into the omap tree, it was agreed that I set them up into a separate branch for both pinctrl tree and linux-omap tree to merge as needed.
2013-10-09dts: socfpga: Add support for Altera's SOCFPGA Arria V boardDinh Nguyen
Add support for a new SOCFPGA board that has an Arria V FPGA along with dual ARM Cortex-A9 cores. Signed-off-by: Dinh Nguyen <dinguyen@altera.com> Cc: Pavel Machek <pavel@denx.de> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: devicetree@vger.kernel.org CC: linux-arm-kernel@lists.infradead.org
2013-10-09ARM: socfpga: dts: fix s2f_* clock nameSteffen Trumtrar
The s2f_* clocks are called h2f_* in the datasheets. Rename them accordingly in the socfpga.dtsi. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
2013-10-09ARM: socfpga: dts: cleanup indentationSteffen Trumtrar
Some of the clock nodes and the rst-/sysmgr use wrong indentation. Fix it. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
2013-10-09ARM: socfpga: dts: Add support for terasic SoCkitSteffen Trumtrar
This adds basic support for the terasic SoCkit board. The board includes an Altera Cyclone 5 SoC. [Dinh Nguyen] - Changed to 115200 for baudrate in dts bootargs Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
2013-10-09ARM: socfpga: dts: Move common nodes to cyclone5 dtsiSteffen Trumtrar
The current socfpga_cyclone5.dts describes the Altera Cyclone5 SoC Development Kit. The Cyclone5 includes a SoCFPGA, which itself can be included in other SoC+FPGA combinations. Instead of having to describe all Cyclone5 common nodes in every board specific dts, move socfpga_cyclone5.dts to a dtsi and include this in a new dts for the Development Kit. [Dinh Nguyen] - Changed to 115200 for baudrate in dts bootargs Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
2013-10-09Merge tag 'dt-3.13-2' of git://git.infradead.org/linux-mvebu into next/dtKevin Hilman
From Jason Cooper: mvebu dt changes for v3.13 (round 2) - kirkwood - use MBus DT binding for setting up the windows - move crypto and nand underneath the mbus node - ib62x0 has a u-boot env partition - mvebu - add the Armada XP matrix board * tag 'dt-3.13-2' of git://git.infradead.org/linux-mvebu: arm: mvebu: add support for the Armada XP Matrix board ARM: kirkwood: ib62x0: add u-boot environment partition ARM: kirkwood: Move the nand node under the mbus node ARM: kirkwood: Move the crypto node under the mbus node ARM: kirkwood: Remove kirkwood_setup_wins and rely on the DT binding Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-09Merge tag 'dt-3.13' of git://git.infradead.org/linux-mvebu into next/dtKevin Hilman
From Jason Cooper: mvebu dt changes for v3.13 - mvebu - add MSI - new compatible string for mv64xxx-i2c - dove - use the pre-processor - define the MBus nodes - add PCIe controllers - add Globalscale D3Plug - relocate internal registers nodes * tag 'dt-3.13' of git://git.infradead.org/linux-mvebu: ARM: dove: add initial DT file for Globalscale D3Plug ARM: dove: add PCIe controllers to SoC DT ARM: dove: relocate internal registers device nodes ARM: dove: add MBus DT node ARM: dove: add MBUS_ID macro to Dove DT ARM: dove: use preprocessor on device tree files ARM: mvebu: link PCIe controllers to the MSI controller ARM: mvebu: the MPIC now provides MSI controller features ARM: dts: mvebu: Update with the new compatible string for mv64xxx-i2c Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-09ARM: OMAP2+: igep0020: use display init from dss-commonJavier Martinez Canillas
Now that display information and setup is made from dss-common there is no need to have this code in the board file. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-09ARM: OMAP2+: pdata-quirks: add legacy display init for IGEPv2 boardJavier Martinez Canillas
IGEPv2 board has both an DVI and TFP410 video interfaces but DSS support for DeviceTree has not yet landed in mainline so is necessary to init the displays using legacy platform code. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-10-08ARM: shmobile: bockw: fixup ether node namingKuninori Morimoto
According to the ePAPR spec, the node name should be "ethernet", not "lan0". Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: r8a7779: add irqpin default status on DTSIKuninori Morimoto
r8a7779 INTC needs IRL pin mode settings to determine behavior of IRQ0 - IRQ3. But it depends on platform. This patch adds status = "disabled" on r8a7779.dtsi as default Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: marzen: fixup SMSC IRQ number on DTSKuninori Morimoto
This patch fixup miss-setting of SMSC IRQ number. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: bockw: add SMSC support on DTSKuninori Morimoto
This patch enables INTC IRQ and SMSC on BockW board via DT. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: r8a7778: add renesas_intc_irqpin support on DTSIKuninori Morimoto
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: r8a7791 SMP device tree nodeMagnus Damm
Add a device node for the r8a7791 secondary CPU core. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: r8a7791 Arch timer device tree nodeMagnus Damm
Add r8a7791 arch timer device tree information. This needs to be used together with r8a7791 support code that ties in the R-Car Gen2 arch timer workarounds. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: r8a7791 IRQC device tree nodeMagnus Damm
Enable a r8a7791 IRQC block by adding a device tree node for the IRQC hardware and pins IRQ0 to IRQ9. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: armadillo800eva-reference: add SDHI and MMCIF interfacesGuennadi Liakhovetski
Add SDHI0 and MMCIF interfaces to armadillo800eva-reference with regulators and pin configurations. SDHI1 is not added yet, because the switch, that connects the interface either to an SD slot or to a WiFi SDIO card cannot be described in DT yet. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: armadillo-reference: Add PWM backlight node to DTLaurent Pinchart
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: r8a73a4: add a DT node for the DMACGuennadi Liakhovetski
Add a DT node for the only system DMAC instance on r8a73a4. The RT DMAC can be added later under the same multiplexer, because they can serve the same slaves and use the same MID-RID values. Configuration data is supplied to the driver, using a compatibility match string. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: r8a7790: add I2C DT nodesGuennadi Liakhovetski
Add DT nodes for the four I2C interfacces on r8a7790. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: only enable used I2C interfaces in DT on all Renesas boardsGuennadi Liakhovetski
Currently all I2C interfaces in all *.dtsi files for various Renesas SoCs are enabled by default. Switch them all off and only enable populated I2C interfaces in board-specific *.dts files. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08Merge tag 'renesas-soc-for-v3.13' into dt2-baseSimon Horman
Renesas ARM based SoC updates for v3.13 * Add support for r8a7791 SoC * Rename DU device in clock lookups list of r8a7779 SoC * USB and SSI/SRU clock support for r8a7778 SoC * USB phy power control function support for r8a7778 SoC
2013-10-07Merge tag 'renesas-dt-for-v3.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt From Simon Horman: Renesas ARM-based SoC DT updates for v3.13 * Add CPU cores to DTSI of r8a7790 SoC * Add MMCIF and SDHI DT nodes for reference DTS of ape6evm board * tag 'renesas-dt-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Add r8a7790 CA7 CPU cores to DTSI ARM: shmobile: Add r8a7790 CA15 CPU cores ARM: shmobile: ape6evm-reference: add MMCIF and SDHI DT nodes Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-07Merge tag 'ux500-devicetree-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt From Linus Walleij: Second part of the Ux500 devicetree conversion and ATAG deletion: this fixes bugs discovered when switching to a devicetree-only setup, primarily on the HREF prototypes. The biggest change is to split into four DTS variants as the UIB autodetection was lost. * tag 'ux500-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: ux500: move BU21013 touchpad GPIOs into top-level DTS ARM: ux500: register the tc35892 GPIO on the TVK UIB ARM: ux500: split the HREF DTS files from two to four ARM: ux500: split HREF UIB files ARM: ux500: move TC35892 at 0x42 to hrefprev60 ARM: ux500: correct CD for micro SD on hrev60plus ARM: ux500: fix proximity sensor button ARM: ux500: correct I2C address of ambient light sensor ARM: ux500 enable the AB8500 gpio for all HREFs ARM: ux500: add default trigger on HREF LED Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-04Merge tag 'pci-v3.12-fixes-1' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci Pull PCI fix from Bjorn Helgaas: "We merged what was intended to be an MMCONFIG cleanup, but in fact, for systems without _CBA (which is almost everything), it broke extended config space for domain 0 and it broke all config space for other domains. This reverts the change" * tag 'pci-v3.12-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: Revert "x86/PCI: MMCONFIG: Check earlier for MMCONFIG region at address zero"
2013-10-04Revert "x86/PCI: MMCONFIG: Check earlier for MMCONFIG region at address zero"Bjorn Helgaas
This reverts commit 07f9b61c3915e8eb156cb4461b3946736356ad02. 07f9b61c was intended to be a cleanup that didn't change anything, but in fact, for systems without _CBA (which is almost everything), it broke extended config space for domain 0 and all config space for other domains. Reference: http://lkml.kernel.org/r/20131004011806.GE20450@dangermouse.emea.sgi.com Reported-by: Hedi Berriche <hedi@sgi.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
2013-10-04arm: socfpga: Add clock for smp_twd timerDinh Nguyen
Assign a clock for the twd-timer. Signed-off-by: Dinh Nguyen <dinguyen@altera.com> Acked-by: Rob Herring <rob.herring@calxeda.com> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: Ian Campbell <ian.campbell@citrix.com> CC: linux-arm-kernel@lists.infradead.org
2013-10-04Merge tag 'arm64-stable' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 Pull ARM64 fixes/updates from Catalin Marinas: - Bug-fixes (get_user/put_user, incorrect register width for ASID, FPSIMD initialisation) - Kconfig clean-up - defconfig update * tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: arm64: Remove duplicate DEBUG_STACK_USAGE config arm64: include VIRTIO_{MMIO,BLK} in defconfig arm64: include EXT4 in defconfig arm64: fix possible invalid FPSIMD initialization state arm64: use correct register width when retrieving ASID arm64: avoid multiple evaluation of ptr in get_user/put_user()
2013-10-04Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds
Pull MIPS fixes from Ralf Baechle: "Two small fixes for 3.12 only this week. I have a few more fixes pending but those are conceptually more complex so will have to wait for a bit longer" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: Fix forgotten preempt_enable() when CPU has inclusive pcaches MIPS: Alchemy: MTX-1: fix incorrect placement of __initdata tag
2013-10-04Merge branch 'x86-urgent-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 fixes from Ingo Molnar: "Two simplefb fixes" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/simplefb: Mark framebuffer mem-resources as IORESOURCE_BUSY to avoid bootup warning x86/simplefb: Fix overflow causing bogus fall-back
2013-10-03Merge branch 'for-curr' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc Pull ARC fix from Vineet Gupta: "Chrisitian found/fixed issue with SA_SIGINFO based signal handler corrupting the user space registers post after signal handling" * 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: ARC: Fix signal frame management for SA_SIGINFO
2013-10-03Merge branch 'merge' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc Pull powerpc fixes from Ben Herrenschmidt: "Here are a few powerpc fixes, all aimed at -stable, found in part thanks to the ramping up of a major distro testing and in part thanks to the LE guys hitting all sort interesting corner cases. The most scary are probably the register clobber issues in csum_partial_copy_generic(), especially since Anton even had a test case for that thing, which didn't manage to hit the bugs :-) Another highlight is that memory hotplug should work again with these fixes. Oh and the vio modalias one is worse than the cset implies as it upsets distro installers, so I've been told at least, which is why I'm shooting it to stable" * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/tm: Switch out userspace PPR and DSCR sooner powerpc/tm: Turn interrupts hard off in tm_reclaim() powerpc/perf: Fix handling of FAB events powerpc/vio: Fix modalias_show return values powerpc/iommu: Use GFP_KERNEL instead of GFP_ATOMIC in iommu_init_table() powerpc/sysfs: Disable writing to PURR in guest mode powerpc: Restore registers on error exit from csum_partial_copy_generic() powerpc: Fix parameter clobber in csum_partial_copy_generic() powerpc: Fix memory hotplug with sparse vmemmap
2013-10-03arm: mvebu: add support for the Armada XP Matrix boardThomas Petazzoni
The Armada XP Matrix board is the mother board of a more complex system. The mother board uses an Armada XP MV78460, 4 serial ports, 2 SATA ports, one Ethernet connection, a PCIe port and a USB port. All those devices are enabled in the Device Tree added by this patch. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-10-03ARM: kirkwood: ib62x0: add u-boot environment partitionLuka Perkov
Also, add some trivial whitespace cleanup. Signed-off-by: Luka Perkov <luka@openwrt.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-10-03ARM: ux500: move BU21013 touchpad GPIOs into top-level DTSLinus Walleij
The BU21013 touchscreen GPIOs have been pretty confused, correct them per board, and move the GPIO assignments up to the top level DTS file so we can control it from there, and avoid defining the GPIO assignments for non-ST UIB equipped boards. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-10-03ARM: ux500: register the tc35892 GPIO on the TVK UIBLinus Walleij
The TVK1281618 UIB has a TC35892 GPIO expander on it, which has in the past probably been confused with the GPIO expander on the older HREF plus previous to v60, which is on an entirely different part of the system with another I2C address. Register the expander in the right place. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-10-03powerpc/tm: Switch out userspace PPR and DSCR soonerMichael Neuling
When we do a treclaim or trecheckpoint we end up running with userspace PPR and DSCR values. Currently we don't do anything special to avoid running with user values which could cause a severe performance degradation. This patch moves the PPR and DSCR save and restore around treclaim and trecheckpoint so that we run with user values for a much shorter period. More care is taken with the PPR as it's impact is greater than the DSCR. This is similar to user exceptions, where we run HTM_MEDIUM early to ensure that we don't run with a userspace PPR values in the kernel. Signed-off-by: Michael Neuling <mikey@neuling.org> Cc: <stable@vger.kernel.org> # 3.9+ Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2013-10-03powerpc/tm: Turn interrupts hard off in tm_reclaim()Michael Neuling
We can't take IRQs in tm_reclaim as we might have a bogus r13 and r1. This turns IRQs hard off in this function. Signed-off-by: Michael Neuling <mikey@neuling.org> Cc: <stable@vger.kernel.org> # 3.9+ Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>