Commit graph

106767 commits

Author SHA1 Message Date
Olof Johansson
2c49e0250a Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19
* Initialise CMT1 timer using DT
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUUG1xAAoJENfPZGlqN0++kNQP/1pfyx9m1XnBqj5Xt6GldxLp
 /5nUzU/q/JgSW457NGiigPdYC9z4yELknL00PYbM1pCvJJAtGnpdcnFUku8JPyiE
 0YrLCRT/JZk0a1MlDJ3Ve0osaefyEoK0LmFWvnJJgm672gE3/sUlDfg4CmmOJqer
 4c0sgz7xS1xU1xuciyvhIaZ7gZ8sz1k5ZXm3em8uwG+uHWE+JQl6BGiup+9XMGaS
 MYjTpL9Vlgz2LH8VZHrnkTbrfeZwT/ufwf12GkXw3nGEvVcVcU2SHPbiHJckETsz
 7w4Jaf5fY/fjHHGbocnbCVH9a4VHqy5pI3pm3Gr8dRqM6s/9oEw50rrXqeFvdjNN
 5SQVoRzScghh+t1bESrf3r3h8dSdCwfkwKkn5SsQZLpJfnvxHUXe1yf3Bvwsklv/
 4U3FmisHDurCCHWyGxEdnAhsUOQT+lbpi+tKuaSCVxwfawiAHCK5hAIRVHGNm0Zr
 hwq28Rrfxd5Nd1z/LREm3ObQCPMyaFm1x3Zd4sGNjoRq6yElf52+O9jW52gAwrqi
 9WObGI7fgIZj5/o8ZDxZl02JnKvRTHuOLWNAnJtDnjtktAxNZsZns7IYK4RA/aIv
 bmDJLUquQWaUkl6gYFXIOUd3nqi4cy54aAsUtwIbjGsVS/bosSb2hqWm6EHnIP/j
 IrtOo8W2PlC7pPsvJ+jH
 =Htuq
 -----END PGP SIGNATURE-----

Merge tag 'renesas-r8a73a4-dt-timers-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19" from Simon
Horman:

* Initialise CMT1 timer using DT

* tag 'renesas-r8a73a4-dt-timers-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a73a4: Remove empty r8a73a4_add_dt_devices
  ARM: shmobile: ape6evm-reference: Initialise CMT1 device using DT
  ARM: shmobile: r8a73a4: Rename cmt registration helper
  ARM: shmobile: r8a73a4: Add CMT1 node

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04 14:37:47 -08:00
Olof Johansson
a26c651126 Renesas ARM Based SoC Boards Cleanups for v3.19
* Sort armadillo800eva includes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUUG/UAAoJENfPZGlqN0++BaYQAKCgAlWNFxVQVARtmZOSC97A
 7QA/JhwG6eCbPax1dUbhoSXiUEvi3XPzxUAvlV35l1RoVZNi6uY16oXx+FWZ/JYh
 f2MgP0TsiUbYJ3m25+mp2Gn8wKYIb9DTW405hffbbQn4BaQVQydNC8iqSs3zW6cV
 D3lacaABqX2Gv/m8oGwb96rEHOhFsNNk8t83VutCfvmLJUvaEf4u32NT0WBftSU4
 8v5xicGJDszZsu6Zxe3JEd2ol/6lUGlItTQnuD8rE7YHzOIJ3XS5q8Zj1YXrLhiT
 XJ8wXA+13MFHX3+ES8YS7HxF8xZrkFAK4Oo3KvkR5RfNuQ5dtUKr+nkL/vSC9WhZ
 7Woni2VHuY/SDGUMNGFoIQDmSbj3TfXpu2iDFDuHPaHatBcGyA3epMX3oCvX5RIM
 xY2StQ3Avd9nioju9P5aTB9tvc6Gg2uaffaUO4t/ZclprhGozChwjmGsTYSvdpdW
 /p3kjtOwX8sYNm9WAXB8RhccsbDs4m1q+nHAu4hhasjyxjjDdpi2pUf/42dljYIr
 THCEvGpeLJ7OrcyD0UHcAUUAn0ULZofswBjYRak8RCfJ8TvjKL3EQtX+h1TfVWBF
 4JQ65HM811vEHWQHhPhGS2MkVzOT33G6pjB4n2lm5ZPWZYs8ERO3uwrU1Ty4kHLf
 9+f2ipE510nuvAh0a3ei
 =sMXS
 -----END PGP SIGNATURE-----

Merge tag 'renesas-boards-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Merge "Renesas ARM Based SoC Boards Cleanups for v3.19" from Simon Horman:

* Sort armadillo800eva includes

* tag 'renesas-boards-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: armadillo800eva: Sort includes

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04 14:33:05 -08:00
Olof Johansson
5d3e1cf245 Renesas ARM Based SoC DT Cleanups for v3.19
* Add chosen/stdout-path to DTS files for shmobile boards
 * Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY
   - The corresponding board file has already been removed
 * Sort dts nodes by address
 * Sort SHMOBILE dtbs alphabetically in Makefile
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUUG0JAAoJENfPZGlqN0++NvoP/1pbn8UA1kfxTpxcQ+GIr9TV
 yUbN50FMwsjeVgIPLn3kfD9PrgwAh7AdSR3oxo/dBF0WR8edhgCFX5WcHGk8yYlf
 9dQXcDpFXPGh7ia5ggh0NNO8wv1Sr95dVqoaI9i9EqEXNVWi2P1yKuzJ2PFYwXqS
 KOqyzBzAlb2dpNnFj6xjtsepGhJwXkwm0X82Vg3FCjVVq3BPzNIUvizpE2GJe3ql
 e5ihwESwOhGL7NapiPcjMpmHpDrp7J/Xrux0jeQFsHTCgCvR09n4JlTY2qIdJlbp
 +Fz8WehIRz2wrd9tngCdmoIGgaQJ6s9iVEOcxTrC1OelfpR3728vPaYihHCP0Ehp
 ewW65U9MRvBDa+EPm0Hb8w9BLThvQJzEQZpHGqzD3+A/FN2B0jNFBafqmv2bHvv8
 WuDy4a3yvjCWAqQ/f8dqWWqUYyXy4FYE2nu2HtYnZJQDPdBVVQ9ZHhMuStKVZjma
 8YYZ87SgF5Ogo0iWWLCaVaJgiy6SkEOAeYT7TORaYQ+1kCSQmDHs5Jc++Kuc3uFT
 n4Y8Wmh67kzabJ2L2NyNgDkf3bK6JKDCo3w+rKARIZESFODw93DlavuGLn62kEng
 TWNl1UL7gsjDT3b5rooPoNXYDfIxgp6aY1rrkxpDInqeDZZbepgaV2u5g6pEjl2K
 q+HNAJqFGezwo4SXnA7Y
 =sqJL
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Renesas ARM Based SoC DT Cleanups for v3.19" from Simon Horman:

* Add chosen/stdout-path to DTS files for shmobile boards
* Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY
  - The corresponding board file has already been removed
* Sort dts nodes by address
* Sort SHMOBILE dtbs alphabetically in Makefile

* tag 'renesas-dt-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: kzm9d dts: Add chosen/stdout-path
  ARM: shmobile: kzm9g-reference dts: Add chosen/stdout-path
  ARM: shmobile: alt dts: Add chosen/stdout-path
  ARM: shmobile: koelsch dts: Add chosen/stdout-path
  ARM: shmobile: henninger dts: Add chosen/stdout-path
  ARM: shmobile: lager dts: Add chosen/stdout-path
  ARM: shmobile: marzen dts: Add chosen/stdout-path
  ARM: shmobile: bockw-reference dts: Add chosen/stdout-path
  ARM: shmobile: armadillo800eva dts: Add chosen/stdout-path
  ARM: shmobile: ape6evm-reference dts: Add chosen/stdout-path
  ARM: shmobile: genmai dts: Add chosen/stdout-path
  ARM: shmobile: emev2 dtsi: Add uart* labels for easier referencing
  ARM: shmobile: emev2 dtsi: Use generic names for device nodes
  ARM: shmobile: r7s72100: Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY
  ARM: shmobile: r8a73a4: sort dtsi file by address
  ARM: shmobile: kzm9d: sort dts file by address
  ARM: shmobile: r7s72100: sort dtsi file by address
  ARM: shmobile: r8a73a4: Remove spurious dma-multiplexer base addresses
  ARM: dts: Sort SHMOBILE dtbs alphabetically

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04 14:32:21 -08:00
Olof Johansson
a49467ce0e Renesas ARM Based SoC Kconfig Cleanups for v3.19
* Remove reference to ARCH_HAS_OPP, it has been removed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUUHBaAAoJENfPZGlqN0++8zQP/RDGJK2bQAGaLyUqn9xbS4cV
 t6k3oa2mBvYUIjfJSG33qVplCjr+t+7c21JfMaqUC0xMOV6RSVEtRfl4Dgh5WiZ+
 1KZXZhd/n6LNNNultkqADDGhZryr1rVq8rmQjyFYK2gYgWD2ReOe8a6Zg6Ql6eqj
 FmKDkqQItmap0WaVLZH5ZVTMfRx9BnSc4pH0L9G541dlCcN/3+MW00A3orA66/JX
 8SHtH51x6tPhSXX0HrZLkmT4KVgmNBlzrIvaoWuzK7vJV6lHpXjGPJDf4EOt9MTx
 qdpb3KbFPpNj8CNVXem9jOJMk1+5XfmonkXbNag1Of/3UDCU/A6QPhwBCBBKWbpb
 oiem1uxFqN/elghpwdAjd0t5quEcQaHBfNECjAYJhWoIW8bul0YU3A5FVtnIGmST
 Dn1LRY2CIA1q4ALaebG+hOYzafnEBX5QVE41xj15VCvztWQtrq37NajClzLteXtn
 fXMHmpxWmYSrVU5jPoCz8u4fFKJGpd5KdS7KyfPzqO3OquVD3ToNvTj7BAWsG+0N
 GXiOnyb9kbfM1jOWzKfNUVjl96qM0Ss0kGSFHMj9+9PjR6aik6pSWu7UT3s9A/Pu
 vLBswr5iPY+PcnaVhr8wZ9PTKR70uDsTz45wCd+SIWD9tuViXEtXrjR5GS1ppt6I
 2qv/WgIRm0yxNCdAzCXE
 =LnmV
 -----END PGP SIGNATURE-----

Merge tag 'renesas-kconfig-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Renesas ARM Based SoC Kconfig Cleanups for v3.19

* Remove reference to ARCH_HAS_OPP, it has been removed

* tag 'renesas-kconfig-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Remove ARCH_HAS_OPP completely

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04 14:31:14 -08:00
Iyappan Subramanian
09c9e0593d dtb: xgene: fix: Backward compatibility with older firmware
The following kernel crash was reported when using older firmware (<= 1.13.28).

[    0.980000] libphy: APM X-Gene MDIO bus: probed
[    1.130000] Unhandled fault: synchronous external abort (0x96000010) at 0xffffff800009a17c
[    1.140000] Internal error: : 96000010 [#1] SMP
[    1.140000] Modules linked in:
[    1.140000] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.17.0+ #21
[    1.140000] task: ffffffc3f0110000 ti: ffffffc3f0064000 task.ti: ffffffc3f0064000
[    1.140000] PC is at ioread32+0x58/0x68
[    1.140000] LR is at xgene_enet_setup_ring+0x18c/0x1cc
[    1.140000] pc : [<ffffffc0003cec68>] lr : [<ffffffc00053dad8>] pstate: a0000045
[    1.140000] sp : ffffffc3f0067b20
[    1.140000] x29: ffffffc3f0067b20 x28: ffffffc000aa8ea0
[    1.140000] x27: ffffffc000bb2000 x26: ffffffc000a64270
[    1.140000] x25: ffffffc000b05ad8 x24: ffffffc0ff99ba58
[    1.140000] x23: 0000000000004000 x22: 0000000000004000
[    1.140000] x21: 0000000000000200 x20: 0000000000200000
[    1.140000] x19: ffffffc0ff99ba18 x18: ffffffc0007a6000
[    1.140000] x17: 0000000000000007 x16: 000000000000000e
[    1.140000] x15: 0000000000000001 x14: 0000000000000000
[    1.140000] x13: ffffffbeedb71320 x12: 00000000ffffff80
[    1.140000] x11: 0000000000000002 x10: 0000000000000000
[    1.140000] x9 : 0000000000000000 x8 : ffffffc3eb2a4000
[    1.140000] x7 : 0000000000000000 x6 : 0000000000000000
[    1.140000] x5 : 0000000001080000 x4 : 000000007d654010
[    1.140000] x3 : ffffffffffffffff x2 : 000000000003ffff
[    1.140000] x1 : ffffff800009a17c x0 : ffffff800009a17c

The issue was that the older firmware does not support 10GbE and
SGMII based 1GBE interfaces.

This patch changes the address length of the reg property of sgmii0 and xgmii
nodes and serves as preparatory patch for the fix.

Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
Reported-by: Dann Frazier <dann.frazier@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-04 17:08:42 -05:00
Mika Westerberg
c673a2b400 leds: leds-gpio: Convert gpio_blink_set() to use GPIO descriptors
Commit 21f2aae91e902aad ("leds: leds-gpio: Add support for GPIO
descriptors") already converted most of the driver to use GPIO descriptors.
What is still missing is the platform specific hook gpio_blink_set() and
board files which pass legacy GPIO numbers to this driver in platform data.

In this patch we handle the former and convert gpio_blink_set() to take
GPIO descriptor instead. In order to do this we convert the existing four
users to accept GPIO descriptor and translate it to legacy GPIO number in
the platform code. This effectively "pushes" legacy GPIO number usage from
the driver to platforms.

Also add comment to the remaining block describing that it is legacy code
path and we are getting rid of it eventually.

Suggested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2014-11-04 21:58:25 +01:00
Jan Beulich
97b67ae559 x86-64: Use RIP-relative addressing for most per-CPU accesses
Observing that per-CPU data (in the SMP case) is reachable by
exploiting 64-bit address wraparound (building on the default kernel
load address being at 16Mb), the one byte shorter RIP-relative
addressing form can be used for most per-CPU accesses. The one
exception are the "stable" reads, where the use of the "P" operand
modifier prevents the compiler from using RIP-relative addressing, but
is unavoidable due to the use of the "p" constraint (side note: with
gcc 4.9.x the intended effect of this isn't being achieved anymore,
see gcc bug 63637).

With the dependency on the minimum kernel load address, arbitrarily
low values for CONFIG_PHYSICAL_START are now no longer possible. A
link time assertion is being added, directing to the need to increase
that value when it triggers.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/5458A1780200007800044A9D@mail.emea.novell.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2014-11-04 20:43:14 +01:00
Jan Beulich
6d24c5f72d x86-64: Handle PC-relative relocations on per-CPU data
This is in preparation of using RIP-relative addressing in many of the
per-CPU accesses.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/5458A15A0200007800044A9A@mail.emea.novell.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2014-11-04 20:43:14 +01:00
Linus Torvalds
8a97577a59 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
Pull powerpc fixes from Michael Ellerman:
 "Some more powerpc fixes if you please"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
  powerpc: use device_online/offline() instead of cpu_up/down()
  powerpc/powernv: Properly fix LPC debugfs endianness
  powerpc: do_notify_resume can be called with bad thread_info flags argument
  powerpc/fadump: Fix endianess issues in firmware assisted dump handling
  powerpc: Fix section mismatch warning
2014-11-04 11:18:29 -08:00
Jan Beulich
2c773dd31f x86: Convert a few more per-CPU items to read-mostly ones
Both this_cpu_off and cpu_info aren't getting modified post boot, yet
are being accessed on enough code paths that grouping them with other
frequently read items seems desirable. For cpu_info this at the same
time implies removing the cache line alignment (which afaict became
pointless when it got converted to per-CPU data years ago).

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/54589BD20200007800044A84@mail.emea.novell.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2014-11-04 20:13:28 +01:00
Murali Karicheri
97ef1af9b2 ARM: keystone: defconfig: add options to enable PCI controller
This patch enables PCI controller driver for Keystone SoCs by
default.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2014-11-04 10:29:39 -08:00
Murali Karicheri
443fcf6316 ARM: keystone: add pcie related options
Now that Keystone PCI controller is merged, add pcie related options
by default for keystone architecture so that driver can be enabled in
the build.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2014-11-04 10:29:39 -08:00
Grygorii Strashko
4d5702b5f9 ARM: keystone_defconfig: enable mdio and marvell eth phys
Enable MDIO support for Keystone 2 SoCs and also
enable Marvell Ethernet PHYs support for Keystone 2 K2H EVM
which has two 1G Marvell 88E1111-B2 PHYs installed.

For more information see:
- http://www.advantech.com/Support/TI-EVM/EVMK2HX.aspx

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2014-11-04 10:28:40 -08:00
Grygorii Strashko
930399bded ARM: keystone_defconfig: enable dsp irq and gpio support
Enable DSP IRQ controller and GPIOs support for Keystone 2.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2014-11-04 10:28:40 -08:00
Murali Karicheri
fc89a57600 ARM: dts: keystone-k2e: add DT bindings for PCI controller for port 1
K2E SoC has a second PCI port based on Synopsis Designware PCIe h/w.
Add DT bindings to support PCI controller for port 1 for this SoC.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2014-11-04 10:27:21 -08:00
Murali Karicheri
bed80507e1 ARM: dts: keystone: add DT bindings for PCI controller for port 0
Add common DT bindings to support PCI controller driver for port 0 on all
of the K2 SoCs that has Synopsis Designware based pcie h/w.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2014-11-04 10:27:21 -08:00
Grygorii Strashko
469fddd81c ARM: dts: k2l-evm: add 1g ethernet phys nodes
Keystone K2L-EVM has two 1G Marvell 88E1514 Ethernet PHYs
installed, which are compatible with 88E1510.
Hence, add corresponding child nodes for 1G MDIO bus.

For more information see:
  https://www.einfochips.com/index.php/partnerships/texas-instruments/k2l-evm.html

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2014-11-04 10:24:50 -08:00
Grygorii Strashko
efa66b3074 ARM: dts: k2e-evm: add 1g ethernet phys nodes
Keystone K2E-EVM has two 1G Marvell 88E1514 Ethernet PHYs
installed, which are compatible with 88E1510.
Hence, add corresponding child nodes for 1G MDIO bus.

For more information see:
  https://www.einfochips.com/index.php/partnerships/texas-instruments/k2e-evm.html

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2014-11-04 10:24:49 -08:00
Daniel J Blueman
bdee237c03 x86: mm: Use 2GB memory block size on large-memory x86-64 systems
On large-memory x86-64 systems of 64GB or more with memory hot-plug
enabled, use a 2GB memory block size. Eg with 64GB memory, this reduces
the number of directories in /sys/devices/system/memory from 512 to 32,
making it more manageable, and reducing the creation time accordingly.

This caveat is that the memory can't be offlined (for hotplug or
otherwise) with the finer default 128MB granularity, but this is
unimportant due to the high memory densities generally used with such
large-memory systems, where eg a single DIMM is the order of 16GB.

Signed-off-by: Daniel J Blueman <daniel@numascale.com>
Cc: Steffen Persvold <sp@numascale.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Link: http://lkml.kernel.org/r/1415089784-28779-4-git-send-email-daniel@numascale.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2014-11-04 18:19:27 +01:00
Daniel J Blueman
b980dcf25d x86: numachip: APIC driver cleanups
Drop printing that serves no purpose, as it's printing fixed or known
values, and mark constant structure appropriately.

Signed-off-by: Daniel J Blueman <daniel@numascale.com>
Cc: Steffen Persvold <sp@numascale.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Link: http://lkml.kernel.org/r/1415089784-28779-3-git-send-email-daniel@numascale.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2014-11-04 18:17:27 +01:00
Daniel J Blueman
25e5a76bae x86: numachip: Elide self-IPI ICR polling
The default self-IPI path polls the ICR to delay sending the IPI until
there is no IPI in progress. This is redundant on x86-86 APICs, since
IPIs are queued. See the AMD64 Architecture Programmer's Manual, vol 2,
p525.

Signed-off-by: Daniel J Blueman <daniel@numascale.com>
Cc: Steffen Persvold <sp@numascale.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Link: http://lkml.kernel.org/r/1415089784-28779-2-git-send-email-daniel@numascale.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2014-11-04 18:17:27 +01:00
Daniel J Blueman
00e7977dd1 x86: numachip: Fix 16-bit APIC ID truncation
Prevent 16-bit APIC IDs being truncated by using correct mask. This fixes
booting large systems, where the wrong core would receive the startup and
init IPIs, causing hanging.

Signed-off-by: Daniel J Blueman <daniel@numascale.com>
Cc: Steffen Persvold <sp@numascale.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Link: http://lkml.kernel.org/r/1415089784-28779-1-git-send-email-daniel@numascale.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2014-11-04 18:17:27 +01:00
Chen Gang
01f7ae0569 arch: tile: kernel: signal.c: Use __copy_from/to_user() instead of __get/put_user()
setup/restore_sigcontext() want to copy all related registers between
user and kernel. So use block copy instead of each registers copy. Then
can let code simple and clearer (which can avoid compiler's warning):

The related warning (with allmodconfig under tile):

    CC      arch/tile/kernel/signal.o
  In file included from include/linux/poll.h:11:0,
                   from include/linux/ring_buffer.h:7,
                   from include/linux/ftrace_event.h:5,
                   from include/trace/syscall.h:6,
                   from include/linux/syscalls.h:81,
                   from arch/tile/kernel/signal.c:30:
  arch/tile/kernel/signal.c: In function 'setup_sigcontext':
  arch/tile/kernel/signal.c:116:31: warning: iteration 53u invokes undefined behavior [-Waggressive-loop-optimizations]
     err |= __put_user(regs->regs[i], &sc->gregs[i]);
                                 ^
  ./arch/tile/include/asm/uaccess.h:236:26: note: in definition of macro '__put_user_asm'
          : "r" (ptr), "r" (x), "i" (-EFAULT))
                            ^
  ./arch/tile/include/asm/uaccess.h:297:10: note: in expansion of macro '__put_user_8'
    case 8: __put_user_8(x, ptr, __ret); break;   \
            ^
  arch/tile/kernel/signal.c:116:10: note: in expansion of macro '__put_user'
     err |= __put_user(regs->regs[i], &sc->gregs[i]);
            ^
  arch/tile/kernel/signal.c:115:2: note: containing loop
    for (i = 0; i < sizeof(struct pt_regs)/sizeof(long); ++i)
    ^

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
2014-11-04 10:38:10 -05:00
Maxime Ripard
5012e8fcf3 ARM: sun7i: olinuxino lime: Relicense the device tree under GPLv2/X11
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.

In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: FUKAUMI Naoki <naobsd@gmail.com>
2014-11-04 16:26:10 +01:00
Ralf Baechle
0097761013 MIPS: Fix strnlen_user() return value in case of overlong strings.
We were returning maxlen like the userland strnlen if no '\0' character
was encountered while the kernel version is expected to return a value
larger than maxlen.  Fixed to return maxlen + 1.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2014-11-04 12:46:33 +01:00
Fabio Estevam
89fbec5b97 ARM: imx: Fix the removal of CONFIG_SPI option
Since 64546e9fe3 ("ARM: imx_v6_v7_defconfig updates") and commit
0650f855d2 ("ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM") CONFIG_SPI
selection was dropped by savedefconfig for imx_v4_v5_defconfig and
imx_v6_v7_defconfig.

In order to keep the same behaviour as previous kernel versions and avoid
regressions, let's add CONFIG_SPI option back.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2014-11-04 19:00:01 +08:00
Olof Johansson
691781785d Multiplatform migration of the Integrator.
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUR55nAAoJEEEQszewGV1zXGkQAKwwhCCI1TMPb+U2e/9fvOMM
 eUiW0CYUJ/G0SKcP1fwegNg3W80kLGJbX23UNXrpV4PzLjg0xlpo0c6Tnh2ttJge
 awDrrqHKxo1FwMqPpRIE2+GPk4ipxJvFyAEiq1gYw7ouEu3nxke1NrpV0DU+S7b+
 KqveK+U1mk21ofOAr6GEWV2XnI7G2UQBCc7sQWc/EZ/Jz1T9gVWckN8Dc5z0l6gy
 9VPeCYn0XzxbBL7jew0n5PMlHbUZf8aC022zXn/JBrDJYaOUH6zKoIztwN8xfKOr
 kZFFlezqjmiISd6WbmK11H3DdAiCBD5QadBixY7RtrepWrIwjDvyZmvkJFNDujRP
 Yl8jOh6G9QRjLeKR61T03OdNn54/c2/aVDbPHasmsjpak0ymZ0wRbnUyqNUbpCFd
 KxyyTpo0GG//I9h1drAAZKqjz3/WBomWoR5YlDEHXTqWAVnoNUta+qs3NEg6/Pcr
 MJ2ApgLLIQ/B5g/b/q1EMIXo1zdf6xF5SAyQlVPiFOtxoSmOr1xgBvlFlVwMqRwz
 a+fZl4cI6H4XOuSt/0VBiByNxW3O7vf1u5k28Ssmuw8ypJ/TABqY8idV39YZLMrv
 mxcX3L0MSYvAsdFllKxSWz4eIzg4AjgWfQ+VUP4We2yDZ7351FT4oT/olJ4ohVqE
 HCz15luWiYI/pUVBWf86
 =XgVc
 -----END PGP SIGNATURE-----

Merge tag 'integrator-multiplatform-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc

Merge "Integrator multiplatform migration for v3.19" from Linus Walleij:

Multiplatform migration of the Integrator.

* tag 'integrator-multiplatform-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: integrator: set V4T and V5 as default multitargets
  ARM: integrator: make the Integrator multiplatform

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-03 22:31:45 -08:00
Olof Johansson
a3206509f6 - Device Tree implementation for the ARM RealView boards
- DTS file for the ARM RealView PB1176
 - Updates on top of the same DTS file
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUR5sZAAoJEEEQszewGV1zEFoP/iqRbD//O4ul8jMNMwrRXw5W
 y6vO8jPPImZm9PSz/KGpx/W/HUXZOZpyja8HgD9v8345jQYhtzFQTagXerNDEMRR
 YXU2CnAPCLoowu/pI+ImNh9rVehGBszzZxEHuBZJq0GAhum6JvaTu3tUWKxfAaqO
 hRfPLchHhHhduzdivHuq2ghmrzYcWM9T8T7MN/8fwI4cnkPaOhPgfIFSD49IydP3
 tx2OaUKVbThw+4t01hD9Ojjj418Cgxl1JNWp55qmQS5l7WMqR885kax1b3OYaStZ
 3vTpbgvQVY/Ht+NFZVE9nNbqGudwCAa8AfhRprHHQ2eaCL/EF35xKtzV7Qr+PwaJ
 jLogO3LlHBsTkkM+UGGz75aclwbyoCcwskqfRefxLRH5ZShIK4noe12Q/DTkR9wB
 lCVEnEtEcMQlVkso/yTZj6u2emQn0mmPDm+HHlK916E4/UlwN7nC47IpNHwtl6fT
 ELAi/7/YoWc+VpdkAjRMKkbK5Aw3m3WhwbG1hGEwscfDmkfJ+gjbmieJJxoEUqEI
 fIZ3uw7Vvn3hxEAJgT/Nf8z9j0r8qq8/EfzsJucH3sVI9dqAcaNPoPRvixtDM+p3
 WgpE+pe9BfE/iD5wYkxoe3vKovqe2vLIcsh+UgPEaFOKpmwV4sdCAaEoEbPI15VH
 S7aSrXpVBZpnypMgS/vA
 =ubCW
 -----END PGP SIGNATURE-----

Merge tag 'arm-realview-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/dt

Merge "RealView DeviceTree support for v3.19" from Linus Walleij:

- Device Tree implementation for the ARM RealView boards
- DTS file for the ARM RealView PB1176
- Updates on top of the same DTS file

* tag 'arm-realview-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: realview: add MMCI to the PB1176 DTS
  ARM: realview: add KMIs to the PB1176 DTS
  ARM: realview: add FPGA UART4 to PB1176 DTS
  ARM: realview: add PL022 SSP/SPI block to PB1176 DTS
  ARM: realview: add RTC clocks to device tree
  ARM: realview: add charlcd to PB1176 device tree
  ARM: realview: add PL061 GPIO to the PB1176 DTS
  ARM: realview: move DT GIC to FPGA node
  ARM: realview: add device tree and bindings for PB1176
  ARM: realview: basic device tree implementation

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-03 22:23:34 -08:00
Olof Johansson
656b5def74 Merge tag 'brcmstb-smp-uart-for-3.19' of http://github.com/brcm/linux into next/soc
Merge "ARM: brcmstb: SMP, Kconfig, earlyprintk and GISB fixes" from Florian
Fainelli:

This pull request contains 3 changes for the brcmstb platform and 2 changes
to the GISB bus arbiter driver

- fist patch adds earlyprintk to brcmstb platforms using the existing 8250
  infrastructure

- second patch re-introduces SMP support after fixing the problems we had in
  the initial implementation, for this patch to apply cleanly, I had to advance
  up to "ARM: brcmstb: revert SMP support"

- third patch is dropping unused Kconfig dependencies

- fourth patch registers the ARM fault code for external aborts that the GISB
  bus arbiter driver is designed to assit

- fifth patch does save/restore the GISB arbiter timeout across S3
  suspend/resume cycles

Thanks!

* tag 'brcmstb-smp-uart-for-3.19' of http://github.com/brcm/linux:
  bus: brcmstb_gisb: save and restore GISB timeout
  bus: brcmstb_gisb: register the fault code hook
  ARM: brcmstb: Kconfig: drop unneeded symbol selections
  ARM: brcmstb: reintroduce SMP support
  ARM: brcmstb: add debug UART for earlyprintk support

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-03 22:19:21 -08:00
Peter Zijlstra (Intel)
ce5686d4ed perf/x86: Fix embarrasing typo
Because we're all human and typing sucks..

Fixes: 7fb0f1de49 ("perf/x86: Fix compile warnings for intel_uncore")
Reported-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: x86@kernel.org
Link: http://lkml.kernel.org/n/tip-be0bftjh8yfm4uvmvtf3yi87@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2014-11-04 07:06:58 +01:00
Olof Johansson
b2b2490a99 Samsung DT updates for v3.19
- add CPU nodes for exynos4210, exynos4212, exynos4412
 
 - exynos4x12-pinctrl: add utility macro to define pin sleep states
 - exynos4412-trats2: add Maxim77693 PMIC node, add sleep mode pin
   configuration and keep eMMC regulators soft-disabled
 
 - add new exynos5250-spring DT
 
 - cleanup exynos5250-arndale, exynos5250-smdk5250 and exynos5250-snow
 
 - exynos5250-arndale: fix apparent GPIO typo and simplify USB3503
 - exynos5250-snow and exynos Peach boards: add rtc_src clock for RTC
 
 - correct mmc0 capability string exynos5420-peach-pit and exynos5800-
   peach-pi
 
 - exynos3250: add MFC codec nodes
 
 - s3c64xx: enable PWM node by default
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJURS3sAAoJEA0Cl+kVi2xqzkcP/1xqcWWiBabtpCEs6nyUL9MD
 9hxi0z7Le9diufZDmAoey2EIWlU/eFpc9eQ7GU/t0bluv1n2CZ07wKO7LAE2OQ/G
 FAsogr1DlnER5fMidgv8nnMBI1v1cHSW+RSaHVQI+r9gsY0uPSqDbGeDk4KQtGbU
 CKSCiuEB0HVtCIbEMwBKpltSy+qfAZuF0kCFKzT8TPGPpIJPJwcA4RAsLRPPS2tv
 QXtnW599fsu4foGFRiOiCUY5bDQlE50BmXSwJsVsGcQ6TSsd25+6f2MUHEQhwStH
 RduGXBqW2J4GNr9I8cdekx2UPrw5kudfg02Vpg/mpYN3c6ZYIostuN31B4tz/d0g
 /w7PoEoDSeSHlUy4GgM1Gs5UYwy3QEYHkx6qOYgYcBHFzebgWERT3cmY7cDhnfKB
 0xyx1UcE3syaMKECYR4AYVZI7p2wEBlZY+FeEspLviI7CVmBzRZXYfwaj8GXb1w5
 dm1nl11Z/q9FIJ19vVUnU/oEyvDFQMiWVKJl5xdM1xWnicve5yZTPUuflVBUEs6/
 g56CBmn7s+OhFSCpoUEKCOKvCg9IpEkbVxrEF0duAh4+it9cnyqWE2qL0wP+hT9X
 kokuFVuUml8tBqgaQIHxwsdvKRMSK14TKpwatVLC18WOozp/Tpf5b3kKSW0OqpYl
 RiOyPFZV0FSzZkMWnvE4
 =DrpM
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt

Merge "1st Round of Samsung DT updates for v3.19" from Kukjin Kim:

Samsung DT updates for v3.19

- add CPU nodes for exynos4210, exynos4212, exynos4412

- exynos4x12-pinctrl: add utility macro to define pin sleep states
- exynos4412-trats2: add Maxim77693 PMIC node, add sleep mode pin
  configuration and keep eMMC regulators soft-disabled

- add new exynos5250-spring DT

- cleanup exynos5250-arndale, exynos5250-smdk5250 and exynos5250-snow

- exynos5250-arndale: fix apparent GPIO typo and simplify USB3503
- exynos5250-snow and exynos Peach boards: add rtc_src clock for RTC

- correct mmc0 capability string exynos5420-peach-pit and exynos5800-
  peach-pi

- exynos3250: add MFC codec nodes

- s3c64xx: enable PWM node by default

* tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: add CPU nodes for Exynos4 SoCs
  ARM: dts: add MFC codec device node for exynos3250
  ARM: dts: Add Maxim 77693 PMIC to exynos4412-trats2
  ARM: dts: Add sleep mode pin configuration for exynos4412-trats2
  ARM: dts: Add utility macro to define pin sleep states for exynos4x12-pinctrl
  ARM: dts: Keep eMMC regulators soft-disabled for exynos4412-trats2
  ARM: dts: correct the mmc0 capability string for exynos Peach boards
  ARM: dts: Add rtc_src clk for s3c-rtc on exynos5250-snow
  ARM: dts: Add rtc_src clk for s3c-rtc on exynos Peach boards
  ARM: dts: Enable PWM node by default for s3c64xx
  ARM: dts: Add exynos5250-spring device tree
  ARM: dts: Simplify USB3503 on exynos5250-arndale
  ARM: dts: Fix apparent GPIO typo in exynos5250-arndale
  ARM: dts: Clean up exynos5250-arndale
  ARM: dts: Clean up exynos5250-smdk5250
  ARM: dts: Fill in bootargs for exynos5250-snow
  ARM: dts: Clean up exynos5250-snow
  ARM: dts: Prepare node labels for exynos5250

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-03 22:04:47 -08:00
Olof Johansson
a0220e12a7 Samsung cleanup for v3.19
- Cleanup SMP/hotplug codes from hotplug.c to platsmp.c
 - Remove unneeded __ref annotation for exynos_cpu_die()
 - Fix the way to power down CPU on exynos4 and CPUidle
   clock down after power down some CPU
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJURSuXAAoJEA0Cl+kVi2xqXlcP/3VcfYe9CNXjTlmWYcUbYHQu
 f9G8ImAquRJ3g6rYdblzoN9B2CTnW/S/PbPDvZudhmo8R92ad0PQnq828lyLfcpE
 ymgqjtkQnhnp4pEGtfB1JMIOTzLsQJTrRJMTIlQkTjJMvvKo8hSv0Dau0q9mtRJR
 GcvtUWqy/wVsaWpACxdo2dzpQNnVLmvWq2kfY5xICYePntpUclSiwT5n6W0NBtzn
 NQo941YDrqfsUF6dOPyji1vlJRLPb7pEgC0nj6mzH0D6xINa+zRUm/pMH5GUn2u3
 WELVRR486Ddmf36Z33BognjeyyGNLbAyjXHBl1PpxwMR8s+qWmP5vVn0KkxJi2kZ
 y9ckFwmdRGxq0Wl/eCP4yTJ1HCGOm91wjoz4LPw00OFPXOisfovDbyWvHR2zkWzB
 wXUFOAqJmtpyqRqSx/h1Zs1FvHixAYD1eqxEUE8CPRA6WdgXf6lyXx9VxgV4dLW4
 Zl19ngtLlr+ecZ8dc8VDEgM5lKcEJYSUzrJQK2VbL1eC3J0zQEYC8eM3G0RZWnKc
 3mzML5Rc1cNd6Ha7MWif9S0N6FyRrGNR0UYYBoz/wc2hyKvo/8VPGjYkCrrl0mYh
 V60NyYXgjA6NnCjSkHf7foQjYB52/du4q5Tvr8buWvYiSWhVMHqNKHHyn0P4szF0
 iO6ncBmdByv0dIOtOkq/
 =N5IA
 -----END PGP SIGNATURE-----

Merge tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

Merge "1st Round of Samsung cleanup for v3.19" from Kukjin Kim:

Samsung cleanup for v3.19

- Cleanup SMP/hotplug codes from hotplug.c to platsmp.c
- Remove unneeded __ref annotation for exynos_cpu_die()
- Fix the way to power down CPU on exynos4 and CPUidle
  clock down after power down some CPU

* tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Fix CPU idle clock down after CPU off
  ARM: EXYNOS: Remove unneeded __ref annotation for cpu_die function
  ARM: EXYNOS: Move code from hotplug.c to platsmp.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-03 22:03:26 -08:00
Stefan Agner
c72c553249 ARM: imx: clk-vf610: define PLL's clock tree
So far, the required PLL's (PLL1/PLL2/PLL5) have been initialized
by boot loader and the kernel code defined fixed rates according
to those default configurations. Beginning with the USB PLL7 the
code started to initialize the PLL's itself (using imx_clk_pllv3).

However, since commit dc4805c2e7
(ARM: imx: remove ENABLE and BYPASS bits from clk-pllv3 driver)
imx_clk_pllv3 no longer takes care of the ENABLE and BYPASS bits,
hence the USB PLL were not configured correctly anymore.

This patch not only fixes those USB PLL's, but also makes use of
the imx_clk_pllv3 for all PLL's and alignes the code with the PLL
support of the i.MX6 series.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2014-11-04 13:40:14 +08:00
Olof Johansson
9576d3e622 Add cpufreq-dt platform device for cpu frequency scaling.
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJUKmvDAAoJEPOmecmc0R2BLxEH/AzKsS3q5FbsyDbOUTU944U6
 4oj1Sby25npzBcWstT1Zlj2nv4CeVI4XMIkNAlx2pkiHXAy9KPBpnrulzffvgxYF
 drncKtQbuPz+9kQ1+YlzOuX0FocZQt3O1Jbs29MXDho3CYaA4KszRoNXXtDhStfM
 0TA0JCU/k7z4aLgoXs/rxfHOwAQL8H56k2RX3eJ1u4PGsvLBC7JAqS1D74KlOjJb
 R/ZAmNjejuXYYGgXlNBjqTB0IIzjTYRSQWAut20ynTjFD2ePN2slQcNP2igoZp8j
 G/kccFo5yp6MK1wDDVqQTt5Ide/4FjVE0EDOGR9VAGY4Lfdp+K01+Yxx8kdHH6Q=
 =M/9x
 -----END PGP SIGNATURE-----

Merge tag 'v3.18-rockchip-cpufreqdev-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc

Merge "ARM: rockchip: cpufreq-cpu0 device" from Heiko Stubner:

Add cpufreq-dt platform device for cpu frequency scaling.

* tag 'v3.18-rockchip-cpufreqdev-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: honor renaming of cpufreq-cpu0 to cpufreq-dt
  ARM: rockchip: add a cpufreq-cpu0 device

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-03 20:49:01 -08:00
Olof Johansson
54981a426b dts, kbuild: Implement support for dtb vendor subdirs
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJURoduAAoJEOpSwMmQLO0fyrQH/Rm2a5vcCH1KPS6CzQOUfFVw
 NFVjkKd9xkXxfB0Ga89/wm0ze2VqXT9aw9kliceteiwG73A9z8FjakIHdBTvzTw2
 YsCZIX8TVUKuALGQ62apUDqvxV5KKgfaLe5TqtJfuNCa0SB07LJBdvbVJV1e6mBD
 dRxjpFzNlLGpqRyRyHu3Dh6+6kbnq/x63JmgzeqFZG6Kf05R27sBggvvzcY9QJeh
 J31b/Cj+cJ5ToErkSFXe8UYSYPPnsDRcGJSn4Yey38rBs4xXhpjxBkq8XG9MlCmq
 HzPdEY2QZ7aUctBbhGKdvhC32Wgb8Qj/+hrACSRuOPEdGL9pBWtwP7rlPtYtez4=
 =epq0
 -----END PGP SIGNATURE-----

Merge tag 'dts-subdirs-for-arm-soc-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux into next/cleanup

Pull "dts, kbuild: Implement support for dtb vendor subdirs" from
Robert Richter:

dts, kbuild: Implement support for dtb vendor subdirs

For arm64 we want to put dts files into vendor's subdirectories from
the beginning. This patch set implements this. As this is a generic
kbuild implementation, vendor subdirs will be also available for
arch/arm and other architectures. The subdirectory tree is also
reflected in the install path.

A new makefile variable dts-dirs is introduced to point to dts
subdirs. This variable is used by kbuild for building and installation
of dtb files.

A dts Makefile looks now as follows:

----
dtb-$(CONFIG_...) += some_file_1.dtb
dtb-$(CONFIG_...) += some_file_2.dtb

dts-dirs          += dir_vendor_a
dts-dirs          += dir_vendor_b

always         := $(dtb-y)
subdir-y       := $(dts-dirs)
clean-files    := *.dtb
----

This patches also introduces the dtbs_install make target for
arm64. Install rules are moved to Makefile.dtbinst using the same
style and calling convention like for modinst and fwinst.

* tag 'dts-subdirs-for-arm-soc-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux:
  dts, arm: Remove $(MACHINE) variable from dtbs make recipes
  dts, arm64: Move dts files to vendor subdirs
  dts, kbuild: Implement support for dtb vendor subdirs
  dts, arm/arm64: Remove dtbs build rules in sub-makes
  dts, kbuild: Factor out dtbs install rules to Makefile.dtbinst
  dts, arm64: Add dtbs_install make target

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-03 20:45:35 -08:00
Greg Kroah-Hartman
a8a93c6f99 Merge branch 'platform/remove_owner' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into driver-core-next
Remove all .owner fields from platform drivers
2014-11-03 19:53:56 -08:00
Tony Lindgren
1b383f44aa ARM: OMAP2+: Drop board file for 3430sdp
This board seems to be in use only for few automated
boot test system and has been booting in device tree
only mode for quite some time now.

So let's drop the board file for it.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-03 17:50:55 -08:00
Tony Lindgren
9e1e632c48 ARM: OMAP2+: Drop board file for ti8168evm
The 81xx support is known to be broken for quite some
time now because of missing patches. And it should be
using device tree based booting now anyways.

So let's just drop the board file for it.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-03 17:50:54 -08:00
Tony Lindgren
2dde3bccbf Merge branch 'for-v3.19/gpmc-omap' of github.com:rogerq/linux into omap-for-v3.19/gpmc
Conflicts:
	arch/arm/mach-omap2/gpmc.c
2014-11-03 17:45:36 -08:00
Tony Lindgren
8f5951172b ARM: OMAP2+: Drop legacy code for gpmc-smc91x.c
This code was only used by 2430sdp, 3430sdp, and n900 development
boards.

The 2430sdp is already device tree only, and all the users of the
3430sdp and n900 development boards are already booting in device
tree mode, so we can drop the legacy smc91x support.

Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-03 17:45:01 -08:00
Tony Lindgren
9995772a6d ARM: OMAP2+: Require proper GPMC timings for devices
Now that we have timings in the .dts files for smc91x
and 8250, we can remove the device specific checks and
just print out the bootloader timings for devices that
may not have timings in the .dts files.

Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-03 17:45:01 -08:00
Tony Lindgren
35ac051e01 ARM: OMAP2+: Show bootloader GPMC timings to allow configuring the .dts file
As we still have some devices with GPMC timings missing from the
.dts files, let's make it a bit easier to use the bootloader
values and print them out.

Note that we now need to move the parsing of the device tree provided
configuration a bit earlier so we can use that for checking if anything
was configured.

Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-03 17:45:01 -08:00
Tony Lindgren
9ed7a776eb ARM: OMAP2+: Fix support for multiple devices on a GPMC chip select
There are cases where we have multiple device instances
connected to a single GPMC chip select. For example, there
are four UARTs on the Zoom debug boards that all share a
single chip select and a GPIO interrupt.

We do have support for this already in theory, but it's broken
because we're bailing out if the chip select is already taken.

To be able to provide checks on the chip select usage, let's
add new struct gpmc_cs_data so we can start using already
registered device names for checks.

Later on we probably want to start using struct gpmc_cs_data
as a wrapper for all the GPMC chipselect related data.

Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-03 17:45:01 -08:00
Tony Lindgren
24f284af1a ARM: dts: Fix missing GPMC NAND device width for omap3 boards
Looks like we have some GPMC NAND timings missing device
width. This fixes "gpmc_cs_program_settings: invalid width 0!"
errors during boot.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-03 17:42:16 -08:00
Tony Lindgren
13aec8e419 ARM: dts: Use better omap GPMC timings for LAN9220
With the GPMC warnings now enabled, I noticed the LAN9220 timings
can overflow the GPMC registers with 200MHz L3 speed. Earlier we
were just skipping the bad timings and would continue with the
bootloader timings. Now we no longer allow to continue with bad
timings as we have the timings in the .dts files.

We could start using the GPMC clock divider, but let's instead
use the u-boot timings that are known to be working and a bit
faster. These are basically the u-boot NET_GPMC_CONFIG[1-6]
defines deciphered. Except that we don't set gpmc,burst-length
as that's only partially configured and does not seem to work
if fully enabled.

[tony@atomide.com: updated to remove gpmc,burst-length]
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-03 16:48:16 -08:00
Hisashi Nakamura
7466c52e17 ARM: shmobile: r8a7791: Correct number of CPU cores
The r8a7791 only has 2 CPU CA15 cores, not 4 CA15 and 4  CA7 cores.

Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-04 09:31:27 +09:00
Hisashi Nakamura
a8d2ff39c7 ARM: shmobile: Separate APMU resource data into CPU dependant part
APMU resources are not common to all R-Car SoCs so don't share this data.
A subsequent patch will correct the CPU cores for the r8a7791.

Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-04 09:31:23 +09:00
Simon Horman
c5940e115e ARM: shmobile: ape6evm: Enable PM Runtime in defconfig
This is consistent with other shmobile defconfigs.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-04 09:13:55 +09:00
Koji Matsuoka
148ebf479a ARM: shmobile: r8a7794: Add VIN clock to device tree
Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-04 09:09:52 +09:00
Linus Torvalds
f4ca536f71 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k update from Geert Uytterhoeven.

Just wiring up the bpf system call.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Wire up bpf
2014-11-03 14:09:33 -08:00