Commit Graph

33343 Commits

Author SHA1 Message Date
Olof Johansson
61c324b4c1 Qualcomm ARM Based defconfig Updates for v3.16-2
* Enable qcom GSBI driver
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 Comment: GPGTools - https://gpgtools.org
 
 iQIcBAABCgAGBQJTiLDZAAoJEF9hYXeAcXzBRewP/io8e9jm2pgGATc5C8nm0osq
 ZYutnX0qh86ylrlVAaiFrtJFROhM9u+CMYgYwIV9rypjDTliC0gJWxd4X9oxSQqO
 2u7GfEE2kQvtDsphuSSjv8QZowpV5JwsrwWI4n7SBSHs/C/iijLX1Hz3Gc8tdNW+
 6gFwMUbvnura1mbde5+GHlO1Swdt7gPfvHYU6uegjKe+inFLehbJwS8KJDzJgQYk
 ekyw+ZYVx8ubtkS7QJ2+KGo2aYTBusM8lEtw8EnQ+/p02DfX8kLWr8TlLCM2HCOA
 av6DX/DUcIXCc2fAdPaAd7nnSG7C6OofIZTsGDI51NDiyERfub09Oc/L6uwNvU0p
 SJV63iU/nzoqTBB+mdfqIGSIffVJW0duL3oxLDfXrMO/Pl2N+3Pt/Xsl3ew4ACZP
 kmomBZp1GxEEbbCXCfpTFi0AfbD7vgFssqHu+zeb4HHoMJTq1+E0oJtu+eIypgtg
 bQhMX/2Koka+tNIymw5QDN6e4vBLjSodDoS8bq+tE4sZipI28gqfyuYoU45RN3VJ
 KcO56NiL4WgcAMqbKfQ8q5rPxSa2rO4EC4FI1JmXGSH81/Vh5kMCraAflEzzPL+z
 xbtb+02wvfDMbHq10SsW62nl4ax31QPjrrA7QW5+FbwlGdi+XjeK1CQ5aFi51Ltl
 NFuWqr5vRD/X3Ujhdz8n
 =Y5if
 -----END PGP SIGNATURE-----

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

Merge "Qualcomm ARM Based defconfig Updates for v3.16-2" from Kumar Gala:

* Enable qcom GSBI driver

* tag 'qcom-defconfig-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: qcom: Enable GSBI driver in defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-30 20:33:39 -07:00
Maxime Ripard
4cff2a2479 ARM: configs: update Allwinner options
Update sunxi_defconfig and multi_v7 with all the latest Allwinner
additions.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-29 13:39:54 -07:00
Olof Johansson
8320857b1d Linux 3.15-rc6
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJTfR2zAAoJEHm+PkMAQRiG3noH/2s+KUge3qO2M+AmxttUo74B
 +npAMdbqYR3MdEiwxYZfsHcMu4Ye/IKLcrh4pydB5hI2mdjtGkH1bnmia0f1ve/c
 Z/a0256+W8gWp7mcUBqSNztqLPAWa7wKOqNdLjj5idr1BSj6u8im+fQ9FBh2woki
 1fyYAuq/60lq4CMOKJvkA95V1Ome/jO+8tS4PguOgsCETQxCVFGurZcBbG3Mx5Y3
 v+ioCqeRc6GvxPFR6YngnTZCrsLxSRT3tnO2Qy5zX7dxjIQkCEbvIckpBQv01Y3R
 wNUaX+2Jae207igxrEv8CjmCFnmZFuUI15aWWCy6fOS/j8bjuk6ThYJO8N4ZBM0=
 =2ShG
 -----END PGP SIGNATURE-----

Merge tag 'v3.15-rc6' into next/defconfig

Linux 3.15-rc6
2014-05-29 13:39:43 -07:00
Kumar Gala
15ce39ade2 ARM: qcom: Enable GSBI driver in defconfig
Signed-off-by: Kumar Gala <galak@codeaurora.org>
2014-05-29 11:27:03 -05:00
Soren Brinkmann
263c08af44 ARM: multi_v7_defconfig: Enable Zynq peripheral drivers
A few drivers for Zynq peripherals made it into mainline recently.
Enable them in the defconfig. The following devices are enabled:
 - Cadence Macb Ethernet controller
 - Cadence I2C controller
 - Arasan SDHCI

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-27 11:07:52 -07:00
Wenyou Yang
0279394672 ARM: at91/defconfig: sama5_defconfig: updated
due to enabling
	-- CONFIG_REGULATOR
	-- CONFIG_REGULATOR_ACT8865

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
[nicolas.ferre@atmel.com: move added entries to proper location within file]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-27 09:46:06 -07:00
Stefan Agner
11fd0a41cd ARM: add drivers for Colibri T30 to multi_v7_defconfig
Toradex Colibri Evaluation Board uses the DS1307 RTC and the
MCP251x CAN controller. The NVIDIA Tegra 3 based Colibri T30
module can be used on this carrier board, hence enable those
drivers in tegra_defonfig and multi_v7_defconfig.

Furthermore the NVIDIA Tegra 3 based Apalis T30 module too
contains two MCP251x CAN controller.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-24 00:16:26 +02:00
Thomas Petazzoni
c4d1c506e0 ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfig
The Marvell Armada 38x platform has a SDHCI interface managed by the
sdhci-pxav3 MMC host driver. It therefore makes sense to enable this
driver in multi_v7_defconfig, which supports the Armada 38x platform.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-24 00:13:18 +02:00
Gregory CLEMENT
470522bab6 ARM: configs: enable XHCI mvebu support in multi_v7_defconfig
The Marvell Armada 38x platform needs the xhci_mvebu driver enabled
for the xHCI USB hosts, so this commit enables the corresponding
Kconfig option in multi_v7_defconfig.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: arm@kernel.org
Cc: Kevin Hilman <khilman@linaro.org>
Cc: Olof Johansson <olof@lixom.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-24 00:13:18 +02:00
Arnd Bergmann
e2372a0f9a Merge prior defconfig changes into next/defconfig
These are from the next/boards branch, and we decided to split
out the defconfig changes now.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-24 00:11:20 +02:00
Arnd Bergmann
143a84c298 Qualcomm ARM Based defconfig Updates for v3.16
* Add a new qcom_defconfig for mach-qcom
 * Update msm_defconfig for handling building the old mach-msm
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 Comment: GPGTools - https://gpgtools.org
 
 iQIcBAABCgAGBQJTf5MmAAoJEF9hYXeAcXzBZqwP/3urUaYsZ8aFO5/j7vaJn+1l
 +WrIdwKTw1DokH71NcdOGe2JA1fvolos7TkId3w6xwXNursuuMX3snCPfUPgYwHU
 jbufp5pRSzjF4y9mzs8f8vMgIiTcZYCenQ3U7CHiKZm2Ufv3U4r94iXeHUe+v3WR
 0DYEqS1IAc/JGQJxqS52g6u+YrIum+ntZUyRliUSe4IhvC92DQlAb5jVDW1oI59G
 Sd+O78dUeJw57uObVCa8V6P3l7TRVOfM6R3suPetBod5N7E/7qH6CM29P9SA/+F3
 3esLMAEqe6uARzhT/XkM7yLh4N5y92eAYmhfff346QY36KhKfTiJHbQ6lz2nTZy+
 DBJY4ntD5zp6NQ5CHph66CgS7ihnLXkHDpkPeYxn2jF/NmjkEjdzqc2FQJHmezkB
 3xid1u5BUAlez3VIL38u4boGGUsO1POm02C80PANr2iuYY0ImxVOTYt/JfYqrSfP
 l9xNKew/MczbJZBvolMCm5gfUYsAPCTGJ5k3sno6R/J/rvW5uNb4wTccF/vq0glx
 eSLC3iwdqXmwLZNeepiLFDWdJ13QoG5ke3vrwM+pQdlezScm2lZatHwNqkY8kxuT
 W3rhvvFOeIiCeE+nrFlPZo1uSl48Zvy5OOMOrP1IvQKC9XMH30o9OLTXLAa1aGNE
 4MeWrY2Vn00pfvw0hAcw
 =RyxN
 -----END PGP SIGNATURE-----

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

Merge "Qualcomm ARM Based defconfig Updates for v3.16" from Kumar Gala:

* Add a new qcom_defconfig for mach-qcom
* Update msm_defconfig for handling building the old mach-msm

* tag 'qcom-defconfig-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: config: Update msm_defconfig
  ARM: config: Add qcom_defconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-24 00:08:46 +02:00
Arnd Bergmann
c6a7d1c6c2 Allwinner defconfig changes, take 2
Add the A31 reset driver to the sunxi-related defconfigs
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTf4VbAAoJEBx+YmzsjxAgfykP/iCSozhJ1LPS1YlqgFcpAeDq
 OZ6BEEWp+Oriw8x3SiMzt1a6E8wu8plj0kDuaN3DbXNOG9iVri7c09nviPzMB8W2
 rJa5ng/CZ8C59Le7jjU6u7ST948oMUISQTUsx8HXnKww9gNwlmXVuFS046TRprD4
 AfvrfLpuI9IrdJ3S7zIXGzbaKp+oF/lrMIQ9GG/Llt6kxTOo5GDYrE2qoi8cY8mp
 lPZFGFVVEsj8bR9PEgiDxqFvt97aKaZH8kqEWmihLFrzem6lF+reNxiWxeUbDdNH
 wjUo1ZQPGXblkll8ksPoNRfolr8crI2AwyaNe2fHMAXt//DqmEKa4YEQU4/S551L
 8CJQe63nHhJa0aUY+eTz1N9H939rUo7Jc9fElSyxw655RYbjscdRO5LsnZHKPuSl
 AdBv6GWkXDhP/XVtxQUveGYW8jS6vejsYMHKCQAFmAi+Axh7wZ2AeHaQoUdRK7Pu
 4h1cFvbcDva6+95DWfYVpz5ZEV/AjuchhECpIA2HSnpfyfuqG7sgHE9kivXucWyT
 drz8Ug1NFfcjn9HadEC16mGysvasb+0ZoN/gudXLsSpeBexctODEFFPJuF26a1Rf
 mU2Jr5F3ltUgUjJJJnvScdxJJM6+ttEhUvPktYpflwCki+kdqmU0KCRXno/netbZ
 AcsEMOhCfYGfhHCIagFm
 =1akP
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-defconfig-for-3.16-2' of https://github.com/mripard/linux into next/defconfig

Merge "Allwinner defconfig changes, take 2" from Maxime Ripard:

Add the A31 reset driver to the sunxi-related defconfigs

* tag 'sunxi-defconfig-for-3.16-2' of https://github.com/mripard/linux:
  ARM: multi_v7: Add Allwinner reset drivers to multi_v7_defconfig
  ARM: sunxi: Add A31 reset driver to sunxi_defconfig
  ARM: sunxi: drop CONFIG_COMMON_CLK_DEBUG

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-24 00:07:01 +02:00
Arnd Bergmann
6c1ef4b917 mvebu defconfig changes for v3.16 (incremental #2)
- mvebu
     - enable MSI and XHCI in mvebu_v7_defconfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTfhwQAAoJEP45WPkGe8Zn79sQAJlEN7xM7y7sFF8sEaEvkOD+
 4c3wJHItvDOSAu3KMn4yrTp8O9h1jiIM8fvA/Z08291xcEX1eJbtXtTOI/hgp77G
 YWuV0cL139iSxZyedrKv5xj7nxEytqdSUPBnSMOM+VZfSAChqLsKlirIZ5OkAvEF
 JagKHaYIePYqQ8Tg2dq1zj7nrqKWlXHvG10He58msw1TcHHOB2KTZEz8OhrvsLp2
 /QfjyouHoBAEgYtcB/FsUZiYG5clecJIS6RrBjItUicaqeX31DC/1+W+hmDyUYdk
 m4DcwxJDj1V0OIabHcQfwTY7+e/BFIhNtaXipn6PbNOZ5uWpVhiCv6ahZqzoB0q1
 asHnIIEKdqZVJOmCdmyqg+G7L0O4V0WFdLprTKYFpF9nTBx/y4co7fGHAYQdOTCT
 nV+rYBbHoXg0wVXi3+RmbPzK7+M26QQRyMmkBsI7eajGdR8rmEXmfcYKjIagT2QH
 UFNwZYFVHAqMdfmJFimnsMmvhHw6UlHF4MHqrUSl8cCiMrT40Y1WUpC+JISzMpUV
 hbEumOl/VqAfqYZ6r9+SoKc0qgjZMYE2QrQvkVP70QFUncr4cxp4cDcptLf/ZLHJ
 B/SVsC6VTaXJW7A+Vqs8flhi6owTMjk0aarLZy/z0fR5yAOWL+EN23Gfm1V6jxEO
 t+lv/Thil9SOmDog4OPG
 =ZWKb
 -----END PGP SIGNATURE-----

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

Merge "mvebu defconfig changes for v3.16 (incremental #2)" from Jason Cooper:

 - mvebu
    - enable MSI and XHCI in mvebu_v7_defconfig

* tag 'mvebu-defconfig-3.16-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: enable MSI support in mvebu_v7_defconfig
  ARM: configs: enable XHCI mvebu support in mvebu_v7_defconfig
  ARM: multi_v5_defconfig: Enable sound modules needed for t5325
  ARM: mvebu_v5_defconfig: Enable sound modules needed for t5325
  ARM: mvebu: defconfig: add MTD_SPI_NOR (new dependency for M25P80)
  ARM: configs: add ahci_mvebu to mvebu_v7_defconfig
  ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the mvebu_v7_defconfig
  ARM: mvebu: enable fhandle in the defconfigs
  ARM: mvebu: Enable nfsroot in the defconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-24 00:04:19 +02:00
Maxime Ripard
e397a78589 ARM: multi_v7: Add Allwinner reset drivers to multi_v7_defconfig
Now that the reset code are part of drivers of their own, we need those in the
defconfig.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-05-23 10:39:49 +02:00
Maxime Ripard
9daf6c5151 ARM: sunxi: Add A31 reset driver to sunxi_defconfig
Now that the A31 reset code is a driver of its own, we need it in the
defconfig.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-05-23 10:39:46 +02:00
Stephen Boyd
f604759ec0 ARM: config: Update msm_defconfig
Now that DT based platforms are split out of mach-msm into
mach-qcom, put back a non-DT based SoC into the msm_defconfig and
stop selecting unsupported drivers.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
2014-05-22 11:18:56 -05:00
Thomas Petazzoni
0105c99902 ARM: mvebu: enable MSI support in mvebu_v7_defconfig
Since Armada 370, XP, 375 and 38x have PCI MSI support, it makes sense
to enable CONFIG_PCI_MSI in mvebu_v7_defconfig.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1400598964-2062-1-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-22 14:22:17 +00:00
Linus Torvalds
84e12d992a Staging driver fixes for 3.15-rc6
Here are 5 staging driver fixes for 3.15-rc6 that resolve some reported
 issues.  They are for the imx and rtl8723au drivers.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iEYEABECAAYFAlN8L4AACgkQMUfUDdst+ymmPwCgg20LEhxW+bIDykpvzZ9Ju8XT
 bjMAnA+3NH0WLfLqcsRFHzHOCWyV5DiI
 =uWwd
 -----END PGP SIGNATURE-----

Merge tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver fixes from Greg KH:
 "Here are five staging driver fixes for 3.15-rc6 that resolve some
  reported issues.  They are for the imx and rtl8723au drivers"

* tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: rtl8723au: Do not reset wdev->iftype in netdev_close()
  staging: rtl8723au: Use correct pipe type for USB interrupts
  imx-drm: imx-tve: correct DDC property name to 'ddc-i2c-bus'
  imx-drm: imx-drm-core: skip components whose parent device is disabled
  imx-drm: imx-drm-core: fix imx_drm_encoder_get_mux_id
2014-05-21 19:00:09 +09:00
Stephen Boyd
2b2c934fcb ARM: config: Add qcom_defconfig
Add a defconfig for mach-qcom platforms (copied from msm_defconfig).
Although these platforms are part of the multi-platform kernel, it's
useful to have a stripped down version of the defconfig that just
selects the DT based Qualcomm platforms and drivers.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
2014-05-16 11:16:11 -05:00
Leif Lindholm
bfaed5abad arm: dts: Fix missing device_type="memory" for ste-ccu8540
The current .dts for ste-ccu8540 lacks a 'device_type = "memory"' for
its memory node, relying on an old ppc quirk in order to discover its
memory. Fix the data so that all parsing code can handle it correctly.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: devicetree@vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
2014-05-16 15:22:40 +01:00
Gregory CLEMENT
fd80f09bc7 ARM: configs: enable XHCI mvebu support in mvebu_v7_defconfig
The Marvell Armada 38x platform needs the xhci_mvebu driver enabled
for the xHCI USB hosts, so this commit enables the corresponding
Kconfig option in mvebu_v7_defconfig.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1400149062-32661-13-git-send-email-gregory.clement@free-electrons.com
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1400149062-32661-13-git-send-email-gregory.clement@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-16 05:40:28 +00:00
Stephen Warren
9956dcc5d1 ARM: tegra: tegra_defconfig updates
AT24C EEPROM:

This is used for the board ID EEPROM on Jetson TK1, as well as likely
a whole slew of other NVIDIA reference boards; we simply haven't added
enabled the EEPROM in the DT files until now.

MTD_SPI_NOR:

This defconfig contains the CONFIG_M25P80 symbol, which is now
dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
the new dependency.

FRAMEBUFFER_CONSOLE_ROTATION:

Needed for devices like Tegra Note 7 and NVIDIA SHIELD to get the boot
console in the expected orientation.

CAN*, RTC_DRV_DS1307:

Toradex Colibri Evaluation Board uses the DS1307 RTC and the MCP251x CAN
controller. The NVIDIA Tegra 3 based Colibri T30 module can be used on
this carrier board.

Furthermore the NVIDIA Tegra 3 based Apalis T30 module too contains two
MCP251x CAN controllers.

INPUT_JOYDEV:

NVIDIA SHIELD embeds a USB joystick device.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2014-05-14 09:55:44 -06:00
Linus Torvalds
619b589190 Xen bug fixes for 3.15-rc5
- Fix arm64 crash on boot.
 - Quiet a noisy arm build warning (virt_to_pfn() redefined).
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQEcBAABAgAGBQJTcMoxAAoJEFxbo/MsZsTReiIIAIJByICKcw/CvwUozD4d/h0C
 xTTcKBRbRMtufhab8WYb/y1eAzuh2azkiUYEphliMQWbPM8Mq5axVsV3MD1lRZjE
 VgniPsCfXE1w9HsBASfLoXutEzBa2+u+BGTef2E0PEFWUiY3BXv6nHoM3QV1e1VN
 5t48DH2xuYiQnX0Hdf/MyMvh++TOXoYuOwD+pozMPNNEox7bD3XTV2XrR4MF9Kf8
 Q2qMqttyJXvpafHfm3rJXdoJGLciemYx8XcB4Bz+P+i981iEkOoBwTtYPRDmEobu
 UGnh1jnzJOOjsBq9SzI+JM7zIvPQ/+ZS59dfEwf8161cWqDKsIWtW8WZpSifTkM=
 =5zf5
 -----END PGP SIGNATURE-----

Merge tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen bug fixes from David Vrabel:
 - Fix arm64 crash on boot.
 - Quiet a noisy arm build warning (virt_to_pfn() redefined).

* tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  arm64: introduce virt_to_pfn
  xen/events/fifo: correctly align bitops
  arm/xen: Remove definiition of virt_to_pfn in asm/xen/page.h
2014-05-13 11:21:01 +09:00
Linus Torvalds
200d963bf4 ARM: SoC fixes for 3.15-rc
Seems like we've had more fixes than usual this release cycle, but
 there's nothing in particular that we're doing differently. Perhaps it's
 just one of those cycles where more people are finding more regressions
 (and/or that the latency of when people actually test what's been in
 the tree for a while is catching up so that we get the bug reports now).
 
 The bigger changes here are are for TI and Marvell platforms:
 * Timing changes for GPMC (generic localbus) on OMAP causing some largeish
   DTS deltas.
 * Fixes to window allocation on PCI for mvebu touching drivers/ stuff. Patches
   have acks from subsystem maintainers where needed.
 * A fix from Thomas for a botched DT conversion in drivers/edma.
 
 There's a handful of other fixes for the above platforms as well as sunxi,
 at91, i.MX. I also included a MAINTAINER update for Broadcom, and a trivial
 move of a binding doc.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTb4tkAAoJEIwa5zzehBx3BikP/jOrFb9MbjfBjtyiFe9iJtzt
 37LCiCXXLpqvB1afdp8Zs4Tp5FLy5Mhc+s8rj/G+s16ijMvQyz4uV/XsyXwPGWHQ
 v8gK9yXHja0vPyPZxMCTU9VRUMHHZW6rwUq55h2HI3NcEid+0nEqt7tC5lYjTAmp
 v/5p9NAPgWQzDk+MOUwqgDVXVdg8Qui3OnWhWEvoMjDVUWg8c0ettDbu2ztPkf3R
 TSJHIvWKoZ5Dyqykvb7RteYwDyZxoEzyPe77U80yrL3f4Y1c2Zj8eZhjKVjKYEOm
 H1yJjkDNopkxlCUWKH9ntvmlfZ8fbHMkPW8hKNXWdd0tBNzkfDPbuQ05vnmK4N1o
 8nYK6ZiYH9L3YrZ0bupFuf0nt3fL6RaouwofMNqA21v7CG0gkIpI3Or2pUT/lNR4
 KuoPMNWR45lUZRWWZPj+3uOpf8WZmqSjG+6AbDJlGF7DBKN3j7N+HHEyrUYZk85o
 SzBqIoJrxCPhOWxLyv1IhqLdAZiudDWXaZ3cznjKtLjYrv5I4ZYoArHx13FADic1
 zgg4TuG1Rn+gcUZpa+/2+U0LGCg1z0nUtAFs1B+VqQeqOmIeAOpE8+x/4iXv79t/
 vIq0jvboQFmv/dGM8f0jFxQqhu5fX0qGQ2OIZOxEiSY5m0ZwyyKWChThBdUklO4D
 vlPQu7jhlniYTOxQfMTf
 =76ry
 -----END PGP SIGNATURE-----

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "Seems like we've had more fixes than usual this release cycle, but
  there's nothing in particular that we're doing differently.  Perhaps
  it's just one of those cycles where more people are finding more
  regressions (and/or that the latency of when people actually test
  what's been in the tree for a while is catching up so that we get the
  bug reports now).

  The bigger changes here are are for TI and Marvell platforms:
   * Timing changes for GPMC (generic localbus) on OMAP causing some
     largeish DTS deltas.
   * Fixes to window allocation on PCI for mvebu touching drivers/
     stuff.  Patches have acks from subsystem maintainers where needed.
   * A fix from Thomas for a botched DT conversion in drivers/edma.

  There's a handful of other fixes for the above platforms as well as
  sunxi, at91, i.MX.  I also included a MAINTAINER update for Broadcom,
  and a trivial move of a binding doc.

  I know you said you'd be offline this week, but I might as well post
  it for when you return.  :)"

I'm not quite offline yet.  Doing a few pulls in the last hour before my
internet goes away..

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
  MAINTAINERS: update Broadcom ARM tree location and add an SoC family
  ARM: dts: i.MX53: Fix ipu register space size
  ARM: dts: kirkwood: fix mislocated pcie-controller nodes
  ARM: sunxi: Enable GMAC in sunxi_defconfig
  ARM: common: edma: Fix xbar mapping
  ARM: sun7i: Fix i2c4 base address
  ARM: Kirkwood: T5325: Fix double probe of Codec
  ARM: mvebu: enable the SATA interface on Armada 375 DB
  ARM: mvebu: specify I2C bus frequency on Armada 370 DB
  ARM: mvebu: use qsgmii phy-mode for Armada XP GP interfaces
  ARM: mvebu: fix NOR bus-width in Armada XP OpenBlocks AX3 Device Tree
  ARM: mvebu: fix NOR bus-width in Armada XP DB Device Tree
  ARM: mvebu: fix NOR bus-width in Armada XP GP Device Tree
  ARM: dts: AM3517: Disable absent IPs inherited from OMAP3
  ARM: dts: OMAP2: Fix interrupts for OMAP2420 mailbox
  ARM: dts: OMAP5: Add mailbox dt node to fix boot warning
  ARM: OMAP5: Switch to THUMB mode if needed on secondary CPU
  ARM: dts: am437x-gp-evm: Do not reset gpio5
  ARM: dts: omap3-igep0020: use SMSC9221 timings
  PCI: mvebu: split PCIe BARs into multiple MBus windows when needed
  ...
2014-05-13 11:07:02 +09:00
Olof Johansson
3b27dcec92 The patch fixes EDMA crossbar mapping to actually
make it work. The patch has been tagged for stable.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJTX7HWAAoJEGFBu2jqvgRNJSQP/3zwkXJizhctwlr91OYwJyZ+
 uN30iljZvVKf5i+qgp4syjznHOT/yFyS33lG3S9cSSjyjsdZcj5DbOOh2PTEzZd+
 josb6bZ+Z6YQBmcYy8V6KuWyEV8UfTr/3wGDb+/cfGfFACD8uxHZo0K/s7p6LCCb
 LIo/yzI3DpgrkWYJ7S4kIjz3P+k0gCc3zy1QwbmyWFXYIwREHlgdRAz/M+vjEHyg
 tx7HZiewg++dGeSui2PHdxhyTANj6k5emBiGTCOUUBYQ0iI4cGsaT2orzxtgEFRx
 Cgd7+/p5Uih2XyC9+7aV6flJoOS2qhsBGvlunVmnd9b7hNxtAtV73I8CEzv3GxDN
 hu6WqPnF9ZIO9hPrj6HdrLtYNPJcmRzvaCT9LOCp3q+kxqjGI6QkrDP9hTT0xc4e
 9R9/n380048CLsjarfrYgeA1PCDq84I3wbRUUf2Wtgr2vaZufgL6m4cDeZRtzk/s
 Ccz+zu4hhxK7NWIH+aze2wcc/8o+l35vaVp2GjGJnh47CAr2Wd65AplWLQhzM3EP
 XAiXh2PKAd5fenIlKBIShFI5j+EZ/dSmAqXgYFhXUI7QG35feXeAa8YdbiWSRscq
 jqOoDTmKX8eT5p/0i7Dkh9dvHOpiwoHimSHt3yVRQQXAOjj5fyQpjVXBHpHv6+YV
 8eY2u5v16Off5qNT4EWH
 =eyxH
 -----END PGP SIGNATURE-----

Merge tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes

Pull "DaVinci fixes for v3.15" from Sekhar Nori:

The patch fixes EDMA crossbar mapping to actually
make it work. The patch has been tagged for stable.

* tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: common: edma: Fix xbar mapping

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-10 22:06:07 -07:00
Olof Johansson
6a7c7b007a Set of fixes for the Allwinner support for 3.15
Some minor things, the major thing being the enabling of the GMAC driver in
 sunxi_defconfig that will un-break Olof's autobooters.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTav07AAoJEBx+YmzsjxAgsRsQAMEAv6UV6uB01jp+QFmYVpyL
 x/IGylK0Eaw89Dx3yBZ94sLM154ACD5VFAkC9bYXZSsprjgm1tK0EQVqB6r4+RQY
 PFdnV/qYwxanBI5AAwLUf8MWmHn3Ts0oWiSxlwDiQ5pi7BnX60rgjUCp3wc5Jt46
 RLAMmAjuj6yGqMSZJeE9FU/1rEwzMTRTaVgWUmudrUc2Sh9t/QgVNWvJpVFeY9Oz
 4jnfMO6TwzeiuRROIEEWnRjPOFBky0ZPutXfWxz6FnwaadiFfNOgnSObOxAd/y88
 xu29P+WjLCZohGMOMjVQy0IvR9kg+O/JHA/EVb7h723sVzHXelVjAhUzPLorbhqi
 e1ACVLuUHI6Hb4i3xlJ1/Ujg6xBSudaFZlnIcwVONPFTn60upWi8kNJ/MJ98KBML
 NxWSkKuGrGGUdy2dhF8avyyJfyNqcha132oGoes0VpMsaleRha4YpWu9mVbJ0wLW
 yeeq8wa4lh8fzQ9NjKsS38ApQL7ajg7IcNh/+BQVGErs+zrMzvVc8CGhreQATjoS
 7hMGfu6He+9L8xW7nncafH+gkNcDYZMEpfdGgJqFDhJurGhfdFxivOqp6QSiTVVD
 ba/70qkNz8Da24IbJIXqG7z9p2HNc/NMuMk2GeMERmg5SBt9tSdi3X6c3NRKzuXH
 d6/pDddjo4kS0LZz0hkC
 =xyny
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-fixes-for-3.15' of https://github.com/mripard/linux into fixes

Merge 'Allwinner fixes for 3.15' from Maxime Ripard:

Set of fixes for the Allwinner support for 3.15

Some minor things, the major thing being the enabling of the GMAC driver in
sunxi_defconfig that will un-break Olof's autobooters.

* tag 'sunxi-fixes-for-3.15' of https://github.com/mripard/linux:
  ARM: sunxi: Enable GMAC in sunxi_defconfig
  ARM: sun7i: Fix i2c4 base address
  ARM: sun7i: fix PLL4 clock and add PLL8

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-10 20:25:07 -07:00
Olof Johansson
e5e49fe9df mvebu DT fixes for v3.15 (incremental #2)
- kirkwood: fix mis-located pcie controller nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTa5VOAAoJEP45WPkGe8ZnwmYP/jou+y52USypPyZq5/+0L4cK
 2bInB+3mNs5NZEdaPxh70xhJMvTbusNvOCOdWpEJVuV5as4kOWba3ThS96c6kY8j
 94UStQAYS18iWORcOI81ZbjYufxvNicmoYqyq68psJ5QWQG/vc9D/N7px5HvkEhg
 jcNvfyjmZb44c2gsS5UsbKlycJ5MwRqczgA7R/ik3Q4CdCuN6E7xgvu4RdPbRPFm
 HvblNijM+0PAslREMy9qi+SFMRazlUmha8VGpWiVHRUZww3HnJ2owNAMkBKfp6ia
 9yv2V2y47Eb+khPEvrmEi5+CkjVaFqhA4G00a+VCwnLWPwK14wV/GKvR7tUwpChK
 O36zdDzZ6w2vWZNIBBLxz0EueLSoa8bUpCJdhrnEFxG2a+xop3JE9A0MU8ewfAEQ
 oMOy79/DC1vn+k9qJsxMPxpt9dNn7uCILRd7mqMkKst9Gp9jjZu9tloCz5qcdO/n
 T8odPQ8XqlWn4Y3vC24qyhZOXrAfTJWUSccNBRyipvvpYrV9/Lcg7u51uNigfaKE
 Z6Q32feKFLuE5o5E2j4HCVpJKVTKi2GQend0cDOGctEofvFDkjuP1Eg4CzmLhJr7
 ioyqpfCtlia/DCbsII/pCOHXX4iI2gsB+EFsidF+20dfSDo9n8jJULVpq3xRwy/6
 ytH0F6R5ijIupaF5BzXv
 =Twky
 -----END PGP SIGNATURE-----

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

Merge 'ARM: mvebu: DT fixes for v3.15 (incr #2)' from Jason Cooper:

mvebu DT fixes for v3.15 (incremental #2)

 - kirkwood: fix mis-located pcie controller nodes

* tag 'mvebu-dt-fixes-3.15-2' of git://git.infradead.org/linux-mvebu:
  ARM: dts: kirkwood: fix mislocated pcie-controller nodes

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-10 20:22:29 -07:00
Sascha Hauer
6d66da89bf ARM: dts: i.MX53: Fix ipu register space size
The IPU register space is 128MB, not 2GB.

Fixes: abed9a6bf2 'ARM i.MX53: Add IPU support'
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@freescale.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-10 20:19:44 -07:00
Lad, Prabhakar
5659e3bcbc ARM: sunxi: drop CONFIG_COMMON_CLK_DEBUG
this patch drops CONFIG_COMMON_CLK_DEBUG option
as this config option is now obsolete.

CC: Maxime Ripard <maxime.ripard@free-electrons.com>
CC: Olof Johansson <olof@lixom.net>
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-05-10 12:07:50 -04:00
Greg Kroah-Hartman
3519acb3b0 Merge branch 'imx-drm-fixes-urgent' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into staging-linus
imx drm fixes from Russell
2014-05-06 06:25:10 -07:00
Alexandre Belloni
f1e9637f4b ARM: multi_v7_defconfig: Select CONFIG_MACH_BERLIN_BG2Q
Now that we support Berlin BG2Q, select CONFIG_MACH_BERLIN_BG2Q so that we can
boot BG2Q based boards like the BG2Q DMP.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-05 13:55:59 -07:00
Antoine Ténart
9630cc9324 ARM: multi_v7_defconfig: select CONFIG_GPIO_DWAPB
The newly integrated dwapb gpio driver handles the Berlin SoCs GPIOs.
Add this driver to the multi_v7_defconfig.

Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-05 13:52:38 -07:00
Stephen Warren
189c208329 ARM: multi_v7: enable AT24C EEPROM driver
This is used for the board ID EEPROM on Jetson TK1, as well as likely
a whole slew of other NVIDIA reference boards; we simply haven't added
enabled the EEPROM in the DT files until now.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-05 13:46:24 -07:00
Olof Johansson
a2fc987ae2 Renesas ARM Based SoC Defconfig Updates for v3.16
SH Mobile Multi-Platform
 * Enable USB [EO]HCI HCD, VSP1, HIGHMEM, USBHS, I2C_SH_MOBILE,
   EEPROM_AT24 and MSIOF
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTThmIAAoJENfPZGlqN0++YwIQAKUyrtwOkseqpcbufClWYkcB
 YTqrnSW1aFD5wPCpenVVSGNDx++jAaWeQfvwOsEUWRfMkR95oPajfhoi/r/KvRxc
 Toa94tGIHDdadY4FpQI+VbMFJj0Jxi1VyQGZnhcY/wEcP8cGbvqmNgXqwjJ9OnFt
 FbuF0Quyk+fMbrVXZZXF8+lqTU0xc8xCaO2peeq1XGtc9HCBZucC3dEK5w5f3cpF
 jKcZT1ojXaZs9KMrjx7JAT6zK8VXyAqh+CmhqiFpIgVKPhNksK82wQ/ppvcvuHb8
 erz5uT8ifvoElZ/S3l8TCKa3NNbqvOejarQKjgMh1VW5g2xe60dnRvcUQAzvT+qF
 E3bdbcOS6+n6BMMfY2Dk3NnSBe/C9z1PWWAKQcJKKUWGNFPPbHFvaeDyojE1WH/x
 INZYkIQWSWF3XKBofMdrjmRuLSqkYisIXQtj8fA/vxF5eHh/+b9muqR5ZIXFI1Vj
 iJx76dBV1bWyHG+wgTZYUYn52wA8JJ6nLLDLVeFxvpG06pyJVDNW+dmWONtp5X58
 VBh9GCUkFnTl4MHQo7+5kCLHX4nbo7kdxyd5fzzeoXfKENcwDZJ46nAC+k6PvzMd
 OSuWXTZYW4V7/3EtIc2ClTeCMo0XEeHQA8KHQZr7J8JViPjgSV0L5VMR/D3Qgxzq
 4I1i75eakCEuDluAtYYt
 =L5Gg
 -----END PGP SIGNATURE-----

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

Merge "Renesas ARM Based SoC Defconfig Updates for v3.16" from Simon Horman:

SH Mobile Multi-Platform
* Enable USB [EO]HCI HCD, VSP1, HIGHMEM, USBHS, I2C_SH_MOBILE,
  EEPROM_AT24 and MSIOF

* tag 'renesas-defconfig-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Enable USB [EO]HCI HCD support in shmobile_defconfig
  ARM: shmobile: Enable VSP1 in shmobile_defconfig
  ARM: shmobile: Enable HIGHMEM in shmobile_defconfig
  ARM: shmobile: Enable USBHS gadget support in shmobile_defconfig
  ARM: shmobile: Include at24.c in shmobile_defconfig
  ARM: shmobile: Include i2c-shmobile.c in shmobile_defconfig
  ARM: shmobile: multiplatform: Enable MSIOF in defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-05 13:41:42 -07:00
Olof Johansson
a2af978986 mvebu DT fixes for v3.15
- mvebu
 
     - fix NOR bus width on Armada XP boards
     - use qsgmii on Armada XP GP board
     - add i2c bus freq for Armada 370 DB board
     - add SATA interface for Armada 375 DB
 
  - kirkwood
 
     - fix double probe of audio codec for T5325
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTX5qGAAoJEP45WPkGe8Zn7iMP/1PxcEqs0Eb+vfOg7O5W/j72
 DTNswSUN/L/mG6rDIAy2vrpx8qlkVknu0UpL/wb6pWXrSg7db6nTtfmHU77d4lTD
 XhatamU4hquBkAIcXP7r/spIgL5FfCwlRMFfK+NmpAmYDq/KTofErBgR8llTYfRK
 HUrsH9RKdTe/Omh6Wv5ogwoqMe2S6dx5R4U0yR2tP4mcgYrDu59hzDi+Ca8EXD9r
 D+BqLJWg1JQOwY1PBZuzdSTNXbascleg004xW2nyV6MFWegqzgrgYhxPseiJIzwI
 D7nQDlMuo4fOAC4mbyAcjaDYJAaTU1EGazhV7XQXoAKDgrCtN8hPJ7sBv/MfrVjH
 KZhtJNEwaDh7YRCctF2eqWveEiFe7hcjViOBda/8EGXqHtPe4jL+IjVyruYPMUmh
 nKaJooxOVNFzo2QimobRxMtOhQfr57UVjHngh+9u0fvnr81uFhMig2+ddNWIn7HP
 ZELGcyyJr5kXYt8e9j13lnGUdHKUtdSD2ILng2ETTC8pnWRP0TPkfjtXbyZ1BqWN
 fLR3jd5nAepRILynS4Ct55FVy2FjsNtCYYekeJrTmIgNps8NaOjyI7Jx+MsGSOpm
 QOWz4iejohwFDc6vVMwEzh5i4JW4qBSBFPksX9Q5BWevi14uVXWujGnGEzZs34h+
 Z/Pxh9rydne+wyYakHcr
 =6yRE
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt-fixes-3.15' of git://git.infradead.org/linux-mvebu into fixes

From Jason Cooper:
mvebu DT fixes for v3.15

 - mvebu
    - fix NOR bus width on Armada XP boards
    - use qsgmii on Armada XP GP board
    - add i2c bus freq for Armada 370 DB board
    - add SATA interface for Armada 375 DB

 - kirkwood
    - fix double probe of audio codec for T5325

* tag 'mvebu-dt-fixes-3.15' of git://git.infradead.org/linux-mvebu:
  ARM: Kirkwood: T5325: Fix double probe of Codec
  ARM: mvebu: enable the SATA interface on Armada 375 DB
  ARM: mvebu: specify I2C bus frequency on Armada 370 DB
  ARM: mvebu: use qsgmii phy-mode for Armada XP GP interfaces
  ARM: mvebu: fix NOR bus-width in Armada XP OpenBlocks AX3 Device Tree
  ARM: mvebu: fix NOR bus-width in Armada XP DB Device Tree
  ARM: mvebu: fix NOR bus-width in Armada XP GP Device Tree

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-04 22:35:15 -07:00
Olof Johansson
1270f063f9 mvebu fixes for v3.15
- devbus: fix bus-width conversion
 
  - orion5x: fix target ID for crypto SRAM window
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTX5gJAAoJEP45WPkGe8ZnXLQP/1EpsDvA8bdCm+kspEBMScpN
 Ji3N1F6XTjYRI/YbpwvJra1UZyZDx2rNaA1ofGDLLTZiELO0pOMeE8gGouG6lZaA
 OZf1Hq5T0pKkq8XkqUhKqgZ3QNUmCjaWL2FCkAIuiFDaCFpops2aCRy1YO3nht6o
 ymhJ/MQwdvCG+pMVfaVNMmnxroA9uiu7OPLtfwru8+7kghGWfa/LNCM5H4+TOEG9
 vV5onWrBzzTQCq1X12+a5qgOsOmlRdo69EZ2j0Rq/aHg5c9+Bxa2u5OncBe0txOa
 blC42x9gTVtOY3sUTkFcyF1HMIC/PajZhWHkJKIqFJfVF11GVFc38LwWJewIsgaH
 OxSwMZQOL4CcRTGl2nwxF4L2TVefYimJgNXsjEe0i7FNahtT/pUS4gz56XDE1iK5
 sIZE//GevJ0eFDk9kCKEZYJkqiSTgrw05wHb5CVlHIy5fi5jG9prYzBqDam57Ohi
 JOpVyC9+sodY7VkLMgqZc1XW492LB0JXdSOn473k8E4j5dK2JVzLd7GljiHXFc8P
 MM/drQGmXa4O85lliD2RLTW1ca40AFbtgimHkQjBIAm1YCaUcZhEp5TUpA40BoBN
 IA+GP6TtN2ha39gk1AbMx773aaRcK28p1B+epfkF2CPuTYuaMYnp51UcVK2Xugvt
 QiD1tZJB3FpyIEqRqecS
 =k1Ts
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-fixes-3.15' of git://git.infradead.org/linux-mvebu into fixes

From Jason Cooper:
mvebu fixes for v3.15

 - devbus: fix bus-width conversion

 - orion5x: fix target ID for crypto SRAM window

* tag 'mvebu-fixes-3.15' of git://git.infradead.org/linux-mvebu:
  ARM: orion5x: fix target ID for crypto SRAM window
  memory: mvebu-devbus: fix the conversion of the bus width

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-04 22:27:30 -07:00
Olof Johansson
9a2044fce2 Mostly fixes for occasional memory corruption caused by bad
timings for smc911x LAN9220 (and potentially LAN9221) devices
 that were noted on a cm-t3730 system. Also fix THUMB mode
 for SMP, and mailbox related warnings when booted with device
 tree.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTWpj8AAoJEBvUPslcq6Vzp5wQANywiCcNZxcoRc6ZW+f/4UUX
 xndCEdCbqIa2feHJFkbFAgVh3flgoFRMu4mqM4hsxz+DdnSjprErJkAiyVV4rVqt
 F8H/EWASDxuW+x/j1BlUr67SgauVsnYuqYQEb8ki3QD1ZA9g3puPzH4cvvevdUuk
 GGXTc/VtH3CTWXPMGwngeIFMmVZg5IbZw9bc/F2irIM8GjQWI1RG7ZJ0MYIt167l
 RDj3/Y++3qFzuWXoX59QovUOr94ixaCAtmJXWyLE9MHpT7NzNpYXTuLXQcWXXcg5
 hp+DIXJuQrRcdYA156Ixfl9CuO20ODzaBqz1aJxj4hRhdtsyshRIQfBwvUwHTpQv
 IKj0SSjiMxQF+mZjDs1bMrw8KCgavV1o6P/CS2NjjQLkuHs07TBD/q4IfhCmLSiW
 e0f/fXBBQoB+0ZA9GFvsVaL+9VZoFP6JTMLxPk66erJhkgYn9RthuP+4oNk8kOaC
 jdaoUhMjGQWohNenecPpkaUiLT6d3phL9ZPnL2Z31FUyYvbw/jrPAtC3e88cXDFu
 CPlIhLmM7mhIKx+yt1BIZ2IY3LoPDYt8YxqXyVOORJcqNMq5juRXGKi+iUB8+mGa
 inViKIptO26FKqQcKWqGABuaQtuUA6RZzc0MNTBSNhhCtGj12ZgD+pg3qcSN+T61
 wLK1ZFlt1YZ2jp2mbt7x
 =8NVy
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.15/fixes-gpmc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge fixes from Tony Lindgren:

Mostly fixes for occasional memory corruption caused by bad
timings for smc911x LAN9220 (and potentially LAN9221) devices
that were noted on a cm-t3730 system. Also fix THUMB mode
for SMP, and mailbox related warnings when booted with device
tree.

* tag 'omap-for-v3.15/fixes-gpmc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: AM3517: Disable absent IPs inherited from OMAP3
  ARM: dts: OMAP2: Fix interrupts for OMAP2420 mailbox
  ARM: dts: OMAP5: Add mailbox dt node to fix boot warning
  ARM: OMAP5: Switch to THUMB mode if needed on secondary CPU
  ARM: dts: am437x-gp-evm: Do not reset gpio5
  ARM: dts: omap3-igep0020: use SMSC9221 timings
  ARM: dts: Fix GPMC timings for LAN9220
  ARM: dts: Fix GPMC Ethernet timings for omap cm-t sbc-t boards for device tree
  ARM: dts: Fix bad OTG muxing for cm-t boards

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-04 22:20:30 -07:00
Andrew Lunn
208f4e0d9b ARM: multi_v5_defconfig: Enable sound modules needed for t5325
Enable simple-card and the CODEC.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1399141819-23924-10-git-send-email-andrew@lunn.ch
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-05 01:22:11 +00:00
Andrew Lunn
474684809f ARM: mvebu_v5_defconfig: Enable sound modules needed for t5325
Enable simple-card and the CODEC.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1399141819-23924-9-git-send-email-andrew@lunn.ch
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-05 01:22:10 +00:00
Brian Norris
809aa6f1b4 ARM: mvebu: defconfig: add MTD_SPI_NOR (new dependency for M25P80)
These defconfigs contain the CONFIG_M25P80 symbol, which is now
dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy
the new dependency.

At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Acked-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Link: https://lkml.kernel.org/r/1398925607-7482-9-git-send-email-computersforpeace@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-05 01:02:02 +00:00
Sebastian Hesselbarth
788296b2d1 ARM: dts: kirkwood: fix mislocated pcie-controller nodes
Commit 54397d8534
 ("ARM: kirkwood: Relocate PCIe device tree nodes")

moved the pcie-controller nodes for the Kirkwood SoCs to the mbus
bus node. For some reason, two boards were not properly converted
and have their pci-controller nodes still in the ocp bus node.

As the corresponding SoC pcie-controller does not exist anymore,
it is likely that pcie is broken on those boards since above commit.
Fix it by moving the pcie related nodes to the correct location.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Fixes: 54397d8534 ("ARM: kirkwood: Relocate PCIe device tree nodes")
Cc: <stable@vger.kernel.org> # v3.12+
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-2-git-send-email-sebastian.hesselbarth@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-05 00:43:15 +00:00
Linus Torvalds
e7e6d2a4a1 - Fix for a Haswell regression in nested virtualization, introduced during
the merge window.
 
 - A fix from Oleg to async page faults.
 
 - A bunch of small ARM changes.
 
 - A trivial patch to use the new MSI-X API introduced during the merge
 window.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTY5anAAoJEBvWZb6bTYby6EQQAIWbOJCrLO3NQxwE9M7d8YvN
 oviaLFv7vJh1vaXVo7SNjBRXTq4pzWrhg9rwWlHBg1KnxJ0/sc9Tn07Fe+0bxWDh
 1XIFXNEkO9+Bpl43VnKGC7sbkYE9m3+jpGCWjF01vBCh+BY73wUOsPD0Zw9YQojN
 TKBtiQEjb8avuoTUR0JSOTwLZw4DlDRmRLHkNwlqqvbPdvuIWI/LG2wFUvY7/eq8
 dWxIPBjLKaIv2aUs9wGNNiz4Kb92uyH5L6bI6SK8VxphRA+51BOjMcBbzdY+Q1XL
 c4CTaL9ybAyUi4SRv41qWnM09YbI1FayUW93k9xz/vEplXOHp5R/lyUdZETd/d83
 GxaooTLcy9nOYeZ75buiH/0EG5HxI7On/QfUBEE3qIf8KfGgxb479HbRw6RnX4bf
 EhQzf7eyZvvk43Xk3OYwq8Ux1SOiXQEo+8TpCSaM/KN57cJbjGB4GCUK6JX8qJCx
 7MfXBdrhkAdw5V4lEBQMYKp4pdUdgYKRXavhLevm0qFjX1Swl6LIHxLtjFTKyX9S
 Xfxi09J7EUs7SsI35pdlMtPQkklEUXE96S/W3RCEpR+OfgbVMkYkcQI8TGb7ib3l
 xLNJrSgFDSlP5F3rN5SYIItAqboXb7iLp7SiF2ByXV43yexIrzTH0bwdwPwpZHhk
 2ziVieX5WXEX4tgzZkRj
 =+bLo
 -----END PGP SIGNATURE-----

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM fixes from Paolo Bonzini:
 - Fix for a Haswell regression in nested virtualization, introduced
   during the merge window.
 - A fix from Oleg to async page faults.
 - A bunch of small ARM changes.
 - A trivial patch to use the new MSI-X API introduced during the merge
   window.

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address.
  KVM: arm/arm64: vgic: fix GICD_ICFGR register accesses
  KVM: async_pf: mm->mm_users can not pin apf->mm
  KVM: ARM: vgic: Fix sgi dispatch problem
  MAINTAINERS: co-maintainance of KVM/{arm,arm64}
  arm: KVM: fix possible misalignment of PGDs and bounce page
  KVM: x86: Check for host supported fields in shadow vmcs
  kvm: Use pci_enable_msix_exact() instead of pci_enable_msix()
  ARM: KVM: disable KVM in Kconfig on big-endian systems
2014-05-02 09:26:09 -07:00
Maxime Ripard
84e108fc7b ARM: sunxi: Enable GMAC in sunxi_defconfig
Since the support of the GMAC has been merged, we're using it as the ethernet
controller on the A20 devices.

However, sunxi_defconfig wasn't selecting it hence breaking the NFS boot.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-05-01 17:07:42 -07:00
Thomas Gleixner
cf7eb97911 ARM: common: edma: Fix xbar mapping
This is another great example of trainwreck engineering:

commit 2646a0e529 (ARM: edma: Add EDMA crossbar event mux support)
added support for using EDMA on peripherals which have no direct EDMA
event mapping.

The code compiles and does not explode in your face, but that's it.

1) Reading an u16 array from an u32 device tree array simply does not
   work. Even if the function is named "edma_of_read_u32_to_s16_array".

   It merily calls of_property_read_u16_array. So the resulting 16bit
   array will have every other entry = 0.

2) The DT entry for the xbar registers related to xbar has length 0x10
   instead of the real length: 0xfd0 - 0xf90 = 0x40.

   Not a real problem as it does not cross a page boundary, but
   wrong nevertheless.

3) But none of this matters as the mapping never happens:

   After reading nonsense edma_of_read_u32_to_s16_array() invalidates
   the first array entry pair, so nobody can ever notice the
   braindamage by immediate explosion.

Seems the QA criteria for this code was solely not to explode when
someone adds edma-xbar-event-map entries to the DT. Goal achieved,
congratulations!

Not really helpful if someone wants to use edma on a device which
requires a xbar mapping.

Fix the issues by:

- annotating the device tree entry with "/bits/ 16" as documented in
  the of_property_read_u16_array kernel doc

- make the size of the xbar register mapping correct

- invalidating the end of the array and not the start

This convoluted mess wants to be completely rewritten as there is no
point to keep the xbar_chan array memory and the iomapping of the xbar
regs around forever. Marking the xbar mapped channels as used should
be done right there.

But that's a different issue and this patch is small enough to make it
work and allows a simple backport for stable.

Cc: stable@vger.kernel.org # v3.12+
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2014-04-29 19:33:49 +05:30
Linus Torvalds
87c7662bea Devicetree bug fixes for v3.15
This branch contains a pair of important bug fixes for the DT code:
 - Fix some incorrect binding property names before they enter common usage
 - Fix bug where some platform devices will be unable to get their
   interrupt number when they depend on an interrupt controller that is
   not available at device creation time. This is a problem causing
   mainline to fail on a number of ARM platforms.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTXr8WAAoJEMWQL496c2LNhzgP/RhhIS9ySzJkdPEMksnBaQbN
 JKG+wBwlzvtJSPw2xX5EpWweOd1PDqHxLjjWu7q5WIrQQyOGRAELkYg1H+5ksFo1
 obCAFOjTC7VXPGc+BX0dLN6Eq4UHP8k3Ui8zlMSZQNt+gBvYo1gX2ulR8sQgS8rF
 xw+8iNDA2GIFusQbci35yOAhp6yo/ble3KIeR5dFKeMpiVSh9rqdLS+H9HgnG5Sw
 G2LUrAeRY2yQbow3c1001HiKrJieZZSTCq8oiZDgJZY5+Qk8zamyj2xxgMoJUA8Q
 2Kcb3379vNvDgjYX61NiwyrhIbJEiao8IXq6WMDNbmH3+FUwogrnh/A/g5POtX0N
 JV5tGkc/2lfm5oBCFSzcw661XjLysPsm3nPLhnxRL/dlBVkl0IZzTVYPTqUtoKlK
 NfwKFUDgg+QVmhFQT0BDCyOGAcRsz4rNEPPB6M12OmEKgxGpetfUaFdBcJqSNaxf
 Ac6AAZCXrkLlRNOVhK333ILPxv1JRC++JAeRKNwHr9e6j2aJjUgilSuzpHJ5Lkyo
 sj6kp+n1n+giYlgc9GjM7b33tm8XEd4rbcgwCWwaypEsl4FIwPs9xMys7md8SOCE
 AAnVPVUvLGC9O2GhldeQlOgtGWzILW3zJXb2mrMIIGyLBGBx1qr3VJIZpxoddTc0
 UtIJn0X37mKY/R4/hWs4
 =B2JT
 -----END PGP SIGNATURE-----

Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux

Pull devicetree bug fixes from Grant Likely:
 "These are some important bug fixes that need to get into v3.15.

  This branch contains a pair of important bug fixes for the DT code:

   - Fix some incorrect binding property names before they enter common
     usage

   - Fix bug where some platform devices will be unable to get their
     interrupt number when they depend on an interrupt controller that
     is not available at device creation time.  This is a problem
     causing mainline to fail on a number of ARM platforms"

* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
  of/irq: do irq resolution in platform_get_irq
  of: selftest: add deferred probe interrupt test
  dt: Fix binding typos in clock-names and interrupt-names
2014-04-28 15:19:06 -07:00
Maxime Ripard
a38670459d ARM: sun7i: Fix i2c4 base address
For some reason, the base address of the fifth I2C adapter in the A20 was
incorrect. Change this to the actual base address.

Reported-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
2014-04-28 09:12:04 -07:00
Mark Salter
5d4e08c45a arm: KVM: fix possible misalignment of PGDs and bounce page
The kvm/mmu code shared by arm and arm64 uses kalloc() to allocate
a bounce page (if hypervisor init code crosses page boundary) and
hypervisor PGDs. The problem is that kalloc() does not guarantee
the proper alignment. In the case of the bounce page, the page sized
buffer allocated may also cross a page boundary negating the purpose
and leading to a hang during kvm initialization. Likewise the PGDs
allocated may not meet the minimum alignment requirements of the
underlying MMU. This patch uses __get_free_page() to guarantee the
worst case alignment needs of the bounce page and PGDs on both arm
and arm64.

Cc: <stable@vger.kernel.org> # 3.10+
Signed-off-by: Mark Salter <msalter@redhat.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2014-04-28 03:21:48 -07:00
Julien Grall
063aa8e68e arm/xen: Remove definiition of virt_to_pfn in asm/xen/page.h
virt_to_pfn has been defined in asm/memory.h by the commit e26a9e0 "ARM: Better
virt_to_page() handling"

This will result of a compilation warning when CONFIG_XEN is enabled.

arch/arm/include/asm/xen/page.h:80:0: warning: "virt_to_pfn" redefined [enabled by default]
 #define virt_to_pfn(v)          (PFN_DOWN(__pa(v)))
 ^
In file included from arch/arm/include/asm/page.h:163:0,
                 from arch/arm/include/asm/xen/page.h:4,
                 from include/xen/page.h:4,
                 from arch/arm/xen/grant-table.c:33:

The definition in memory.h is nearly the same (it directly expand PFN_DOWN),
so we can safely drop virt_to_pfn in xen include.

Signed-off-by: Julien Grall <julien.grall@linaro.org>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
2014-04-28 10:31:12 +01:00
David Vrabel
67dadcb324 Merge commit 'e26a9e0' into stable/for-linus-3.15 2014-04-28 10:31:04 +01:00
Linus Torvalds
ac6c9e2bed Merge branch 'safe-dirty-tlb-flush'
This merges the patch to fix possible loss of dirty bit on munmap() or
madvice(DONTNEED).  If there are concurrent writers on other CPU's that
have the unmapped/unneeded page in their TLBs, their writes to the page
could possibly get lost if a third CPU raced with the TLB flush and did
a page_mkclean() before the page was fully written.

Admittedly, if you unmap() or madvice(DONTNEED) an area _while_ another
thread is still busy writing to it, you deserve all the lost writes you
could get.  But we kernel people hold ourselves to higher quality
standards than "crazy people deserve to lose", because, well, we've seen
people do all kinds of crazy things.

So let's get it right, just because we can, and we don't have to worry
about it.

* safe-dirty-tlb-flush:
  mm: split 'tlb_flush_mmu()' into tlb flushing and memory freeing parts
2014-04-27 15:08:12 -07:00