Commit Graph

43917 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Will Deacon
abff083ce2 ARM: perf: add format entry to describe event -> config mapping
It's all very well providing an events directory to userspace that
details our events in terms of "event=0xNN", but if we don't define how
to encode the "event" field in the perf attr.config, then it's a waste
of time.

This patch adds a single format entry to describe that the event field
occupies the bottom 8 bits of our config field on ARMv7.

Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-12-22 14:42:57 +00:00
Ilya Ledvich
67fea0f43d ARM: dts: imx7d: sbc-imx7: add basic board support
SBC-iMX7 is a single board computer designed for industrial
and embedded applications. It is based on the Freescale i.MX7
system-on-chip. SBC-iMX7 is implemented with the CL-SOM-iMX7
System-on-Module providing most of the functions, and SB-SOM-iMX7
carrier board providing additional peripheral functions and
connectors.

http://www.compulab.co.il/products/sbcs/sbc-imx7-freescale-i-mx-7-single-board-computer/

http://www.compulab.co.il/products/computer-on-modules/cl-som-imx7-freescale-i-mx-7-system-on-module/

Add basic board support, including SD card as a secondary boot and storage device

Signed-off-by: Ilya Ledvich <ilya@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
2015-12-22 20:43:43 +08:00
Ilya Ledvich
470f269ce3 ARM: dts: imx7d: cl-som-imx7: add basic module support
CL-SOM-iMX7 is a miniature System-on-Module (SoM) based on
Freescale i.MX7 System-on-Chip family.

http://www.compulab.co.il/products/computer-on-modules/cl-som-imx7-freescale-i-mx-7-system-on-module/

Add basic DT support for standalone module (without a carrier board):

* Memory configuration
* eMMC
* 2x Gigabit Ethernet ports (FEC1 and FEC2)
* I2C2 bus
  * EEPROM
  * PCA9555 GPIO extender
  * PMIC
* UART1
* USB OTG port

Signed-off-by: Ilya Ledvich <ilya@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
2015-12-22 20:43:43 +08:00
Damien Riegel
f736c596f4 ARM: dts: TS-4800: add touchscreen support
This commit enables the touchscreen on TS-4800, using the ts4800-ts
driver.

Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:42 +08:00
Damien Riegel
865fc4014d ARM: dts: ts-4800: Add LCD support
This commit adds LCD support for the TS-4800. The panel is an Okaya
RS800480T-7X0WQ and the timings have been extracted from Technologic
Systems' tree.

Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:42 +08:00
Sean Cross
70a8c03bd9 ARM: dts: imx6q: add Novena board
Novena is an open-hardware laptop/desktop/bare board.

See http://www.kosagi.com/w/index.php?title=Novena_Main_Page

Signed-off-by: Sean Cross <xobs@kosagi.com>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:42 +08:00
Damien Riegel
ef41e4c56f ARM: dts: TS-4800: use weim IP to map the FPGA
Previously, the device tree mapped the FPGA like any other IPs inside
the SoC, but it is actually mapped through the WEIM (Wireless External
Interface Module). This patch updates the device tree to make use of it.

About the timings: in the image provided by the manufacturer, only
CS0GCR1 is changed. The other values are the default ones, but the WEIM
bindings expect them to be all explicitly set in the device tree, so I
just put the default values in the dt.

Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:41 +08:00
Damien Riegel
6989cc8fc7 ARM: dts: TS-4800: drop uart rts/cts pin reservations
These pins are actually not routed for UARTs, they should not be
reserved.

Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:41 +08:00
Lucas Stach
419e202b26 ARM: dts: imx6: add Vivante GPU nodes
This adds the device nodes for 2D, 3D and VG GPU cores.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:41 +08:00
Mans Rullgard
cfa1dd99d5 ARM: dts: imx28: add alternate auart4 pinmux
Add auart4 2-pin configuration on auart0 rts/cts pads.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:40 +08:00
Tang Yuantian
318f05e5d7 ARM: dts: ls1021a: add sata node to dts
Added sata node to ls1021aqds and ls1021atwr board to support
sata function.

Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:40 +08:00
Damien Riegel
b446ff229e ARM: dts: TS-4800: add basic device tree
This device tree adds support for TS-4800 by Technologic Systems. This
board is based on MX51-babbage, but there are some subtle differences in
the pins used, and there is an additional FPGA that is memory-mapped.

More details here:
  http://wiki.embeddedarm.com/wiki/TS-4800

Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:40 +08:00
Haibo Chen
64b834324d ARM: dts: imx7d-sdb: add ADC support
Add ADC support for imx7d-sdb board.

Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:39 +08:00
Haibo Chen
a3d19f2179 ARM: dts: imx7d.dtsi: add ADC support
Add imx7d ADC support.

Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:38 +08:00
Stefan Agner
2afa06cbf1 ARM: dts: vf-colibri: add CAN support
Add Colibri standard pinmux for FlexCAN controller instances. CAN
is not a standard Colibri feature, but the datasheet predefines
pins which provide CAN (compatible across some modules). Hence,
add the pinmux on module level.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:38 +08:00
Alexandre Belloni
234f82a702 ARM: mxs: dt: cfa10057: fix backlight PWM
The backlight PWM is actually pwm4.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:38 +08:00
Lucas Stach
67157882a4 ARM: dts: imx6qdl: move GIC to right location in DT
No functional change, just moving the node to the place where it
belongs according to its unit address.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:37 +08:00
Philipp Zabel
41beef39cd ARM: dts: imx6qdl: add IPU aliases
This allows for consistent numbering of the IPU output and
input ports.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:37 +08:00
Lucas Stach
d9cf0a125e ARM: dts: imx6: remove config space from PCIe controller ranges property
This has been moved to the reg property where it belongs for quite some
time. The range has been unused by the kernel since then and with kernel
4.4 it's flagged as an unparsable range, as it does not comply to the
PCI ranges DT binding. Fix this by removing the superfluous range.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:37 +08:00
Shengjiu Wang
09d3059adc ARM: dts: imx6: Change the clock name for spba clock
Audio IP need the spba clock, but original clock name "dma" is not
accurate, so change it to name "spba". The audio driver has been
using the new name "spba", the binding document has been updated.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:36 +08:00
Meng Yi
edb3ed394b ARM: dts: ls1021a: Add a TFT LCD panel.
Signed-off-by: Alison Wang <b18965@freescale.com>
Signed-off-by: Xiubo Li <lixiubo@cmss.chinamobile.com>
Signed-off-by: Jianwei Wang <jianwei.wang.chn@gmail.com>
Signed-off-by: Meng Yi <b56799@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:36 +08:00
Meng Yi
ab0087dfc2 ARM: dts: ls1021a: Add DCU dts node.
Signed-off-by: Alison Wang <b18965@freescale.com>
Signed-off-by: Xiubo Li <lixiubo@cmss.chinamobile.com>
Signed-off-by: Jianwei Wang <jianwei.wang.chn@gmail.com>
Signed-off-by: Meng Yi <b56799@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:36 +08:00
Bai Ping
698e2ac536 ARM: dts: imx: modify the clocks used by cpufreq driver
As on i.MX7D, we using a virtual arm clk for CPU frequency
scaling, so correct the clocks info used by the cpufreq driver.

Signed-off-by: Bai Ping <b51503@freescale.com>
Acked-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:43:36 +08:00
Tim Harvey
3edf253c5d ARM: dts: imx: ventana: Add SPI support for GW52xx
This addes support for SPI available on an off-board connector available on
some models of the GW52xx.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:42:25 +08:00
Tim Harvey
aa2b21783b ARM: dts: imx: ventana: add PWM nodes for Ventana boards
Ventana boards have an off-board connector with signals that can be pinmuxed
as either GPIO or PWM. This patch adds pwm device-tree nodes in the disabled
state which the bootloader can decide to enable based on bootloader config.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:42:25 +08:00
Afzal Mohammed
058c0c1a44 ARM: dts: vf6xx: Cosmic+: M4(nommu) initial support
Minimal Cortex-M4 device tree to boot Linux to shell. M4 is booted via
Cortex-A5 running Linux using Stefan Agner's <stefan@agner.ch> "m4boot"
utility.

Signed-off-by: Afzal Mohammed <afzal.mohd.ma@gmail.com>
Acked-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:42:25 +08:00
Cory Tusar
5f060c71aa ARM: dts: vfxxx: Include support for dspi[23] functionality.
Extend the existing Vybrid DSPI devicetree implementation to also
describe the dspi2 and dspi3 functional blocks.

Signed-off-by: Cory Tusar <cory.tusar@pid1solutions.com>
Acked-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:42:24 +08:00
Marc Kleine-Budde
70f97128a1 ARM: dts: imx25: add alias for pwm nodes
This, together with the corresponding patch to pwm-imx.c,  allows to order the
pwm devices correctly.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:42:24 +08:00
Markus Pargmann
c1b99dedfd ARM: dts: imx6dl: Fix gpt compatibles, remove imx6q-gpt
imx6qdl.dtsi uses compatibles "fsl,imx6q-gpt", "fsl,imx31-gpt".
imx6dl.dtsi uses compatibles "fsl,imx6dl-gpt", "fsl,imx6q-gpt" since
commit

	4e415ed814 (ARM: dts: imx6dl: add imx6dl gpt specific compatible string)

If imx6dl would be compatible with imx6q-gpt it would also have to be
compatible with imx31-gpt which is currently missing.

Based on the above mentioned patch I assume imx6q-gpt and imx6dl-gpt are
not compatible. So imx6q-gpt should be removed as compatible.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:42:24 +08:00
Tim Harvey
e726a9fdde ARM: dts: imx: ventana: Allow HDMI and LVDS to work simultaneously
Currently it is not possible to have HDMI and LVDS working simultaneously,
because both ports try to use PLL5.

Move the LVDS clock parent to PLL3_USB_OTG, so that HDMI and LVDS can be
driven from independent sources.

With this change the LDB pixel clock goes to 68.57 MHz, which is still
within the valid range for the displays supported by the Ventana boards.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:42:23 +08:00
Tim Harvey
a7668fda6b ARM: dts: imx: ventana: fix GW53xx/GW54xx lvds channel
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:42:23 +08:00
Tim Harvey
70b6b438cc ARM: dts: imx: ventana: GW54xx PMIC swbst reg always-on
The GW54xx PMIC swbst regulator is used for LVDS power, CANbus xceiver
and HDMI DDC and is enabled by the bootloader. Set the regulator to
always-on so that Linux doesn't turn it off thinking its not needed.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:42:23 +08:00
Uwe Kleine-König
b312e3600d ARM: dts: imx25-pinfunc: add some more pin configurations
This patch adds some values that are needed for an out-of-tree device
tree I'm currently working with.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:42:22 +08:00
Fabio Estevam
aab8ec0c73 ARM: dts: imx6ul: Add ADC support
Add support for ADC1.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:42:22 +08:00
Fabio Estevam
eb45ff7469 ARM: dts: imx6sx: Pass the 'adck-max-frequency' property
Specify the 'adck-max-frequency' property in the adc nodes.

According to Documentation/devicetree/bindings/iio/adc/vf610-adc.txt
this is a recommended property.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:42:22 +08:00
Peter Chen
2b1a40e8d1 ARM: dts: imx6: change default burst size for USB
It can improve the USB performance when choosing larger
burst size at some systems (bus size is larger), there is
no side effect if this burst size is larger than bus size.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:41:51 +08:00
Peter Chen
9493bf5458 ARM: dts: imx6: set ahb-burst-config as 0 for USB
After setting ahb burst configuration as 0, we can increase tx/rx
burst size, it will improve the USB performance

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-22 20:41:32 +08:00
Linus Walleij
36f46d6d5c ARM: 8482/1: l2x0: make it possible to disable outer sync from DT
According to commit 2503a5ecd8
"ARM: 6201/1: RealView: Do not use outer_sync() on ARM11MPCore
boards with L220" Some PB11MPCore RealView core tiles have broken
outer_sync.

We got rid of the custom barriers from the machine by disabling
outer sync, but that was just for the boardfile case. We have
to be able to do the same in the device tree case.

Since __l2c_init() is cloning and copying the L2C vtable,
we pass an argument to this function to optionally numb
the outer sync operation if desired, before initializing
the cache.

After this we can set up the cache correctly on the RealView
PB11MPCore. This was tested on a PB11MPCore known to have the
issue. Before this, spurious crashes would occur if we try to
set up the cache properly, after this it boots rock solid.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: devicetree@vger.kernel.org
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2015-12-22 12:15:53 +00:00
Marc Zyngier
e7273ff49a ARM: 8488/1: Make IPI_CPU_BACKTRACE a "non-secure" SGI
Having IPI_CPU_BACKTRACE as SGI15 may not work if the kernel is
running in non-secure mode and that the secure firmware has
decided to follow ARM's recommendations that SGI8-15 should
be reserved for secure purpose.

Now that we are "only" using SGI0-6, change IPI_CPU_BACKTRACE
to use SGI7, which makes it more likely to work.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2015-12-22 12:09:44 +00:00
Marc Zyngier
89d798b73d ARM: 8487/1: Remove IPI_CALL_FUNC_SINGLE
Since 9a46ad6d6d ("smp: make smp_call_function_many() use logic
similar to smp_call_function_single()"), the core IPI handling
has been simplified, and generic_smp_call_function_interrupt is
now the same as generic_smp_call_function_single_interrupt.

This means that one of IPI_CALL_FUNC and IPI_CALL_FUNC_SINGLE has
become redundant. We can then safely drop IPI_CALL_FUNC_SINGLE,
and use only IPI_CALL_FUNC.

This has the advantage of reducing the number of SGI IDs we're using
(a fairly scarse resource).

Tested on a dual A7 board.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2015-12-22 12:09:43 +00:00
Lorenzo Pieralisi
f6419f240b ARM: 8485/1: cpuidle: remove cpu parameter from the cpuidle_ops suspend hook
The suspend() hook in the cpuidle_ops struct is always called on
the cpu entering idle, which means that the cpu parameter passed
to the suspend hook always corresponds to the local cpu, making
it somewhat redundant.

This patch removes the logical cpu parameter from the ARM
cpuidle_ops.suspend hook and updates all the existing kernel
implementations to reflect this change.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Lina Iyer <lina.iyer@linaro.org>
Tested-by: Lina Iyer <lina.iyer@linaro.org>
Tested-by: Jisheng Zhang <jszhang@marvell.com> [psci]
Cc: Lina Iyer <lina.iyer@linaro.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2015-12-22 12:09:43 +00:00
Songjun Wu
ca6349a8c5 ARM: at91/dt: sama5d2 Xplained: add pdmic node
Add pdmic node on sama5d2-xplained board.The pdmic
pins conflict with ISC_D0 & ISC_D1 data pins.

Signed-off-by: Songjun Wu <songjun.wu@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2015-12-22 10:37:53 +01:00
Songjun Wu
70450d4d58 ARM: at91/dt: sama5d2: add pdmic node
Add pdmic node.

Signed-off-by: Songjun Wu <songjun.wu@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2015-12-22 10:37:30 +01:00
Olof Johansson
a67c7129d4 Defconfig (exynos and multi_v7) changes for Exynos based boards for 4.5:
1. Enable Maxim 8997 and 77693 family drivers (charger, extcon, LED,
    RTC, haptic/motor, regulator).
 2. Build ChromeOS EC drivers as modules on multi_v7.
 3. Enable drivers important for Exynos4210-based Universal C210 board.
 4. Enable NFSv4 client.
 5. On exynos_defconfig set some options to a value recommended
    by systemd. This also makes it more consistent with multi_v7.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWXkcyAAoJEME3ZuaGi4PXktAP/A+KSG03XL7ltm0o0qlSUIbv
 sag2traI0icbyur/8T4DqBe9m5Gq/4ouG0sBOoB4r7cs80zjzxtsr7VO61YGZHSo
 pAIPn020K4y9uBm6uBs+mIbshoC5g7BxJB9/sYy28tDz9iK5DNPMu1d8Q08YLNT8
 xfIfyLz4mP1wH/WvWhKpV5fnTX4DJr4wbixdH4jEAsz6ity4sWDLuLus/dibkdFU
 4jIa4Fr40o+T463svIagGd5+eUv5SjOEzXfhfYty1CQIRbdqnLkasIIkTdBcn6RO
 hMyvw1DJ5QBxD61I2hE1L66OmphdH0clTreER7H9/tfTP4YftIhUlUP0pjAq5Nle
 ckD2RsvMz364WZ+iwsqUXu8EbM8HLRAzO7VHOd2pi+zlpWGtc67l5v/QqCi4oSZX
 Lnlep17YaMit9ufeJSaf7aO5PRmGDSKX2lSSlWQ0VM7WVFRuHLVXxGSq2itIsH6P
 +7OGHwbEH7wyhf11XsYAh+goTvLWtQlGeeJaVyq4NrG6oHvzc2HEWN1Gezvwx0HB
 Tj7thncWBEy8rkC1DCU6qxnC0FZiWAufcU90onjBYunjEEU6cCPMTPj1GG1Vb1fQ
 73rkYJYnp7z8W39wSdcAafpqy+EZgOlWRk6mv32/txjnGBlOWkUpiLERTEhS0eUH
 xiEYg17LeNYcqMuDYnpX
 =ANuN
 -----END PGP SIGNATURE-----

Merge tag 'samsung-defconfig-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig

Defconfig (exynos and multi_v7) changes for Exynos based boards for 4.5:
1. Enable Maxim 8997 and 77693 family drivers (charger, extcon, LED,
   RTC, haptic/motor, regulator).
2. Build ChromeOS EC drivers as modules on multi_v7.
3. Enable drivers important for Exynos4210-based Universal C210 board.
4. Enable NFSv4 client.
5. On exynos_defconfig set some options to a value recommended
   by systemd. This also makes it more consistent with multi_v7.

* tag 'samsung-defconfig-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos_defconfig: Set recommended options for systemd
  ARM: exynos_defconfig: Enable NFSv4 client
  ARM: exynos_defconfig: Add drivers for Exynos4210 Universal C210 board
  ARM: multi_v7_defconfig: Build ChromeOS EC drivers as modules
  ARM: multi_v7_defconfig: Enable Maxim 77693 LED and haptic drivers
  ARM: multi_v7_defconfig: Enable Maxim 8997 family drivers
  ARM: exynos_defconfig: Enable Maxim 77693 LED and haptic drivers
  ARM: exynos_defconfig: Enable Maxim 8997 family drivers

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-21 20:56:33 -08:00
Olof Johansson
d622bbfcae Samsung Exynos improvements for 4.5:
1. Switch from Exynos-specific restart/poweroff handler
    (mach-exynos/pmu.c) to generic syscon-reboot and syscon-poweroff
    drivers.
    This depends on adding syscon nodes to DTS to preserve
    bisectability.
 2. Minor improvements.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWXj9IAAoJEME3ZuaGi4PXgzcP/jjZSZaYFk31/PTtdpOlV0je
 kOAAZByLdStEr1rxY89o/YtznaqYowbFrElJPVwHr4W9y0UyP+FjIWFCBNh7vn29
 cVRlJUAg99dVP8cohrgbc1Gd6943CeR/0S3EPYAOK6SffRuoDNWvgtGg4Y9mV/7Z
 3g1FeuCIxaKisCWFmRYNw3cjnekLgeL1AC+N6IjPiX1iy2Wnx58zTeFPL0cAhpHY
 YjG4S6hVzaWFt969hR7cqhuG6a05wmSWTDKVk4PBuCkZpoX/k2lRwy0saT6WFzjc
 8MoNVgqGTqlgeYXDIQcR3upmS2NSp2IPXxjcT9I7qP8gnHX1fgb9hdYWdj9+uaKh
 7uF4JM2xlGXeMja9t1TcIBCMTc9rKPd0dxPHm4MnIYgC9BxGi5iBkvoGEH5zxoeg
 P0pAeIxkk11q+d59b2AMZF4EMUkuZh6iLZPrwUh5JWs0rdo+sh+wdDiQ0GYdvtev
 eW51mfWIuhFfwRCafYM9KL+GAf+fn+vKecYe7KFmNbLhXYSUMtmiffXVjFFhuFy7
 mW8iOEPfrxP2sqAsuElrl5c82klxvXJgLQ51hCthHeugrP/tJsYyLffIcLMhlFZL
 t8yKIeTnjytfiE8OsrHMUiDNd62bmiRyAU7vl9twlQLYU1LcYJ+tITq+mrxFfAY0
 DpUn13WehOA7qSYWy9zm
 =JWjG
 -----END PGP SIGNATURE-----

Merge tag 'samsung-soc-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Samsung Exynos improvements for 4.5:
1. Switch from Exynos-specific restart/poweroff handler
   (mach-exynos/pmu.c) to generic syscon-reboot and syscon-poweroff
   drivers.
   This depends on adding syscon nodes to DTS to preserve
   bisectability.
2. Minor improvements.

* tag 'samsung-soc-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: EXYNOS: Remove redundant code from regs-pmu.h
  ARM: EXYNOS: Constify local exynos_pmu_data structure
  ARM: EXYNOS: Switch to syscon reboot and poweroff
  ARM: dts: Add syscon-{reboot, poweroff} nodes for exynos5410
  ARM: dts: Add syscon-{reboot, poweroff} nodes for exynos5
  ARM: dts: Add syscon-{reboot, poweroff} nodes for exynos4
  ARM: dts: Add syscon-{reboot, poweroff} nodes for exynos3250

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-21 20:42:30 -08:00
Olof Johansson
3a8659772c Device Tree changes adding necessary nodes for syscon reboot/poweroff
handlers on Exynos boards. The mach-exynos changes must base on top
 of this to retain the bisectability of not loosing reboot/poweroff
 features.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWTsTCAAoJEME3ZuaGi4PXFh0P/0nbYXs89Y9guNwDJwlXKrlo
 kfgbZWmsrvbyMp0mTxwF9u2YwEKWycVrgBG5AnT4xaumF+cJoDSGSPb9mRDhNEfl
 9yOb6c+18TyWa7Kwu4Zya2RzOWEMMHorZgcwBBbPqw4pIMF/Oj92Dnl7OuZ19D5m
 DItDAPasw/Q8Kx3N5kksobvOzYbiGT3otG7wnL8xEL13ovTnSx3qB0rkDS4LVYRP
 xLQI8jYzj377B3T0iob0XhbT25CjsGT6B6IwLbrPHG3wkaBMLDlvWyAHtnGFHKX6
 2qSLce8qAJhTCoYqPcBWX4UzddMAY0r0l2AFTmfTQjyLZKGhmex3OvwTZEl/amO4
 t8QE7FrUiGDBzrMQaTPre9xhKyoNeeeSS+OAa3NJT/kpTi70kqC9Vig32xQ7J2PD
 42AuMwHxgUqtDJ2135is0bkutXXfnRTtotICaKPd9j9HNrgwRQ+ffg+jgyuOJmiC
 wsQCCSDhJQ3H3bH/1o8aQmAVvHXyniE5FY+1hFHUhPRmvenceAjLKX2tIc8Wqasu
 W1FKJAYalM4TdXcgmQy56EnXEK+VbIVhNmvnnNUp8+CfpTWS9bMwrH/TlbpDwTkK
 pSC8A6Dols0HgaKzdLbWM0L03mYuWvZ/JO6wW1Y11chPYw234+ph7ez4MBrHLTTF
 QTOPTffhLOcGVBLuFPoi
 =/NF/
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt-syscon-restart-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Device Tree changes adding necessary nodes for syscon reboot/poweroff
handlers on Exynos boards. The mach-exynos changes must base on top
of this to retain the bisectability of not loosing reboot/poweroff
features.

* tag 'samsung-dt-syscon-restart-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: Add syscon-{reboot, poweroff} nodes for exynos5410
  ARM: dts: Add syscon-{reboot, poweroff} nodes for exynos5
  ARM: dts: Add syscon-{reboot, poweroff} nodes for exynos4
  ARM: dts: Add syscon-{reboot, poweroff} nodes for exynos3250

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-21 20:39:19 -08:00
Adam Ford
6c95771f8c ARM: OMAP2+: LogicPD Torpedo: Add Touchscreen Support
The development kit uses a TSC2004 chip attached to I2C3.

Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-21 11:10:40 -08:00
Hans de Goede
12ec938403 ARM: dts: sun5i: Add dts file for the Empire Electronix D709 tablet
The Empire Electronix D709 tablet is a fairly standard 7" A13 tablet,
featuring usb-wifi, a micro-sd slot, micro-usb otg and headphone jack.

Empire Electronix is written on the back of the tablet, the D709 model
info can be found in the about tablet menu in android.

The PCB has no markings to speak of.

This dts file does not add support for the ft5x touchscreen found at
i2c bus 1, addr 0x38, irq PG11, because it does not work out of the box.
It seems it has been flashed with the wrong firmware and needs to have
alternative firmware uploaded at boot to make the touchscreen work
properly, when hot-booting from android into an upstream kernel the
touchscreen does work.

The Memsic MXC622X accelerometer at i2c bus 1, addr 0x15 also is not
enabled as there is no driver for it.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-12-21 17:10:18 +01:00
Hans de Goede
b3a9995e58 ARM: dts: sun7i: Enable gmac on Wits Pro A20 DKT
The Wits Pro A20 DKT has a gbit ethernet port, enable it.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-12-21 17:08:36 +01:00
Marcus Cooper
8661d0c34e ARM: dt: sun7i: Enable audio codec on MK808C
This commit enables the on-chip audio codec present on the MK808C.

Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-12-21 17:05:06 +01:00
Marcus Cooper
b0389c2caf ARM: sunxi: dt: enable audio codec on mk802
This commit enables the on-chip audio codec present on some variants
of the MK802.

Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-12-21 17:04:48 +01:00
Aleksei Mamlin
9f483c717d ARM: dts: sun7i: Add PA gpio pin to Wexler TAB7200 tablet
Add PA gpio pin for controlling power of two external amplifiers (NS4890) which are used on the Wexler TAB7200 tablet

Signed-off-by: Aleksei Mamlin <mamlinav@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-12-21 16:45:08 +01:00
Aleksei Mamlin
028997bb92 ARM: dts: sun7i: Add backlight node to Wexler TAB7200 tablet
Add a backlight for controlling the lcd panel backlight on Wexler TAB7200 tablet

Signed-off-by: Aleksei Mamlin <mamlinav@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-12-21 16:44:46 +01:00
Aleksei Mamlin
e7bb896a7f ARM: dts: sun7i: Enable touchscreen on Wexler TAB7200 tablet
Add a node for the Goodix GT911 touchscreen found on the Wexler TAB7200 tablet

Signed-off-by: Aleksei Mamlin <mamlinav@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-12-21 16:44:08 +01:00
Stefano Stabellini
7d5f6f81dd xen/arm: set the system time in Xen via the XENPF_settime64 hypercall
If Linux is running as dom0, call XENPF_settime64 to update the system
time in Xen on pvclock_gtod notifications.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
2015-12-21 14:40:58 +00:00
Stefano Stabellini
e709fba132 xen/arm: introduce xen_read_wallclock
Read the wallclock from the shared info page at boot time.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
2015-12-21 14:40:58 +00:00
Stefano Stabellini
ab76078a3d arm: extend pvclock_wall_clock with sec_hi
The hypervisor actually exposes an additional field to struct
pvclock_wall_clock, with the high 32 bit seconds.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Julien Grall <julien.grall@citrix.com>
2015-12-21 14:40:57 +00:00
Stefano Stabellini
72d39c691b xen/arm: introduce HYPERVISOR_platform_op on arm and arm64
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
2015-12-21 14:40:56 +00:00
Stefano Stabellini
34e38523d5 xen/arm: account for stolen ticks
Register the runstate_memory_area with the hypervisor.
Use pv_time_ops.steal_clock to account for stolen ticks.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
2015-12-21 14:40:55 +00:00
Stefano Stabellini
02c2433b3a arm: introduce CONFIG_PARAVIRT, PARAVIRT_TIME_ACCOUNTING and pv_time_ops
Introduce CONFIG_PARAVIRT and PARAVIRT_TIME_ACCOUNTING on ARM.

The only paravirt interface supported is pv_time_ops.steal_clock, so no
runtime pvops patching needed.

This allows us to make use of steal_account_process_tick for stolen
ticks accounting.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Christopher Covington <cov@codeaurora.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Russell King <linux@arm.linux.org.uk>
2015-12-21 14:40:54 +00:00
Gregory CLEMENT
3869394ae4 ARM: at91/dt: Add Support for the L+G VInCo platform
The Versatile Industrial Communication platform is a community oriented
board from Landis + Gyr. It comes with:
      - an RS-485 port
      - 2 Ethernet ports
      - a wireless M-BUS
      - a 4G modem
      - a 4MB SPI flash
      - a 4GB eMMC

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2015-12-21 15:19:04 +01:00
Arnd Bergmann
f1858b0e80 ARM: imx: select SRC for i.MX7
The i.MX7 Kconfig option had a couple of missing select lines that
I fixed already, but I missed HAVE_IMX_SRC:

arch/arm/mach-imx/built-in.o: In function `imx7d_init_irq':
platform-spi_imx.c:(.init.text+0x25a8): undefined reference to `imx_src_init'

This adds that one as well.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 0be5da9dc2 ("ARM: imx: imx7d requires anatop")
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-21 21:24:05 +08:00
Marek Vasut
91f69147d6 ARM: socfpga: dts: Enable MMC support at correct place in the DT
The socfpga.dtsi explicitly enabled MMC support, but not all boards are
equiped with an MMC card. There are setups which only have QSPI NOR.
Therefore, disable the MMC support on socfpga.dtsi level and enable it
on per-board basis.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alan Tull <atull@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Olof Johansson <olof@lixom.net>
Cc: Thor Thayer <tthayer@altera.com>
Cc: Vince Bridgers <vbridgers2013@gmail.com>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-12-21 00:44:21 -06:00
Afzal Mohammed
f541316928 ARM: multi_v7_defconfig: enable TPS65217 regulator
Enable TPS65217 regulator to have rootfs in MMC for Beagle Bone's.

Suggested-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Afzal Mohammed <afzal.mohd.ma@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-20 10:44:42 -08:00
Masahiro Yamada
20f0c63ccb ARM: uniphier: select PINCTRL
The UniPhier SoCs support pinctrl drivers.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-20 10:43:13 -08:00
Caesar Wang
94cf32b97b ARM: dts: rockchip: add the kylin board for rk3036
This patchset is the initiation version to try work
for kylin board.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-12-19 18:11:48 +01:00
Caesar Wang
187d7967a5 ARM: dts: rockchip: add the sdio/sdmmc node for rk3036
In general, the sdio/sdmmc is used by the wifi module
and sd card.

let's add the node for these function.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-12-19 18:11:36 +01:00
Xing Zheng
68556dd775 ARM: dts: rockchip: fix the pinctrl bias settings for rk3036
The pinctrl gpio pull up/down is incorrect since the rk3036 SoCs
can't set the status in the internal.

We should keep the default status for enable the gpio status,
In fact, the pull_none is the disable the gpio pull up/down.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-12-19 17:58:04 +01:00
Tony Lindgren
0b4d6972d7 ARM: dts: Fix UART wakeirq for omap4 duovero parlor
Looks like we're missing the wakeirq for the console uart for
duovero parlor. Let's add that as without it console acess just
hangs with PM enabled.

Cc: Arun Bharadwaj <arun@gumstix.com>
Cc: Ash Charles <ash@gumstix.com>
Cc: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-18 16:43:22 -08:00
Aleksei Mamlin
0e710f1f5b ARM: dts: sun7i: Enable PWM controller on Wexler TAB7200 tablet
Wexler TAB7200 tablet use channel 0 of the PWM controller for backlight dimming

Signed-off-by: Aleksei Mamlin <mamlinav@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-12-18 22:25:38 +01:00
Priit Laes
2c102c38d5 ARM: dts: sun4i: gemei-g9: Enable PA GPIO pin configuration
PA GPIO pin (PH15) controls power to external amplifier (FT2012Q).

Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-12-18 22:19:18 +01:00
Hans de Goede
53aa934609 ARM: dts: sun4i: Enable onboard codec used on the pov protab2-ips9 tablet
The pov protab2-ips9 tablet uses the A10's integrated audio codec,
enable it.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-12-18 22:18:19 +01:00
Hans de Goede
a692e00a77 ARM: dts: sun5i: Enable onboard codec used on the UTOO P66 tablet
The UTOO P66 tablet uses the A13's integrated audio codec, enable it.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-12-18 22:18:16 +01:00
Keerthy
fcf589581b ARM: dts: DRA7-EVM: Add regulator-allow-bypass property for ldo9
Add regulator-allow-bypass property for ldo9.

Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-18 08:43:30 -08:00
Keerthy
6686f744df ARM: dts: DRA72-EVM: Add regulator-allow-bypass property for ldo1 and ldo2
Add regulator-allow-bypass property for ldo1 and ldo2.

Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-18 08:43:04 -08:00
Vignesh R
2acb6c3ef8 ARM: dts: AM4372: add entry for qspi mmap region
Add qspi memory mapped region entries for AM43xx based SoCs. Also,
update the binding documents for the controller to document this change.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Vignesh R <vigneshr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-18 08:41:31 -08:00
Vignesh R
1929d0b5a8 ARM: dts: DRA7: add entry for qspi mmap region
Add qspi memory mapped region entries for DRA7xx based SoCs. Also,
update the binding documents for the controller to document this change.

Signed-off-by: Vignesh R <vigneshr@ti.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-18 08:40:47 -08:00
Arnd Bergmann
11c7a6c5a3 Merge branch 'treewide/cleanup' into next/multiplatform
The realview multiplatform series has a trivial conflict with
one of the treewide cleanups, let's just merge that in to
avoid having to resolve this later.

* treewide/cleanup:
  ARM: use "depends on" for SoC configs instead of "if" after prompt
  ARM/clocksource: use automatic DT probing for ux500 PRCMU
  ARM: use const and __initconst for smp_operations
  ARM: hisi: do not export smp_operations structures

Conflicts:
	arch/arm/mach-integrator/Kconfig
2015-12-18 17:07:52 +01:00
Arnd Bergmann
3f93c644c9 ARM: realview: build realview-dt SMP support only when used
The platsmp-dt.c file does not build when CONFIG_SMP is disabled:

platsmp-dt.c:84:2: error: unknown field 'smp_prepare_cpus' specified in initializer

This changes the Makefile to build it conditionally on CONFIG_SMP.
The legacy platsmp.c file is only used for ATAGS based builds, so
we can move it into the CONFIG_ATAGS conditional.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-18 17:03:59 +01:00
Linus Walleij
8c5eb925ac ARM: realview: select apropriate targets
Now that we have multiplatform support, let the RealView
defconfigs select all the RealView boards so we boot out of
the box like before. This updates both defconfigs.

Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-18 16:53:45 +01:00
Arnd Bergmann
86fff036fe Multiplatform support for the RealView
- Tested on the ARM PB11MPCore
 - Tested with boardfile boot
 - Tested with DeviceTree boot
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWdAsTAAoJEEEQszewGV1zMtsP/1So1gjBSf8NfLbRCndf4l3/
 jrviXeGEyGAzvyXvH+KB/24R10NpJMC5zEB8LiUP1Ig/cmNA+XVIJ9IkE8QsjsDx
 dA3aqYHTsXr8w8l6hzVX95GvAsxvg7hQ73rMsSg1x6r6pNeg859M4ZJis5gfB7Pf
 w76Qazl4jJUE79t768mxOKf46Af6D3y/Oa8dpsNW7w3ehzeEODI4N5BvUyZ50vKT
 j8ZdBs++S2ucW1s1zUTeo0wDjaOBK8gNmYKzDtwScCNs5K6l4GcggO0pkrX7MmN/
 quNHcvULU0qnzETMjss6wb4xCAenZ98hqHTnBL2NjHd9A1tvTEGBzRfFx4jb5EI6
 MspsOfxCLpj59QV7qwQJoYbFdzmQo6YgPn+lZoHA5wzxNqt2g0xiBscPYCVO30WT
 mYEF27dUDYzq8EH/BkQ/0dsPcWSNZVWpTYj/14+L766maFsPHJYAVnRk1iRNK9Gq
 uxdu9ZH8VusqFLFkikbNkj9xeFc9M0GN2F5AY0+Li24uzqjClessdXdfiOqQAWZ5
 px0ET819Zz+HG0F8+YNKiLL3Ybnhz8EB4NrncXwSJPrvOGt+xATqSUycqrxwwMsu
 a/kNRaZMRZ7jKdZPPHPESPXdJZKs0vGDThrEFMqKVTFtXfoGNQKdh/Ltixy+rPCH
 CX8QrAZPi7CqRUEMXmFp
 =tfk1
 -----END PGP SIGNATURE-----

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

Pull "Multiplatform support for the RealView" from Linus Walleij:

Here is the result of my application of the second part of Arnds
patchset, actually enabling multiplatform and getting the RealView
off the ground as a multiplatform target.

It is dependent on an outstanding patch to the irqchips tree bumping
the number of GICs to 2 for the RealView platform. I cannot say I will
be sleepless if these go in side by side: each branch will compile but
will not boot until both trees have been pulled hurting bisectability a
bit.

- Tested on the ARM PB11MPCore
- Tested with boardfile boot
- Tested with DeviceTree boot

* tag 'realview-multiplatform-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: realview: select apropriate targets
  ARM: realview: clean up header files
  ARM: realview: make all header files local
  ARM: no longer make CPU targets visible separately
  ARM: integrator: use explicit core module options
  ARM: realview: enable multiplatform
2015-12-18 16:42:47 +01:00
Linus Walleij
93b2d7b15a ARM: realview: select apropriate targets
Now that we have multiplatform support, let the RealView
defconfigs select all the RealView boards so we boot out of
the box like before. This updates both defconfigs.

Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-12-18 14:31:00 +01:00
Arnd Bergmann
38d2cfcc8d ARM: realview: clean up header files
This contains multiple trivial cleanups to the realview headers:

- removing the file names from the introductory comment
- removing the uncompress.h header that is unused
- removing the irqs.h header and NR_IRQS logic that is
  obsoleted by sparse IRQs

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-12-18 14:09:45 +01:00
Arnd Bergmann
6d407a6eac ARM: realview: make all header files local
Nothing includes these files any more, so we can simply move them
from arch/arm/mach-realview/include/mach/ to arch/arm/mach-realview.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[Two fixes added to make everything compile]
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-12-18 14:09:34 +01:00
Arnd Bergmann
17d44d7d87 ARM: no longer make CPU targets visible separately
Now that realview and integrator always select the correct CPU
type themselves based on the core tiles, there is no need to
still have them user-visible in arch/arm/mm/Kconfig. The
ARM925T symbol has been selected by the only user for many
years, so that can be removed along with the realview and
integrator specific ones.

This also solves randconfig build problems on realview.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-12-18 14:09:21 +01:00
Arnd Bergmann
abc466951a ARM: integrator: use explicit core module options
For consistency with the other platforms, this remove the CPU
selection logic in mm/Kconfig that was only used by integrator,
and adds specific options for each available core tile and core
module, which in turn select the correct CPUs.

This is consistent with the new way that we do it for realview
and all other platforms.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-12-18 14:09:08 +01:00
Arnd Bergmann
2934167dd0 ARM: realview: enable multiplatform
All obstacles are out of the way by now, so we can finally move realview
to multiplatform.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
[Rebased Kconfig, fixed if $(X) to if X in Makefile]
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-12-18 14:08:15 +01:00
Marek Vasut
dfd35b779d ARM: socfpga: Repair incorrectly applied MCV patch
For whatever reason, this patch was not applied verbatim and had all
tabs replaced with spaces. Replace them back by a quick sed.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alan Tull <atull@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: Thor Thayer <tthayer@altera.com>
Cc: Vince Bridgers <vbridgers2013@gmail.com>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-12-18 06:22:13 -06:00
Pavel Fedin
c7da6fa43c arm/arm64: KVM: Detect vGIC presence at runtime
Before commit 662d971584
("arm/arm64: KVM: Kill CONFIG_KVM_ARM_{VGIC,TIMER}") is was possible to
compile the kernel without vGIC and vTimer support. Commit message says
about possibility to detect vGIC support in runtime, but this has never
been implemented.

This patch introduces runtime check, restoring the lost functionality.
It again allows to use KVM on hardware without vGIC. Interrupt
controller has to be emulated in userspace in this case.

-ENODEV return code from probe function means there's no GIC at all.
-ENXIO happens when, for example, there is GIC node in the device tree,
but it does not specify vGIC resources. Any other error code is still
treated as full stop because it might mean some really serious problems.

Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
2015-12-18 12:01:58 +00:00
Vladimir Murzin
20475f784d arm64: KVM: Add support for 16-bit VMID
The ARMv8.1 architecture extension allows to choose between 8-bit and
16-bit of VMID, so use this capability for KVM.

Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
2015-12-18 10:15:12 +00:00
Vladimir Murzin
8420dcd37e arm: KVM: Make kvm_arm.h friendly to assembly code
kvm_arm.h is included from both C code and assembly code; however some
definitions in this header supplied with U/UL/ULL suffixes which might
confuse assembly once they got evaluated.
We have _AC macro for such cases, so just wrap problem places with it.

Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
2015-12-18 10:15:11 +00:00
Vladimir Murzin
9d4dc68834 arm/arm64: KVM: Remove unreferenced S2_PGD_ORDER
Since commit a987370 ("arm64: KVM: Fix stage-2 PGD allocation to have
per-page refcounting") there is no reference to S2_PGD_ORDER, so kill it
for the good.

Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
2015-12-18 10:15:11 +00:00
Marc Zyngier
e078ef8151 ARM: KVM: Cleanup exception injection
David Binderman reported that the exception injection code had a
couple of unused variables lingering around.

Upon examination, it looked like this code could do with an
anticipated spring cleaning, which amounts to deduplicating
the CPSR/SPSR update, and making it look a bit more like
the architecture spec.

The spurious variables are removed in the process.

Reported-by: David Binderman <dcb314@hotmail.com>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
2015-12-18 10:14:54 +00:00
Adam Ford
d01d879930 ARM: OMAP2+: LogicPD Torpedo: Revert Duplicative Entries
Revert 6f0f6c40b66 ("ARM: dts: Set VAUX1 and VAUX4 on Logic PD Torpedo")
because it It was already done and it's just a duplicate.  See:
2d11961f3e ("ARM: dts: Set VAUX1 and VAUX4 to 3.0V and 1.8V respectively")

Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 17:28:54 -08:00
Arnd Bergmann
d0b6342df0 Merge branch 'fixes' into next/multiplatform
The 'fixes' branch contains d5d4fdd86f ("irqchip/versatile-fpga:
Fix PCI IRQ mapping on Versatile PB") that is required for booting
the versatile platform prior to the rework in this branch, but
including both causes a build-time error.

I'm doing an evil merge here to pull in the fixes branch so we have
that commit included but at the same time revert the trivial change.
This gives us a bisectable history.

* fixes: (22 commits)
  fsl-ifc: add missing include on ARM64
  ls2080a/dts: Add little endian property for GPIO IP block
  dt-bindings: define little-endian property for QorIQ GPIO
  ARM64: dts: ls2080a: fix eSDHC endianness
  ARM: dts: vf610: use reset values for L2 cache latencies
  ARM: pxa: use PWM lookup table for all machines
  ARM: dts: berlin: add 2nd clock for BG2Q sdhci0 and sdhci1
  ARM: dts: berlin: correct BG2Q's sdhci2 2nd clock
  ARM: dts: am4372: fix clock source for arm twd and global timers
  ARM: at91: fix pinctrl driver selection
  ARM: at91/dt: add always-on to 1.8V regulator
  ARM: dts: vf610: fix clock definition for SAI2
  ARM: imx: clk-vf610: fix SAI clock tree
  ARM: ixp4xx: fix read{b,w,l} return types
  irqchip/versatile-fpga: Fix PCI IRQ mapping on Versatile PB
  ARM: OMAP2+: enable REGULATOR_FIXED_VOLTAGE
  ARM: dts: add dm816x missing spi DT dma handles
  ARM: dts: add dm816x missing #mbox-cells
  cpufreq: s3c24xx: Do not mark s3c2410_plls_add as __init
  bus: sunxi-rsb: unlock on error in sunxi_rsb_read()
  ...
2015-12-17 22:33:58 +01:00
Linus Torvalds
d7637d01be Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fixes from Dan Williams:

 - Two bug fixes for misuse of PAGE_MASK in scatterlist and dma-debug.
   These are tagged for -stable.  The scatterlist impact is potentially
  corrupted dma addresses on HIGHMEM enabled platforms.

 - A minor locking fix for the NFIT hot-add implementation that is new
   in 4.4-rc.  This would only trigger in the case a hot-add raced
   driver removal.

* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  dma-debug: Fix dma_debug_entry offset calculation
  Revert "scatterlist: use sg_phys()"
  nfit: acpi_nfit_notify(): Do not leave device locked
2015-12-17 11:20:13 -08:00
Felipe Balbi
54011103fb ARM: OMAP2+: AM43xx: select ARM TWD timer
Make sure to tell the kernel that AM437x devices have ARM TWD timer.

Signed-off-by: Felipe Balbi <balbi@ti.com>
[grygorii.strashko@ti.com: drop ARM Global timer selection, because
 it's incompatible with PM (cpuidle/cpufreq). So, it's unsafe to enable
 it unconditionally]
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 10:54:13 -08:00
Grygorii Strashko
0b3e6fca4d ARM: OMAP2+: am43xx: enable GENERIC_CLOCKEVENTS_BROADCAST
System will misbehave in the following case:
- AM43XX only build (UP);
- CONFIG_CPU_IDLE=y
- ARM TWD timer enabled and selected as clockevent device.

In the above case, It's expected that broadcast timer will be used as
backup timer when CPUIdle will put MPU in low power states where ARM
TWD will stop and lose its context. But, the CONFIG_SMP might not be
selected when kernel is built for AM43XX SoC only and, as result,
GENERIC_CLOCKEVENTS_BROADCAST option will not be selected also. This
will break CPUIdle and System will stuck in low power states.

Hence, fix it by selecting GENERIC_CLOCKEVENTS_BROADCAST option for
AM43XX SoCs always and add empty tick_broadcast() function
implementation - no need to send any IPI on UP. After this change
timer1 will be selected as broadcast timer the same way as for SMP,
and CPUIdle will work properly.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 10:53:28 -08:00
Peter Ujfalusi
f2e6a0a913 ARM: OMAP2+: Remove device creation for omap-pcm-audio
The omap-pcm in ASoC is no longer a platform device. No need to create this
device anymore.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 10:34:41 -08:00
Peter Ujfalusi
65a52a212a ARM: OMAP1: Remove device creation for omap-pcm-audio
The omap-pcm in ASoC is no longer a platform device. No need to create this
device anymore.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 10:34:40 -08:00
Adam Ford
485fa1261f ARM: OMAP2+: LogicPD Torpedo + Wireless: Add Bluetooth
Bindings for the WL1283 Bluetooth was removed from the shared transport
driver in commit c0bd1b9e58 ("Revert ti-st: add device tree support")
Until we havea better binding, we need to use the platform data to
initialize Bluetooth.

Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 10:30:02 -08:00
Adam Ford
60db554de3 ARM: OMAP2+: LogicPD Torpedo: Add LCD Type 15 Support
Add basic support for Logic PD type 15 display for older development kits.
This uses GPIO for the backlight.

Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 10:29:51 -08:00
Uri Mashiach
d284aa27d9 ARM: dts: cm-t335: add support for bluetooth
bluetooth HW is WLS1271 chip connected to UART1.

Device tree modifications:
- Pinmux for UART1.
- Pinmux for bluetooth enable GPIO.

Bluetooth enable GPIO is set to enable during startup by setting the
relevant pinmux pin to pull-up.

Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 10:04:22 -08:00
Uri Mashiach
3089e40e9f ARM: dts: cm-t335: add support for DVI/LCD
Add pinmux configuration for DVI/LCD.
Add DRM display driver node with timing configurations for DVI and LCD.
Add I2C GPIOs configurations for DVI and LCD enable.

Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 10:04:22 -08:00
Uri Mashiach
98e5d8987c ARM: dts: cm-t335: add support for I2C GPIO expander
The I2C GPIO expander (PCA9555) adds 16 GPIOs to the module.

Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 10:04:22 -08:00
Uri Mashiach
c6135a6fd1 ARM: dts: cm-t335: add support for SBC-T335
Add basic support for the SBC-T335.

CompuLab SBC-T335 is a single baseboard computer.
The SBC-T335 is based on the Texas Instruments Cortex-A8 Sitara AM3354
SoC.

Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 10:03:47 -08:00
Ilya Ledvich
f3e1dee242 ARM: dts: cm-t335: add support for USB0
Enable USB0.

Signed-off-by: Ilya Ledvich <ilya@compulab.co.il>
Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 10:02:02 -08:00
Sudeep Holla
0c4d63b323 ARM: dts: omap: replace legacy *,wakeup property with wakeup-source
Though the keyboard and other driver will continue to support the legacy
"gpio-key,wakeup", "linux,wakeup" boolean property to enable the wakeup
source, "wakeup-source" is the new standard binding.

This patch replaces all the legacy wakeup properties with the unified
"wakeup-source" property in order to avoid any futher copy-paste
duplication.

Cc: "Benoît Cousson" <bcousson@baylibre.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 09:52:32 -08:00
Sudeep Holla
3efda00129 ARM: dts: am335x: replace gpio-key,wakeup with wakeup-source property
Though the keyboard driver for GPIO buttons(gpio-keys) will continue to
check for/support the legacy "gpio-key,wakeup" boolean property to
enable gpio buttons as wakeup source, "wakeup-source" is the new
standard binding.

This patch replaces the legacy "gpio-key,wakeup" with the unified
"wakeup-source" property in order to avoid any futher copy-paste
duplication.

Cc: "Benoît Cousson" <bcousson@baylibre.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 09:51:48 -08:00
Peter Ujfalusi
cce1ee0001 ARM: DTS: am437x: Use the new DT bindings for the eDMA3
Switch to use the ti,edma3-tpcc and ti,edma3-tptc binding for the eDMA3 and
enable the DMA even crossbar with ti,am335x-edma-crossbar.
With the new bindings boards can customize and tweak the DMA channel
priority to match their needs. With the new binding the memcpy is safe
to be used since with the old binding it was not possible for a driver
to know which channel is allowed to be used as non HW triggered channel.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 09:43:08 -08:00
Peter Ujfalusi
b5e5090660 ARM: DTS: am33xx: Use the new DT bindings for the eDMA3
Switch to use the ti,edma3-tpcc and ti,edma3-tptc binding for the eDMA3 and
enable the DMA even crossbar with ti,am335x-edma-crossbar.
With the new bindings boards can customize and tweak the DMA channel
priority to match their needs. With the new binding the memcpy is safe
to be used since with the old binding it was not possible for a driver
to know which channel is allowed to be used as non HW triggered channel.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-17 09:43:08 -08:00
Arnd Bergmann
70722803de ARM: make default platform work for NOMMU
Moving ARCH_VERSATILE into ARCH_MULTIPLATFORM means that it no longer
works as the default target for MMU-less kernels. While we might
want to get that working again in the future, it's also a rather
bad default, and it makes sense to make ARM_SINGLE_V7M the default
because that is what realistically all NOMMU users on ARM are using,
and it actually is what gets selected by default in the absence of
versatile in the choice statement.

Related to this, 'allnoconfig' kernels fail to link with the new
default, as they do not include a machine record:

arm-linux-gnueabi-ld: no machine record defined

For ARCH_MULTIPLATFORM kernels, we avoid this error by using a
default machine descriptor that works for all trivial platforms,
like ARCH_VIRT. The same reasoning applies for ARM_SINGLE_V7M,
as that can also boot with empty machine descriptors both on
qemu and on real hardware, as long as all the drivers are present.

We could also follow up with a patch to remove the existing
machine descriptors for the ARMv7M platforms, the only callback
pointer the four platforms contain today is the armv7m_restart
handler and we can simply make that the default for v7M with an
add-on patch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-17 17:45:47 +01:00
Arnd Bergmann
06920d4eea ARM: debug-ll: move DEBUG_LL_UART_EFM32 to correct Kconfig location
I accidentally move the DEBUG_LL_UART_EFM32 option when sorting all
other options alphanumerically, but it belongs into the same group
as DEBUG_LL_UART_8250 and DEBUG_LL_UART_PL01X.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 1dc9341 ("ARM: debug-ll: reorder Kconfig alphanumerically")
2015-12-17 17:04:48 +01:00
Arnd Bergmann
e45a1e18a5 ARM: defconfig: use correct debug_ll settings
The debug-ll infrastructure can be configured in two ways, either
by selecting a platform specific debug option, or by picking one
of the generic options (8250 or pl01x typically). For compatibility
with multiplatform kernels, we have changed a couple of platforms
to use the former method now when they used to use the latter.

Unfortunately, this broke the defconfigs because now they still
enable CONFIG_DEBUG_LL_UART_PL01X or CONFIG_DEBUG_LL_UART_8250,
and we no longer configure the correct register addresses
automatically.

Embarrassingly, this was only found in linux-next when the
defconfig builds turned up errors for multiple people, and I
had not caught those in my own tests, which were done using
the randconfig fixes patchset on top, and that has a workaround
to avoid a build error when the addresses are not configured.

The error was something like:

.config:2010:warning: symbol value '' invalid for DEBUG_UART_PHYS
.config:2011:warning: symbol value '' invalid for DEBUG_UART_VIRT

This patch avoids the problem by removing the respective
statements from the defconfig files. Any out of tree defconfig
files on the platforms I have changed will have to do the same
change or run into the build error above. Any users that have
a full .config already set the correct DEBUG_UART_PHYS/VIRT
addresses and do not need to change anything.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 4db22c1 ("ARM: debug-ll: rework integrator/versatile handling")
Fixes: f06455f ("ARM: debug-ll: rework ep93xx handling")
Fixes: c047f52 ("ARM: debug-ll: reorganize mvebu debug uart config")
Fixes: 59bd4c3 ("ARM: debug-ll: rework lpc32xx handling")
2015-12-17 16:39:08 +01:00
Nicolas Pitre
42f25bddd0 ARM: 8477/1: runtime patch udiv/sdiv instructions into __aeabi_{u}idiv()
The ARM compiler inserts calls to __aeabi_idiv() and
__aeabi_uidiv() when it needs to perform division on signed and
unsigned integers. If a processor has support for the sdiv and
udiv instructions, the kernel may overwrite the beginning of those
functions with those instructions and a "bx lr" to get better
performance.

To ensure that those functions are aligned to a 32-bit word for easier
patching (which might not always be the case in Thumb mode) and that
the two patched instructions end up in the same cache line, a 8-byte
alignment is enforced when ARM_PATCH_IDIV is selected.

This was heavily inspired by a previous patch from Stephen Boyd.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2015-12-17 10:29:01 +00:00
Prasanna Karthik
38fc2f6c98 ARM: 8476/1: VDSO: use PTR_ERR_OR_ZERO for vma check
Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR

Signed-off-by: Prasanna Karthik <mkarthi3@visteon.com>
Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2015-12-17 10:29:01 +00:00
Nicolas Pitre
b563d06451 ARM: 8453/2: proc-v7.S: don't locate temporary stack space in .text section
The proc-v7.S code uses a small temporary stack to preserve register
content in its setup code. This stack is located in the .text section
which is normally meant to be read-only.

Move that temporary stack to the .bss section and get its address in
a position independent way, similarly to what we do in other parts
of the kernel.

While at it, one comments was updated to reflect reality, and the list
of saved registers in the proc-v7.S case is updated to match the comment
next to it for coherency.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2015-12-17 10:29:01 +00:00
Simon Horman
d01c8bec91 ARM: shmobile: r8a779x: use SoC-specific usb-dmac compatibility strings
Use recently SoC-specific compatibility strings in r8a779[01] device trees.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-17 10:10:54 +09:00
Jeffy Chen
2608224c81 ARM: rockchip: enable support for RK3228 SoCs
Add a rockchip,rk3228 compatible.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-12-16 22:15:06 +01:00
Heiko Stuebner
26dc88fbb9 ARM: rockchip: use const and __initconst for rk3036 smp_operations
The newly added rk3036 smp operations missed the wholesale fixup from
Masahiro Yamada. So fix that now.

Reported-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-12-16 22:15:05 +01:00
Stephen Boyd
4394810265 ARM: defconfig: qcom: Enable SSBI drivers
Enable some ssbi drivers present on msm8660, msm8960 and apq8064
devices so that we fully exercise the devices present in the dts
files.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
2015-12-16 15:11:31 -06:00
Linus Torvalds
a5e90b1b07 Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
 "Further ARM fixes:
   - Anson Huang noticed that we were corrupting a register we shouldn't
     be during suspend on some CPUs.
   - Shengjiu Wang spotted a bug in the 'swp' instruction emulation.
   - Will Deacon fixed a bug in the ASID allocator.
   - Laura Abbott fixed the kernel permission protection to apply to all
     threads running in the system.
   - I've fixed two bugs with the domain access control register
     handling, one to do with printing an appropriate value at oops
     time, and the other to further fix the uaccess_with_memcpy code"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8475/1: SWP emulation: Restore original *data when failed
  ARM: 8471/1: need to save/restore arm register(r11) when it is corrupted
  ARM: fix uaccess_with_memcpy() with SW_DOMAIN_PAN
  ARM: report proper DACR value in oops dumps
  ARM: 8464/1: Update all mm structures with section adjustments
  ARM: 8465/1: mm: keep reserved ASIDs in sync with mm after multiple rollovers
2015-12-16 10:57:24 -08:00
Bjorn Andersson
3d2eaeaa09 ARM: defconfig: Update qcom_defconfig
This enables smem, smd, rpm, regulators, pmic pinctrl and hwspinlock as
these platform features are now merged. It enables gpio-keys as this is
used by most boards and enables fhandle and cgroups, so we can boot
systemd.

Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
2015-12-16 00:37:21 -06:00
Andy Gross
4add107457 arm: dts: Add support for PMA8084 on APQ8084
This patch adds support for the PMA8084 regulators found on APQ8084
platforms.

Signed-off-by: Andy Gross <agross@codeaurora.org>
Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
2015-12-15 23:35:19 -06:00
Andy Gross
53ced99d70 arm: dts: Add RPM/SMD support on APQ8084
This patch adds support for RPM and SMD nodes that are present on APQ8084
platforms.

Signed-off-by: Andy Gross <agross@codeaurora.org>
Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
2015-12-15 23:35:19 -06:00
Andy Gross
64ab88638a arm: dts: Add APQ8084 SMEM nodes
This patch adds all the required nodes to support SMEM on APQ8084

Signed-off-by: Andy Gross <agross@codeaurora.org>
Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
2015-12-15 23:35:18 -06:00
Ivan T. Ivanov
426ac151ec ARM: dts: qcom: apq8064-ifc6410 Use hardware flow control for GSBI6
GSBI6 UART module is connected to BT chip, which uses
hardware flow control lines. Enable them on SoC side.

Signed-off-by: Ivan T. Ivanov <ivan.ivanov@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
2015-12-15 23:35:18 -06:00
Georgi Djakov
aa2691279e arm: dts: qcom: apq8064: Add fixed rate on-board oscillators
Currently the rates of the xo and sleep clocks are hard-coded in the
GCC driver, but this is a board layout description that actually should
be in the DT. Moving them into DT also allows us to insert the RPM
controlled clocks between the DT and GCC clocks.

Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-12-15 23:35:18 -06:00
Arnd Bergmann
3081dc9eff mvebu soc for 4.5 (part 1)
- orion5x/mv78xx0 multiplatform conversion
 - legacy dove PMU support conversion
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZq1uEACgkQCwYYjhRyO9XZ8ACdHuhMhzgLQ3lR/wUj0Eaj6udh
 AuMAn2JdAcBRYkI6B0PkPK5igJugASzQ
 =pkme
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-soc-4.5-1' of git://git.infradead.org/linux-mvebu into next/multiplatform

Merge "mvebu soc for 4.5 (part 1)" from Gregory CLEMENT:

- orion5x/mv78xx0 multiplatform conversion
- legacy dove PMU support conversion

* tag 'mvebu-soc-4.5-1' of git://git.infradead.org/linux-mvebu:
  ARM: dove: convert legacy dove to PMU support
  soc: dove: add legacy support to PMU driver
  ARM: orion5x: multiplatform support
  ARM: orion5x: clean up mach/*.h headers
  ARM: mv78xx0: multiplatform support
  ARM: mv78xx0: clean up mach/*.h headers
  ARM: orion: use SPARSE_IRQ everywhere
  ARM: orion: always use MULTI_IRQ_HANDLER
  ARM: orion: move watchdog setup to mach-orion5x

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-dove/include/mach/entry-macro.S
	arch/arm/mach-orion5x/include/mach/entry-macro.S
2015-12-16 00:57:08 +01:00
Arnd Bergmann
22ba14f41c The board and infrastructure changes for RealView
multiplatform and extended DT support.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWb9LqAAoJEEEQszewGV1z1I4QAIgylTG1hftD5xCtaKsgJv5X
 pcp+eVVCeYjeO3AbknrXzBlty0u3/rDOR6n9aUn7ci63qErGi2GeoZ5glo6y3aOU
 qKo2/M0LOoP3y6SGxMjaPTTpStjKsaj2XLjHLNrSHAKXsvoFB69vnAlQh2jU+ohX
 JEl9wvkugMWicGaiooWQfG7OAf2Gb6AFAKQUfYNVNNXBTD13oQcFRgLwBKDkNlc9
 7N6yzPQDNQiauytr7Ji/49fbkiOLFSB5yllhecb37F/b56XprGvsXJTRwsQhPwbj
 ig28qu/g7LhfnkZUOTwhWH6WdyFarMlpA8oHHKrZBeGySgvdjXBVYH4IQAfhT2N9
 WSh/he+w8T2+oMVj97gLSxKiP4ugUSsBR6daq5X8NESobxFVYzmFIYQxKxOwFif4
 JDWvOKaQsRhx42iAq3CIMkh7yQsBC4tJjtyvVwHuGeC2zRlyODbBCnN4OGKDdYpJ
 +VY4kr48Yld5IxYm6J6fXOEWTcFw2n/hvEVsik5mmgw1rYivJsCcvcVxv04xZYCl
 6d13eCaSh2TfeKYs/Qf2yy3hmps4dWFcd18/xWRyFdnkCs5qGRbtgLiAQtUnQAGm
 bpaI/rYeRnnF80af2dhpZT2i0zBL9uuur7FYZDB9xsQDOkqnCYxKvSW1CfNg5Gtc
 senI3dczeTC3NtwRp4eC
 =Zhx3
 -----END PGP SIGNATURE-----

Merge tag 'realview-base-armsoc-1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/multiplatform

Merge "Realview multiplatform support" from Linus Walleij:

The board and infrastructure changes for RealView
multiplatform and extended DT support.

* tag 'realview-base-armsoc-1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: realview: add an DT SMP boot method
  ARM: realview: select SP810 and ICST for the DT variant
  soc: versatile: add support for the PB11MPCore
  clk: versatile-icst: add device tree support
  clk: versatile-icst: refactor to allocate regmap separately
  clk: versatile-icst: convert to use regmap
  ARM: realview: remove private barrier implementation
  ARM: no longer force unbuffered DMA for realview
  clk/realview: stop using machine headers
  ARM: realview: don't map undefined PCI registers
  ARM: realview: remove sparsemem hack

Conflicts:
	drivers/clk/versatile/Kconfig
2015-12-16 00:56:18 +01:00
Arnd Bergmann
a436848cc7 Fixes for ti81xx for v4.5 merge window. We have hp t410 already booting
in mainline kernel with it's bootloader configured clocks.  However,
 trying to boot dm814x-evm uncovered all kind of issues with the timer
 clock. To keep t410 booting, these issues need to be fixed in a specific
 order and this branch contains both device tree and code changes.
 
 To summarize the changes, we had missing ranges for clocks to probe,
 missing aliase for clocks, wrong registers for divder clocks, and bad
 address for the control module. All these went unnoticed earlier as
 things worked without errors by luck and I did not pay much attention
 to them until I got hold of a dm814x-evm and I noticed it did not boot.
 
 As these are fixes for features that never worked, these can wait for
 v4.5 merge window no problem.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWag8GAAoJEBvUPslcq6VzDmwP/3Zcu9WU4C/vTm3zig273PbV
 qmGMc5FshVmlInBEDE3FaCbE3EFscH1DfGP/rYV6e2bPZNl/NIhns0GlZdPA35TO
 TgXqijdoEOTqMHuCVQtkZkqPfCDR6JIGfnJ7Hk87gph/zDETRPBalAZKfqzsk2qg
 rAXOVCLCfhRqPO0Miav+VUS/7xZ8Qsz6ItnRmAr+dv95Wicq9OQoyG3Yrk3XEcDW
 PMnjoHCLaX9KdIyckLX9gWJP/qOL2eCHve45YliXxNYsh/h0CVSxqBkqhYydNgrm
 XqUOeRIja3pBV9ov3Y+jQn/9Y4cbKEkw168YQkMk5WNFbHZrAdV35e7JHpm6Q+un
 oH+w8UmncjwObYwkr6AmgOCTeuvAU76FtlPyD/Ct6oHk2hJjJ18AUCRgiUcZ5NEN
 Lx0NGWyZmNbMe7aqLHPEsrz+3SBir53xOFp8fElIvNM1eURP7nhBIX5SpNXjrZk1
 gpvlHROcZy2kYi5cjcBRHh4kZlHJuWFReLXj7L00YLAR67VHQeq8rZ212WZhef/o
 PGCBJonr1Tfhpe4iWRU4Z/Tm9c4DyO+yWQcHk/GjphACFEH37gdkH3Qzq4CFKz/6
 bQtKd4ky/0G965S2bFk5tljelU/+ro4jryE0yU3ip/5aSTlPb3LeZtd6+TzvUKg0
 96brOPxlxBBh/gQ0ExB6
 =Mesm
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.5/81xx-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

Merge "omap fixes for 81xx for v4.5 merge window" from Tony Lindgren:

Fixes for ti81xx for v4.5 merge window. We have hp t410 already booting
in mainline kernel with it's bootloader configured clocks.  However,
trying to boot dm814x-evm uncovered all kind of issues with the timer
clock. To keep t410 booting, these issues need to be fixed in a specific
order and this branch contains both device tree and code changes.

To summarize the changes, we had missing ranges for clocks to probe,
missing aliase for clocks, wrong registers for divder clocks, and bad
address for the control module. All these went unnoticed earlier as
things worked without errors by luck and I did not pay much attention
to them until I got hold of a dm814x-evm and I noticed it did not boot.

As these are fixes for features that never worked, these can wait for
v4.5 merge window no problem.

* tag 'omap-for-v4.5/81xx-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Remove useless check for legacy booting for dm814x
  ARM: OMAP2+: Enable GPIO for dm814x
  ARM: dts: Fix dm814x pinctrl address and mask
  ARM: dts: Fix dm8148 control modules ranges
  ARM: OMAP2+: Fix timer entries for dm814x
  ARM: dts: Fix some mux and divider clocks to get dm814x-evm booting
  ARM: OMAP2+: Add DPPLS clock manager for dm814x
  clk: ti: Add few dm814x clock aliases
  ARM: dts: Fix dm814x entries for pllss and prcm
2015-12-16 00:14:25 +01:00
Arnd Bergmann
8d08689dd3 SoCFPGA DTS update for v4.5
- Add DT board file for Denx MCVEVK board
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWZ1NZAAoJEBmUBAuBoyj0uEAP/jKwgfQUwTW8VYG+qjL0fzUU
 A8HXGjBza61dCav+lf7bKPrjzYMgyfsMRtwbQ+xYTEUzWVOXhIHMaAPs522sEjvQ
 WLDNSE9pLi5eApi+OGkSVRP8/8XPCbBpt01FSW5DFKjH2UOyYe4YKUmJC35PPPz9
 flSLRPypoTBq0XtVtAzuGVpdz92UQuiFNLW/UDruitrTl2gMgSLrQ/nP1aiFdYCR
 ZtIDiP/sqSv5FrmjyarBl+KMN8DLS8LyZIVeCTSLu1Wh9Mhjo8qLHzUX4oNZWxu1
 4ouaFBbaviUZTiW1qh6Fu/F8+XpLkhBKkkpdLjNO1HItJo3iS5VMViEpaRquq4f+
 WpcMQlW6UMGmW9UE2aCM7jwSiOC59MYfM0y3P6HfMkXQaGMfR2/MrBCIdOZE09H5
 nGHBELolcwCI98u4NAfRtEqr9UOc9wcGekP/4qsoy+wRV3Epv1mOYP9hAJu2bS83
 oH6ZQronWvkwHQrt4IA6KQ0zFxEUy0n6uflncILiujzwjXqzghdEaPZxtDio4+cF
 Zamc80l6LAoT29WFECnchH3YZ02JDnjw5rHe53Q8naTSY1nUCiK6y2ngT6QeeByp
 WlpimGXyEWN797bL6tnpdkIXrXzE087sQFTBMOi9s3DSIQGtDeNP4CUxRMtV0KYQ
 kCYfSsSkLJTKSrqH6iWi
 =DaLC
 -----END PGP SIGNATURE-----

Merge tag 'socfpga_dts_for_v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

Merge "SoCFPGA DTS update for v4.5" from Dinh Nguyen:

- Add DT board file for Denx MCVEVK board

* tag 'socfpga_dts_for_v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: Add support for DENX MCV SoM and MCVEVK baseboard
2015-12-16 00:06:21 +01:00
Arnd Bergmann
8ea1c981b6 The device tree changes for the continued RealView DT
support.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWb9NkAAoJEEEQszewGV1zVIIP/iRfWwsmuOscmw7hl25E5h1U
 KWb8Q0b71vkDDe5rhCGZzahdosX+BVnP2gE4Ft0p1ekgFkIoGEL4qCfiMgs8cOHn
 RxraRkkS7U9CpT9OpOyew96VyPA5yoOWLes0VxUJ9vNGgE79UoaRpMzNYnpIBAVE
 vfZXT1JFXvz9ZoWL6jnehsafrLSqJpXCcbMA28i6Wx4BMSSjkXp0MGLxp5eDjebM
 EWuxfgLpdoZvTM6Uwzs1KEk/DcyqgdfwrOCHvtd66lKvTZSzkvc82jOF18s2tjZs
 355eWuEvsyVHAak+QWW1QGxayXGKhbPjPmNUHXRrBE4y1FGncJtnrKGe9eNimvhQ
 ge8/EAeImqg8LrQ4Rea9wNh/VmVn+BHZgShHRI6BdzIOiCKLhyRWQJ4lgcmLf53C
 r8SfRL2lOasGvgfBEAb30a9JRVGSPyCWufqmQ6LQtrCwBu7VHzsl/9VrJemZN9TD
 dd5FboClHZUOgJA9la1uT/5qlIA3bfucJ3cHWPYFGbv5pErdNWpBI+GNQhN0QTQq
 be8gCM5MvSg1zXflBbvD+afZvmfDZl2DAc80asGywp5vumpH2nj4RgkZpJoisb/H
 V9hvlcPVYOvCrgTRXrTNyRU6d0VZc2DHMZqYP04KqmYJKBS4sAyBiEpLyZ8CeCQA
 BLvA139rl6/MqQo5sIkQ
 =De8M
 -----END PGP SIGNATURE-----

Merge tag 'realview-base-armsoc-2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/dt

Merge "Realview DT files" from Linus Walleij:

The device tree changes for the continued RealView DT
support.

* tag 'realview-base-armsoc-2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: realview: add device tree for PB11MPCore
  clk: add ARM syscon ICST device tree bindings
  ARM: add DT bindings for the ARM11MPCore CPU cluster
2015-12-16 00:04:26 +01:00
Arnd Bergmann
7379d96bda Merge branch 'versatile/multiplatform' into next/multiplatform
Merge "ARM Versatile multi-platform support" from Rob Herring:

Arnd lit a fire under me to dust this off and get it merged. So here it
is. The main change from prior version is I merged all the code to a
single file. It's a bigger patch than I'd like, but I don't think trying
to do it in multiple steps is worth it.

This is dependent on some solution for the default platform choice on
!MMU builds (allnoconfig) as it can't be Versatile after this series.
Arnd has some ideas on how to address that.

This is tested under QEMU. Linus previously tested this on actual h/w
and had a problem with the display identification which needs
investigation or agreement to worry about it if and when someone
actually cares.

* versatile/multiplatform:
  ARM: versatile: convert to multi-platform
  ARM: versatile: merge mach code into a single file
  ARM: versatile: switch to DT only booting and remove legacy code
  ARM: versatile: add DT based PCI detection

Acked-by: Marc Zyngier <marc.zyngier@arm.com>
2015-12-15 23:55:32 +01:00
Rob Herring
a29da136de ARM: versatile: convert to multi-platform
Now that all the prerequisites are in place, we can enable Versatile
boards for multi-platform kernels.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 23:54:48 +01:00
Rob Herring
a709678921 ARM: versatile: merge mach code into a single file
With DT-only support now in place and most of the legacy code removed,
the separation of core.c and versatile_dt.c makes little sense. The
headers in mach include directory also have to move for multi-platform
support, but with a single .c file the remaining definitions needed can
also be moved into the versatile_dt.c.

In the move, the system registers and IB2 registers are converted to
run-time mappings and all register accesses converted to use
readl/writel.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 23:54:43 +01:00
Rob Herring
16956fed35 ARM: versatile: switch to DT only booting and remove legacy code
With DT support for clocks, irqchips, timers, and PCI now in place, DT
based booting has feature parity with non-DT legacy boot. The final
piece is actually enabling common clock support on Versatile. Enabling
full DT support requires either removing the old Versatile clock code,
updating the legacy boot to use the common clock code, or making DT and
legacy boot mutually exclusive. Given that removing legacy boot code is
the goal anyway, I am going with the 1st option.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 23:53:21 +01:00
Rob Herring
a8e2894c12 ARM: versatile: add DT based PCI detection
Disable the Versatile PCI DT node when no PCI backplane is detected. This
will prevent the Versatile PCI driver from probing when PCI is not
populated.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 23:53:10 +01:00
Arnd Bergmann
ee5d874271 ARM: pxa: mark ezx structures as __maybe_unused
The ezx platform contains multiple machine descriptors, but not all
of them use all of the data structures, and it's possible to disable
all of the machines, which produces some harmless warnings:

mach-pxa/ezx.c:53:26: warning: 'ezx_pwm_lookup' defined but not used [-Wunused-variable]
mach-pxa/ezx.c:86:31: warning: 'ezx_fb_info_1' defined but not used [-Wunused-variable]
mach-pxa/ezx.c:107:31: warning: 'ezx_fb_info_2' defined but not used [-Wunused-variable]
mach-pxa/ezx.c:113:32: warning: 'ezx_devices' defined but not used [-Wunused-variable]
mach-pxa/ezx.c:117:22: warning: 'ezx_pin_config' defined but not used [-Wunused-variable]

This marks all those structures as __maybe_unused to avoid the warnings.
Obviously a configuration that contains the ezx platform but no specific
model is a bit silly, but it should not cause compile-time warnings.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
2015-12-15 23:50:13 +01:00
Arnd Bergmann
f41bd6afb7 ARM: pxa: mark raumfeld init functions as __maybe_unused
The raumfeld.c file contains three similar machine definitions,
each with their own init function. If one or more of them are
disabled, we get compile-time warnings:

arm/mach-pxa/raumfeld.c:1070:123: warning: 'raumfeld_connector_init' defined but not used [-Wunused-function]
arm/mach-pxa/raumfeld.c:1082:123: warning: 'raumfeld_speaker_init' defined but not used [-Wunused-function]

This marks the functions as __maybe_unused to avoid the warnings.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Daniel Mack <daniel@zonque.org>
2015-12-15 23:50:09 +01:00
Arnd Bergmann
f39c42f5f9 ARM: pxa: cm-x2xx: avoid duplicate macro warnings
In an old commit, we worked around the duplicate definition of
GPIO24_SSP1_SFRM in cm-x2xx.c, which includes files for both
pxa25x and pxa27x. Apparently the problem has come back and we
now have four additional duplicate symbols that cause warnings:

In file included from /git/arm-soc/arch/arm/mach-pxa/pxa27x.h:7:0,
                 from /git/arm-soc/arch/arm/mach-pxa/cm-x2xx.c:27:
/git/arm-soc/arch/arm/mach-pxa/mfp-pxa27x.h:21:0: warning: "GPIO86_GPIO" redefined
 #define GPIO86_GPIO  MFP_CFG_IN(GPIO86, AF0)

This uses the same hack as before and undefines all symbols that
are defined more than once. Fortunately, cm-x2xx does not need
any of these.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
2015-12-15 23:50:00 +01:00
Arnd Bergmann
8864eaca90 Merge branch 'mmp/multiplatform' into next/multiplatform
* mmp/multiplatform:
  ARM: mmp: avoid unused functions
  ARM: mmp: move into ARCH_MULTIPLATFORM
  ARM: mmp: make all header files local
  ARM: mmp: make plat-pxa build standalone
  ARM: mmp: remove remaining legacy pxa-dma support
  ARM: mohawk: allow building with MMU disabled
  ARM: make xscale iwmmxt code multiplatform aware
  clk: mmp: stop using platform headers
2015-12-15 23:45:45 +01:00
Arnd Bergmann
fb4f042429 Merge branch 's3c64xx/multiplatform' into next/multiplatform
* s3c64xx/multiplatform:
  ARM: s3c64xx: allow building without board support
  ARM: s3c64xx: multiplatform support
  ARM: s3c64xx: use common debug-ll implementation
  ARM: s3c64xx: use new adc/touchscreen driver
  iio: exynos-adc: add experimental touchscreen support
  ARM: s3c64xx: enable sparse IRQ support
  ARM: s3c64xx: prepare initcalls for multiplatform
  gpio: samsung: move gpio-samsung driver back to platform code
  ASoC: samsung/smartq: use dynamic registration
  Input: s3c2410_ts: fix S3C_ADC dependency

Conflicts:
	arch/arm/Kconfig.debug
2015-12-15 23:45:22 +01:00
Arnd Bergmann
35d3aad492 Merge branch 'multiplatform/debug-ll' into next/multiplatform
* multiplatform/debug-ll:
  ARM: debug-ll: reorder Kconfig alphanumerically
  ARM: debug-ll: rework footbridge handling
  ARM: debug-ll: rework lpc32xx handling
  ARM: debug-ll: rework gemini handling
  ARM: debug-ll: rework integrator/versatile handling
  ARM: debug-ll: rework SPEAr handling
  ARM: debug-ll: rework ep93xx handling
  ARM: debug-ll: reorganize mvebu debug uart config
  ARM: debug-ll: fix UART configuration with ARCH_KEYSTONE
2015-12-15 23:44:30 +01:00
Arnd Bergmann
1dc93416ea ARM: debug-ll: reorder Kconfig alphanumerically
The file has gotten a little out of sync, as platforms got
added in the wrong place, or have been renamed. This moves
the options around, but should not change any functionality.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 23:43:36 +01:00
Arnd Bergmann
0045c0dd2f ARM: debug-ll: rework footbridge handling
Footbridge has two debug ports that are handled a bit differently:

The 8250 port uses the normal debug/8250.S implementation that is shared
with a lot of other platforms, but it relies on the DEBUG_UART_8250
option to be turned on automatically instead of being selected by
DEBUG_FOOTBRIDGE_COM1 as we do for most other platforms. I'm changing
this to use a 'select' and change the dependency to the debug symbol
rather than the platform symbol for consistency.

The DC21285 UART has a separate top-level option, and relies on
the traditional include/mach/debug-macro.S method. With the s3c64xx
multiplatform series queued up for 4.5, it is now the last one that does
this, so by moving this file to include/debug/dc21285.S, we can get
all platforms to do things the same way.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 23:43:29 +01:00
Arnd Bergmann
59bd4c3827 ARM: debug-ll: rework lpc32xx handling
LPC32xx can not yet be configured in a multiplatform kernel, but
if we ever get there, enabling one of the LPC32xx platforms
while trying to use DEBUG_LL for another platform can default to
the wrong UART address, as the options are purely based on the
architecture being enabled or not.

This changes the logic to use the LPC32xx default addresses only
if we have also picked the respective Kconfig symbols introduced
here.

While we're at it, this also reorders the virtual address as
it should be.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Vladimir Zapolskiy <vz@mleia.com>
2015-12-15 23:42:03 +01:00
Arnd Bergmann
d7175a3b79 ARM: debug-ll: rework gemini handling
Gemini can not yet be configured in a multiplatform kernel, but
if we ever get there, enabling one of the gemini platforms
while trying to use DEBUG_LL for another platform can default to
the wrong UART address, as the options are purely based on the
architecture being enabled or not.

This changes the logic to use the gemini default addresses and
the flow control settings only if we have also picked the respective
Kconfig symbols introduced here.

While we're at it, this also reorders the virtual address as
it should be.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
2015-12-15 23:42:01 +01:00
Arnd Bergmann
4db22c1033 ARM: debug-ll: rework integrator/versatile handling
Enabling one of the integrator platforms in a multiplatform kernel
while trying to use DEBUG_LL for another platform can default to
the wrong UART address, as the options are purely based on the
architecture being enabled or not.

This changes the logic to use the integrator default addresses only
if we have also picked the respective Kconfig symbols introduced
here. Versatile is not yet part of multiplatform, but hopefully
soon will be, so we do the same change for versatile as well.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 23:41:58 +01:00
Arnd Bergmann
375d84cf86 ARM: debug-ll: rework SPEAr handling
Enabling one of the SPEAr platforms in a multiplatform kernel
while trying to use DEBUG_LL for another platform can default to
the wrong UART address, as the options are purely based on the
architecture being enabled or not.

This changes the logic to use the SPEAr default addresses only
if we have also picked the respective Kconfig symbols introduced
here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 23:41:56 +01:00
Arnd Bergmann
f06455fab6 ARM: debug-ll: rework ep93xx handling
This makes ep93xx debug-ll handling more consistent with the other
platforms, by adding a separate Kconfig symbol for it that
in turn selects the standard DEBUG_UART_PL01X symbol.

We still have to pick a physical address even if DEBUG_LL is disabled
here, because the EP93xx uncompress output code uses
CONFIG_DEBUG_UART_PHYS. If we ever move to multiplatform support,
this can go away.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 23:41:53 +01:00
Arnd Bergmann
c047f529e8 ARM: debug-ll: reorganize mvebu debug uart config
As we are moving dove/mv78xx0/orion into multiplatform, the debug-ll
configuration options for these platforms are conflicting with the
multiplatform configuration: enabling one of those platforms sometimes
changes the default addresses to the ones used on one of them, rather
than the one that was selected in Kconfig.

This changes the configuration so we share the physical address
configuration with mach-mvebu.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 23:41:51 +01:00
Arnd Bergmann
cdd2e08b21 ARM: debug-ll: fix UART configuration with ARCH_KEYSTONE
We may have multiple platforms enabled and also DEBUG_LL
configured for one of them. However if we enable ARCH_KEYSTONE,
we default to using 32-bit UART access independent of which
platform we are actually using, which can be confusing.

This changes the logic so the 32-bit default gets only
used by default if we actually configure the keystone
UART, as opposed to picking some other 8250 setting on
a kernel that has keystone support enabled.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 23:41:49 +01:00
Dan Williams
3e6110fd54 Revert "scatterlist: use sg_phys()"
commit db0fa0cb01 "scatterlist: use sg_phys()" did replacements of
the form:

    phys_addr_t phys = page_to_phys(sg_page(s));
    phys_addr_t phys = sg_phys(s) & PAGE_MASK;

However, this breaks platforms where sizeof(phys_addr_t) >
sizeof(unsigned long).  Revert for 4.3 and 4.4 to make room for a
combined helper in 4.5.

Cc: <stable@vger.kernel.org>
Cc: Jens Axboe <axboe@fb.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Fixes: db0fa0cb01 ("scatterlist: use sg_phys()")
Suggested-by: Joerg Roedel <joro@8bytes.org>
Reported-by: Vitaly Lavrov <vel21ripn@gmail.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
2015-12-15 12:54:06 -08:00
Arnd Bergmann
75f287180a Merge tag 'arm-soc/for-4.5/soc' of http://github.com/Broadcom/stblinux into next/soc
Merge "Broadcom soc changes for v4.5" from Florian Fainelli:

This pull request contains Broadcom SoC changes for 4.5, with the following changes:

- Lucas Stach removes the workaround for an imprecise fault for Broadcom
  BCM5301x SoCs (Northstar) since this is now handled by the ARM/Linux kernel
  directly

- Hauke Merthens enables a bunch of erratas for the Cortex-A9 and PL310 L2
  cache present on early Northstar chips (BCM4708)

- Kapil Hali adds SMP support for the Northstar Plus SoCs by consolidating the
  existing SMP code for Kona SoCs (mobile platforms), fixng the Device Tree
  binding for the Kona platforms (wrong placement for 'enable-method' and
  'secondary-reg') and then finally adds the functional code for the Northstar
  Plus platforms to boot their secondary CPUs

- Jon Mason enables SMP on BCM4708/BCM5301X (Northstar SoCs) by building the generic
  Northstar/Northstar Plus SMP code, and adding the relevant SMP Device Tree nodes

* tag 'arm-soc/for-4.5/soc' of http://github.com/Broadcom/stblinux:
  ARM: BCM: Add SMP support for Broadcom 4708
  ARM: BCM: Add SMP support for Broadcom NSP
  ARM: BCM: Clean up SMP support for Broadcom Kona
  ARM: BCM5310X: activate erratas needed for SoC
  ARM: BCM5301X: remove workaround imprecise abort fault handler
2015-12-15 18:12:29 +01:00
Arnd Bergmann
ee5d892395 Merge tag 'arm-soc/for-4.5/devicetree' of http://github.com/Broadcom/stblinux into next/dt
Pull "Broadcom devicetree changes for v4.5¨ from Florian Fainelli:

This pull request contains the Broadcom ARM-based Device Tree changes for 4.5:

- Jon Mason enables the following for Broadcom Northstar Plus SoCs: PCI (using
  iProc PCI), NAND flash controller (BRCMNAND), TWD Timer and Watchdog
  (Cortex-A9), I2C (iProc), clock providers, does some Device Tree cleanups
  (re-parenting, fixing register sizes and hierarchy)

- Jon Mason also adds support for some reference Broadcom Northstar reference
  designs like the BCM5301X SVK reference boards, updates the existing binding
  documentation to cover the Northstar chips: 4708, 4709 and 53012.

- Pramod Kumar adds the GPIO to pinctrl mapping for the Broadcom Northstar Plus
  SoCs

- Yendapally Reddy Dhananjaya Reddy adds pinctrl Device Tree nodes for the
  Broadcom Northstar Plus SoCs device tree nodes

- Ray Jui adds Cygnus PCIe PHY Device Tree nodes and enables MSI for the iProc
  PCI controller on Cygnus platforms

- Kapil Hali adds SMP binding documentation and Device Tree nodes for the
  Northstar Plus SoCs

- Florian Fainelli adds clock provider support for the Broadcom BCM63138 DSL
  SoCs by utilizing the existing iProc ARM PLL controller, this includes a
  stable topic branch from Stephen Boyd to be merged

- Rafal Milecki adds missing LEDs for the Netgear R8000 router

* tag 'arm-soc/for-4.5/devicetree' of http://github.com/Broadcom/stblinux:
  ARM: dts: Enable MSI support for Broadcom Cygnus
  ARM: dts: Add SMP support for Broadcom NSP
  dt-bindings: add SMP enable-method for Broadcom NSP
  ARM: dts: enable pinctrl for Broadcom NSP
  ARM: dts: enable PCIe PHY support for Cygnus
  ARM: dts: Cygnus: define ngpios property in gpio controller's node
  ARM: BCM5301X: Add missing Netgear R8000 LEDs
  ARM: dts: BCM63xx: Add ARMPLL device tree nodes
  clk: bcm: Add BCM63138 clock support
  clk: iproc: Extend binding to cover BCM63138
  ARM: dts: enable clock support for Broadcom NSP
  ARM: dts: enable clock support for BCM5301X
  ARM: dts: NSP: Add I2C support to the DT
  ARM: dts: NSP: Device Tree clean-ups
  dts: pinctrl: Add GPIO to Pinctrl pin mapping in DT
  ARM: dts: bcm5301x: Add BCM SVK DT files
  dt-bindings: Add new SoCs to bcm4708 DT bindings
  ARM: dts: NSP: Add TWD Support to DT
  ARM: dts: NSP: Add NAND Support to DT
  ARM: dts: NSP: Add PCI support
2015-12-15 18:07:19 +01:00
Enric Balletbo i Serra
0c3ef53943 ARM: multi_v7_defconfig: Enable Rockchip generic power domain.
In order to meet high performance an low power requirement for Rockchip
enable the power domain support. The patch also fixes a drm/kms issue,
driver deferring untils power-domains are available)

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 17:56:28 +01:00
Sudeep Holla
8b44f5be20 ARM: dts: armada: replace isil, irq2-can-wakeup-machine with wakeup-source property
Though the driver will continue to check for and support the legacy
"isil,irq2-can-wakeup-machine" boolean property to wakeup source,
"wakeup-source" is the new standard binding.

This patch replaces the legacy "isil,irq2-can-wakeup-machine" with the
unified "wakeup-source" property in order to avoid any futher copy-paste
duplication.

Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2015-12-15 17:55:35 +01:00
Arnd Bergmann
7af0d32ac4 SoCFPGA defconfig update for v4.5
-Enable USB OTG dual-role and some cleanup by make savedefconfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWZ1WgAAoJEBmUBAuBoyj0OlwP/3EZyo1lLAU4ZMDmB9biciVR
 FMUiLO2UoUIMdgz/2V/glSC92QehyYVQrOhOo3pFS3RfLdrPDhHbHvja/7yelYhi
 6MzyvQAF4qlWLA8TeVKvisgE7+zjhB24uwG+CRgbdd/PM/XUqkINCo//CcrZo4ex
 RL/XYKNwCqW+pQjnUVYNogWdlwoqNKdaFcVGELKnJcymN4LvkkvLs1y+swMxjou5
 qGH9vlXyXvNEJvb44OsrfMZPT6X0CfN/lRrzGoIoc+0cxg4YEiLhTrHDO8Pgr/Pv
 IyEoNy6jWL2+RiUg4pBXfu2aEm62tmRTyURn7xYPVzyvS+fPAHAcFiJk+jmF6IX+
 2TFHjLJN5X7EaGukVaLYEGCvivlJdR2gjj8tvdtfWY45OX28SxLTxbUGfWOZBOSL
 ICF2E4hD6UG1hTJ+ot9aJoVWVtLZw5bhcvtCmZM6YU5N422BKTPSACBZhVCWwsLd
 pj9HsirBS5F3zu710DZQuoh35qB38XXcLWI57rvR4RD87ncDg6p6UrQDUsEAeAa7
 L3HGnBp/mDJLrF1ASWDXxdcV2fykoNxdNP10r06MrcbjUY6keihEuS7ePnNunGpn
 a1c4DQRnaPVmrBCwd51BNfEk2tU+M2Mo3JfINLS+iMQuCVJMs7+Jj4+VwuA4AL5f
 1qwsWAuBhlNg6Yx6QEx6
 =y5U2
 -----END PGP SIGNATURE-----

Merge tag 'socfpga_defconfig_for_v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/defconfig

Merge "SoCFPGA defconfig update for v4.5" from Dinh Nguyen:
-Enable USB OTG dual-role and some cleanup by make savedefconfig

* tag 'socfpga_defconfig_for_v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  arm: socfpga_defconfig: enable USB dual-role and cleanup
2015-12-15 17:53:50 +01:00
Linus Walleij
00b6351e76 ARM: realview: add generic config options
This adds a few features that are available on some
or all of the RealView but never made it into the SMP
defconfig file:

- Full tickless idle
- High resolution timers
- Perf events and HW perf events from the PMU
- MTD AFS partition handling
- MTD ROM partition handling
- USB and ISP1760 USB driver

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 17:48:26 +01:00
Linus Walleij
7ad6725708 ARM: realview: add generic config options
This adds a few features that are available on some
or all of the RealView but never made it into the defconfig
file:

- High-resolution timers
- Perf events and HW perf events from the PMU
- MTD AFS partition handling
- MTD ROM partition handling
- USB and ISP1760 USB driver

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 17:48:25 +01:00
Linus Walleij
953bfb8ff6 ARM: realview: update SMP defconfig
This updates the RealView SMP defconfig with the latest Kconfig
structure.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 17:48:25 +01:00
Linus Walleij
b244b56947 ARM: realview: refresh defconfig
This updates the RealView defconfig with the latest Kconfig
structure.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 17:48:24 +01:00
Russell King
ce9981bd63 ARM: dts: enable GPU for SolidRun's Cubox
Enable the GPU for SolidRun's Cubox.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2015-12-15 17:46:34 +01:00
Russell King
6c72d8ab26 ARM: dts: dove: add DT GPU support
Add DT support for the Vivante GC600 GPU on Marvell Dove platforms.
These nodes default to being disabled unless a platform decides they
should be enabled.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2015-12-15 17:46:16 +01:00
Alison Wang
b02ec7658c ARM: multi_v7_defconfig: Enable some drivers for LS1021A
This patch enables some drivers for LS1021A, such as
GIANFAR, WATCHDOG, AUDIO, QSPI, I2C, ESDHC, EDMA, FTM.
QorIQ Clock Framework and Ramdisk support is also enabled.

Signed-off-by: Alison Wang <alison.wang@freescale.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-15 17:46:01 +01:00
Arnd Bergmann
e9293d92be mvebu defconfig for 4.5 (part 2)
- Reenable DSA in mvebu_v5_defconfig
 - Update multi_v5_defconfig after adding Orion5x to multiarch
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZq2NAACgkQCwYYjhRyO9Xu3gCeMhnGk15fEWF8WNkCpxPLJgxy
 gwcAoILSSQ2ByCvbL8h0DMwdOE16B2r/
 =/oQV
 -----END PGP SIGNATURE-----

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

Merge "mvebu defconfig for 4.5 (part 2)" from Gregory CLEMENT:

- Reenable DSA in mvebu_v5_defconfig
- Update multi_v5_defconfig after adding Orion5x to multiarch

* tag 'mvebu-defconfig-4.5-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: update v5 defconfig for Orion5x machines
  ARM: mvebu: Reenable DSA in mvebu_v5_defconfig
  ARM: config: Add orion5x to multi_v5_defconfig
  ARM: config: Reenable DSA in multi_v5_defconfig
  ARM: config: Regenerate multi_v5_defconfig
2015-12-15 17:44:49 +01:00
Arnd Bergmann
1741c73579 Allwinner defconfig changes for 4.5
A bunch of patches to enable new drivers related to Allwinner SoCs.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWbrDuAAoJEBx+YmzsjxAgTdoP+QFrx/IEge9ipLDe2wQ3jbiz
 4Qn2JkkbwBDALXUMAjHEKXx5xknbq38x/iUnYkZsZCw7RaijxCirvjzSW/6EozCu
 aRnmNLakSNdG7H8erVhOYEDFOpaXnv+v5OJ8PI8mW7+NDBRhQ1o/GCn7C/Yb2K3K
 A/1mUtbH6pT53yU2qzXj0Ez+MtRGMrWyod2gePSwR7NlNr7pVXQDPkeMA09HV37J
 HkTHsa5bU59ou96MN+wZLI8eTT6L7PIU64FX89f5C4V4vLvPe4roBXmzm6Ii47up
 lbJX2HJP01ruz/aJdb6rUrB7jRqpi9//E6RrkmWy8u5QX/WGJbeVY6SfFivSu/gM
 5SLit995SX1SmVk7z4VVEK9gxlzklO1lyjzxa/m2t3a1lk1Cb2G9ImV8nD6vesvu
 wUDCLc4cfdAc+HK9DnGsQEp2T4Q+UltsXYstsEds0Ui3fRXWTrehkbDSPS0mg6Hu
 ExJfhrVpsB4LtuwOl1DWnBEC+E+eJ0xggMFSBvfA5HJynlQx4nuRHOAuvR0ovBY9
 oPd7JW8LHJnAfv1txZlUKdItZ/GCVAvfv1zUgXgoJIzaAA/5wFdJZidBGwI1yj9h
 TgylqmoiIxMMue7FgtEUS/mf2zSmkNgcKevARoe7ubPwAPWYu70DOjWXDPjVsw1B
 7kiPahxBKCi1Vezr+z12
 =eVFZ
 -----END PGP SIGNATURE-----

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

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

A bunch of patches to enable new drivers related to Allwinner SoCs.

* tag 'sunxi-defconfig-for-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: Clean up sunxi_defconfig
  ARM: sunxi: Really enable LRADC keys in sunxi_defconfig
  ARM: sunxi: Re-enable SID driver in sunxi_defconfig
  ARM: sunxi: Re-enable SID driver in multi_v7_defconfig
  ARM: multi_v7_defconfig: Enable RSB and AXP20X related drivers as modules
  ARM: sunxi_defconfig: Update MFD_AXP20X symbol and enable MFD_AXP20X_RSB
2015-12-15 17:43:36 +01:00
Arnd Bergmann
0ae102c64c mvebu defconfig for 4.5 (part 1)
update of mvebu_v5 defconfig with the addition of cpuidle
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZlsxEACgkQCwYYjhRyO9UumgCfR353K8WoWry2InK6VnZvD9hG
 tuEAnjYYkYYGvdt4/hl/ASSXTOqfM9R4
 =2Sxs
 -----END PGP SIGNATURE-----

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

Merge "mvebu defconfig for 4.5 (part 1)" from Gregory CLEMENT:

update of mvebu_v5 defconfig with the addition of cpuidle

* tag 'mvebu-defconfig-4.5-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: add Kirkwood cpuidle to defconfig
  ARM: mvebu: update v5 defconfig
2015-12-15 17:42:32 +01:00
Arnd Bergmann
d7e4859100 Two changes for NAND/MTD refactoring. The mtd_to_nand() helper will allow us to
stop using mtd->priv for NAND drivers.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWZkijAAoJEFySrpd9RFgtnYIP/0y43CeSvaeyDl51xfxrep5m
 ctbICUKLi0dtrIwtyUuFgx33BjrOvEoqxEpEd0TMF1wPILhUszaEnqB03LXzi1zh
 090w0jXi0B5lSZuDmc5pFJR7staFz+suX4Gqs35xWWxymO0PX4+MxBWX/SE5whiB
 fw+aHm5AsG4NxL2wGuoTKhHS7HcUHPKhOCdhoHv9tknV7i5b4WFoh4k4W2CAhHpY
 5xKpJ0YKRHbBFFCKEpfQx1kUTo8dEe6ZcVWtnpRw7dg21KO8yEKQDP2fJvW6wTsv
 zF6SYKEvFL76D8j+Po2lDr0X+R1RLibi8LehVx3EMfG8j80p20xbHtnW4G1R5L2G
 l3Y/DVqsDL9esxyhFUTiYxig5tlYTYbaG6MmQch2OlPrXK/6UEDI1xsZuUCGRa8y
 8xZlnvLyogV4bQapnTV38wfKD9d6GQVS599uz9bpFd3TloxsQf5o/OJEkl0wEnTM
 xmZzXXQLK3vQfdy3biD+DEViQopcGK0GlYXaQPhQgUoNRHJzC1E42gFM7NUCp699
 nOUIsADi3QYZdC6OAcmZnnSiVqgPQBlwphR9YE0UmU50GHpFsx4QGNs/hIIMzXBS
 16aIV641baRxIvdbVvb23q9vKgoLzVKj2ZLdIwt/P0guo/NujrMU33EmWfyX/hOF
 Y0qb0T2GtuhHxEPfKti3
 =03sV
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-4.5/cleanup' of git://git.infradead.org/linux-mtd into next/cleanup

Merge "MTD/NAND cleanups for v4.5" from Brian Norris:

Two changes for NAND/MTD refactoring. The mtd_to_nand() helper will allow us to
stop using mtd->priv for NAND drivers.

* tag 'arm-soc/for-4.5/cleanup' of git://git.infradead.org/linux-mtd:
  ARM: nand: make use of mtd_to_nand() where appropriate
  mtd: nand: add an mtd_to_nand() helper
2015-12-15 17:39:53 +01:00
Arnd Bergmann
4ce5219554 mvebu cleanup for 4.5 (part 1)
remove unused mach/gpio.h in mach-mvebu
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZlrCoACgkQCwYYjhRyO9Vc+ACghTYLKbFlJ15uf+1ShqDmivZe
 kGsAn12OMwASyXgCM5Nz5YfC1ufIoTSQ
 =Xr84
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-cleanup-4.5-1' of git://git.infradead.org/linux-mvebu into next/cleanup

Merge "mvebu cleanup for 4.5 (part 1)" from Gregory CLEMENT:

remove unused mach/gpio.h in mach-mvebu

* tag 'mvebu-cleanup-4.5-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: remove unused mach/gpio.h
2015-12-15 17:36:20 +01:00
Linus Walleij
b6e30a4705 ARM: mvebu: kirkwood: add PogoPlug series 4 device tree
This adds a device tree for the CloudEngines PogoPlug series 4
NAS device. Inspired by out-of-tree boardfiles from ArchLinux
by Kevin Mihelich.

Cc: Moonman <moonman.ca@gmail.com>
Cc: Kevin Mihelich <kevin@archlinuxarm.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2015-12-15 17:18:52 +01:00
Hans Ulli Kroll
61521e3924 ARM: dts: kirkwood: Add DTS for Zyxel NSA325
Add a new DTS file to support the Zyxel NSA325(v2) dual bay
NAS device, based on the NSA320 DTS files.

The only difference to the NSA320 device is GPIO47.
This en/disables the power for the hdd in slot2, currently
fixed to on.

[gregory.clement@free-electrons.com: fix comment format]
Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2015-12-15 17:12:55 +01:00
Shengjiu Wang
34bfbae33a ARM: 8475/1: SWP emulation: Restore original *data when failed
__user_swpX_asm maybe failed in first STREX operation, emulate_swpX
will try again, but the *data has been changed in first time. which
causes the result is wrong.
This patch is to fix this issue. When STREX succeed, change the *data.
if it fail, *data is not changed.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2015-12-15 11:51:42 +00:00
Anson Huang
fa0708b320 ARM: 8471/1: need to save/restore arm register(r11) when it is corrupted
In cpu_v7_do_suspend routine, r11 is used while it is NOT
saved/restored, different compiler may have different usage
of ARM general registers, so it may cause issues during
calling cpu_v7_do_suspend.

We meet kernel fault occurs when using GCC 4.8.3, r11 contains
valid value before calling into cpu_v7_do_suspend, but when returned
from this routine, r11 is corrupted and lead to kernel fault.
Doing save/restore for those corrupted registers is a must in
assemble code.

Signed-off-by: Anson Huang <Anson.Huang@freescale.com>
Reviewed-by: Nicolas Pitre <nico@linaro.org>
Cc: <stable@vger.kernel.org> # v3.3+
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2015-12-15 11:51:41 +00:00
Russell King
c014953d84 ARM: fix uaccess_with_memcpy() with SW_DOMAIN_PAN
The uaccess_with_memcpy() code is currently incompatible with the SW
PAN code: it takes locks within the region that we've changed the DACR,
potentially sleeping as a result.  As we do not save and restore the
DACR across co-operative sleep events, can lead to an incorrect DACR
value later in this code path.

Reported-by: Peter Rosin <peda@axentia.se>
Tested-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2015-12-15 11:51:02 +00:00
Ludovic Desroches
0a804b5729 ARM: at91/dt: sama5d2 Xplained: pmic needs a specific sda hold time
Data have to be held longer for the PMIC device. The ACT8945A
datasheet claims that minimum SDA data hold time is about 300 ns.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-12-15 12:23:32 +01:00
Ludovic Desroches
a2ebbb0795 ARM: at91/dt: sama5d4: update i2c compatible string
A new compatible string has been introduced: atmel,sama5d4-i2c. It
allows to use the i2c-sda-hold-time-ns property if needed.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-12-15 12:21:59 +01:00
Nicolas Ferre
bdf9a4d303 ARM: at91/dt: sama5d4 master clock can run at 200MHz now
After the change of frequency a SAMA5D4 can reach, we have to modify the
maximum clock specification for the master clock, up to 200MHz now.

It avoids the wrong message saying that "master clk is overclocked" for this
configuration.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-12-15 12:20:24 +01:00
Wenyou Yang
94c2317cf4 ARM: at91/defconfig: enable watchdog drivers in sama5_defconfig
Enable AT91SAM9X and SAMA5D4 watchdog drivers.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-12-15 11:18:39 +01:00
Wenyou Yang
92bd7aa413 ARM: at91/dt: sama5d2: add watchdog node
Add watchdog node to support SAMA5D4 watchdog.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-12-15 11:12:07 +01:00
Marek Vasut
ca5a4b5622 ARM: at91/dt: sama5d4: Add support for DENX MA5D4 SoM and EVK
Add support for the DENX MA5D4 SoM and MA5D4EVK board. The system
consists of a SoM with eMMC, SPI NOR for booting, 2x SPI CAN chip
and an EVK with microSD slot, 2x UART, 2x CAN port, 3x USB port,
LEDs and expansion headers.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-12-15 11:07:26 +01:00
Marek Vasut
49f6697499 ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus
Add pinmux for the 4 remaining signals used in 8-bit MMC 0
bus configuration.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Reviewed-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-12-15 11:06:25 +01:00
Marek Vasut
5e4458fa5d ARM: at91/dt: sama5d4: Fix mmc0 pinmux comments
Synchronise the comments in mmc0 pinmux node with HSMCI0 pinmux
description in the Atmel SAMA5D4 datasheet from 24-Aug-15 page
1119, section 37.6.1, Table 37-3 .

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Reviewed-by: Josh Wu <josh.wu@atmel.com>
Reported-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-12-15 11:05:29 +01:00
Geliang Tang
5bcd927233 ARM: davinci: fix a problematic usage of WARN()
WARN() takes a condition and a format string. The condition was
omitted. So I added it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2015-12-15 15:29:34 +05:30
Arnd Bergmann
1b50b0c1ce ARM: davinci: only select WT cache if cache is enabled
The DA830 chip only works if the dcache is in writethrough mode,
but that produces a harmless Kconfig warning if the cache happens
to be disabled:

warning: (ARCH_DAVINCI_DA830) selects CPU_DCACHE_WRITETHROUGH which has unmet direct dependencies ((CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || CPU_ARM1020 || CPU_FA526) && !CPU_DCACHE_DISABLE)

This makes the select conditional so we don't have to worry
about the warning in randconfig builds any more.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2015-12-15 15:21:53 +05:30
Magnus Damm
0da4cfd1a2 ARM: shmobile: r8a7794: IPMMU compat string SoC part number update
Update IPMMU compat strings to include SoC part number.

By specifying SoC part number in DT it becomes possible
to implement SoC specific features in the IPMMU driver.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-15 18:17:10 +09:00
Magnus Damm
c51b1473ed ARM: shmobile: r8a7793: IPMMU compat string SoC part number update
Update IPMMU compat strings to include SoC part number.

By specifying SoC part number in DT it becomes possible
to implement SoC specific features in the IPMMU driver.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-15 18:16:58 +09:00
Magnus Damm
3c8ab0c88e ARM: shmobile: r8a7791: IPMMU compat string SoC part number update
Update IPMMU compat strings to include SoC part number.

By specifying SoC part number in DT it becomes possible
to implement SoC specific features in the IPMMU driver.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-15 18:16:48 +09:00
Magnus Damm
c8d6686e41 ARM: shmobile: r8a7790: IPMMU compat string SoC part number update
Update IPMMU compat strings to include SoC part number.

By specifying SoC part number in DT it becomes possible
to implement SoC specific features in the IPMMU driver.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-15 18:16:31 +09:00
Krzysztof Hałasa
3a35e470bc ARM: dts: imx6: Fix Ethernet PHY mode on Ventana boards
Gateworks Ventana boards seem to need "RGMII-ID" (internal delay)
PHY mode, instead of simple "RGMII", for their Marvell 88E1510
transceiver. Otherwise, the Ethernet MAC doesn't work with Marvell PHY
driver (TX doesn't seem to work correctly).

Tested on GW5400 rev. C.

This bug affects ARM Fedora 23.

Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Acked-by: Tim Harvey <tharvey@gateworks.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-15 16:53:15 +08:00
Bai Ping
13fdae1ae5 ARM: dts: imx: Fix the assigned-clock mismatch issue on imx6q/dl
The 'assigned-clock-parents' and 'assigned-clock-rates' list
should corresponding to the 'assigned-clocks' property clock list.

Signed-off-by: Bai Ping <b51503@freescale.com>
Fixes: ed339363de ("ARM: dts: imx6qdl-sabreauto: Allow HDMI and LVDS to work simultaneously")
Cc: <stable@vger.kernel.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-15 16:48:56 +08:00
Linus Walleij
acde758b31 ARM: realview: add device tree for PB11MPCore
This adds a device tree for the ARM RealView ARM11MPCore
reference design.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-12-15 09:45:30 +01:00
Linus Walleij
5420b4b156 ARM: realview: add an DT SMP boot method
This adds an SMP boot method for the ARM RealView reference
designs. We also select HAVE_SMP by default and make it use
SMP_ON_UP so we only need to support one single kernel across
the RealView reference designs when using DT.

The RealViews need to have the SCU (Snoop Control Unit)
activated on boot, and this is now done by looking up its
address from the device tree and initializing it and counting
the available cores.

The RealViews boot by using a magic address register in the
system controller (SYS_FLAGS) to store the boot address,
the ROM will then read this register to the PC when the CPUs
are taken out of WFI. This code uses a handle to the syscon
regmap to access this register.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-12-15 09:42:52 +01:00
Linus Walleij
ca5b21fa6e ARM: realview: select SP810 and ICST for the DT variant
The device tree boot for RealView need the SP810 system controller
(same as found on the Versatile Express) to set up the timers on the
board so the machine can tick. It further utilize the ICST307 through
its system controller for 6 other oscillators. We have to select these
from Kconfig or the machine does not boot.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-12-15 09:42:51 +01:00
Daniel Lezcano
39366ef421 clocksource/drivers/exynos_mct: Fix Kconfig and add COMPILE_TEST option
Let the platform's Kconfig to select the clock instead of having a reverse
dependency from the driver to the platform options.

Add the COMPILE_TEST option for the compilation test coverage. Due to the
non portable 'delay' code, this driver is only compilable on ARM.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Tested-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
2015-12-15 09:41:52 +01:00
Daniel Lezcano
1becd6edea clocksource/drivers/prcmu: Fix Kconfig and add COMPILE_TEST option
Let the platform's Kconfig to select the clock instead of having a reverse
dependency from the driver to the platform options.

Add the COMPILE_TEST option for the compilation test coverage.

This change is debatable as the option itself in the Kconfig allows to
select the driver for the platform or not. This change will make the prcmu
timer always selected.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
2015-12-15 09:41:50 +01:00
Arnd Bergmann
2b749cb3a5 ARM: realview: remove private barrier implementation
The realview barrier implementation tries to avoid calling outer_sync in order
to not lock up as a result of a bug in the l220 cache controller.

This gets in the way of the multiplatform support, but we can still remove
it if we make sure that the outer_sync function never gets called, by replacing
the function pointer with NULL, right after initialization.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[Fixed up header inclusions]
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-12-15 09:41:34 +01:00
Arnd Bergmann
38541bf485 ARM: no longer force unbuffered DMA for realview
Commit 42c4dafe80 ("ARM: 6202/1: Do not ARM_DMA_MEM_BUFFERABLE
on RealView boards with L210/L220") changed the generic setting for
ARM_DMA_MEM_BUFFERABLE to be disabled on any Realview kernel that includes
support for any of the ARM11 variations. Doing this was required to
allow doing DMA without a lockup in the l2x0 cache controller on the
Realview platform.

Unfortunately, in a kernel that also contains support for any ARMv7
based machine, the same change makes it impossible to do DMA on ARMv7,
which gets in the way of enabling multiplatform support on Realview.

As confirmed by Catalin Marinas and Linus Walleij, the current
code for Realview that we have in the kernel does not actually
perform any DMA, and this is unlikely to change in the future.
Therefore we can revert 42c4dafe80 without introducing regressions,
but we must never start using DMA on this platform in the future.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-12-15 09:41:33 +01:00
Arnd Bergmann
930748a033 ARM: realview: don't map undefined PCI registers
PCI support for realview was never merged, and trying to build realview with
CONFIG_PCI enabled fails because the constants for the mapping windows are
not defined anywhere.

This removes them from the static I/O window mapping table as a preparation
for multiplatform support.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-12-15 09:41:32 +01:00
Arnd Bergmann
fd0053c9eb ARM: realview: remove sparsemem hack
The realview-pbx platform has an elaborate way of avoiding the use of highmem
by redefining its phys_to_virt function. In practice this doesn't help all
that much, and it gets in the way of doing multiplatform builds for
realview.

This removes the feature and kills off the mach/memory.h file for realview.
We also lose the ability to do sparsemem with this patch, but that should
be put back into place for generic multiplatform configurations, to save
a little memory on PBX.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-12-15 09:41:31 +01:00
Daniel Lezcano
389d9b5841 clocksource/drivers/pxa_timer: Move the Kconfig rule
Instead of having the clocksource's Kconfig depending on the arch, let the
arch to select the timer it needs.

The CLKSRC_OF dependency is removed because already selected by the
ARCH_PXA, and it is added for SA1100.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
2015-12-15 09:41:17 +01:00
Daniel Lezcano
2ffdf71b83 clocksource/drivers/st_lpc: Fix Kconfig dependency
Change the Kconfig selection rule by letting the STI arch to select
the timer.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Maxime Coquelin <maxime.coquelin@st.com>
2015-12-15 09:41:14 +01:00
Wolfram Sang
691cd0a64d ARM: shmobile: r8a7794: dtsi: add internal delay for i2c IPs
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-15 13:14:08 +09:00
Wolfram Sang
49160dc19f ARM: shmobile: r8a7791: dtsi: add internal delay for i2c IPs
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-15 13:13:58 +09:00
Wolfram Sang
ac8e7f31c7 ARM: shmobile: r8a7790: dtsi: add internal delay for i2c IPs
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-15 13:13:40 +09:00
Kevin Hilman
8fcacc0344 Allwinner fixes for 4.4
Two patches, one to fix the touchscreen axis on one Allwinner board, and
 the other one fixing a mutex unlocking issue on one error path in the RSB
 driver.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWbpHVAAoJEBx+YmzsjxAgbEQQALWoDBtYUwlUfWPL9hHIShbv
 HHkelqcxZgQB2LtNQMufwitmoLH8lhf5C0ILZuLiiA0EZM1V+PrsGLKRKHGeQxYO
 K6g3TVZp3v+Q+vb8T3FsGSbP1dtAm+IXIfknQBT+FLHnp84d0wRa29Kx4e3QFUmi
 8UieBQG4dd45ghv08w1jSa2D1nUEfuAMYG1jZIrTw/ZWTB3siZxKBKEaPccvDFF6
 1WgTwoYoHj05ldLG6W2/MPbW1eosVqZTPvdb+QEAvdDVQsKMOyCqc6O8+khbxoV/
 S5RGGh6tJ6xBbsOnzvqjNjSMCeL7SyiYAxMc5y3rEBfexdMUiJi0Laj1dYVcpuNT
 LERGmxw7FIJB2HNsMqjMa4+GB1+DZBplu3RwYZqplnGe1lT9Rk7Irj6muUuH5cBf
 Ubh0RN2Mo5QNAhkwo4TDqy7xzrYRjC/XOQeQx9SSbFHPGl/raTCm0yd31vUdrZXT
 BTW9V7hIJU6vt6+RKXOqtgjAOqcBLi3npeCrUVY11hrCylKP2gEtQ4dFFGNgUSBu
 eOzDvlrtxVavoQB+XQQ+Js5hZlnXNWYLxR3Bher1xc5NXCI/aHM4pmymSzHjrQmU
 aBfmsJYdWDL9fW18cR9vCgdS1sBIqdz9zu9GW5A8MVVf6s7KoM3vEDX7tzFrghfi
 +mxUdfjbuWHgUxmHMN8J
 =9lSI
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-fixes-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes

Merge "Allwinner fixes for 4.4" from Maxime Ripard:

Allwinner fixes for 4.4

Two patches, one to fix the touchscreen axis on one Allwinner board, and
the other one fixing a mutex unlocking issue on one error path in the RSB
driver.

* tag 'sunxi-fixes-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  bus: sunxi-rsb: unlock on error in sunxi_rsb_read()
  ARM: dts: sunxi: sun6i-a31s-primo81.dts: add touchscreen axis swapping property
2015-12-14 16:59:40 -08:00
Ariel D'Alessandro
5743520806 ARM: dts: lpc4337-ciaa: add i2c0 and devices
Add I2C0 and two I2C EEPROM devices on the CIAA-NXP board:

* 24AA1025 EEPROM, 1Mbit: it is accessed as two 512Kbit EEPROMs.
* 24AA025E48 EEPROM, 2kbit.

Signed-off-by: Ariel D'Alessandro <ariel@vanguardiasur.com.ar>
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
2015-12-14 23:13:06 +01:00
Ariel D'Alessandro
7888c8c12f ARM: dts: lpc4337-ciaa: enable SCT-PWM
Enable the PWM based on the State Configurable Timer (SCT) included in
the LPC4337 SoC of the CIAA-NXP board.

Signed-off-by: Ariel D'Alessandro <ariel@vanguardiasur.com.ar>
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
2015-12-14 23:13:05 +01:00
Joachim Eastwood
a086dfe5bf ARM: dts: lpc4357-ea4357: add mma7455 i2c accelerometer
Add Freescale MMA7455 3-axis I2C accelerometer as found on
Embedded Artists' LPC4357 Developer's Kit to the device tree.

This makes it possible to access the accelerometer through
the API provided by IIO.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
2015-12-14 23:13:05 +01:00
Joachim Eastwood
7d775d34b1 ARM: dts: lpc4357: enable EEPROM memory
Enable EEPROM for all LPC435x/3x/2x/1x controllers that include
the 16 kB EEPROM device.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
2015-12-14 23:13:04 +01:00
Ariel D'Alessandro
5c36aa6fda ARM: dts: lpc18xx: add EEPROM memory node
Add node for the NXP LPC18xx EEPROM memory which can be found in
NXP LPC185x/3x and LPC435x/3x/2x/1x devices.

Signed-off-by: Ariel D'Alessandro <ariel@vanguardiasur.com.ar>
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
2015-12-14 23:12:53 +01:00
Ariel D'Alessandro
74b40b2c53 ARM: configs: lpc18xx: enable EEPROM NVMEM driver
Enable NVMEM driver for NXP LPC18xx EEPROM, which can be found in
NXP LPC185x/3x and LPC435x/3x/2x/1x devices.

Signed-off-by: Ariel D'Alessandro <ariel@vanguardiasur.com.ar>
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
2015-12-14 22:49:11 +01:00
Joachim Eastwood
de0afc59c3 ARM: configs: lpc18xx: enable mma7455 IIO driver
MMA7455 is 3-axis accelerometer that can be found on
Embedded Artists' LPC4357 Developer's Kit.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
2015-12-14 22:48:46 +01:00
Caesar Wang
4b0d98ae2d ARM: dts: rockchip: add eFuse node for rk3188 SoCs
This patch add the eFuse dt node for rk3188 SoCs.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-12-14 14:15:44 +01:00
Caesar Wang
d3369b1eba ARM: dts: rockchip: add eFuse node for rk3066a SoCs
This patch add the eFuse dt node for rk3066a SoCs.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-12-14 14:14:54 +01:00
Marc Zyngier
910917bb7d arm64: KVM: Map the kernel RO section into HYP
In order to run C code in HYP, we must make sure that the kernel's
RO section is mapped into HYP (otherwise things break badly).

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
2015-12-14 11:30:43 +00:00
Amit Tomar
b19e6892a9 KVM: arm/arm64: Count guest exit due to various reasons
It would add guest exit statistics to debugfs, this can be helpful
while measuring KVM performance.

  [ Renamed some of the field names - Christoffer ]

Signed-off-by: Amit Singh Tomar <amittomer25@gmail.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2015-12-14 11:30:00 +00:00
Roy Franz
81a0bc39ea ARM: add UEFI stub support
This patch adds EFI stub support for the ARM Linux kernel.

The EFI stub operates similarly to the x86 and arm64 stubs: it is a
shim between the EFI firmware and the normal zImage entry point, and
sets up the environment that the zImage is expecting. This includes
optionally loading the initrd and device tree from the system partition
based on the kernel command line.

Signed-off-by: Roy Franz <roy.franz@linaro.org>
Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
2015-12-14 10:38:21 +01:00
Moritz Fischer
400b6a0cbe ARM: dt: zynq: Add labels to cpu nodes to allow overriding OPPs.
By adding labels to the cpu nodes in the dtsi, a dts that
includes it can change the OPPs by referencing the cpu0
through the label.

Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
Reviewed-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2015-12-14 09:48:39 +01:00
Masahiro Yamada
bc5ba9b984 ARM: dts: zynq: describe SLCR as simple-mfd rather than simple-bus
The SLCR (System-Level Control Registers) block is an MFD (Multi
Function Device) rather than a bus.

"simple-mfd" seems a more suitable compatible string than "simple-bus".

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2015-12-14 09:48:39 +01:00
Moritz Fischer
8f039f9a69 ARM: zynq: Select ARCH_HAS_RESET_CONTROLLER
Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2015-12-14 09:33:08 +01:00
Sudeep Holla
b0d12e9a66 ARM: dts: zynq: replace gpio-key,wakeup with wakeup-source property
Though the keyboard driver for GPIO buttons(gpio-keys) will continue to
check for/support the legacy "gpio-key,wakeup" boolean property to
enable gpio buttons as wakeup source, "wakeup-source" is the new
standard binding.

This patch replaces the legacy "gpio-key,wakeup" with the unified
"wakeup-source" property in order to avoid any futher copy-paste
duplication.

Cc: Michal Simek <michal.simek@xilinx.com>
Cc: "Sören Brinkmann" <soren.brinkmann@xilinx.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2015-12-14 09:30:03 +01:00
Soren Brinkmann
e57f6e5e19 ARM: zynq: DT: Add interrupt-controller property to GPIO
GPIO can be used as interrupt-controller. Add the missing properties to
the GPIO node.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Reviewed-by: Moritz Fischer <moritz.fischer@ettus.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2015-12-14 09:30:03 +01:00
Geert Uytterhoeven
26828d9e94 ARM: shmobile: r8a7778 dtsi: Use "arm,pl390" for GIC
Replace the "arm,cortex-a9-gic" compatible value for the GIC by
"arm,pl390", as the documentation states it is a PL390.
This has been confirmed by reading the GICD_IIDR register, which reports
0x0000043b (PL390 = 0x00, ARM = 0x43b).

This has no effect on runtime behavior, as currently the GIC driver
treats both compatible values the same.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-14 17:26:18 +09:00
Geert Uytterhoeven
c8a5880afe ARM: shmobile: emev2 dtsi: Use "arm,pl390" for GIC
Replace the "arm,cortex-a9-gic" compatible value for the GIC by
"arm,pl390", as the documentation states it is a PL390.
This has been confirmed (thanks Simon!) by reading the GICD_IIDR
register, which reports 0x0000043b (PL390 = 0x00, ARM = 0x43b).

This has no effect on runtime behavior, as currently the GIC driver
treats both compatible values the same.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-14 17:26:17 +09:00
Geert Uytterhoeven
ad14ba96f9 ARM: shmobile: r8a7740 dtsi: Use "arm,pl390" for GIC
Replace the "arm,cortex-a9-gic" compatible value for the GIC by
"arm,pl390", as the documentation states it is a PL390.
This has been confirmed by reading the GICD_IIDR register, which reports
0x0000043b (PL390 = 0x00, ARM = 0x43b).

This has no effect on runtime behavior, as currently the GIC driver
treats both compatible values the same.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-14 17:26:17 +09:00
Geert Uytterhoeven
d9e1a0ef45 ARM: shmobile: r7s72100 dtsi: Use "arm,pl390" for GIC
Replace the "arm,cortex-a9-gic" compatible value for the GIC by
"arm,pl390", as the documentation states it is a PL390.
This has been confirmed (thanks Chris, Wolfram!) by reading the
GICD_IIDR register, which reports 0x0000043b (PL390 = 0x00, ARM =
0x43b).

This has no effect on runtime behavior, as currently the GIC driver
treats both compatible values the same.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-14 17:26:16 +09:00
Geert Uytterhoeven
3bf834e17c ARM: multi_v7_defconfig: Enable frame buffer console for armadillo800eva
Enabling the frame buffer device on r8a7740/armadillo800eva requires the
board staging code.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-14 14:13:18 +09:00
Geert Uytterhoeven
954ceafd50 ARM: multi_v7_defconfig: Enable missing Renesas ARM support based on DTSes
Enable all missing support, extracted from the various Renesas ARM DTSes
using linux-config-from-dt.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-14 14:13:02 +09:00
Geert Uytterhoeven
65e5698c27 ARM: multi_v7_defconfig: Drop useless CONFIG_USB_RCAR_PHY=y
The Renesas R-Car (Gen1) USB PHY driver (which is being removed) does
not support DT, and is thus useless in a generic ARM multi-platform
kernel.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-14 14:12:23 +09:00
Linus Torvalds
dec9cbf97d Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixlets from Thomas Gleixner:
 "Two trivial fixes which add missing header fileas and forward
  declarations so the code will compile even when the magic include
  chains are different"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/gic-v3: Add missing include for barrier.h
  irqchip/gic-v3: Add missing struct device_node declaration
2015-12-13 12:41:10 -08:00
Ard Biesheuvel
da58fb6571 ARM: wire up UEFI init and runtime support
This adds support to the kernel proper for booting via UEFI. It shares
most of the code with arm64, so this patch mostly just wires it up for
use with ARM.

Note that this does not include the EFI stub, it is added in a subsequent
patch.

Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
2015-12-13 19:18:30 +01:00
Ard Biesheuvel
09414d00a1 ARM: only consider memblocks with NOMAP cleared for linear mapping
Take the new memblock attribute MEMBLOCK_NOMAP into account when
deciding whether a certain region is or should be covered by the
kernel direct mapping.

Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
2015-12-13 19:18:29 +01:00
Ard Biesheuvel
c7936206b9 ARM: implement create_mapping_late() for EFI use
This implements create_mapping_late(), which we will use to populate
the UEFI Runtime Services page tables.

Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
2015-12-13 19:18:29 +01:00
Ard Biesheuvel
b430e55b23 ARM: add support for non-global kernel mappings
Add support to the kernel translation table population routines for
creating non-global mappings. This will be used by the UEFI runtime
services, which will use temporary mappings in the userland range.

Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
2015-12-13 19:18:29 +01:00
Ard Biesheuvel
f579b2b104 ARM: factor out allocation routine from __create_mapping()
To allow __create_mapping() to be used for populating UEFI Runtime
Services page tables, factor out the allocation routine 'early_alloc'
and pass it down as a function pointer into alloc_init_[pud|pmd|pte].
This way, new users of __create_mapping() can supply another allocation
function.

Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
2015-12-13 19:18:29 +01:00
Ard Biesheuvel
1bdb2d4ee0 ARM: split off core mapping logic from create_mapping
In order to be able to reuse the core mapping logic of create_mapping
for mapping the UEFI Runtime Services into a private set of page tables,
split it off from create_mapping() into a separate function
__create_mapping which we will wire up in a subsequent patch.

Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
2015-12-13 19:18:28 +01:00
Ard Biesheuvel
2937367b8a ARM: add support for generic early_ioremap/early_memremap
This enables the generic early_ioremap implementation for ARM.

It uses the fixmap region reserved for kmap. Since early_ioremap
is only supported before paging_init(), and kmap is only supported
afterwards, this is guaranteed not to cause any clashes.

Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
2015-12-13 19:18:28 +01:00