Commit graph

520,225 commits

Author SHA1 Message Date
Olof Johansson
47f36e4921 CCI-400 PMU updates
This series reworks some of the CCI-400 PMU code so that it can be used
 on both ARM and ARM64-based systems, without the need to boot in secure
 mode on the latter. This paves the way for CCI-500 support in future.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCgAGBQJVFWAiAAoJELescNyEwWM0pK8IALUinCT+Ec/Oi5WwGJaLgQgw
 exlDFAcmml0xisxglGL7eHcvNBs/j4wFD37mqDUszrGW3jrM+Ex+/cvUzWIlEyZl
 LjG99ZF2j51LFxDHMgpRwg1aD/NNQsQjwsuHHdCr+NHB5R2C0M4umsgX6Kt6/PE4
 95LOnnjBOx4FkMOG9mZElzldUlqnhWd6drjQ9qZQar9VVVewfbR1LH/xQhjrCL0w
 nwRzJwYj1LnLFO0hBVUAJSfvYltMF9PxBEx0FkyzN7QcuP1tLQ25NmGEvarHP6iZ
 XpvTZ7akzButyUQbvz/kf6a0agPNUv1HHEqh7/Zddvgm//+p8nEBORuJ/cC6g1E=
 =UHCi
 -----END PGP SIGNATURE-----

Merge tag 'arm-perf-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/drivers

Merge "arm-cci PMU updates for 4.1" from Will Deacon:

CCI-400 PMU updates

This series reworks some of the CCI-400 PMU code so that it can be used
on both ARM and ARM64-based systems, without the need to boot in secure
mode on the latter. This paves the way for CCI-500 support in future.

* tag 'arm-perf-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
  arm-cci: Fix CCI PMU event validation
  arm-cci: Split the code for PMU vs driver support
  arm-cci: Get rid of secure transactions for PMU driver
  arm-cci: Abstract the CCI400 PMU specific definitions
  arm-cci: Rearrange code for splitting PMU vs driver code
  drivers: cci: reject groups spanning multiple HW PMUs
  + Linux 4.0-rc4

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:38:43 -07:00
Lina Iyer
06c49f2b88 ARM: dts: qcom: Add idle state device nodes for 8064
Add ARM common idle state device bindings for cpuidle support for APQ
8064.

Support Standalone power collapse (SPC) idle state (power down that does not
affect any SoC idle states) for each cpu.

Signed-off-by: Lina Iyer <lina.iyer@linaro.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:55 -07:00
Lina Iyer
d8664979e6 ARM: dts: qcom: Add idle states device nodes for 8084
Add ARM common idle states device bindings for cpuidle support for APQ
8084.

Support Standalone power collapse (SPC) idle state (power down that does not
affect any SoC idle states) for each cpu.

Signed-off-by: Lina Iyer <lina.iyer@linaro.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:55 -07:00
Lina Iyer
d596d620d8 ARM: dts: qcom: Add idle states device nodes for 8974/8074
Add ARM common idle states device bindings for cpuidle support for APQ
8974/8074.

Support Standalone power collapse (SPC) idle state (power down that does
not affect any SoC idle states) for each cpu.

Signed-off-by: Lina Iyer <lina.iyer@linaro.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:54 -07:00
Lina Iyer
9fc23ce3bf ARM: dts: qcom: Update power-controller device node for 8064 Krait CPUs
Update the SAW2 DT bindings to add qcom,apq8064-saw2-v1.1-cpu compatible
binding string to configure SPM registers and allow the SPM to put the
core in deeper idle states when the core is idle.

Signed-off-by: Lina Iyer <lina.iyer@linaro.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:53 -07:00
Lina Iyer
030e27f6c6 ARM: dts: qcom: Add power-controller device node for 8084 Krait CPUs
Each Krait CPU in the QCOM 8084 SoC has an SAW power controller to
regulate the power to the cpu and aide the core in entering idle states.
Reference the SAW instance and associate the instance with the CPU core.

Signed-off-by: Lina Iyer <lina.iyer@linaro.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:53 -07:00
Lina Iyer
8c76a6382e ARM: dts: qcom: Add power-controller device node for 8074 Krait CPUs
Each Krait CPU in the QCOM 8074/8974 SoC has an SAW power controller to
regulate the power to the cpu and aide the core in entering idle states.
Reference the SAW instance and associate the instance with the CPU core.

Signed-off-by: Lina Iyer <lina.iyer@linaro.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:52 -07:00
Lina Iyer
52cd845181 devicetree: bindings: Document qcom,idle-states
Document cpuidle states of QCOM cpus. In addition to arm-idle-state
compatible string, the ARM idle state definition must define one of the
following compatible strings -
	"qcom,idle-state-ret",
	"qcom,idle-state-spc",
	"qcom,idle-state-pc",

The compatibles helps the SPM platform driver to use the correct idle
function when the index to the idle state is passed to the platform
driver.

Signed-off-by: Lina Iyer <lina.iyer@linaro.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:51 -07:00
Lina Iyer
005c5dc9b3 devicetree: bindings: Update qcom,saw2 node bindings
Update qcom,saw2 node bindings with compatible strings to identify nodes
that provides cpuidle functionality for a particular SoC. Remove
unused compatible strings.

Update examples for different SAW nodes.

Signed-off-by: Lina Iyer <lina.iyer@linaro.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:51 -07:00
Georgi Djakov
83bd147952 dt-bindings: Add #defines for MSM8916 clocks and resets
Add clocks/resets defines for the global clock controller
found on Qualcomm MSM8916 SoCs.

Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:50 -07:00
Kenneth Westfield
f49cadeb48 arm: dts: qcom: Add LPASS Audio HW to IPQ8064 device tree
Model the Qualcomm Technologies LPASS hardware for the ipq806x SOC.

Signed-off-by: Kenneth Westfield <kwestfie@codeaurora.org>
Acked-by: Banajit Goswami <bgoswami@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:49 -07:00
Ivan T. Ivanov
e321cbbd55 arm: dts: qcom: Add APQ8084 chipset SPMI PMIC's nodes
PMA8084 have 2 SPMI devices per physical package. Add their
configuration nodes and include them in boards which are using
AQP8084 based chipset.

Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:49 -07:00
Ivan T. Ivanov
c91278931d arm: dts: qcom: Add 8x74 chipset SPMI PMIC's nodes
PM8841 and PM8941 have 2 SPMI devices per physical package.
Add their configuration nodes and include them in boards
which are using 8x74 based chipset.

Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:48 -07:00
Ivan T. Ivanov
af22e46d3e arm: dts: qcom: Add SPMI PMIC Arbiter nodes for APQ8084 and MSM8974
Add SPMI PMIC Arbiter configuration nodes for APQ8084 and MSM8974.

Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:47 -07:00
Kumar Gala
1e1177bf4c arm: dts: qcom: Add LCC nodes
Add the node for the LPASS clock controller found on a few qcom
SoCs so that the clock driver can probe.

Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
[sboyd@codeaurora.org: Added apq8064 and msm8960 nodes]
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:47 -07:00
Andy Gross
3860d43c80 arm: dts: qcom: Add TCSR support for MSM8960
This patch adds TCSR support for use by the GSBI to automatically
configure ADM CRCI values based on the GSBI port configuration.

Signed-off-by: Andy Gross <agross@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:46 -07:00
Andy Gross
da047acd17 arm: dts: qcom: Add TCSR support for MSM8660
This patch adds TCSR support for use by the GSBI to automatically
configure ADM CRCI values based on the GSBI port configuration.

Signed-off-by: Andy Gross <agross@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:45 -07:00
Andy Gross
4d9b766bfe arm: dts: qcom: Add TCSR support for IPQ8064
This patch adds TCSR support for use by the GSBI to automatically
configure ADM CRCI values based on the GSBI port configuration.

Signed-off-by: Andy Gross <agross@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:44 -07:00
Andy Gross
4105d9d60a arm: dts: qcom: Add TCSR support for APQ8064
This patch adds TCSR support for use by the GSBI to automatically
configure ADM CRCI values based on the GSBI port configuration.

Signed-off-by: Andy Gross <agross@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:44 -07:00
Andy Gross
a8b21018de mfd: qcom,tcsr: Add device tree binding for TCSR
This patch adds the device tree binding for the Qualcomm Top Control and
Status Register device.  The TCSR is comprised of a set of registers that
provide various control and status functions for attached peripherals.

Signed-off-by: Andy Gross <agross@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:43 -07:00
Kumar Gala
2d9ad4f85e arm: qcom: dts: gic: add compatible string for Qualcomm MSM GICs
Document the Qualcomm MSM GICs implementation as compatible with the
ARM GIC standard.

Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:33:42 -07:00
Kumar Gala
282703e828 arm64: dts: Add Qualcomm APQ8016 SBC evaluation board dts
Add initial device tree support for Qualcomm APQ8016 SBC Evaluation board.
This board is also referred to as the DragonBoard 410c.

Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:32:22 -07:00
Kumar Gala
57f0a7eae6 arm64: dts: Add Qualcomm MSM8916 SoC and evaluation board dts
Add initial device tree support for Qualcomm MSM8916 SoC and MTP8916
evaluation board.  At the current time we only boot up a single processor.

Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:32:16 -07:00
Olof Johansson
a6964d90fe Qualcomm ARM Based defconfig Updates for v4.1-1
* Increase MMC_BLOCK_MINORS to 32 since qcom platforms have more than
   16 partitions
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 Comment: GPGTools - https://gpgtools.org
 
 iQIcBAABCgAGBQJVFYb7AAoJEF9hYXeAcXzBKcEQANqLRQvljpkQIvLFg4ztL2z+
 5kGkGMsuEzFTorZ4ma8dxZal8fBLhRMVYs6kDYEy8+yIRBmoysAA0ylQ/ZZQCXTi
 lBqDypDA8v3xJg8u+2oD5MITZ1N8M7QowqTg96R1Fw7vf8alVsWwjR5SFCRfP2j2
 L34LuKQp3IXUyMTBWFZB3cZAxPorsj3inBobRVLHj27BmIevc5hw+KCOJNDp5KEx
 4ZBOfGGovIYO2mNq2b15RY6Y+aIQwVuDHb6rKj/Pti4Q2mCwmNR6sUfeUXm5C1JC
 d2B9o5g+xpLT+L2+j08SbdxzUgG3DBwe6LyMmDR3BxrS3SIeiQK+RNqUSqpEoj1N
 MOAK7AzKwU4ONDgJU85KTlxTCY+sEg6IfkMnvGUM2RioqMfbnqMnIiCKkG6e72Pj
 T817mfLChv938VngooP7vsWivyigJSSVP61+vn/zsQVuEQuqKR/VHI160IUdGS8L
 h/PMyDtqJwl5A77UPfr6/weyX+NQBqaXpfwHWLWSxF4MT/INvo6PKrRa4btIuPos
 C4qYKew2vaiymPGvsniywv4F6rsmq+B9YA0E2ciYnN3jXbB13ic4pLUy1bxvrWM+
 HNHEk0zegf2hiwYFePGk/yNvhlWCuNin9SiqnzCi+Y9axpzyFmXdJiH6yyEWp4y6
 4TS1dKXFP8HuMO8bQUiW
 =zxOh
 -----END PGP SIGNATURE-----

Merge tag 'qcom-defconfig-for-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/defconfig

Merge "qcom defconfig changes for 4.1-1" from Kumar Gala:

Qualcomm ARM Based defconfig Updates for v4.1-1

* Increase MMC_BLOCK_MINORS to 32 since qcom platforms have more than
  16 partitions

* tag 'qcom-defconfig-for-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: qcom: Increase MMC_BLOCK_MINORS in defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:23:33 -07:00
Olof Johansson
ee327179b9 Wireless and omap changes to make wl12xx driver to use device tree
data instead of platform data from Eliad Peller <eliad@wizery.com>:
 
 - Add device-tree support to the wlcore (wl12xx/wl18xx) driver.
 
 - Update the current users to use the bindings instead of pdata-quirks.
 
 - Finally, remove the deprecated wl12xx_platform_data struct
 
 Note that da850 board file code that still uses the platform data,
 but we have da850.dtsi that can be used instead. So it was decided
 that we should try to remove the wl12xx support from the da850
 board file as suggested by Sekhar Nori <nsekhar@ti.com>. As it's
 the last patch in the series, the last patch can be simply reverted
 if needed.
 
 As this series touches quite a bit of arch code, it was suggested
 by Kalle Valo <kvalo@codeaurora.org> that the whole series should
 be merged via the arm-soc tree.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVEyqpAAoJEBvUPslcq6VzXFgP/2iNBoDmg3Zu+FR/waaVOD/k
 iOUrT7ZU2Db4dWgprAwKTByiNg1PZ7cPVF3ekKR2j870YWNG8RTKrN1//t4tRCJv
 gwSDNYJan8uCd54fgopi4mFC2/YhwzwH76ow1+DGw3+QoEBu9X0e/63uWNSQXTnE
 ldNA+IiXp68DvCj5Xn649TdZTCNeNcAfQGt5MItwFuIAU+1hP9jIbEqFmC+HbFOb
 xsn66ziTXTu8aLGR3Pkf2PTpJXEiKbuX11Un1BZfgJ5GJp+aSa8zAGX+rYXhTwv6
 Cw+jtJffHbuA4RPdqLPPAWgPhmNfM4D+kLdu/N8iEi72Lsoq2VgLi2IgE5g60Bq9
 7AxgAvZImvE3X8lSxeyyT4VfD7xVuRfzqbCXd/RJteZogRME7nxWrm2q32e/IDo9
 EdWsOMTA2jNG7W0UN8ChX5aexb2n1LqxABLnKnEHuvV/qvw33O6QtMmFyzB+t2Pr
 BpX7H2hwFFU2daF1xRTp/zAJIavsADAgnwco47NZlrBNfkyOH12b0YOuUgKOK8mi
 /0zDi1NpCdU+nDgWynnlMBbpk3NMTVLE2IkHNDJ7pJ9Eagf6KDw/yJrhiRAJyJu8
 CRTTdyEX1lBbPznYz7j95JD3Rw0g+TWg+pMlVpj6zaJQcWl0pWphXpoPYE1UZZTR
 VJWeFrbVptL3mBXoKWyp
 =Nr1k
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.1/wl12xx-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Merge "wireless wl12xx and omap device tree changes for v4.1" from Tony
Lindgren:

Wireless and omap changes to make wl12xx driver to use device tree
data instead of platform data from Eliad Peller <eliad@wizery.com>:

- Add device-tree support to the wlcore (wl12xx/wl18xx) driver.

- Update the current users to use the bindings instead of pdata-quirks.

- Finally, remove the deprecated wl12xx_platform_data struct

Note that da850 board file code that still uses the platform data,
but we have da850.dtsi that can be used instead. So it was decided
that we should try to remove the wl12xx support from the da850
board file as suggested by Sekhar Nori <nsekhar@ti.com>. As it's
the last patch in the series, the last patch can be simply reverted
if needed.

As this series touches quite a bit of arch code, it was suggested
by Kalle Valo <kvalo@codeaurora.org> that the whole series should
be merged via the arm-soc tree.

* tag 'omap-for-v4.1/wl12xx-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  wlcore: remove wl12xx_platform_data
  ARM: dts: add wl12xx/wl18xx bindings
  wlcore: add device-tree support
  dt: bindings: add TI's wilink wireless device
  wl12xx: use frequency instead of enumerations for pdata clocks
  wlcore: set irq_trigger in board files instead of hiding behind a quirk
  + Linux 4.0-rc4

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:22:39 -07:00
Olof Johansson
5602d12a86 General cleanups for MSM/QCOM for 4.1
* Removal of mach-msm and associated drivers cleanups that have been
   ack'd by associated maintainers
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 Comment: GPGTools - https://gpgtools.org
 
 iQIcBAABCgAGBQJVFYYJAAoJEF9hYXeAcXzBqZkQAOnZShQ3iLgo5Btn0wGLMN2X
 AiUqztk0iHV+R94ahpAmkCF5iYUYWotViacGZ7JA+8TVef1m1JosTKzjswS0736l
 copG345v4JijBMVks6Jg5HX6MZZqmIKZKyBNhIqYl8dA84NRClno6La3iwjbLsDv
 9suavM3ylgUTFpJdXZynz0AhOlbFeiUTYXYCPgSu6OSjYSs1JYcyGo/4cnaviR6w
 WkkAnlgplx9qTCPGwuPvGLlFL632kezIERwElUEoSNz7GavR3rFwLlyOfToQyjMU
 t6mTlVKwVvdS0dLSCAN076XxTpbPpaRlnH+0Ij1F6dhaPDjdJ+7I+TOMYidrgfbE
 exNLftXFdT05pt2e/ThRPJWsS6y2SuOhxqvjwRwsQs1ozSt5s9t9w/Jrb4kShbaC
 gcbjqKw+tFijzgF+KGz9aQ84gLTyxaFMd120o/JDXscgodeXZWSUrPoWLt1ilKlN
 9gwA26cOF/vLOUUM1qCGG/gTHPOfFVObj0DbW43PqKhYdrpHBBRbLxf8zF0w1fmQ
 vLq8nNuY84hViJLuDb2lXnM1Z1yH5QAXm2mh7uMU3z7W4sDM8e2U3e2rasFAL0SN
 FmpuxqlnK+QglC9foT6mq8rZLQytIysmkzsn3Zg0A6lEvP76OIi9cHqlZyv0T174
 j9FupW91klhS4bG4sx50
 =rBCl
 -----END PGP SIGNATURE-----

Merge tag 'qcom-cleanup-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/cleanup

Merge "qcom cleanup changes for 4.1" from Kumar Gala:

General cleanups for MSM/QCOM for 4.1

* Removal of mach-msm and associated drivers cleanups that have been
  ack'd by associated maintainers

* tag 'qcom-cleanup-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  mmc: Remove msm_sdcc driver
  gpio: Remove gpio-msm-v1 driver
  ARM: Remove mach-msm and associated ARM architecture code
  + Linux 4.0-rc3

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:20:42 -07:00
Olof Johansson
37267675c9 Allwinner defconfig changes for 4.1
Nothing really standing out here, just a few options to enable in the defconfigs
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVEyXYAAoJEBx+YmzsjxAgrFQQALpZ2O17Z7EyH0V/RszYLllP
 a1YXgj+b5gT3OaD9RHZ73/dKKA7kohkgzWn88CTGzt7J3dfsPwzaLXPOj2xAJffK
 0INE00XP2b8RHykTXR4zZp1+PUA+qpvZLFYfWa8BYBMMn9OEVXztoLptXR+lpz3V
 2zzr5y9npV709P8SIaT4XzLSCgQAD9h0RM4F3E5qRUSJKsYxbCSAi2S/h2bvlu6C
 R2uo8ktUuVZs6jaaWUWczD+KS5No+P/r30VkPSZp1xU4gpXdWVIhNpj5fU409p5b
 PaNcEUnGDp2yrZzwMBBXrpxKYlySo8iMy6si/XmWKhbPURVfMW3SqXxFSOFdOuTj
 z5iMZYiJvzIsMrvj8qlyaCFGlg9axEzZiJ2UMJdrYfoKjNSZvXELoInGeDqJY2LA
 iqPrX2JGvdZAU/VOyagrBY5/TsupaWAS+kI6iLvBiRvNt0s8i84K0+EHTxVT9VNv
 yrod3jNw9caNWPQdsmwiWC9SpCCfmv7w9Z2dhW14AgnPTRNxHrRtTijGIktdwvzo
 Fby3jdaZDzowF7Iv2+veKa5Ja5k2ipVcv3jVA1uWaMd3h1SgZApPJhTd9useucmk
 5JSS9bh8pzwBFyjcGVXa0LPNyFVWZU2fAM++7n56VFTVGyot4zXSxfjIX+cNPjPj
 lEtjoAYudb8Oxr5iEVrQ
 =99ES
 -----END PGP SIGNATURE-----

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

Merge "Allwinner defconfig changes for 4.1" from Maxime Ripard:

Nothing really standing out here, just a few options to enable in the defconfigs

* tag 'sunxi-defconfig-for-4.1' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi_defconfig: increase the number of maximum number of CPUs to 8
  ARM: multi_v7_defconfig: Enable CONFIG_PHY_SUN9I_USB
  ARM: sunxi_defconfig: Enable CONFIG_PHY_SUN9I_USB

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 13:06:52 -07:00
Ioan Nicu
623e4ecb86 i2c: i2c-mux-gpio: remove error messages for probe deferrals
Probe deferral is not an error case. It happens only when
the necessary dependencies are not there yet.

The driver core is already printing a message when a driver
requests probe deferral, so this can be traced in the logs
without these error prints.

This patch removes the error messages for these deferral cases.

Signed-off-by: Ionut Nicu <ioan.nicu.ext@nokia.com>
Acked-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Acked-by: Peter Korsgaard <peter.korsgaard@barco.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
2015-04-03 22:00:14 +02:00
Nicolas Pitre
5f493ace72 ARM: Exynos: migrate DCSCB to the new MCPM backend abstraction
The custom suspend callback is removed for this change. The extra call
to exynos_cpu_power_up(() that was present at the end of exynos_suspend()
is now relocated to the cpu_is_up callback.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Tested-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 12:52:49 -07:00
Nicolas Pitre
323ab95339 ARM: vexpress: migrate DCSCB to the new MCPM backend abstraction
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 12:52:48 -07:00
Nicolas Pitre
03fd5db717 ARM: vexpress: DCSCB: tighten CPU validity assertion
Currently the cpu argument validity check uses a hardcoded limit of 4.
The DCSCB configuration data provides the actual number of CPUs and
we already use it elsewhere.  Let's improve the cpu argument validity
check by using that information instead.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 12:52:47 -07:00
Nicolas Pitre
41f26e2d94 ARM: vexpress: migrate TC2 to the new MCPM backend abstraction
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 12:52:47 -07:00
Nicolas Pitre
d3a875444a ARM: MCPM: move the algorithmic complexity to the core code
All backends are reimplementing a variation of the same CPU reference
count handling. They are also responsible for driving the MCPM special
low-level locking. This is needless duplication, involving algorithmic
requirements that are not necessarily obvious to the uninitiated.
And from past code review experience, those were all initially
implemented badly.

After 3 years, it is time to refactor as much common code to the core
MCPM facility to make the backends as simple as possible.  To avoid a
flag day, the new scheme is introduced in parallel to the existing
backend interface.  When all backends are converted over, the
compatibility interface could be removed.

The new MCPM backend interface implements simpler methods addressing
very platform specific tasks performed under lock protection while
keeping the algorithmic complexity and race avoidance local to the
core code.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Tested-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 12:52:46 -07:00
Chunyan Zhang
3341ada436 arm64: dts: sprd: adding coresight entries to Spreadtrum SC9836
Support only for ETF, FUNNEL, STM are included currently.
Support for ETM, TPIU and the replicator linked to it are not included in
this version patch.

Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 12:50:55 -07:00
Zubair Lutfullah Kakakhel
ba92222ed6 i2c: jz4780: Add i2c bus controller driver for Ingenic JZ4780
Adds the i2c bus controller driver for the Ingenic JZ4780 SoC.

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
2015-04-03 21:22:52 +02:00
Herbert Xu
b81b7be6ae test_rhashtable: Remove bogus max_size setting
Now that resizing is completely automatic, we need to remove
the max_size setting or the test will fail.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-03 15:09:36 -04:00
David S. Miller
b98d8075e6 Merge branch 'mvneta-sgmii'
Stas Sergeev says:

====================
mvneta: SGMII-based in-band link state signaling

Currently the fixed-link DT binding is pre-configured and
cannot be changed in run-time. This means the cable unplug
events are not being detected, and the link parameters can't
be negotiated.

The following patches are needed when mvneta is used
in fixed-link mode (without MDIO).
They add an API to fixed_phy that allows to update
status, and use that API in the mvneta driver when parsing
the SGMII in-band status.

There is also another implementation that doesn't add any API
and does everything in mvneta driver locally:
https://lkml.org/lkml/2015/3/31/327
I'll let people decide which approach is better.
No strong opinion on my side.
====================

Signed-off-by: Stas Sergeev <stsp@users.sourceforge.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-03 15:08:20 -04:00
Stas Sergeev
898b2970e2 mvneta: implement SGMII-based in-band link state signaling
When MDIO bus is unavailable (common setup for SGMII), the in-band
signaling must be used to correctly track link state.
This patch enables the in-band status delivery for link state changes, namely:
- link up/down
- link speed
- duplex full/half
fixed_phy_update_state() is used to update phy status.

CC: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
CC: Florian Fainelli <f.fainelli@gmail.com>
CC: netdev@vger.kernel.org
CC: linux-kernel@vger.kernel.org

Signed-off-by: Stas Sergeev <stsp@users.sourceforge.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-03 15:08:20 -04:00
Stas Sergeev
a3bebdce41 add fixed_phy_update_state() - update state of fixed_phy
Currently fixed_phy uses a callback to periodically poll the link state.
This patch adds the fixed_phy_update_state() API.
It solves the following problems:
- On link state interrupt, MAC driver can't update status.
Instead it needs to provide the callback to periodically query
the HW about the link state. It is more efficient to update status
after interrupt.
- The callback needs to be unregistered before phy_disconnect(),
or otherwise it will be called with net_dev==NULL. phy_disconnect()
does not have enough info to unregister the callback automatically.
- The callback needs to be registered before of_phy_connect() to
avoid running with outdated state, but of_phy_connect() returns the
phy_device pointer, which is needed to register the callback. Registering
it before of_phy_connect() will therefore require a hack to get the
pointer earlier.

Overall, this addition makes the subsequent patch that implements
SGMII link status for mvneta, much cleaner.

CC: Florian Fainelli <f.fainelli@gmail.com>
CC: netdev@vger.kernel.org
CC: linux-kernel@vger.kernel.org

Signed-off-by: Stas Sergeev <stsp@users.sourceforge.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-03 15:08:20 -04:00
Daniel Borkmann
bcad571824 ebpf: add skb->priority to offset map for usage in {cls, act}_bpf
This adds the ability to read out the skb->priority from an eBPF
program, so that it can be taken into account from a tc filter
or action for the use-case where the priority is not being used
to directly override the filter classification in a qdisc, but
to tag traffic otherwise for the classifier; the priority can be
assigned from various places incl. user space, in future we may
also mangle it from an eBPF program.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-03 14:59:15 -04:00
Olof Johansson
0a47acfa16 Third Round of Renesas ARM Based SoC Cleanup for v4.1
* Remove default cpuidle driver, it does not appear to serve any purpose
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVEgOQAAoJENfPZGlqN0++9GQQAK32yBvDVGxsxs4Sf0+BeXsQ
 qiVoRsqhNIDtHmonGwpQAtpBxLbKiKUgTUXsT3BbX7YOgGwv0QxsiZnP6jsn0CR9
 +cqylFHmSpC14hBfVSl59JKwOOeJ5C46xlnfB0Kf6h/HPBhDR83wPxGMrkAiYKd1
 XsibuWhzDHZT5MpMXCuTzcWSWeC7Ss+BeimmT+5+pU6WzNx2gQGIYJstqcoYXdRH
 ssUzGt83jUYxwAzh9pd4TsPQqqaPteB0t6AoMUWr3K3RAii2TwUTPrfoxfxBWLMS
 mq1im3oH6VZdjc9vzFwlHR54C8/LOEDx3amdyJXPPShb1ZY59Fyk+FsL5GWsb1sO
 ro7WJWBupSUFO+DD0IPMzoR6CZTim//lImbmS6FFd3x1KP8e64NEhPHl1D335eUj
 w2yR/WCKDChxZ2n5eu3kpaIXGIhsevfjeIOJhgClnScgK3IHDNvQGOq0UPhk/YKI
 Ggn13hI1VsV7+leZnt8uWaJ/rQfXfcf6EVmPhrgaPbOMXVThzrQJmPCxs57D4Qj/
 KCcDtDnZTYgfxMsUK4/QzV7Fa+KLTwuLnDd/SZ1cmGDhDbnTMtAxTiTNqE/q4C7+
 Gy1SBlFbarEIv3Ch5/LOkTjHrZQEec9GncxDF2PzAPoFq9XmEqbnUpnMJxqcwaRs
 l68w1O/jQWHNVppl1tau
 =wZzt
 -----END PGP SIGNATURE-----

Merge tag 'renesas-soc-cleanup3-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Merge "Third Round of Renesas ARM Based SoC Cleanup for v4.1" from Simon
Horman:

* Remove default cpuidle driver, it does not appear to serve any purpose

* tag 'renesas-soc-cleanup3-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: cpuidle: Remove the pointless default driver

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 11:26:08 -07:00
Olof Johansson
6054ef25e2 ARM: dts: fix typo in bcm7445.dtsi
Reported-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 11:24:28 -07:00
Olof Johansson
ceca038a35 Merge tag 'arm-soc/for-4.1/devicetree-part-3' of http://github.com/broadcom/stblinux into next/dt
Merge "Broadcom Device Tree changes for 4.1 #3" from Brian Norris:

This pull request contains changes to the BCM7445 reference DTS files from
Brian:

- making a clock-frequency property decimal instead of hexadecimal

- adding the irq0 interrupt controller node to make the reference DTS bootable
  again

* tag 'arm-soc/for-4.1/devicetree-part-3' of http://github.com/broadcom/stblinux:
  ARM: dts: brcmstb: add IRQ0 controller
  ARM: dts: brcmstb: un-hexify clock frequency

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 11:23:19 -07:00
Olof Johansson
e0199d9829 Second batch of DT changes for 4.1:
- RTC nodes for at91sam9x5 boards and at91sam9n12ek
 - HLCDC nodes and pin definitions for sama5d3 & sama5d4
 - additional uarts for sama5d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJVECujAAoJEAf03oE53VmQjaUIALOrBMH7/pLtohJDqH1ZFKlc
 5HIGuzM7FDFE0K057ExQVT9aNNHDWlveNrB9G0pnp53CzR8hbceiDA/zgcVP0Xak
 aKaT1vc9nKbKmqPUyD2k3RYGHkClpGelJDfQ2+YhPQP727cgFjIRlZV8aEICuT81
 0g9C5e7qfjo6i2SqLf1RG+ryI7lSMyp9iUhRNQ6YjfGDLOWhYHwnzzUcOhW5ZIXi
 7AMlJch5a0yhmhuBcGqsqowj94Fqhiy+Jo9kLyHNkMfIMuT41SZ6uP0u6SvWYarP
 OtnzL+dsjXnIpJx8TqC+yf8JjL4Sy8/5lgd5IeKYaPmEM0dEeveQziCed0jXA3M=
 =MK+/
 -----END PGP SIGNATURE-----

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

Merge "at91: dt for 4.1 #2" from Nicolas Ferre:

Second batch of DT changes for 4.1:
- RTC nodes for at91sam9x5 boards and at91sam9n12ek
- HLCDC nodes and pin definitions for sama5d3 & sama5d4
- additional uarts for sama5d3

* tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: sama5d4: add rgb777 LCD line configuration
  ARM: at91/dt: sama5d4: fix LCD pins for RGB666 format
  ARM: at91/dt: sama5d4: add hlcdc node
  ARM: at91/dt: sama5d4: add lcdc pin definitions
  ARM: at91/dt: sama5d3: add uart1 pinctrl definition
  ARM: at91/dt: sama5d3: add uart0
  ARM: at91/dt: define the HLCDC node available on sama5d3 SoCs
  ARM: at91/dt: add alternative pin muxing for sama5d3 lcd pins
  ARM: at91/dt: split sama5d3 lcd pin definitions to match RGB mode configs
  ARM: at91/dt: at91sam9n12ek: enable RTC
  ARM: at91/dt: at91sam9x5cm: enable RTC
  DT: video: atmel_lcdc: Add example of fixed framebuffer memory

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 11:08:28 -07:00
Olof Johansson
63fad06a27 OMAP-GPMC driver fixes for v4.1
* Fixed WAITMONITORINGTIME programming to be based on
 GPMC_CLK instead of GPMC_FCLK. The GPMC clock divider
 programming is fixed for both synchronous and asynchronous
 modes.
 * Allow GPMC's children of default bus type to be populated in
 the device tree.
 * Improved DEBUG output data and format.
 * Prevent writing 1 into reserved bits of GPMC_CONFIG7.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJU+Z36AAoJENJaa9O+djCTdvUP/3a4AxX5cUavSsu9YYMJirL7
 9JxUETrQfjkpRLrXDtahchn/nqnBESMMss992ipWBLyT1idQu81I2wztMM6KuQnc
 iuL8h8lQCctjEBAkKxWkZVORq60NcgRhBivAClUHxxpobA8MnChRwHmrJI8aPGxp
 /XKogeg5aa99NyRgQo7t4fMg8/KZWyUGtVf21wXhfwyhuV+dP8vUQMvaxXjQqXJ2
 r936x1fOT+hA48sScRbcCGFaATmxoNN5Tx8+lfCqXv2JXUt1Y+7FXUtnkiC3nc6Y
 JLZ9rKeBv45VLf7TMlGJBlQj3o971CahrlxXv3P3i/G/ALoJE1Xyuqto4dJ474N/
 hU7OlPyrSZF9J9z/e0uhpteuk7KHq6mgZ7HGh+ytKlFrTocOqTlbO0L/zRvOXXuB
 Aajcs1PbpG5j0Znha0sYyj33y5UbKnpTxlydffLA7r3wiNUr3fI9+bR5uOsnu+yF
 OwgJLCeymp1DiqGx3gupTvkJLJJxb7wjMUncGhXt3pRKJEQHBWekOZnI7v4S3tXE
 r6HjvKoe+ZdQQyUaCb17jOMZ0FLOSsT3XcIqq1xOMzhxP7tSRRQet3hkdL4CgP1E
 fedp0FintqpUfzBQkRn6JY/UMR2mCCalPMaOF7L/sa5wOWRSjSoXOHa5w6lHQJVB
 fWZR4/msDvBrVnxuKAci
 =wtGZ
 -----END PGP SIGNATURE-----

Merge tag 'gpmc-omap-for-v4.1' of git://github.com/rogerq/linux into next/drivers

Merge "OMAP-GPMC driver fixes for v4.1" from Roger Quandros:

* Fixed WAITMONITORINGTIME programming to be based on
GPMC_CLK instead of GPMC_FCLK. The GPMC clock divider
programming is fixed for both synchronous and asynchronous
modes.
* Allow GPMC's children of default bus type to be populated in
the device tree.
* Improved DEBUG output data and format.
* Prevent writing 1 into reserved bits of GPMC_CONFIG7.

* tag 'gpmc-omap-for-v4.1' of git://github.com/rogerq/linux:
  ARM OMAP2+ GPMC: fix programming/showing reserved timing parameters
  ARM OMAP2+ GPMC: fix WAITMONITORINGTIME divider bug
  ARM OMAP2+ GPMC: calculate GPMCFCLKDIVIDER based on WAITMONITORINGTIME
  ARM OMAP2+ GPMC: always program GPMCFCLKDIVIDER
  ARM OMAP2+ GPMC: change get_gpmc_timing_reg output for DTS
  ARM OMAP2+ GPMC: fix debug output alignment
  ARM OMAP2+ GPMC: add bus children
  ARM OMAP2+ GPMC: don't undef DEBUG
  ARM: OMAP2+: gpmc: make gpmc_cs_get_name() static
  ARM: OMAP2+: gpmc: Fix writing in gpmc_cs_set_memconf

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 11:00:47 -07:00
Olof Johansson
c6746958bc mvebu dt changes for v4.1 (part #2)
- add support for Performance Monitor Unit on most of mvebu SoCs
 - add nas2big support
 - add support for USB3 port On Armada 385 AP
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlUL6VsACgkQCwYYjhRyO9Vm/wCfZNIo3l1U82ietdSE8zuVWq1U
 A2gAmQHeLLV6izood0nm9/AvvcMHPpI5
 =rtR1
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt-4.1-2' of git://git.infradead.org/linux-mvebu into next/dt

Merge "ARM: mvebu: dt changes for v4.1 (round 2)" from Gregory Clement:

mvebu dt changes for v4.1 (part #2)

- add support for Performance Monitor Unit on most of mvebu SoCs
- add nas2big support
- add support for USB3 port On Armada 385 AP

* tag 'mvebu-dt-4.1-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: armada-385-ap: Enable USB3 port
  ARM: mvebu: Enable Performance Monitor Unit on Armada 380/385 SoC
  ARM: mvebu: Enable Performance Monitor Unit on Armada 375 SoC
  ARM: mvebu: Enable Performance Monitor Unit on Armada XP/370 SoCs
  ARM: Kirkwood: add DT description for nas2big

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 10:55:21 -07:00
Olof Johansson
f28ae3ba10 mvebu defconfig changes for v4.1 (part #2)
- add perf support in mvebu_v7_defconfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlUL6CAACgkQCwYYjhRyO9XHCACgiDr25bMPW6sxghz6LNXP9fbv
 6z4AnjYvd/kefOzNeAJFrVLJyt2I24lV
 =TxRJ
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-defconfig-4.1-2' of git://git.infradead.org/linux-mvebu into next/defconfig

Merge "ARM: mvebu: defconfig changes for v4.1 (round 2)" from Gregory Clement:

mvebu defconfig changes for v4.1 (part #2)

- add perf support in mvebu_v7_defconfig

* tag 'mvebu-defconfig-4.1-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Enable perf support in mvebu_v7_defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 10:54:34 -07:00
Olof Johansson
cef9f50130 Renesas ARM Based SoC Defconfig Updates for v4.1
Multiplatform defconfig updates
 * Enable bockw and ape6evm boards
 * Drop useless SERIAL_8250_EXTENDED=y
 * Enable R-Mobile reset
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVC3F4AAoJENfPZGlqN0++WbIP+gJjAYDm33i7nkAew39DKZfQ
 /FV+kDOUUBiWzDbTvH1lVMpEftAQqkfgy2LLXYD7tyoCgR9v+LhY4FLBkst45dZW
 2ZjIlHT0RXavlnod/z9+P4GNH5F4S6PtEgYr9ZZCb11zUfc1Q3l9/fDH27DKDnkf
 Ivv+UxakMVyqov/5128ef8qQDP4B+Vwdkl5yA+dbr/JQg9Dn0YERe9i8x/8cheI5
 Ri/SNaBEL1f8b4jz3htUwinaRpaiCXDMNGeNQY3ut7mwMljHlPaCaUVntfF9WOaj
 Chbz/zOqXnqg3gvmIG2vOtQ1ilseoIKna9JHWKi8Z/ffIt6XF76ARJwfk22/KuHT
 xH6uNqT9JYciKfsnq2tnMF/03p1kDKxOmVLltgvejARcWxZI1cku03cH1mBSdqQ0
 fOEA927enlZtbWGOce4Ta7vuxzsR46NVcAWtrAFSmWAAG7pGRRr+G+2efVvMTeR3
 wiaUtAEvUs+v1Il4eEAEQLQ9U6YOVRPccBP/LA6l/QOGQwbvmwuDecLylDvOi8jt
 bQKIDPvE5snWz3UEUok8HeTv1y1LpM+2DaW031i60dsKrSi4JLv4y0wR1Rp7R8Yv
 bDl9cChqZ2/vXScD4iSwjOiuR/MSttXgPLxY2tKKFCXD9srg/ea21Y+z1muKioim
 H+JiXDB4NTk9MkrPaSOg
 =2KzZ
 -----END PGP SIGNATURE-----

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

Merge "Renesas ARM Based SoC Defconfig Updates for v4.1" from Simon Horman:

Multiplatform defconfig updates
* Enable bockw and ape6evm boards
* Drop useless SERIAL_8250_EXTENDED=y
* Enable R-Mobile reset

* tag 'renesas-defconfig-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Enable bockw board in multiplatform defconfig
  ARM: shmobile: defconfig: Drop useless SERIAL_8250_EXTENDED=y
  ARM: shmobile: Enable R-Mobile reset driver in multiplatform defconfig
  ARM: shmobile: Enable ape6evm board in multiplatform defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 10:53:09 -07:00
Grzegorz Kolodziejczyk
e0fdbab169 Bluetooth: bnep: Return err value while sending cmd is not understood
Send command not understood response should be verified if it was
successfully sent, like all send responses.

Signed-off-by: Grzegorz Kolodziejczyk <grzegorz.kolodziejczyk@tieto.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2015-04-03 19:52:35 +02:00
Olof Johansson
c25a9fada4 Renesas ARM Based SoC PM Updates for v4.1
* Consolidate the pm code for R-Car Gen2
 * Correct SYSCIER value for r8a7790 and r8a7791 SoCs
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVC2/9AAoJENfPZGlqN0++QAoP/ijqzdLRJznv0Td4sBVwcNgP
 L3YOAwaMM4xG527QwETdz7KT1LnbNMROp/MbBrmdDQM2lfz7um8oFAdKcxe+7RLM
 GAJiH61RZfrPEzjOhwXoIMyAMPUR42rSI1dl78nMDg4pjKACurwpXjLPxNLMGiTa
 v09iJA/JYcrFNlTB+wWQiskln3rq87wVSmD27pVQo1p0TH1tn+yS1DBVbqzb9M+Y
 d1DVvYhsjx1tjz6yzP6+C/rkXgNex4FCMsd2QrLOVXS+FkU1OklFEyaPMP6Tz5Y0
 CXgvByWjTt8Sz8hcPBhpVr7rg7BPZ0EX0SDD9NvdLCAGlXtxpVfh0YadupCkF/I2
 9rmwG0B3IL66d2Z4erH7H3hhurC+hnSeuXDeVzGyJGAQ/Cky3Qg5KLEJz1hFYoLu
 EY6kob48Ar3sXO4NFvY60C11+xJKrCFT1l/f5ZG1AgG8D1LjFGeUcp04AM0LE6pD
 haMv5a7FTUDsp9bK9278btZuSHxgap8pnFpvHvXwVDfWDcFDfzgtPc2M0ifhxf82
 MbyIE5BGg+36ri5Opw8SAZ1Fjl/AymlJu2w5+bcKQxkjID7N2HD5YrdTfhkFA4ID
 uGA1XldCrCUYlziOty82Pe8ZLz2PkZjgSvcN5juYLMX2VU/Ug6AKPLfbWEtN8WmO
 rpwEwmmQ6j6eooVQXBzk
 =Y+v1
 -----END PGP SIGNATURE-----

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

Merge "Renesas ARM Based SoC PM Updates for v4.1" from Simon Horman:

* Consolidate the pm code for R-Car Gen2
* Correct SYSCIER value for r8a7790 and r8a7791 SoCs

* tag 'renesas-pm-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Consolidate the pm code for R-Car Gen2
  ARM: shmobile: r8a7791: Correct SYSCIER value
  ARM: shmobile: r8a7790: Correct SYSCIER value

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-04-03 10:52:29 -07:00