summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-07-28Merge tag 'v3.16-rc6' into next/dtArnd Bergmann245-1403/+2239
Update to Linux 3.16-rc6 as a dependency for the broadcom changes. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-28Merge tag 'mvebu-dt-3.17-4' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann4-1/+301
Merge "mvebu DT changes for v3.17 (round 4)" from Jason Cooper" - Armada XP - New board, Lenovo ix4-300d NAS - Add Lenovo to vendor-prefixes - Dove - Add LCD controllers * tag 'mvebu-dt-3.17-4' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Add dts definition for Lenovo Iomega ix4-300d NAS of: Add Lenovo Group Ltd. to the vendor-prefixes list. ARM: dts: dove: add DT LCD controllers Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-28ARM: mvebu: Add dts definition for Lenovo Iomega ix4-300d NASBenoit Masson2-1/+286
The Lenovo Iomega ix4-300d is a 4-Bay sata NAS with dual Gb, USB2.0 & 3.0, powered by a Marvell Armada XP MV78230 dual core CPU. http://shop.lenovo.com/us/en/servers/network-storage/lenovoemc/ix4-300d/ Signed-off-by: Benoit Masson <yahoo@perenite.com> Link: https://lkml.kernel.org/r/1406503839-4662-1-git-send-email-yahoo@perenite.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-07-28of: Add Lenovo Group Ltd. to the vendor-prefixes list.Benoit Masson1-0/+1
Lenovo Group Ltd. (stylized as lenovo) is a Chinese multinational computer technology company with headquarters in Beijing, China, and Morrisville, North Carolina, United States. http://www.lenovo.com/ Signed-off-by: Benoit Masson <yahoo@perenite.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Rob Herring <robh@kernel.org> Link: https://lkml.kernel.org/r/1406154923-13612-1-git-send-email-yahoo@perenite.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-07-28Merge tag 'v3.17-rockchip-rk3xxx-dts' of ↵Arnd Bergmann7-1143/+1176
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Merge "ARM: dts: changes for existing rockchip boards" from Heiko Stuebner: Collected changes for existing Rockchip boards - convert to new clock driver - bring structure in line with recent rk3288 comments (no soc-nodes, using phandles when adding changes, sorted by address) - i2c, board-pmic and pwm nodes nodes - sd card slot and ir receiver on radxa rock * tag 'v3.17-rockchip-rk3xxx-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rk3188-radxarock: add GPIO IR receiver node ARM: dts: rockchip: add pwm nodes ARM: dts: rockchip: add both clocks to uart nodes ARM: dts: rk3188-radxarock: enable sd-card slot ARM: dts: add i2c and regulator nodes to rk3188-radxarock ARM: dts: rockchip: add tps65910 regulator for bqcurie2 ARM: dts: add rk3066 and rk3188 i2c device nodes and pinctrl settings ARM: dts: rockchip: oder nodes by register address ARM: dts: rockchip: remove address from pinctrl nodes ARM: dts: uses handles to reference nodes for changes ARM: dts: rockchip: add handles for shared nodes that don't have one yet ARM: dts: rockchip: remove soc subnodes arm: dts: rockchip: remove obsolete clock gate definitions ARM: dts: rockchip: move oscillator input clock into main dtsi ARM: dts: rockchip: add cru nodes and update device clocks to use it Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-28Merge tag 'v3.17-rockchip-rk3288' of ↵Arnd Bergmann10-5/+826
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Merge "Initial support for Rockchip RK3288 SoCs" from Heiko Stuebner: * tag 'v3.17-rockchip-rk3288' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: Build dtbs for Rockchip boards ARM: dts: add rk3288 evaluation board ARM: dts: rockchip: add core rk3288 dtsi ARM: rockchip: enable support for RK3288 SoCs ARM: Kconfig: set default gpio number for rockchip SoCs ARM: rockchip: add debug uart used by rk3288 ARM: rockchip: clarify usability of DEBUG_RK3X_UART debug_ll options dt-bindings: arm: add cortex-a12 and cortex-a17 cpu compatible properties Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-28Merge branch 'clk-rockchip' of ↵Arnd Bergmann16-15/+3338
git://git.linaro.org/people/mike.turquette/linux into next/soc This is a dependency for the rk3288 DT updates, the branch should first get merged through Mike's clk git. * 'clk-rockchip' of git://git.linaro.org/people/mike.turquette/linux: ARM: rockchip: Select ARCH_HAS_RESET_CONTROLLER clk: rockchip: add clock controller for rk3288 dt-bindings: add documentation for rk3288 cru clk: rockchip: add clock driver for rk3188 and rk3066 clocks dt-bindings: add documentation for rk3188 clock and reset unit clk: rockchip: add reset controller clk: rockchip: add clock type for pll clocks and pll used on rk3066 clk: rockchip: add basic infrastructure for clock branches clk: composite: improve rate_hw sanity check logic clk: composite: allow read-only clocks clk: composite: support determine_rate using rate_ops->round_rate + mux_ops->set_parent Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-27ARM: dts: rk3188-radxarock: add GPIO IR receiver nodeBeniamino Galvani1-0/+13
This adds a device tree node for the infrared receiver connected to a GPIO pin on the Radxa Rock. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-27ARM: dts: rockchip: add pwm nodesBeniamino Galvani3-0/+120
This adds the necessary nodex and pinctrl settings for the Rockchip PWM-driver. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> Modified to use the new clock defines and added rk3066 pins. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-27ARM: dts: rockchip: add both clocks to uart nodesHeiko Stuebner1-4/+8
Use the newly ammended dw_8250 clock binding to define both the baudclk as well as the pclk supplying the ip. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-27ARM: dts: rk3188-radxarock: enable sd-card slotHeiko Stuebner1-0/+22
The Radxa Rock contains one sd-card slot. Add the supplying regulator and enable its dw_mmc node. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-27ARM: dts: add i2c and regulator nodes to rk3188-radxarockBeniamino Galvani1-0/+112
This enables the 2nd i2c bus and adds the act8846 pmic as device. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-27ARM: dts: rockchip: add tps65910 regulator for bqcurie2Heiko Stuebner1-0/+87
The Curie2 uses a tps659102 as its main pmic, so add the i2c1 and tps65910 node as well as define the used voltages and regulator-names according to the schematics. Also fix the supply of the sd0 regulator, as it is supplied by the vio reg. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-27ARM: dts: add rk3066 and rk3188 i2c device nodes and pinctrl settingsHeiko Stuebner3-0/+209
The core controller settings themself are identical, only the compatible and pinctrl settings differ. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-27ARM: dts: rockchip: oder nodes by register addressHeiko Stuebner2-67/+67
To create some sort of ordering of nodes, they are suggested to be ordered by their register address. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-27ARM: dts: rockchip: remove address from pinctrl nodesHeiko Stuebner2-2/+2
The pincontroller uses the GRF and PMU syscons nowadays, so should not contain an address in its device node. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-27ARM: dts: uses handles to reference nodes for changesHeiko Stuebner4-74/+119
Use the handles for subsequent changes to nodes, similar to like the rk3288 submission does it. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-27ARM: dts: rockchip: add handles for shared nodes that don't have one yetHeiko Stuebner3-6/+6
Some nodes that are changed in the dtsi hierarchy do not have handles yet. As it was suggested in the rk3288 submission to do subsequent nodes changes through such handle-references, add the missing ones. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-27ARM: dts: rockchip: remove soc subnodesHeiko Stuebner5-589/+573
Comments received from the rk3288 submission indicated that a generic subnode to group soc components should not be used. So to keep all rockchip devicetree files similar, remove it from rk3066 and rk3188. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-27arm: dts: rockchip: remove obsolete clock gate definitionsHeiko Stuebner4-578/+0
The clock and reset unit is now provided by the rk3188-cru clock driver and thus the old style definitions of the gate clocks can go away. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Acked-By: Max Schwarz <max.schwarz@online.de> Tested-By: Max Schwarz <max.schwarz@online.de>
2014-07-27ARM: dts: rockchip: move oscillator input clock into main dtsiHeiko Stuebner3-12/+7
The clock definitions get a lot shorter due to the soc clocks being handled by rk3188-cru and only the input clock remains. These can now simply live in the main rk3xxx.dtsi without affecting readability. At the same time, rename the node to oscillator, adding a clock-output-names property to match how the rk3288 handles this. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Acked-By: Max Schwarz <max.schwarz@online.de> Tested-By: Max Schwarz <max.schwarz@online.de>
2014-07-27ARM: dts: rockchip: add cru nodes and update device clocks to use itHeiko Stuebner3-21/+41
This adds a node for the clock and reset unit on rk3188 and rk3066 SoCs and also updates the device nodes retrieve their clocks from there, instead of the previous gate clock nodes. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Acked-By: Max Schwarz <max.schwarz@online.de> Tested-By: Max Schwarz <max.schwarz@online.de>
2014-07-26ARM: dts: Build dtbs for Rockchip boardsDoug Anderson1-0/+5
This allows the "make dtbs" target to work. Signed-off-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26ARM: dts: add rk3288 evaluation boardHeiko Stuebner3-0/+226
There exist 2 variants using either the act8846 or rk808 as pmic, while the rest of the board stays the same. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Will Deacon <will.deacon@arm.com> Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Doug Anderson <dianders@chromium.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26ARM: dts: rockchip: add core rk3288 dtsiHeiko Stuebner1-0/+575
Node definitions shared by all rk3288 based boards. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Will Deacon <will.deacon@arm.com> Tested-by: Doug Anderson <dianders@chromium.org> Reviewed-by: Doug Anderson <dianders@chromium.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26ARM: rockchip: enable support for RK3288 SoCsHeiko Stuebner2-0/+2
Enable HAVE_ARM_ARCH_TIMER and add a rockchip,rk3288 compatible. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Will Deacon <will.deacon@arm.com> Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Doug Anderson <dianders@chromium.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26ARM: Kconfig: set default gpio number for rockchip SoCsHeiko Stuebner1-0/+1
The new rk3288 needs a bigger gpio space, as it has 9 gpio banks. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Doug Anderson <dianders@chromium.org> Tested-by: Will Deacon <will.deacon@arm.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26ARM: rockchip: add debug uart used by rk3288Heiko Stuebner1-1/+11
The uarts on rk3288 are still compatible with the dw_8250, but located at a different position and need DEBUG_UART_8250_WORD enabled. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Doug Anderson <dianders@chromium.org> Tested-by: Will Deacon <will.deacon@arm.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26ARM: rockchip: clarify usability of DEBUG_RK3X_UART debug_ll optionsHeiko Stuebner1-4/+4
The debug uart settings from the DEBUG_RK3X_UART options are usable on all Rockchip SoCs from the rk30xx and rk31xx series but not on the new rk3288 SoCs. Thus clarify their use to prevent confusion. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Doug Anderson <dianders@chromium.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26dt-bindings: arm: add cortex-a12 and cortex-a17 cpu compatible propertiesHeiko Stuebner1-0/+2
As announced parts from ARM they will probably be used in socs shortly. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-07-25ARM: dts: dove: add DT LCD controllersRussell King1-0/+14
Add the DT fragment for the Marvell Dove LCD controllers. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Link: https://lkml.kernel.org/r/E1XAKGS-0004WE-8h@rmk-PC.arm.linux.org.uk Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-07-24Merge tag 'zynq-dt-for-3.17-2' of git://git.xilinx.com/linux-xlnx into next/dtArnd Bergmann1-0/+18
Merge "arm: Xilinx Zynq dt patches for v3.17 second pull request" from Michal Simek: - Add GPIO and XADC node to dtsi * tag 'zynq-dt-for-3.17-2' of git://git.xilinx.com/linux-xlnx: ARM: zynq: DT: Add GPIO node ARM: zynq: DT: Add XADC node Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-24Merge tag 'mvebu-dt-3.17-3' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann1-0/+3
Merge "mvebu DT changes for v3.17 (round 3)" from Jason Cooper: - Armada 375 - Fix ethernet aliases for new node added for v3.17 - Add missing MDIO clock for new node added for v3.17 * tag 'mvebu-dt-3.17-3' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Add missing MDIO clock in Armada 375 ARM: mvebu: Add ethernet aliases required by U-Boot Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-23ARM: zynq: DT: Add GPIO nodeSoren Brinkmann1-0/+10
Add node describing Zynq's GPIO controller. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2014-07-23ARM: zynq: DT: Add XADC nodeSoren Brinkmann1-0/+8
Add node for the Xilinx A/D Converter. Cc: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2014-07-23ARM: mvebu: Add missing MDIO clock in Armada 375Ezequiel Garcia1-0/+1
In Armada 375 SoCs, the MDIO is handled by a separate orion-mdio driver, despite the register is contained within the "LMS" block of the network controller. Therefore we need to add the clock to the MDIO devicetree to prevent the controller from being accesed with its clock gated. This is needed, for instance, to be able to load the MDIO driver before the network driver. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Link: https://lkml.kernel.org/r/1405961296-5846-7-git-send-email-ezequiel.garcia@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-07-23ARM: mvebu: Add ethernet aliases required by U-BootMarcin Wojtas1-0/+2
The vendor bootloader provided for Armada 375 boards expect an alias for the ethernet nodes, which is used to fixup the MAC address. Signed-off-by: Marcin Wojtas <mw@semihalf.com> Link: https://lkml.kernel.org/r/1405961296-5846-6-git-send-email-ezequiel.garcia@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-07-21Linux 3.16-rc6Linus Torvalds1-1/+1
2014-07-21Merge tag 'staging-3.16-rc6' of ↵Linus Torvalds2-1/+10
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull more IIO driver fixes from Greg KH: "Here are two IIO driver fixes for 3.16-rc6 that resolve some reported issues" * tag 'staging-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: iio: mma8452: Use correct acceleration units. iio:core: Handle error when mask type is not separate
2014-07-21Merge tag 'usb-3.16-rc6' of ↵Linus Torvalds2-2/+21
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb Pull USB fixes from Greg KH: "Here are two USB patches that resolve some reported issues, one with an odd HUB, and one in the chipidea driver" * tag 'usb-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: usb: Check if port status is equal to RxDetect usb: chipidea: udc: Disable auto ZLP generation on ep0
2014-07-21Merge tag 'driver-core-3.16-rc6' of ↵Linus Torvalds1-4/+14
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core fix from Greg KH: "Here is a single driver core fix that reverts an older patch that has been causing a number of reported problems with the platform devices. This revert has been in linux-next for a while with no reported issues" * tag 'driver-core-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: platform_get_irq: Revert to platform_get_resource if of_irq_get fails
2014-07-21Merge tag 'char-misc-3.16-rc6' of ↵Linus Torvalds1-1/+1
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc Pull char/misc fix from Greg KH: "Here's a single hyper-v driver fix for a reported issue" * tag 'char-misc-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: Drivers: hv: hv_fcopy: fix a race condition for SMP guest
2014-07-21Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds4-6/+17
Pull intel drm fixes from Dave Airlie: "Intel fixes came in late, but since I debugged one of them I'll send them on, Two reverts, a quirk and one warn regression" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: Revert "drm/i915: reverse dp link param selection, prefer fast over wide again" drm/i915: Track the primary plane correctly when reassigning planes drm/i915: Ignore VBT backlight presence check on HP Chromebook 14 Revert "drm/i915: Don't set the 8to6 dither flag when not scaling"
2014-07-21Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/umlLinus Torvalds3-9/+11
Pull UML fixes from Richard Weinberger: "Four fixes, all discovered by Trinity" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: um: segv: Save regs only in case of a kernel mode fault um: Fix hung task in fix_range_common() um: Ensure that a stub page cannot get unmapped Revert "um: Fix wait_stub_done() error handling"
2014-07-21Merge branch 'for-linus' of ↵Linus Torvalds2-4/+15
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs fixes from Chris Mason: "We have two more fixes in my for-linus branch. I was hoping to also include a fix for a btrfs deadlock with compression enabled, but we're still nailing that one down" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: test for valid bdev before kobj removal in btrfs_rm_device Btrfs: fix abnormal long waiting in fsync
2014-07-21Merge tag 'nfs-for-3.16-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds6-62/+343
Pull NFS client fixes from Trond Myklebust: "Apologies for the relative lateness of this pull request, however the commits fix some issues with the NFS read/write code updates in 3.16-rc1 that can cause serious Oopsing when using small r/wsize. The delay was mainly due to extra testing to make sure that the fixes behave correctly. Highlights include; - Stable fix for an NFSv3 posix ACL regression - Multiple fixes for regressions to the NFS generic read/write code: - Fix page splitting bugs that come into play when a small rsize/wsize read/write needs to be sent again (due to error conditions or page redirty) - Fix nfs_wb_page_cancel, which is called by the "invalidatepage" method - Fix 2 compile warnings about unused variables - Fix a performance issue affecting unstable writes" * tag 'nfs-for-3.16-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: NFS: Don't reset pg_moreio in __nfs_pageio_add_request NFS: Remove 2 unused variables nfs: handle multiple reqs in nfs_wb_page_cancel nfs: handle multiple reqs in nfs_page_async_flush nfs: change find_request to find_head_request nfs: nfs_page should take a ref on the head req nfs: mark nfs_page reqs with flag for extra ref nfs: only show Posix ACLs in listxattr if actually present
2014-07-20Merge tag 'mvebu-dt-3.17-2' of git://git.infradead.org/linux-mvebu into next/dtOlof Johansson13-27/+186
Merge "ARM: mvebu: DT changes for v3.17 (round 2)" from Jason Cooper: mvebu DT changes for v3.17 (round 2): - kirkwood * Add d2 Network v2 board - mvebu * Add Armada 375 ethernet node * Add CA9 MPcore SoC controller node * Add support for dynamic freq scaling on Armada XP * tag 'mvebu-dt-3.17-2' of git://git.infradead.org/linux-mvebu: ARM: mvebu: update Armada XP DT for dynamic frequency scaling ARM: mvebu: add CA9 MPcore SoC Controller node ARM: mvebu: Enable the network controller in Armada 375 DB board ARM: mvebu: Add support for the network controller in Armada 375 SoC ARM: Kirkwood: add DT support for d2 Network v2 ARM: Kirkwood: allow to use netxbig DTSI for d2net_v2 DTS Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-20Merge tag 'mvebu-dt-3.17' of git://git.infradead.org/linux-mvebu into next/dtOlof Johansson7-3/+309
Merge "ARM: mvebu: DT changes for v3.17" from Jason Cooper: mvebu DT changes for v3.17 - kirkwood * add boards net2big and net5big - dove * add vendor prefix for SolidRun * split CuBox into it's variants * tag 'mvebu-dt-3.17' of git://git.infradead.org/linux-mvebu: ARM: kirkwood: fix net5big regulator gpio assignments ARM: dts: mvebu: split SolidRun CuBox into variants dt-binding: add vendor prefix for SolidRun ARM: Kirkwood: Add DT descriptions for net2big and net5big. Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-20um: segv: Save regs only in case of a kernel mode faultRichard Weinberger1-1/+1
...otherwise me lose user mode regs and the resulting stack trace is useless. Signed-off-by: Richard Weinberger <richard@nod.at>
2014-07-20um: Fix hung task in fix_range_common()Richard Weinberger1-1/+5
If do_ops() fails we have to release current->mm->mmap_sem otherwise the failing task will never terminate. Reported-by: Toralf Förster <toralf.foerster@gmx.de> Signed-off-by: Richard Weinberger <richard@nod.at>