]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 20 May 2014 02:56:02 +0000 (12:56 +1000)]
Merge remote-tracking branch 'hid/for-next'

10 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Tue, 20 May 2014 02:52:02 +0000 (12:52 +1000)]
Merge remote-tracking branch 'pci/next'

10 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Tue, 20 May 2014 02:41:46 +0000 (12:41 +1000)]
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/cifs/cifsfs.c
fs/f2fs/file.c

10 years agoMerge remote-tracking branch 'file-private-locks/linux-next'
Stephen Rothwell [Tue, 20 May 2014 02:40:26 +0000 (12:40 +1000)]
Merge remote-tracking branch 'file-private-locks/linux-next'

10 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Tue, 20 May 2014 02:30:28 +0000 (12:30 +1000)]
Merge remote-tracking branch 'xfs/for-next'

10 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Tue, 20 May 2014 02:29:36 +0000 (12:29 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'

10 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 20 May 2014 02:28:22 +0000 (12:28 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

10 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 20 May 2014 02:27:19 +0000 (12:27 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

10 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 20 May 2014 02:25:40 +0000 (12:25 +1000)]
Merge remote-tracking branch 'logfs/master'

10 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Tue, 20 May 2014 02:24:47 +0000 (12:24 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'

10 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 20 May 2014 02:23:51 +0000 (12:23 +1000)]
Merge remote-tracking branch 'gfs2/master'

10 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Tue, 20 May 2014 02:23:45 +0000 (12:23 +1000)]
Merge remote-tracking branch 'fscache/fscache'

10 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Tue, 20 May 2014 02:22:52 +0000 (12:22 +1000)]
Merge remote-tracking branch 'f2fs/dev'

10 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 20 May 2014 02:11:48 +0000 (12:11 +1000)]
Merge remote-tracking branch 'ext4/dev'

10 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Tue, 20 May 2014 02:10:51 +0000 (12:10 +1000)]
Merge remote-tracking branch 'ecryptfs/next'

10 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Tue, 20 May 2014 02:09:53 +0000 (12:09 +1000)]
Merge remote-tracking branch 'cifs/for-next'

10 years agoMerge remote-tracking branch 'uml/next'
Stephen Rothwell [Tue, 20 May 2014 02:08:51 +0000 (12:08 +1000)]
Merge remote-tracking branch 'uml/next'

Conflicts:
arch/um/include/asm/Kbuild

10 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Tue, 20 May 2014 02:07:55 +0000 (12:07 +1000)]
Merge remote-tracking branch 'tile/master'

10 years agoMerge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Tue, 20 May 2014 02:00:28 +0000 (12:00 +1000)]
Merge remote-tracking branch 'sparc-next/master'

Conflicts:
arch/sparc/include/asm/pgtable_64.h

10 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 20 May 2014 01:52:34 +0000 (11:52 +1000)]
Merge remote-tracking branch 's390/features'

10 years agoMerge remote-tracking branch 'fsl/next'
Stephen Rothwell [Tue, 20 May 2014 01:51:41 +0000 (11:51 +1000)]
Merge remote-tracking branch 'fsl/next'

10 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Tue, 20 May 2014 01:48:55 +0000 (11:48 +1000)]
Merge remote-tracking branch 'powerpc/next'

Conflicts:
arch/powerpc/kernel/exceptions-64s.S

10 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 20 May 2014 01:47:10 +0000 (11:47 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

10 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 20 May 2014 01:46:14 +0000 (11:46 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

10 years agoMerge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Tue, 20 May 2014 01:44:58 +0000 (11:44 +1000)]
Merge remote-tracking branch 'arm64/for-next/core'

10 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 20 May 2014 01:44:01 +0000 (11:44 +1000)]
Merge remote-tracking branch 'tegra/for-next'

10 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Tue, 20 May 2014 01:43:09 +0000 (11:43 +1000)]
Merge remote-tracking branch 'samsung/for-next'

10 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Tue, 20 May 2014 01:41:54 +0000 (11:41 +1000)]
Merge remote-tracking branch 'renesas/next'

10 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Tue, 20 May 2014 01:40:48 +0000 (11:40 +1000)]
Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
arch/arm/mach-mvebu/Kconfig

10 years agoMerge remote-tracking branch 'keystone/next'
Stephen Rothwell [Tue, 20 May 2014 01:30:25 +0000 (11:30 +1000)]
Merge remote-tracking branch 'keystone/next'

10 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Tue, 20 May 2014 01:29:22 +0000 (11:29 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'

10 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Tue, 20 May 2014 01:29:14 +0000 (11:29 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

10 years agoMerge remote-tracking branch 'berlin/berlin/for-next'
Stephen Rothwell [Tue, 20 May 2014 01:28:21 +0000 (11:28 +1000)]
Merge remote-tracking branch 'berlin/berlin/for-next'

10 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Tue, 20 May 2014 01:27:25 +0000 (11:27 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

10 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Tue, 20 May 2014 01:26:35 +0000 (11:26 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

10 years agoMerge remote-tracking branch 'arm-kvm-cpuresume/arm-kvm-cpuresume'
Stephen Rothwell [Tue, 20 May 2014 01:25:39 +0000 (11:25 +1000)]
Merge remote-tracking branch 'arm-kvm-cpuresume/arm-kvm-cpuresume'

10 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 20 May 2014 01:23:35 +0000 (11:23 +1000)]
Merge remote-tracking branch 'arm/for-next'

10 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Tue, 20 May 2014 01:22:44 +0000 (11:22 +1000)]
Merge remote-tracking branch 'arc/for-next'

10 years agoMerge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Stephen Rothwell [Tue, 20 May 2014 01:11:44 +0000 (11:11 +1000)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'

10 years agoMerge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Tue, 20 May 2014 01:11:41 +0000 (11:11 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'

10 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Tue, 20 May 2014 01:11:38 +0000 (11:11 +1000)]
Merge remote-tracking branch 'ide/master'

10 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Tue, 20 May 2014 01:11:36 +0000 (11:11 +1000)]
Merge remote-tracking branch 'crypto-current/master'

10 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Tue, 20 May 2014 01:11:33 +0000 (11:11 +1000)]
Merge remote-tracking branch 'input-current/for-linus'

10 years agoMerge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Tue, 20 May 2014 01:11:32 +0000 (11:11 +1000)]
Merge remote-tracking branch 'staging.current/staging-linus'

10 years agoMerge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Tue, 20 May 2014 01:11:31 +0000 (11:11 +1000)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'

10 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Tue, 20 May 2014 01:11:29 +0000 (11:11 +1000)]
Merge remote-tracking branch 'wireless/master'

10 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Tue, 20 May 2014 01:11:28 +0000 (11:11 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'

10 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Tue, 20 May 2014 01:11:27 +0000 (11:11 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'

10 years agonext-20140519/net
Stephen Rothwell [Tue, 20 May 2014 00:58:26 +0000 (10:58 +1000)]
next-20140519/net

10 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Tue, 20 May 2014 00:40:01 +0000 (10:40 +1000)]
Merge remote-tracking branch 'sparc/master'

10 years agoMerge remote-tracking branch 'powerpc-merge/merge'
Stephen Rothwell [Tue, 20 May 2014 00:40:00 +0000 (10:40 +1000)]
Merge remote-tracking branch 'powerpc-merge/merge'

10 years agoMerge remote-tracking branch 'metag-fixes/fixes'
Stephen Rothwell [Tue, 20 May 2014 00:39:59 +0000 (10:39 +1000)]
Merge remote-tracking branch 'metag-fixes/fixes'

10 years agoMerge remote-tracking branch 'fixes/master'
Stephen Rothwell [Tue, 20 May 2014 00:29:14 +0000 (10:29 +1000)]
Merge remote-tracking branch 'fixes/master'

10 years agoMerge branch 'berlin/soc' into berlin/for-next
Sebastian Hesselbarth [Mon, 19 May 2014 21:05:39 +0000 (23:05 +0200)]
Merge branch 'berlin/soc' into berlin/for-next

10 years agoARM: dts: berlin: enable SD card reader and eMMC for the BG2Q DMP
Antoine Tenart [Mon, 19 May 2014 20:04:33 +0000 (22:04 +0200)]
ARM: dts: berlin: enable SD card reader and eMMC for the BG2Q DMP

Enable the SD Card reader and the internal eMMC on the Berlin BG2Q DMP
using two of the SDHCI nodes of the Berlin BG2Q.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoARM: dts: berlin: add the SDHCI nodes for the BG2Q
Antoine Tenart [Mon, 19 May 2014 20:03:00 +0000 (22:03 +0200)]
ARM: dts: berlin: add the SDHCI nodes for the BG2Q

Add the SDHCI nodes for the Marvell Berlin BG2Q, using the mrvl,pxav3-mmc
driver.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoARM: dts: berlin: add the pinctrl node and muxing setup for uarts
Antoine Tenart [Sun, 18 May 2014 18:15:57 +0000 (20:15 +0200)]
ARM: dts: berlin: add the pinctrl node and muxing setup for uarts

Add pinctrl bindings and system control nodes to what we currently know
about Berlin SoCs. Where available, also set default pinctrl property
for uarts, when there is only one pinmux option for it.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agodt-binding: ARM: add pinctrl binding docs for Marvell Berlin2 SoCs
Antoine Tenart [Mon, 5 May 2014 05:27:28 +0000 (07:27 +0200)]
dt-binding: ARM: add pinctrl binding docs for Marvell Berlin2 SoCs

Add pin control binding documentation to the SoC binding documentaion
as pinctrl is part of chip/system control registers. The documentation
also explains how to configure this group based controller.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoARM: dts: berlin: convert BG2Q to DT clock nodes
Alexandre Belloni [Mon, 12 May 2014 20:07:35 +0000 (22:07 +0200)]
ARM: dts: berlin: convert BG2Q to DT clock nodes

This converts Berlin BG2Q SoC dtsi to make use of the new DT clock
nodes for Berlin SoCs.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoARM: dts: berlin: convert BG2 to DT clock nodes
Sebastian Hesselbarth [Sun, 11 May 2014 19:32:41 +0000 (21:32 +0200)]
ARM: dts: berlin: convert BG2 to DT clock nodes

This converts Berlin BG2 SoC dtsi to make use of the new DT clock
nodes for Berlin SoCs. While at it, also fix up twdclk which is
running at cpuclk/3 instead of sysclk.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoARM: dts: berlin: convert BG2CD to DT clock nodes
Sebastian Hesselbarth [Sat, 10 May 2014 13:22:48 +0000 (15:22 +0200)]
ARM: dts: berlin: convert BG2CD to DT clock nodes

This converts Berlin BG2CD SoC dtsi to make use of the new DT clock
nodes for Berlin SoCs. Also add a binding include to ease core clock
references.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoclk: berlin: add binding include for Berlin SoC clock ids
Sebastian Hesselbarth [Wed, 14 May 2014 19:04:16 +0000 (21:04 +0200)]
clk: berlin: add binding include for Berlin SoC clock ids

This adds a dt-binding include for Marvell Berlin BG2/BG2CD and BG2Q
core clock IDs.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
10 years agodt-binding: ARM: add clock binding docs for Marvell Berlin2 SoCs
Sebastian Hesselbarth [Sat, 10 May 2014 11:46:12 +0000 (13:46 +0200)]
dt-binding: ARM: add clock binding docs for Marvell Berlin2 SoCs

This adds mandatory device tree binding documentation for the clock related
IP found on Marvell Berlin2 (BG2, BG2CD, and BG2Q) SoCs to the Berlin SoC
binding documentation.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoARM: dts: berlin: add the BG2CD GPIO nodes
Antoine Tenart [Thu, 17 Apr 2014 08:45:29 +0000 (10:45 +0200)]
ARM: dts: berlin: add the BG2CD GPIO nodes

The Berlin BG2CD has 32 GPIOs in SoC power domain and 16 in the SM one.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoARM: dts: berlin: add the BG2 GPIO nodes
Antoine Tenart [Thu, 17 Apr 2014 08:45:28 +0000 (10:45 +0200)]
ARM: dts: berlin: add the BG2 GPIO nodes

The Berlin BG2 has 32 GPIOs in SoC power domain and 16 in the SM one.
Only the first 8 SM GPIOs have interrupt support.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoARM: dts: berlin: add the BG2Q GPIO nodes
Antoine Tenart [Wed, 16 Apr 2014 19:18:41 +0000 (21:18 +0200)]
ARM: dts: berlin: add the BG2Q GPIO nodes

The Marvell Berlin BG2Q has 6 GPIO ports compatible with the snps,dw-apb-gpio
driver. This patch adds the corresponding device tree nodes.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Reviewed-by: Jisheng Zhang <jszhang@marvell.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoARM: dts: berlin: add scu and chipctrl device nodes for BG2/BG2Q
Sebastian Hesselbarth [Thu, 13 Mar 2014 12:32:34 +0000 (13:32 +0100)]
ARM: dts: berlin: add scu and chipctrl device nodes for BG2/BG2Q

This adds scu and general purpose registers device nodes required for
SMP on Berlin BG2 and BG2Q SoCs. The secondary CPUs will pick their jump
address from general purpose (SW generic) register 1.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: Jisheng Zhang <jszhang@marvell.com>
Tested-by: Antoine Tenart <antoine.tenart@free-electrons.com>
10 years agoARM: dts: berlin: add the Marvell BG2-Q DMP device tree
Antoine Tenart [Tue, 18 Mar 2014 14:32:47 +0000 (15:32 +0100)]
ARM: dts: berlin: add the Marvell BG2-Q DMP device tree

Adds initial support for the Marvell BG2-Q DMP. The board has 2GB of
memory, an uart activated and what's initially supported by the Marvell
Armada 1500 pro dtsi.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoARM: dts: berlin: add the Marvell Armada 1500 pro
Antoine Tenart [Tue, 18 Mar 2014 14:32:45 +0000 (15:32 +0100)]
ARM: dts: berlin: add the Marvell Armada 1500 pro

Adds initial support for the Marvell Armada 1500 pro (BG2Q) SoC (Berlin family).
The SoC has nodes for cpu, l2 cache controller, interrupt controllers, local
timer, apb timers and uarts for now. Also add corresponding binding documentation.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoARM: berlin: add the pinctrl dependency for the Marvell Berlin SoCs
Antoine Tenart [Sun, 18 May 2014 18:06:32 +0000 (20:06 +0200)]
ARM: berlin: add the pinctrl dependency for the Marvell Berlin SoCs

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoARM: berlin: add the LIBGPIO as a dependency for the BG2Q
Antoine Tenart [Wed, 16 Apr 2014 07:46:34 +0000 (09:46 +0200)]
ARM: berlin: add the LIBGPIO as a dependency for the BG2Q

The BG2Q has GPIOs driven by the dwapb GPIO driver. Add the LIBGPIO as a
dependency to be able to support them.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Reviewed-by: Jisheng Zhang <jszhang@marvell.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoARM: berlin: add MACH_BERLIN_BG2Q symbol
Alexandre Belloni [Fri, 21 Mar 2014 19:39:16 +0000 (20:39 +0100)]
ARM: berlin: add MACH_BERLIN_BG2Q symbol

Now that we start supporting the Marvell Berlin BG2Q, add a symbol allowing to
differentiate that SoC from the other SoCs of the Berlin family.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoARM: berlin: add Marvell Armada 1500 pro to Marvell doc
Antoine Tenart [Tue, 18 Mar 2014 14:32:46 +0000 (15:32 +0100)]
ARM: berlin: add Marvell Armada 1500 pro to Marvell doc

This adds Marvell Berlin Armada 1500 Pro (BG2Q) to Marvell SoC documentation.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...
John W. Linville [Mon, 19 May 2014 20:34:27 +0000 (16:34 -0400)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

10 years agoPCI: Wrong register used to check pending traffic
Gavin Shan [Mon, 19 May 2014 03:06:46 +0000 (13:06 +1000)]
PCI: Wrong register used to check pending traffic

The incorrect register offset is passed to pci_wait_for_pending(), which is
caused by commit 157e876ffe ("PCI: Add pci_wait_for_pending() (refactor
pci_wait_for_pending_transaction())").

Fixes: 157e876ffe ("PCI: Add pci_wait_for_pending() (refactor pci_wait_for_pending_transaction())
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Alex Williamson <alex.williamson@gmail.com>
CC: stable@vger.kernel.org # v3.14+
10 years agoMerge branch 'v3.16-next/soc-exynos' into for-next
Kukjin Kim [Mon, 19 May 2014 16:32:41 +0000 (01:32 +0900)]
Merge branch 'v3.16-next/soc-exynos' into for-next

10 years agoMerge branch 'v3.16-next/mcpm-exynos' into for-next
Kukjin Kim [Mon, 19 May 2014 16:32:35 +0000 (01:32 +0900)]
Merge branch 'v3.16-next/mcpm-exynos' into for-next

10 years agoMerge branch 'v3.16-next/dt-samsung' into for-next
Kukjin Kim [Mon, 19 May 2014 16:32:27 +0000 (01:32 +0900)]
Merge branch 'v3.16-next/dt-samsung' into for-next

Conflicts:
arch/arm/mach-exynos/firmware.c

10 years agoMerge branch 'v3.16-next/drivers-samsung' into for-next
Kukjin Kim [Mon, 19 May 2014 16:31:35 +0000 (01:31 +0900)]
Merge branch 'v3.16-next/drivers-samsung' into for-next

10 years agoMerge branch 'v3.16-next/cleanup-samsung' into for-next
Kukjin Kim [Mon, 19 May 2014 16:31:26 +0000 (01:31 +0900)]
Merge branch 'v3.16-next/cleanup-samsung' into for-next

Conflicts:
arch/arm/mach-s3c24xx/Kconfig

10 years agoMerge branch 'v3.16-next/clk-samsung' into for-next
Kukjin Kim [Mon, 19 May 2014 16:28:15 +0000 (01:28 +0900)]
Merge branch 'v3.16-next/clk-samsung' into for-next

10 years agoMerge branch 'v3.16-next/clk-s3c24xx-3' into for-next
Kukjin Kim [Mon, 19 May 2014 16:28:04 +0000 (01:28 +0900)]
Merge branch 'v3.16-next/clk-s3c24xx-3' into for-next

10 years agoMerge branch 'v3.16-next/clk-s3c24xx-2' into for-next
Kukjin Kim [Mon, 19 May 2014 16:27:57 +0000 (01:27 +0900)]
Merge branch 'v3.16-next/clk-s3c24xx-2' into for-next

10 years agoMerge branch 'v3.16-next/clk-s3c24xx' into for-next
Kukjin Kim [Mon, 19 May 2014 16:27:49 +0000 (01:27 +0900)]
Merge branch 'v3.16-next/clk-s3c24xx' into for-next

10 years agoMerge branch 'samsung-fixes-2' into for-next
Kukjin Kim [Mon, 19 May 2014 16:25:21 +0000 (01:25 +0900)]
Merge branch 'samsung-fixes-2' into for-next

10 years agoARM: dts: Keep LDO4 always ON for exynos5250-arndale board
Sachin Kamat [Mon, 19 May 2014 16:15:46 +0000 (01:15 +0900)]
ARM: dts: Keep LDO4 always ON for exynos5250-arndale board

LDO4 regulator was getting disabled preventing the system from
going into low power states. Keep it always on to fix it.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: Fix SPI interrupt numbers for exynos5420
Sachin Kamat [Mon, 19 May 2014 16:14:03 +0000 (01:14 +0900)]
ARM: dts: Fix SPI interrupt numbers for exynos5420

Updated as per the user manual.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: fix incorrect ak8975 compatible for exynos4412-trats2 board
Beomho Seo [Mon, 19 May 2014 16:12:50 +0000 (01:12 +0900)]
ARM: dts: fix incorrect ak8975 compatible for exynos4412-trats2 board

This patch fixed incorrect compatible for ak8975 magnetic sensor.
ak8975 magnetic sensor use compatible "ak8975" or "asahi-kasei,ak8975"
In this patch, use "asahi-kasei,ak8975" according to dt bindings document.

Signed-off-by: Beomho Seo <beomho.seo@samsung.com>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: Add MFC memory banks to exynos5420 boards
Sachin Kamat [Mon, 19 May 2014 16:04:13 +0000 (01:04 +0900)]
ARM: dts: Add MFC memory banks to exynos5420 boards

Add MFC memory banks to Exynos5420 based SMDK and Arndale-octa boards.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: Add Vbus regulator for USB 3.0 on exynos5800-peach-pi
Vivek Gautam [Mon, 19 May 2014 13:32:11 +0000 (22:32 +0900)]
ARM: dts: Add Vbus regulator for USB 3.0 on exynos5800-peach-pi

Add required fixed-regulator for VBUS supply for USB 3.0
controller phy.

Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: enable fimd for exynos5800-peach-pi board
Rahul Sharma [Fri, 16 May 2014 22:53:36 +0000 (07:53 +0900)]
ARM: dts: enable fimd for exynos5800-peach-pi board

Enable FIMD for peach-pi board.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
Reviewed-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: enable display controller for exynos5800-peach-pi board
Rahul Sharma [Fri, 16 May 2014 22:51:33 +0000 (07:51 +0900)]
ARM: dts: enable display controller for exynos5800-peach-pi board

Enable display controller with timing information for 1080p
panel in Exynos5800 peach-pi board.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
Reviewed-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: Add device tree sources for exynos3250
Tomasz Figa [Wed, 14 May 2014 21:01:27 +0000 (06:01 +0900)]
ARM: dts: Add device tree sources for exynos3250

This patch adds new exynos3250.dtsi to support Exynos3250 SoC
based on Cortex-A7 dual core and includes following dt nodes:

- GIC interrupt controller
- Pinctrl to control GPIOs
- Clock controller
- CPU information (Cortex-A7 dual core)
- UART to support serial port
- MCT (Multi Core Timer)
- ADC (Analog Digital Converter)
- I2C/SPI bus
- Power domain
- PMU (Performance Monitoring Unit)
- MSHC (Mobile Storage Host Controller)
- PWM (Pluse Width Modulation)
- AMBA bus
- sysram node for SYSRAM memory mapping

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Hyunhee Kim <hyunhee.kim@samsung.com>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: devicetree@vger.kernel.org
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: enable hdmi for exynos5800-peach-pi board
Rahul Sharma [Thu, 15 May 2014 20:06:34 +0000 (05:06 +0900)]
ARM: dts: enable hdmi for exynos5800-peach-pi board

Enable hdmi for peach-pi board.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
Acked-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: enable dp-controller for exynos5420-peach-pit board
Rahul Sharma [Mon, 19 May 2014 14:01:46 +0000 (23:01 +0900)]
ARM: dts: enable dp-controller for exynos5420-peach-pit board

Enable dp-controller for peach-pit board.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: enable fimd for exynos5420 based peach-pit board
Rahul Sharma [Mon, 19 May 2014 14:01:18 +0000 (23:01 +0900)]
ARM: dts: enable fimd for exynos5420 based peach-pit board

Enable fimd for peach-pit board.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: enable dp-controller for exynos5250-snow board
Rahul Sharma [Mon, 19 May 2014 13:58:47 +0000 (22:58 +0900)]
ARM: dts: enable dp-controller for exynos5250-snow board

Enable dp-controller for snow board.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: enable fimd for exynos5250-snow board
Rahul Sharma [Mon, 19 May 2014 13:56:49 +0000 (22:56 +0900)]
ARM: dts: enable fimd for exynos5250-snow board

Enable fimd node for snow board.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: enable pwm backlight for exynos5250-snow
Ajay Kumar [Mon, 19 May 2014 13:38:18 +0000 (22:38 +0900)]
ARM: dts: enable pwm backlight for exynos5250-snow

Add PWM backlight node for exynos5250 based snow board.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: Add pwmX_out pinctrl nodes to exynos5250
Ajay Kumar [Mon, 19 May 2014 13:38:17 +0000 (22:38 +0900)]
ARM: dts: Add pwmX_out pinctrl nodes to exynos5250

Adds the PWM nodes to 5250 pinctrl dtsi file.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>