Commit graph

691,473 commits

Author SHA1 Message Date
Olof Johansson
43ff5eaf09 Third Round of Renesas ARM64 Based SoC DT Updates for v4.5
* Enable SATA
 * Add salvator-x part number to DT bindings documentation
 * Enable all four A57 cores instead of just one
 * Enhanced audio support:
   - Use CS2000 as AUDIO_CLK_B
   - Set ak4613 In/Out pin as single-end
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWc12aAAoJENfPZGlqN0++N7YP/iUOSo2pptyYMC6SYjT+v7ST
 R2eYynCqUktGycOeMbxZzcm15jhltCE4roxz01uhuSETAHpBDCyMhr34075UCYr/
 he/NoswZ2zFE9b2cKx6i0teb8Plegx3BJhBAovTK3kegEAg5ouqRX2Kyfa3/VWDd
 ZoXXp2WiEQ09JVrJQGViCNb7EkKt2X3lFwctFWWMuR5dq2g12W4Ka2vbHNcBrWU8
 otSAn7CFoEaKc190RF8kVcHPvVh87ZnuIW15Hs+fr5RFvnGy5PVOLF/l0/ihY9pF
 ErP+M7G8s0wmh3OaeMWHXLeU2pY2TNWAY+mVo49TOe9HpTyC4ij0rDTHE9qiZELm
 lwFP4Pl6liYnJzuAEYh9lbwbtkQ0jvjMihz7bhdlfXOaTFSjbev48NWh+HXeAlSv
 LPCrukqKn1KQVNA2bU1Fg0mEpfpVy+42WAMm7dZzIEacOGs8/0khWZMl3rAvEiRT
 EC4N/bVgIbspSTtvj4F6YHPhTnvI1kx9J5tbjDelTHwuxDBXwEGEiP6b3rTw3znL
 xMv5hc+7kt77UHhmUCYZYpcKfiR8/6Rc8WiQaIdO2oglWdzKuaaf16Ib67aKj31D
 y7SWpEyhUF9g/tqEUwmrL6Kl1F9EXKtYQh8rP2SaTWdU1Ndapa3mtRC95rxcpYai
 ASSssEwMGwbS2S4Oui9G
 =qm/m
 -----END PGP SIGNATURE-----

Merge tag 'renesas-arm64-dt3-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64

Third Round of Renesas ARM64 Based SoC DT Updates for v4.5

* Enable SATA
* Add salvator-x part number to DT bindings documentation
* Enable all four A57 cores instead of just one
* Enhanced audio support:
  - Use CS2000 as AUDIO_CLK_B
  - Set ak4613 In/Out pin as single-end

* tag 'renesas-arm64-dt3-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  arm64: renesas: r8a7795: fix SATA clock assignment
  arm64: dts: salvator-x: Enable SATA controller
  arm64: dts: r8a7795: Add SATA controller node
  arm64: renesas: r8a7795: add internal delay for i2c IPs
  arm64: renesas: salvator-x: Add board part number to DT bindings
  arm64: dts: r8a7795: Add pmu device nodes
  arm64: dts: r8a7795: Add Cortex-A57 CPU cores
  arm64: dts: r8a7795: Add PSCI node
  arm64: renesas: salvator-x: use CS2000 as AUDIO_CLK_B
  arm64: renesas: salvator-x: set ak4613 In/Out pin as single-end

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 12:51:21 -08:00
Olof Johansson
8bdd6f5454 Third Round of Renesas ARM64 Based SoC Defconfig Updates for v4.5
* Enable CS2000 and Renesas R-Car SATA driver
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWc1zcAAoJENfPZGlqN0++GKMP/RBwpAkn8GtGwmGEbIHmx0n7
 npLr8+Anzt+jud6v5E17mg8k/7UDlCB+Deua366mpiAZ3KYNwEyViYXU0OwBwVMG
 UbATErlvHVT9O/yD5z52hy+qSVlh2YhmhV55uQ7Ky5POpHWBazqFQqMdCLyDC8jU
 qQBZpJ9i3pVc+N7+KvIUP1UPun4/5TcTy3sG+ZdTSZ4bCa6WGdKLR+hPzMXbm7Yv
 v6dG+8yi8/4Xl2AT9brhg5v59KBKZM7bx6fSlPr7z09fhVadCjxjCMMGEKP+Q87I
 nS2lB0mJ/5wNpZmZogzTOwTtiFgfDq4v082gA8MpydXsw787N9bXslMGq+V54xBB
 QV0IxN/Tb8TXIgzDiN5/V5Oqh+nm1YfON/prI433H+itEFCXUIKhcO7vBExyRniw
 RZfkF7BhvYHpOTBcCgfIvHhXKCrpliyan5bBS8/ADkngJJ56wO4AWSdi4vz9/P70
 vqPDGfyiffOiXYGkr95AmQhSO6LOo/INmqAHhLb0Z65kVkIAAIiWvXmmxhNFhj9p
 s4lMh6T0dK1PN2l/ctudgSIHgllQanJ5Vl7nPsHQTZ06lkW/O4gNxm3AtIlSRetN
 /NaSrKVVmAIfCKwJ2VMZzVHruyYKJCTGkozW5QMtYh+zqbGyoxZ5R95BYA6R7Dq7
 Bs8XsleUxMNJbk+ahpCX
 =9272
 -----END PGP SIGNATURE-----

Merge tag 'renesas-arm64-defconfig3-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/config64

Third Round of Renesas ARM64 Based SoC Defconfig Updates for v4.5

* Enable CS2000 and Renesas R-Car SATA driver

* tag 'renesas-arm64-defconfig3-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  arm64: defconfig: add CS2000 support
  arm64: defconfig: Add Renesas R-Car SATA driver for R-Car Gen3 SoCs

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 12:50:29 -08:00
Michael Turquette
471a9abeb1 Merge branch 'clk-dove' into clk-next 2015-12-22 12:34:39 -08:00
Russell King
63b8d92c79 clk: add Dove PLL divider support for GPU, VMeta and AXI clocks
Add support for the Dove PLL dividers, which are used to generate the
clocks for the AXI bus, as well as the GPU and VMeta peripherals.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
2015-12-22 12:25:00 -08:00
Sergei Shtylyov
5cbf20c747 sh_eth: fix 16-bit descriptor field access endianness too
Commit 1299653aff ("sh_eth: fix descriptor access endianness") only
addressed the 32-bit buffer address field byte-swapping  but the driver
still accesses 16-bit frame/buffer length descriptor fields without the
necessary byte-swapping -- which should affect the big-endian kernels.
In order to be able to use {cpu|edmac}_to_{edmac|cpu}(), we need to declare
the RX/TX descriptor word 1 as a 32-bit field and use shifts/masking to
access the 16-bit subfields (which gets rid of the ugly #ifdef'ery too)...

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 15:23:47 -05:00
Sebastian Andrzej Siewior
f2830d0989 RDS: don't pretend to use cpu notifiers
It looks like an attempt to use CPU notifier here which was never
completed. Nobody tried to wire it up completely since 2k9. So I unwind
this code and get rid of everything not required. Oh look! 19 lines were
removed while code still does the same thing.

Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Tested-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 15:23:05 -05:00
Olof Johansson
1c5d795704 Qualcomm ARM64 Updates for v4.5
* Add fixed rate oscillators to dts
 * Fixup PMIC alias and properties
 * Change 8916-MTP compatible to be compliant with new scheme
 * Fix 8x16 UART pinctrl configuration
 * Add SMEM, RPM/SMD, and PM8916 support on MSM8916
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWckTvAAoJEFKiBbHx2RXVAH0QAIOVo46P/LtOQk8J+A8lUyM3
 eui/kuJG5H9iKf+r7maPCnWQbkdRfAevHFBixDfqq3WLK6muNAsWlAeTWasBG2AR
 mMqg/0pkVCJHHxJ9xeMqdo7RkAPDgmk/CiR+kD+SA19N+OegU+fExI7RyEd9LQ/B
 sQgbebZxB5VBQPIPlJorFP4UPG6T/sbV4FjsQ65GMGxZ321EV4OsApJHbEK9bzO7
 8fFAU6OX9wRcqkQ9K5aLTo312ZzE1TvgyPLfSfZmAVAmgrWSC99nqKzd3u1qeCOC
 jAzcv9yGMx4bfCMZcTuHp2OIGHbxFE9S0vBHfZrlzYxn8gniKBepGIr8w09TZgEq
 TfDl2pzzfOsLF2sh1UAA3Is/i88zgf/EXt4q+1qgSZAGG66BvNUHDZP3uXVItRcY
 GvugxN/96v5eszrG/0d+0IYQzYvFqXAbFfuYi5ax4+B4eah5YNPjSufJnWbHKogt
 Eg3DVnvlilMBDpqc8zMCR5AnLsFFxGZEtsd8WTofE3Gd8wtkqCMS95Hh5PkNxkyC
 bp1WXKEarMPjJ0X3YtAhQo7M5eFMYsZPxblhCr1CPmuVFzbwlyMkpqdaX23H93Ni
 it+geo3aRKFdtxIX11bqCO6S6f2en7ZGg1bsychxqk+oN309EAqJkQAyNGYpo2h3
 aWGLpsxVEC3/NHNh9aRg
 =mu4g
 -----END PGP SIGNATURE-----

Merge tag 'qcom-arm64-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt64

Qualcomm ARM64 Updates for v4.5

* Add fixed rate oscillators to dts
* Fixup PMIC alias and properties
* Change 8916-MTP compatible to be compliant with new scheme
* Fix 8x16 UART pinctrl configuration
* Add SMEM, RPM/SMD, and PM8916 support on MSM8916

* tag 'qcom-arm64-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  arm64: dts: Add PM8916 support on MSM8916
  arm64: dts: qcom: Add RPM/SMD support on MSM8916
  arm64: dts: qcom: Add MSM8916 SMEM nodes
  arm64: dts: set the default i2c pin drive strength to 16mA
  arm64: dts: fix the i2c aliasing to match to schematics.
  arm64: dts: qcom: msm8916: Add fixed rate on-board oscillators
  arm64: dts: qcom: Alias pm8916 on msm8916 devices
  arm64: dts: qcom: Make msm8916-mtp compatible string compliant
  arm64: dts: qcom: 8x16: UART1 and UART2 use DMA for RX and TX
  arm64: dts: qcom: 8x16: UART1 add CTS_N, RTS_N pin configurations

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 12:20:54 -08:00
Olof Johansson
8418f73b19 Qualcomm ARM Based defconfig Updates for v4.5
* Enable newly supported devices on Qualcomm platforms
 * Enable HAVE_ARM_ARCH_TIMER
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWcdSBAAoJEFKiBbHx2RXVSoUP/inMifRasdVrERu5Dy2wyzXC
 uDRrYLN0BtZvtUEyb/IvJE03qzcXXf4MV/xvco23YvDjOG0bKu+8hWm+XgfR6dbS
 SK2SuXVjWsw4ykaB6NVfrZNotY4rKuQ7FkRRd932EWsIiMNHaQkCrxf9g0oCO0QC
 hug1rwz1+wHayzTC3WXFOQBrlO8Hznswi4zhAeskGYnVdHQdzKd85rIoR/A+7+Pv
 R4CbjGjjDoQcqFJ7cCd8+5OFk8zoQh4vGJDI8o8LJmEojbWpGfkRP6zCSbQd4f+n
 GVflttdZd6IjwqSNosqxV1S9VK5VPuguEPu3RXDPp9Rvr2+zX7Tn8grB40zfQmo/
 gxzAe6qFJpdh6PW2tw/g99f3XSmZeRve7NfTtdwH2ef8CMPMVAiNwLUSYMkZ0L4d
 0yR7ck0Y3htpvswreWGcJ2lVcbpuZAHx6w5jLG1YVBs7hNAOvg/JVPN1oYgB/poH
 G+QxZndvWCeZuQpourEmfs1EQnfoIHOq81XUVKvjKYtc4mvrwivP14hOhEUUcSCt
 aHRMdf9Q8K/9RUDN3BDBSYwgPKCr5m5AaGSD27e8szJDCVLaqhkm1hmDM8zYnTCo
 0slgwX9uF2Tw71fvgHB52f4mNARLMbTzVdkaPx1TVfr5jdLJJhbDRbGnef89IHUB
 XMLPFnRmZGF1SWXcinAW
 =1qOe
 -----END PGP SIGNATURE-----

Merge tag 'qcom-defconfig-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/defconfig

Qualcomm ARM Based defconfig Updates for v4.5

* Enable newly supported devices on Qualcomm platforms
* Enable HAVE_ARM_ARCH_TIMER

* tag 'qcom-defconfig-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: defconfig: qcom: Enable SSBI drivers
  ARM: defconfig: Update qcom_defconfig
  ARM: qcom_defconfig: Enable HAVE_ARM_ARCH_TIMER

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 12:20:15 -08:00
Olof Johansson
8eb1f10ee9 Qualcomm ARM Based Device Tree Updates for v4.5
* Add support for Sony Xperia Z
 * Updates for Sony Honami board
 * Updates for APQ8064 generic platform
 * Updates for MSM8974 generic platform
 * Add fixed rate oscillators for MSM8960 and APQ8064
 * Add documentation for SMSM and SMP2P
 * Fixup PMIC compat strings
 * Add support for SMEM, RPM/SMD on APQ8084
 * Fixup compat on IFC5640
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWcPySAAoJEFKiBbHx2RXVIq8P/3heOjXawoLnb6/xbiKzZ/fM
 T9weGZ4ISTT3LIWRgj2MjWh/Nl7dVDF7PnFzXibwoUefsaM30q+EXmKOZcM8VfRC
 dmnP7KEI80E7Y3sFknih9sYBvBsosq77rw8s148nMgliFFwKB06bboKzvz5lV3X6
 0Vq6TPvVR2mwJcs9qnOI2k3wy7myZ59MpcQQceQPsgWz571a43j1bI/C5nVWRFuK
 QHJhOIwCTF2F8rVeWEAZ7avi4ATbkAv/523sy+kmbNQ61NlJGTsYit1ED4KM/D26
 JfrHgtavsIY5cPgAR5om3+xE7XkRZunen+k5xKWYrsk1aOZK2ETZf0H39sZLE2tN
 6U08J+Lylma+Vr2oA9oMsnuSMroi95+/qqML9mCARwZwZwjYwE3mj0OY6PcLly3a
 QbNShKf2wrY4gyY1GI4gZ86BwgDe5SVbgcd1sTLHFfXt0dW2tQuvJf0rxEtzCv3S
 xivMjNVJ4dpUILUmguWSmfpVi1h5b4poajBZEFR7qsXG1W0lvJJyIz+pp2gOYdT0
 Pt2amBAj6Izi6bBojJfyA3SZ2+wYEqUyZOh1CyCYxdlwF8kE2Pv3ODsSRP+HlUnO
 Yk95gZqXT3s0qZR0QH3LXBNXReid416uqubgQ2knI+PWcqMonk7T/7KrKXSVSqko
 ZtuWPS3DErPGfdTE3yKv
 =1ERX
 -----END PGP SIGNATURE-----

Merge tag 'qcom-dt-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt

Qualcomm ARM Based Device Tree Updates for v4.5

* Add support for Sony Xperia Z
* Updates for Sony Honami board
* Updates for APQ8064 generic platform
* Updates for MSM8974 generic platform
* Add fixed rate oscillators for MSM8960 and APQ8064
* Add documentation for SMSM and SMP2P
* Fixup PMIC compat strings
* Add support for SMEM, RPM/SMD on APQ8084
* Fixup compat on IFC5640

* tag 'qcom-dt-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: (24 commits)
  arm: dts: Add support for PMA8084 on APQ8084
  arm: dts: Add RPM/SMD support on APQ8084
  arm: dts: Add APQ8084 SMEM nodes
  ARM: dts: qcom: apq8064-ifc6410 Use hardware flow control for GSBI6
  arm: dts: qcom: apq8064: Add fixed rate on-board oscillators
  ARM: dts: qcom: msm8974: Add i2c8 node
  ARM: dts: qcom: msm8974: Disable wled and move it to honami
  arm: dts: qcom: Add generic PMIC gpio/MPP compat strings
  arm: dts: qcom: Add aliases for PMICs
  arm: dts: qcom: Update ifc6540 compat for qcom boot format
  arm: dts: qcom: Add board clocks
  ARM: dts: qcom: apq8064: Introduce Sony Xperia Z dts
  ARM: dts: qcom: apq8064: Introduce gsbi5 and gsbi5 serial node
  ARM: dts: qcom: apq8064: Declare all pm8921 regulators
  ARM: dts: qcom: apq8064: Add hwmutex and SMEM nodes
  dt-binding: soc: qcom: Introduce qcom, smp2p binding documentation
  dt-binding: soc: qcom: Add Qualcomm SMSM device tree documentation
  devicetree: Add hardware rng entry to qcom-apq8064.dtsi
  ARM: dts: qcom: msm8974-honami: Specify charging parameters
  ARM: dts: qcom: msm8974-honami: Add uSD slot nodes
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 12:17:48 -08:00
Olof Johansson
f5ff6cc41d MAINTAINERS: Drop Kumar Gala from QCOM
commit bbeaa59598 ("MAINTAINERS: Change QCOM entries") was supposed to drop
Kumar, but didn't. Kumar acked the patch but I suspect Andy had a mistake in
a rebase. Fix it up.

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 12:15:43 -08:00
Vijay Pandurangan
ce8c839b74 veth: don’t modify ip_summed; doing so treats packets with bad checksums as good.
Packets that arrive from real hardware devices have ip_summed ==
CHECKSUM_UNNECESSARY if the hardware verified the checksums, or
CHECKSUM_NONE if the packet is bad or it was unable to verify it. The
current version of veth will replace CHECKSUM_NONE with
CHECKSUM_UNNECESSARY, which causes corrupt packets routed from hardware to
a veth device to be delivered to the application. This caused applications
at Twitter to receive corrupt data when network hardware was corrupting
packets.

We believe this was added as an optimization to skip computing and
verifying checksums for communication between containers. However, locally
generated packets have ip_summed == CHECKSUM_PARTIAL, so the code as
written does nothing for them. As far as we can tell, after removing this
code, these packets are transmitted from one stack to another unmodified
(tcpdump shows invalid checksums on both sides, as expected), and they are
delivered correctly to applications. We didn’t test every possible network
configuration, but we tried a few common ones such as bridging containers,
using NAT between the host and a container, and routing from hardware
devices to containers. We have effectively deployed this in production at
Twitter (by disabling RX checksum offloading on veth devices).

This code dates back to the first version of the driver, commit
<e314dbdc1c> ("[NET]: Virtual ethernet device driver"), so I
suspect this bug occurred mostly because the driver API has evolved
significantly since then. Commit <0b7967503d> ("net/veth: Fix
packet checksumming") (in December 2010) fixed this for packets that get
created locally and sent to hardware devices, by not changing
CHECKSUM_PARTIAL. However, the same issue still occurs for packets coming
in from hardware devices.

Co-authored-by: Evan Jones <ej@evanjones.ca>
Signed-off-by: Evan Jones <ej@evanjones.ca>
Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Cc: Phil Sutter <phil@nwl.cc>
Cc: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Vijay Pandurangan <vijayp@vijayp.ca>
Acked-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 15:15:34 -05:00
Olof Johansson
47ec7e0b75 Qualcomm ARM Based SoC Updates for 4.5
* Add WCNSS_CTRL client
 * Various Kconfig changes to fix build issues
 * Update SoC Qualcomm MAINTAINERS entry
 * Add SMP2P, SMSM, and SMEM state machine drivers
 * Add SMD-RPM support for existing platforms
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWcxOwAAoJEFKiBbHx2RXVCW8P/0WyBFVTOsOiPgm+zM35f4IP
 dmq3sLMIkanVR7QlnZTqJZ0VcuJvUqB254wGOlVDcSQ5wly7CBZRqGH/qD0fRTaO
 pCOPAR50MUWg/pwfQwJKKfJuvGWzuyOCmfg+dBs0nB9dTbnJcYvJ6s7Th12eCPIB
 8//yI/mbAbhml+YQ4Oc2wOd+nfG1DiStxsxrpwd9g9RBgVHTGbyMdrn6ZsOOXvY2
 kQiRebO62KvaoZQY3nGpMSjr0Rxus7o7pAEN0Q1PNEJjc2fKUkWFR00fTBfMIjVh
 l26cdr5MN7xottnDc5Q56xeOW1P85mdBtGdvLqj8r57zJbEX0WFzV4MnuZgclf7j
 RMM58n+CF/mG7YTueCoA5MvAdBkIyhTpflTYQpf5QmLz05ut80KZj4xvvMr5m5WY
 ywKaXfGMLj8w2fXx1uywq8OEtCzkq3uhxk9uULojvGRjfGCSl4FSwUMQhFP7WcfW
 97J0c57o4spVx+ymLopLHfQXj9AuZEdJNFFayno2u3iLoV5RjI1C3Muq3nY8svgp
 mc3DqeImVHS1k/oXGWZeWyro4r3BbnduamH+nwntko91JmxyUZNqhNCMOXIhaI9F
 IR1XKLoIWc9SqK/uh7Lc5mKGUdyy66xaQTfsGPB4quiBrfXDhEkQgEHwEqed6+lO
 jTGAmmfxlKxGRa36By8R
 =gwgF
 -----END PGP SIGNATURE-----

Merge tag 'qcom-soc-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers

Qualcomm ARM Based SoC Updates for 4.5

* Add WCNSS_CTRL client
* Various Kconfig changes to fix build issues
* Update SoC Qualcomm MAINTAINERS entry
* Add SMP2P, SMSM, and SMEM state machine drivers
* Add SMD-RPM support for existing platforms

* tag 'qcom-soc-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  MAINTAINERS: Change QCOM entries
  soc: qcom: smd-rpm: Add existing platform support
  soc: qcom: Introduce WCNSS_CTRL SMD client
  ARM: qcom: select ARM_CPU_SUSPEND for power management
  MAINTAINERS: Add rules for Qualcomm dts files
  soc: qcom: enable smsm/smp2p modular build
  serial: msm_serial: Make config tristate
  soc: qcom: smp2p: Qualcomm Shared Memory Point to Point
  soc: qcom: smsm: Add driver for Qualcomm SMSM
  soc: qcom: Introduce common SMEM state machine code

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 12:10:37 -08:00
Geliang Tang
5c29482dd1 net-sysfs: use to_net_dev in net_namespace()
Use to_net_dev() instead of open-coding it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 15:04:09 -05:00
Michael Turquette
1807b34f95 Merge tag 'clk-samsung-4.5' of git://linuxtv.org/snawrocki/samsung into clk-next
drivers/clk/samsung updates (mostly bug fixes):
 - instantiation of the cpu clocks and addition of the GSCL
   IP parent clocks to the list of available consumer clocks
   for exynos542x SoCs;
 - MFC IP parent clock fix for exynos542x;
 - fix of locking bug in samsung/clk-cpu.c which caused
   system crashes with cpufreq enabled;
 - minor cleanup for s3c2410.
2015-12-22 11:57:37 -08:00
Michael Turquette
b8f15e7119 Merge commit 'fe5fa8fbd4d47f40a45fa29ee1abdb10cb061ec2' into clk-next 2015-12-22 11:57:35 -08:00
Michael Turquette
fcd5ac1a41 Merge tag 'imx-clk-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into clk-next
The i.MX clock updates for 4.5:
- Add is_prepared function callback for pllv3 clock driver
- Use imx_check_clocks() on imx6ul and imx7d clock drivers to save
  some code
- Add a core clock for imx7d to support generic cpufreq driver
- Support imx6q clock routing with OSC to anaclk2/2b
- To support more precise pixel clocks on imx5, allow ipu_di_sel clock
  selectors to influence the PLLs that they are derived from
- A cleanup on imx25 OSC clock
2015-12-22 11:57:34 -08:00
Michael Turquette
eaaa6fb53f Merge tag 'v4.5-rockchip-clk1_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next
Rockchip clock changes for 4.5 containing
- a new pll-type used on rk3036 and other Cortex-A7 socs
- new clock-trees for rk3036 and rk3228
- switch rk3288 plls to slow mode on reboot
- a bunch of new clock ids
- some more critical clocks
- wrong register offsets for the rk3368 cpuclks
- allowing more than 2 parents for the cpuclk
2015-12-22 11:57:33 -08:00
Michael Turquette
d90e149666 Merge branch 'clk-shmobile-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-next 2015-12-22 11:57:32 -08:00
Olof Johansson
e9dd4939ac ARM: tegra: Default configuration updates for v4.5-rc1
This set of patches enable various drivers and features required by
 64-bit Tegra SoCs (Tegra132 and Tegra210).
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJWcqwyAAoJEN0jrNd/PrOh8k0QAJuMMfICxDzPRCWZ+I13o/Pk
 RHlu+ISgOEO5wiCoLsQha628OXu8pl5MiGtD1I84c5DStCF++2SH3aZz3XDaiXEq
 ew19o7lPbvhr2XfHeLMy9DxxYCBgFpKwgNFQanUE5pIs9GFUPuCKAbGkuvFOXKTO
 XV527jxg/TMXNqHkGGiChHjy6AzhVQ69JTsclERikQ9JOspihl3SgXwqagEvmlEy
 ngaxwihDtJ/H+Jw5JhjYEFyA6io998lXlBKriLsu3xbE0SnqH3BU6MBOMNIiqOBB
 SwZdyE7Q8hS18mQg9aqxVZNdYaLDhMyjNLliZ3TnYJFe/MsyVtn1gvebEBiWxwT1
 f0GtT8Z1iAaE3RFlNT2+Da77rCdPYP2VJSmTN655rVFqmHmWksTQeud7TUyZ6BvM
 c7L1XQlG6SWVEbP9XiAbjerj/nqw6YOM7Orde2WvkrwSO97pzT2ACtorgh0Ak5ng
 vL29O4eOduq0vJV6eMXX7LulO/7VIO39aNbG1x6V1fh1LK7QGzmBlXc0f/HbNl8o
 Z6U3Qe8SoeGxRUfavX3lrhj1sqB6kgaheMmAKHLZUJuTDXq6i73bss0Cnl6wkRPp
 8Lh6jqITWBCXj8/NqBPBQ1iei95x3qF7F1FxmD8rh02xBZDGPXHswxbO7lbH77Al
 u3LApmgvYfeuIaPyiu/y
 =e72e
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-4.5-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/config64

ARM: tegra: Default configuration updates for v4.5-rc1

This set of patches enable various drivers and features required by
64-bit Tegra SoCs (Tegra132 and Tegra210).

* tag 'tegra-for-4.5-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: defconfig: Enable printk timestamps
  arm64: defconfig: Enable squashfs support
  arm64: defconfig: Enable sdhci-tegra driver
  arm64: defconfig: Enable serial-tegra driver
  arm64: defconfig: Enable tegra-apbdma driver
  arm64: defconfig: Do not disable Tegra AHB driver
  arm64: defconfig: Enable Tegra210 support

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:56:20 -08:00
David S. Miller
a7c09ae63d Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains two netfilter fixes:

1) Oneliner from Florian to dump missing NFT_CT_L3PROTOCOL netlink
   attribute, from Florian Westphal.

2) Another oneliner for nf_tables to use skb->protocol from the new
   netdev family, we can't assume ethernet there.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 14:54:13 -05:00
Olof Johansson
8483ff079d memory: tegra: Changes for v4.5-rc1
This is a single fix to improve performance of the SMMU on Tegra124.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJWcqsXAAoJEN0jrNd/PrOhx9gQALUUAq012BMfgCKjAfKL5r4A
 +dVGZwDsFDaizY3AvfSfbR2iVXaklmL3++lXYjyQvdtydo+i9/Jq+Dhgv/A2MbQF
 9uHX1hBkbAktJoZK06A8+4ze6vpz6Pug0/X7WjUL3wNc+jp1lkCvKV2FmeZk3c+e
 Du1o0tITGcOPc1oOl46dLVvsGw4ai8g8ADQMpI6UwZevnfk98NgklgJlNtSf80gi
 xD8wDRc656raBiPXUymBpyYF5JyzR5VMqHwdnEcqBu91Ft8GlIksgQLdjJjLqLeu
 bitf7PRDoChWyh5olsellQKK5AFLUPmTpclcHZDXBIdicq9cuFrH8vOydbgLg/Vm
 up+HAglyaPhoNnQt3rCvf1Z4fccPwG/CkmyXPFIBP406nMNk4Nu3QWBSUk457ig1
 YAS0gf9YZMi82DB8xArb5zff9gZ/gUoYEzDtrpEoyWXD1A2W8CYQWAMxAkX8hdkd
 5h9HZ5tkfohntQhLdhVi0KI7kXcRBgxXstbAbfxxw0x0s8icW6uuPK8R53OLhpYR
 w5gr5Uf59obScLllIUs66CQx39Ks8NHnjdzNl/6IKDCEzqVROpyBgMWavl+3XKhk
 6qXOFApcAWVe6iWr4zoC0z3MiF2ME70Zb6T0KTq8hhWEi2huZRMYC0LoQIChlYFN
 NHp5uEOdaNrrH16TkW1O
 =9Kap
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-4.5-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers

memory: tegra: Changes for v4.5-rc1

This is a single fix to improve performance of the SMMU on Tegra124.

* tag 'tegra-for-4.5-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  memory/tegra: Add number of TLB lines for Tegra124

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:51:24 -08:00
Olof Johansson
8b9c13347a The i.MX fixes for 4.4, 3rd round:
- Fix Ethernet PHY mode on i.MX6 Ventana boards, which can result in
   a non-functional Ethernet when Marvell phy driver rather than generic
   phy driver is selected.
 - Fix an assigned-clock configuration bug on imx6qdl-sabreauto board
   which was introduced by commit ed339363de ("ARM: dts:
   imx6qdl-sabreauto: Allow HDMI and LVDS to work simultaneously").
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJWcnPzAAoJEFBXWFqHsHzOvfAIALZo+lVpA3c89ZuDJn0bKfsI
 hsV2wfMW1N5BhLN0AGjNIk/nk/YWhZ57gZyQ8miMdz2VeQRSgcjRaFFfEGRGOGop
 OrrKpgmRKmUNxMrvztLlMmb1hGxpHOO7z/CXO3UrzDRIiw9lzxYymt0Re2UHiE1u
 +tekMe7xBdimfMVmcM8RX/FOZC81tUjH3W8fyPbbzTTgrAnLPmXcfjtHkXy2VPw0
 5ikWCJhFWB9ODnmKHbdA7YsNh52JAe5BieWiLXzLj33XJNDBbiFBbBltbo+BJZnp
 ZaIek/fGHbq7ouCSLdRq7SEQn6ZbjpHhlic/okqNX0ux29QpY2GKTbiq8fLmcLU=
 =wMKP
 -----END PGP SIGNATURE-----

Merge tag 'imx-fixes-4.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

The i.MX fixes for 4.4, 3rd round:
- Fix Ethernet PHY mode on i.MX6 Ventana boards, which can result in
  a non-functional Ethernet when Marvell phy driver rather than generic
  phy driver is selected.
- Fix an assigned-clock configuration bug on imx6qdl-sabreauto board
  which was introduced by commit ed339363de ("ARM: dts:
  imx6qdl-sabreauto: Allow HDMI and LVDS to work simultaneously").

* tag 'imx-fixes-4.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6: Fix Ethernet PHY mode on Ventana boards
  ARM: dts: imx: Fix the assigned-clock mismatch issue on imx6q/dl
2015-12-22 11:49:21 -08:00
David S. Miller
d317aa5893 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says:

====================
100GbE Intel Wired LAN Driver Updates 2015-12-22

This series contains updates to fm10k only.

Bruce cleans up the initialization of fm10k_workqueue at the global level,
which fixes a checkpatch.pl error.  Made several other cleanups of the
driver, like making structures that do not change constant, remove unused
code, cleanup code comments and use boolean states true/false instead of
an integer since a bool is all that is needed.

Jacob fixed the TLV format for little endian structures which are 4 byte
aligned copy, so add an additional __aligned(4) and __packed to ensure
that these structures are actually 4 byte aligned and packed correctly.
Updated the driver to use ether_addr_equal() instead of memcmp() to
compare MAC addresses.

Alex Duyck cleans up the exception handling so all of the paths result in
a similar state if we fail.  Specifically the driver will now unload the
mailbox interrupt, free the queue vectors and MSI-X, and then detach the
interface.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 14:49:03 -05:00
Olof Johansson
4f3ab84156 Renesas ARM Based SoC Defconfig Updates for v4.5
* multi_v7_defconfig and shmobile_defconfig:
   - Enable frame buffer console for armadillo800eva
   - Enable missing Renesas ARM support based on DTSes
   - Drop useless CONFIG_USB_RCAR_PHY=y
 * shmobile_defconfig only:
   - Enable CONFIG_PRINTK_TIME
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWcg6bAAoJENfPZGlqN0++aqEP/idCqLuVdjIKhgSKtgNeWvT2
 2j8KgdYl0/MdTpYSJkbmACRexPaxm/I8uFZlUz5kAXFYXrWw1+OYdAeQKVYssSYJ
 f5W7KZSicUL4vm9ZP12iznHq5cQgkI+9s6H4IpJLDpCOc4vZ9RytvOZDwj6Njw9u
 KvAOZRbRdO/4GRi6vSMoFpFa9rriznya5RkLNEoRJAy81xUzH6tTw/2eTmW17x6v
 rxSlEOkmGSEn9RUTuPOH4n6ys0SHDGh163NZlIb/dxyqwvvZ2CN6n00xmHnjXiAc
 jK2Nfs4r1GYItnzAd5eWEW5P3O5e+fP479pBc1tqX2aoM5MyZTc94Z/zytLUnY4K
 8z33gMm1dy711uIVsZ4+lN8v7LiLlvJxtvhiwqUXGsRtQ3gioJmyyFs+Ewzla4+r
 /v5cYtbn1H6xxNwsLGqLO5wMF3j078FBuep/2RZg6gGb3dLrlcksX+1RCn0ipF5G
 nPxdQ2hCmIHKALpY+C9urHbYfpzF4MCaZeqKCeXP/YKGaN8qhbbukRs6wdf+EhK2
 PsMspbWUQNlAoL3YXOb1vve99GwbitjvUBLkud/LRdVmN6Mi26/fpv8c+7jSBGeW
 XN3UiqSKCHFjvyXIfD4K5x5YAb+byA/45ge8Nlld3ghG6crHCBa1sdrogXp6pcY6
 0K7e/K+m7PHuIBgy3iAk
 =3O01
 -----END PGP SIGNATURE-----

Merge tag 'renesas-defconfig-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig

Renesas ARM Based SoC Defconfig Updates for v4.5

* multi_v7_defconfig and shmobile_defconfig:
  - Enable frame buffer console for armadillo800eva
  - Enable missing Renesas ARM support based on DTSes
  - Drop useless CONFIG_USB_RCAR_PHY=y
* shmobile_defconfig only:
  - Enable CONFIG_PRINTK_TIME

* tag 'renesas-defconfig-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: multi_v7_defconfig: Enable frame buffer console for armadillo800eva
  ARM: multi_v7_defconfig: Enable missing Renesas ARM support based on DTSes
  ARM: multi_v7_defconfig: Drop useless CONFIG_USB_RCAR_PHY=y
  ARM: shmobile: defconfig: Enable frame buffer console for armadillo800eva
  ARM: shmobile: defconfig: Enable missing support based on DTSes
  ARM: shmobile: defconfig: Drop useless CONFIG_USB_RCAR_PHY=y
  ARM: shmobile: defconfig: Enable CONFIG_PRINTK_TIME

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/configs/multi_v7_defconfig
2015-12-22 11:48:45 -08:00
Olof Johansson
0b71b62802 First defconfig pull-request for 4.5:
- a single patch to add watchdog drivers to sama5_defconfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJWcTppAAoJEAf03oE53VmQ5gcH/252ZvQZghdwzRBOGrmabRGt
 9llUe/bGnd6ah582VjYtEHk27815+7qyFWQfLs501n/5/RYAIRIzdin/QrjdUbh1
 hHr881ym5MgPYAwFEZ9yK1GVGyM3QUybVXFDPromBw9fvfVCcqOn/U/4gRCdNlQw
 90j167bhkCWO4uhdZ6yoS6Apv/cs4BF/g6sVXmXuJkck98w8e+wHXZ3LzUC9jP97
 RkmZU3YVbRH0/WYzjx8ymjyyqyJUDtU+jAkeDT6Gnjs1tfrM0irXXkRv3zrB6LJG
 dPmXK9w6rjF+X/hqo4ojKzuZrxyA1qD9CHVOBalgXYXETlhrl+YBRNWOC/yk7g4=
 =s+Hb
 -----END PGP SIGNATURE-----

Merge tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/defconfig

First defconfig pull-request for 4.5:
- a single patch to add watchdog drivers to sama5_defconfig

* tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/defconfig: enable watchdog drivers in sama5_defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:47:27 -08:00
Olof Johansson
960ac2dbee First batch of DT changes for 4.5:
- addition of nodes for sama5d2 & sama5d4
 - some fixes for i2c hold time, compatible stings
 - addition of a new patform by DENX: the MA5D4 SoM and EVK
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJWcThWAAoJEAf03oE53VmQuRgIAJG4qqeh62GE5naX6wCiaPmi
 bWay4W1iMImiX+DHIKgFpBdHmjbHUlajUqifk4+CQ08FuFBiSl23pOP9U0j4b0Hr
 jglidWJRpm2vlqN+25R/lJgwA3jleFtDn/l5EW8P5kL8WkXfXOWU7Jop+Pqxae0a
 aAmKZKi9MU6mwUyZnDEYpNf29pILbBve+vPqRRVaFXiOzDYXzl3LnTE2zQvSeY0U
 dpkrrH2jbjfJ8gWmAvfMqTuJLwbgv00H5MvcaP3Q8MR+7F6ATZUtqjSiMF+aRYCM
 sUYCJTG4WglZvWBFTn4LcSTXZgwfVjM4r59hd18Ep2TGnXk3fRS17xTxtoAQczE=
 =+zlN
 -----END PGP SIGNATURE-----

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

First batch of DT changes for 4.5:
- addition of nodes for sama5d2 & sama5d4
- some fixes for i2c hold time, compatible stings
- addition of a new patform by DENX: the MA5D4 SoM and EVK

* tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: sama5d2 Xplained: pmic needs a specific sda hold time
  ARM: at91/dt: sama5d4: update i2c compatible string
  ARM: at91/dt: sama5d4 master clock can run at 200MHz now
  ARM: at91/dt: sama5d2: add watchdog node
  ARM: at91/dt: sama5d4: Add support for DENX MA5D4 SoM and EVK
  ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus
  ARM: at91/dt: sama5d4: Fix mmc0 pinmux comments

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:46:26 -08:00
Chen-Yu Tsai
bccd240fc8 bus: sunxi-rsb: Fix peripheral IC mapping runtime address
0x4e is the runtime address normally associated with perihperal ICs.
0x45 is not a valid runtime address.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:42:30 -08:00
Chen-Yu Tsai
427d6e4812 bus: sunxi-rsb: Fix primary PMIC mapping hardware address
The primary PMICs use 0x3a3 as their hardware address, not 0x3e3.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:42:26 -08:00
Olof Johansson
4749edf82f This pull request includes a fix for
improper usage of WARN() and a fix
 for unmet 'select' dependencies.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJWb/f/AAoJEGFBu2jqvgRNKyQP/jIpuXiRm6NxXQZASGv2i7Qg
 +kzkxbMIj3Z6WKtteZkQoleA9xnBvPiK+ecTCug+TwNCOYeNZHPkYxY4Ce01YZj4
 NNzJTLyUgd92CY+3ovS5Vd1Prz6lPnSKGTLHBxLYptug56NhBcEmfqM65eAgoT22
 UKs19WvZjshc1FNhuY0jGTKAZF9pe6PvZji5NOb8ueCUV+P/mLJfA9iOeXnOmpEb
 bdsKNT5E3LxYSGF8LdRZ7e5Yl77o+dNh7yl+j9ias8cYu1BiPFUmtfLsnjNxmaE7
 erFRTlzYn6/sqYtIOpIj2vDSL+dVF8k9fVc3tzfpjeDzALgdmYOyDGpEB404a6Ml
 1NuWaZvsrJIVoL5v6nTcpP0U2Y/yC2T9bpDE/3SCZIIubPz08bVAdtx1yAyO8DHq
 wVeV9X6mF2RpslWHO02vALsmBXdyecNzYtiNFDPT+NMIoAuVRvaWkrgJMu9Kut/u
 CkY7wwZD4VQV54rd6kK0wrGyMWJCqQ4QhkVlK6DPAHqM/X81lBDPm33m68Pb/xF+
 V20G2q+Nfdfq7LJafoEIMrRaWAd+ZlhvqJ5W1LgL5YeCMylHNU87S6r7hWyeLQ+D
 cV0bq3qW0DGIzbwv2Tw+rq8ie4nywJb63jPQzNo1i0B5rWTUpS6pCisabFrUvji5
 fbIRKa1KyENz7Um1mgU2
 =u3KY
 -----END PGP SIGNATURE-----

Merge tag 'davinci-for-v4.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/fixes-non-critical

This pull request includes a fix for improper usage of WARN() and a fix
for unmet 'select' dependencies.

* tag 'davinci-for-v4.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: fix a problematic usage of WARN()
  ARM: davinci: only select WT cache if cache is enabled

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:40:17 -08:00
Or Gerlitz
cebfe5ca03 staging/o2iblnd: Avoid calling ib_query_device
Instead, use the cached copy of the attributes present on the device.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
2015-12-22 14:39:00 -05:00
Or Gerlitz
e3e45b1b43 xprtrdma: Avoid calling ib_query_device
Instead, use the cached copy of the attributes present on the device.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
2015-12-22 14:39:00 -05:00
Or Gerlitz
0353261c12 net/rds: Avoid calling ib_query_device
Instead, use the cached copy of the attributes present on the device.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
2015-12-22 14:39:00 -05:00
Or Gerlitz
4a061b287b IB/ulps: Avoid calling ib_query_device
Instead, use the cached copy of the attributes present on the device.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
2015-12-22 14:39:00 -05:00
Or Gerlitz
86bee4c9c1 IB/core: Avoid calling ib_query_device
Use the cached copy of the attributes present on the device, except for
the case of a query originating from user-space, where we have to invoke
the driver query_device entry, so they can fill in their udata.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
2015-12-22 14:39:00 -05:00
Ira Weiny
3e153a93a1 IB/core: Save the device attributes on the device structure
This way both the IB core and upper level drivers can access these cached
device attributes rather than querying or caching them on their own.

Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
2015-12-22 14:39:00 -05:00
Nishanth Menon
1c5a9b84a1 ARM: multi_v7_defconfig: Enable generic SoC internal OMAP regulators
ABB and PBIAS are internal LDO control regulators that are needed for
maintaining proper functionality of OMAP architecture SoCs. Enable the
same. PBIAS is already enabled, so just enable ABB regulator as well.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:32:12 -08:00
Nishanth Menon
7b5c01bb26 ARM: multi_v7_defconfig: Enable AM437x PMIC TPS65218
Enable PMIC for AM437x platforms such as AM437x-sk similar to commit
a186cf10da ("ARM: omap2plus_defconfig: enable TPS65218 configs").
This allows multi_v7_defconfig to boot up on AM437x-sk platform.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:32:00 -08:00
Olof Johansson
74386da41d Allwinner DT changes for 4.5
Allwinner device-tree related patches for the 4.5 merge window.
   * Support for the H3
   * Addition of the RSB to the relevant devices (sun8i, sun9i)
   * Addition of the Video Engine clocks for the older SoCs (sun4i, sun7i)
   * Addition of the DRAM gates for the older SoCs (sun4i, sun7i)
   * Addition of the audio codec to a bunch of boards
   * New board: ICNova SWAC
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWbrtVAAoJEBx+YmzsjxAgOoUQAJRZaA5HCcnIFgz1ycssmpPn
 g72weaAPY4+QSF1nk06jE9+0cbdiVCukpFd5aVIBXGyw7YRcTCITDN0HhndlmAgY
 aQ4nHwlIXQc0aGMIiUpZXEoHcHuuvUoB5GpTLl3RRmOdCApxeF96SIBZthkCrPpO
 6dB40heyPdD2C+rs0HNEROepFAXkTNdZd/PrYfPEr5/8rP5SGnQZl08xwXPvlQoe
 6uW1Gg5+RHoWC9V2RF6n9JIhTtVU1YBjZ3/zZZCYifURBtwHATGzwLRVIGJp4qE6
 +GwlaQBAHiSyf/Z69/s3L5zZUDj/Ko+2qw48n1qgCJWhpctkFceC6fL0kpi+VRT0
 /yWigiZfox1BWtdXiCRdOAyQZGb5VJ61/K25cZuyllSuwisELfdIsdwfB9f2HOOJ
 HSdN+FzEskDHvYZX3B8EEEstS38po7O0q9T6deCfCM8NyEg4RnXVf8sf3p2JmOCo
 M9u6akQjwav5U4mmeBwUB+8qLniyXTEcpkB+R38Mh6jnomU+x1nqdbheUsY84zyx
 NFoBpatlfKin0xCA30eP582V92qi73Vhs6xzeGOk9/WrTt4p+724/9RIseqfiB5V
 z3vaKXnCr4Hs+gZFxegiElHeIeQHGtX6iVpoDoZl4I1u8fkABYz1W18qdJxrPEhd
 ytnxUwyL1h5uzVs6+1Yr
 =qu2G
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt-for-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt

Allwinner DT changes for 4.5

Allwinner device-tree related patches for the 4.5 merge window.
  * Support for the H3
  * Addition of the RSB to the relevant devices (sun8i, sun9i)
  * Addition of the Video Engine clocks for the older SoCs (sun4i, sun7i)
  * Addition of the DRAM gates for the older SoCs (sun4i, sun7i)
  * Addition of the audio codec to a bunch of boards
  * New board: ICNova SWAC

* tag 'sunxi-dt-for-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (40 commits)
  ARM: dts: sun7i: Olimex A20-SOM-EVB: Enable mmc3 (baseboard SD socket)
  ARM: dts: sun7i: Olimex A20-SOM-EVB: Add LRADC keys
  ARM: dts: sun9i: cubieboard4: Enable Reduced Serial Bus controller
  ARM: dts: sun9i: cubieboard4: Enable consumer IR receiver
  ARM: dts: sun9i: cubieboard4: Enable LEDs
  ARM: dts: sun7i: Add VE (Video Engine) module clock node
  ARM: dts: sun4i: Add VE (Video Engine) module clock node
  ARM: dts: sun8i: Add Orange Pi Plus support
  ARM: dts: sunxi: Add Allwinner H3 DTSI
  ARM: dts: sun7i: Add DRAM gates
  ARM: dts: sun4i: Add DRAM gates
  ARM: dts: sun9i: Add NMI controller device node
  ARM: dts: sun9i: optimus: Enable Reduced Serial Bus controller
  ARM: dts: sun9i: Add Reduced Serial Bus controller device node to A80 dtsi
  ARM: dts: sun9i: optimus: Enable consumer IR receiver
  ARM: dts: sun9i: Add consumer IR receiver device node and pinmux settings
  ARM: dts: sun9i: optimus: Enable LED3
  ARM: dts: sun9i: Add A80 R_PIO pin controller device node
  ARM: dts: sun9i: Add TODO comments for the main and low power clocks
  ARM: dts: sun9i: Add A80 PRCM clocks and reset control nodes
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:29:28 -08:00
Olof Johansson
f877df2bcf arm: Xilinx Zynq patches for v4.5
- Select reset controller by default for Zynq
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZutbsACgkQykllyylKDCGOjgCfWC/4Z3UmDAypeSEABmFaBkb2
 uDkAn2VeuLBHYIZaEp3c22iVZ4X+xtbJ
 =8W06
 -----END PGP SIGNATURE-----

Merge tag 'zynq-soc-for-4.5' of https://github.com/Xilinx/linux-xlnx into next/soc

arm: Xilinx Zynq patches for v4.5

- Select reset controller by default for Zynq

* tag 'zynq-soc-for-4.5' of https://github.com/Xilinx/linux-xlnx:
  ARM: zynq: Select ARCH_HAS_RESET_CONTROLLER

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:28:30 -08:00
Olof Johansson
5b30ffc29d arm: Xilinx ZynqMP dt patches for v4.5
- Label GPIO controller as interrupt controller
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZus2EACgkQykllyylKDCEfZwCdHZEn5t3e73R3pgctM8fiuInZ
 3lMAni1qDWL4G4PVGVoibUBNTgZ3hSNT
 =/W1/
 -----END PGP SIGNATURE-----

Merge tag 'zynqmp-dt-for-4.5' of https://github.com/Xilinx/linux-xlnx into next/dt64

arm: Xilinx ZynqMP dt patches for v4.5

- Label GPIO controller as interrupt controller

* tag 'zynqmp-dt-for-4.5' of https://github.com/Xilinx/linux-xlnx:
  ARM64: zynqmp: DT: Add interrupt-controller property to GPIO

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:27:29 -08:00
Olof Johansson
69c8e667ff arm: Xilinx Zynq dt patches for v4.5
- Various small DT changes, GPIO, slcr, cpu label
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZusi0ACgkQykllyylKDCFCDgCfQ0mCK4O38NMUHwG9wA4THD/e
 54MAoJtiu6VVch3iJ7aMX7rcDPhQPQW9
 =XrJB
 -----END PGP SIGNATURE-----

Merge tag 'zynq-dt-for-4.5' of https://github.com/Xilinx/linux-xlnx into next/dt

arm: Xilinx Zynq dt patches for v4.5

- Various small DT changes, GPIO, slcr, cpu label

* tag 'zynq-dt-for-4.5' of https://github.com/Xilinx/linux-xlnx:
  ARM: dt: zynq: Add labels to cpu nodes to allow overriding OPPs.
  ARM: dts: zynq: describe SLCR as simple-mfd rather than simple-bus
  ARM: dts: zynq: replace gpio-key,wakeup with wakeup-source property
  ARM: zynq: DT: Add interrupt-controller property to GPIO

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:26:28 -08:00
Rob Herring
dd90caaca2 arm64: dts: hikey: add label properties to UARTs
Add label properties to provide a way to identify UARTs based on their
board or connector name. This follows naming convention in 96boards CE
spec. Ports without external connections are not labelled.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:25:43 -08:00
Rob Herring
262c45d43f arm64: dts: apq8016-sbc: add label properties for UART, I2C, and SPI
Add label properties to provide a way to identify UART, I2C and SPI
ports based on their connector names. This follows naming convention in
96boards CE spec. Ports without external connections are not labelled.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Andy Gross <agross@codeaurora.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Tested-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:25:26 -08:00
Rob Herring
700dfee190 arm64: dts: apq8016-sbc: enable UART0 on LS connector
The LS UART0 is not used by anything else and should be enabled for
expansion boards.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Andy Gross <agross@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:25:15 -08:00
Jon Medhurst (Tixy)
28e10a8f3a arm64: dts: juno: Add idle-states to device tree
This patch adds idle-states bindings data collected through a set of
benchmarking experiments (latency and energy consumption) on Juno
boards. Latencies data represents the worst case scenarios as required
by the DT idle-states bindings.

Signed-off-by: Jon Medhurst <tixy@linaro.org>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:23:20 -08:00
Masahiro Yamada
4b7f48d395 bus: uniphier-system-bus: add UniPhier System Bus driver
The UniPhier System Bus is an external bus that connects on-board
devices to the UniPhier SoC.  Each bank (chip select) is dynamically
mapped to the CPU-viewed address base via the bus controller.  The
bus controller must be configured before any access to the bus.

This driver parses the "ranges" property of the System Bus node and
initialized the bus controller.  After the bus becomes ready, devices
below it are populated.

Note:
Each bank can be mapped anywhere in the supported address space;
there is nothing preventing us from assigning bank 0 on 0x42000000,
0x43000000, or anywhere as long as such region is not used by others.
So, the "ranges" is just one possible software configuration, which
does not seem to fit in device tree because device tree is a hardware
description language.  However, of_translate_address() requires
"ranges" in every bus node between CPUs and device mapped on the CPU
address space.  In other words, "ranges" properties must be statically
defined in device tree.  After some discussion, I decided the dynamic
address reassignment by the driver is too bothersome.  Instead, the
device tree should provide a reasonable translation setup that the OS
can rely on.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 11:22:39 -08:00
Eric Anholt
c1be3c1fc6 ARM: bcm2835: Add a compat string for bcm2836 machine probe
Supporting the 2836 requires using the new interrupt controller, which
we have support for.

Signed-off-by: Eric Anholt <eric@anholt.net>
2015-12-22 11:17:04 -08:00
Eric Anholt
57e5c6d95b dt-bindings: Add root properties for Raspberry Pi 2
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Rob Herring <robh@kernel.org>
2015-12-22 11:16:55 -08:00
J. German Rivera
c7a5675f52 arm64: dts: Added syscon-reboot node for FSL's LS2080A SoC
Added sys-reboot node to the FSL's LS2080A SoC DT to leverage
the ARM-generic reboot mechanism for this SoC. This mechanism
is enabled through CONFIG_POWER_RESET_SYSCON.

Signed-off-by: J. German Rivera <German.Rivera@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 10:53:36 -08:00
Shaohui Xie
ac0ca41634 arm64: dts: add LS1043a-RDB board support
Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com>
Signed-off-by: Wenbin Song <Wenbin.Song@freescale.com>
Signed-off-by: Hou Zhiqiang <B48286@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 10:53:33 -08:00