Commit Graph

575451 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
David S. Miller
d317aa5893 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says:

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

This series contains updates to fm10k only.

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

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

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

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

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

Renesas ARM Based SoC Defconfig Updates for v4.5

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Allwinner DT changes for 4.5

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

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

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

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

arm: Xilinx Zynq patches for v4.5

- Select reset controller by default for Zynq

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

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

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

arm: Xilinx ZynqMP dt patches for v4.5

- Label GPIO controller as interrupt controller

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

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

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

arm: Xilinx Zynq dt patches for v4.5

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

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

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

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

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

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

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

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

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

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

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

Signed-off-by: J. German Rivera <German.Rivera@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 10:53:36 -08:00
Shaohui Xie
ac0ca41634 arm64: dts: add LS1043a-RDB board support
Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com>
Signed-off-by: Wenbin Song <Wenbin.Song@freescale.com>
Signed-off-by: Hou Zhiqiang <B48286@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 10:53:33 -08:00
Mingkai Hu
6d453cd223 arm64: dts: add Freescale LS1043a SoC support
LS1043a is an SoC with 4 ARMv8 A53 cores and most other IP blocks are
similar to LS1021a which also complies to Freescale Chassis 2.1 spec.

Created LS1043a SoC DTSI file to be included by board level DTS files.

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Hou Zhiqiang <B48286@freescale.com>
Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com>
Signed-off-by: Wenbin Song <Wenbin.Song@freescale.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 10:53:29 -08:00
Mingkai Hu
8dd1f63ba0 Documentation: DT: Add entry for Freescale LS1043a-RDB board
Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com>
Signed-off-by: Hou Zhiqiang <B48286@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 10:53:27 -08:00
Jonathan Cameron
e8aab48b34 iio: adc: ina2xx: Fix incorrect report of data endianness to userspace.
This was extracted from a reposting of the driver after it had been applied
to the IIO tree.  I have fast tracked it as the driver will be in 4.5 and
it would be nice to fix this trivial issue before it is.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2015-12-22 18:51:27 +00:00
Jaegeuk Kim
7441ccef33 f2fs: use atomic variable for total_extent_tree
It would be better to use atomic variable for total_extent_tree.

Reviewed-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2015-12-22 10:31:41 -08:00
Heiko Stübner
a40a00318c usb: dwc2: add shutdown callback to platform variant
In specific conditions (involving usb hubs) dwc2 devices can create a
lot of interrupts, even to the point of overwhelming devices running
at low frequencies. Some devices need to do special clock handling
at shutdown-time which may bring the system clock below the threshold
of being able to handle the dwc2 interrupts. Disabling dwc2-irqs
in a shutdown callbacks prevents reboots/poweroffs from getting stuck
in such cases.

The hsotg struct already contains an unused irq element, so we can
just use it to store the irq number for the shutdown callback.

Reviewed-by: Douglas Anderson <dianders@chromium.org>
Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Heiko Stuebner <heiko.stuebner@collabora.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-12-22 12:12:51 -06:00
Masahiro Yamada
3837bd277a clk: fix codying style of if ... else blocks
This code is unreadable due to the blank line between if and else
blocks.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
2015-12-22 10:11:52 -08:00
Geliang Tang
ea4a8cb1c2 usb: gadget: bcm63xx_udc: use list_for_each_entry_safe
Use list_for_each_entry_safe() instead of list_for_each_safe() to
simplify the code.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-12-22 12:08:40 -06:00
Adriana Reus
9b1de75b5d iio: light: us5182d: Refactor read_raw function
A bit of refactoring for better readability.
Moved and slightly reorganized all the activity necessary for reading als
and proximity into a different function. This way the switch in read raw
becomes clearer and more compact.

Signed-off-by: Adriana Reus <adriana.reus@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2015-12-22 18:07:08 +00:00
Adriana Reus
b6695254f8 iio: light: us5182d: Add interrupt support and events
Add interrupt support for proximity.
Add two threshold events to signal rising and falling directions.

Signed-off-by: Adriana Reus <adriana.reus@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2015-12-22 18:07:05 +00:00
Uwe Kleine-König
39cee200c2 usb: musb: core: call init and shutdown for the usb phy
The phy's init routine must be called before it can be used. Do so in
musb_init_controller and the matching shutdown in musb_remove.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-12-22 12:05:44 -06:00
Du, Changbin
8a0859b65b usb: gadget: forbid queuing request to a disabled ep
Queue a request to disabled ep  doesn't make sense, and induce caller
make mistakes.

Here is a example for the android mtp gadget function driver. A mem
corruption can happen on below senario.
1) On disconnect, mtp driver disable its EPs,
2) During send_file_work and receive_file_work, mtp queues a request
   to ep. (The mtp driver need improve its synchronization logic!)
3) mtp_function_unbind is invoked and all mtp requests are freed.
4) when udc process the request queued on step 2, will cause kernel
   NULL pointer dereference exception.

Signed-off-by: Du, Changbin <changbin.du@intel.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-12-22 12:04:05 -06:00
Marek Vasut
6d76c92c2f usb: dwc2: gadget: Repair DSTS register decoding
The "enumspd" field is located in register DSTS[2:1], but the code
which checks the bitfield does not shift the value accordingly. This
in turn causes incorrect detection of gadget link partner speed in
dwc2_hsotg_irq_enumdone() .

Shift the value accordingly to fix the problem with speed detection.

Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-12-22 12:03:05 -06:00
John Youn
60c0288c72 usb: dwc2: gadget: Remove call to dwc2_hsotg_init()
Remove call to dwc2_hsotg_init() from dwc2_gadget_init(). The
gadget_init function should not access any device registers because the
mode isn't guaranteed here.

Also, this is already called elsewhere before anything starts on the
gadget so it is not necessary here.

Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-12-22 12:02:44 -06:00
John Youn
25362d3183 usb: dwc2: Remove redundant reset in probe
Reset already happens before this so just force the dr_mode.

Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-12-22 12:02:34 -06:00
John Youn
97e463886b usb: dwc2: Reduce delay when forcing mode in reset
The delay for force mode is only 25ms according to the databook.

Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-12-22 12:01:32 -06:00
John Youn
241729baa9 usb: dwc2: gadget: Replace dwc2_hsotg_corereset()
The dwc2_core_reset() function exists in the core so use that one
instead.

Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-12-22 12:01:19 -06:00
John Youn
43e9034904 usb: dwc2: gadget: Use hw params from core
Use the previously cached hw params in the gadget. This saves a reset
and force mode in the gadget initialization during probe and makes
getting the hardware parameters consistent between gadget and host.

Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-12-22 12:01:01 -06:00
Adriana Reus
58e9042f5f iio: light: us5182d: Fix enable status inconcistency
When setting als only or proximity only modes make sure that we mark the
other component as disabled. This fix is in preparation of adding event
support because that will make it possible to switch between one-shot and
continuous modes and not tracking these correctly may cause faulty
behaviour (e.g wrongfully considering px enabled and not setting an
appropriate mode in the chip).

Signed-off-by: Adriana Reus <adriana.reus@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2015-12-22 18:00:51 +00:00
John Youn
55e1040e42 usb: dwc2: Improve handling of host and device hwparams
Adds separate functions to get the host and device specific hardware
parameters. The functions check whether the parameters need to be read
at all, depending on dr_mode, and forces the mode only if necessary.
This saves some delays during probe. This also adds two device mode
parameters that will be used by the gadget.

Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-12-22 12:00:51 -06:00
John Youn
09c96980dc usb: dwc2: Add functions to set and clear force mode
Added functions to set force mode for host and device. These functions
will check the current mode and only force if needed thus avoiding
unnecessary force mode delays. However clearing the mode is currently
done unconditionally and with the delay in place. This is needed during
the connector ID status change interrupt in order to ensure that the
mode has changed properly. This preserves the old behavior only for this
case. The warning comment about this is moved into the clear mode
condition.

Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-12-22 12:00:34 -06:00
John Youn
263b7fb557 usb: dwc2: Move reset into dwc2_get_hwparams()
The reset is required to get reset values of the hardware parameters but
the force mode is not. Move the base reset into dwc2_get_hwparams() and
do the reset and force mode afterwards.

Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-12-22 11:58:34 -06:00