Commit graph

533,096 commits

Author SHA1 Message Date
Heikki Krogerus
289fcff4bc usb: add bus type for USB ULPI
UTMI+ Low Pin Interface (ULPI) is a commonly used PHY
interface for USB 2.0. The ULPI specification describes a
standard set of registers which the vendors can extend for
their specific needs. ULPI PHYs provide often functions
such as charger detection and ADP sensing and probing.

There are two major issues that the bus type is meant to
tackle:

Firstly, ULPI registers are accessed from the controller.
The bus provides convenient method for the controller
drivers to share that access with the actual PHY drivers.

Secondly, there are already platforms that assume ULPI PHYs
are runtime detected, such as many Intel Baytrail based
platforms. They do not provide any kind of hardware
description for the ULPI PHYs like separate ACPI device
object that could be used to enumerate a device from.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: David Cohen <david.a.cohen@linux.intel.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-05-13 12:04:55 -05:00
Felipe Balbi
3521a399da usb: dwc2: hcd: fix build warning
commit db62b9a804 (usb: dwc2: host: don't
use dma_alloc_coherent with irqs disabled)
introduced a build warning by using NULL
as an integer. Fix that by just using 0 instead
of NULL.

Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-05-13 12:03:23 -05:00
Florian Fainelli
9f98802911 ARM: dts: BCM63xx: Add SMP nodes and required properties
Update bcm63138.dtsi with the following:

- enable-method for both CPU nodes
- brcm,bcm63138-bootlut node
- resets properties to point to the correct PMB controller to release
  the secondary CPU from reset

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-05-13 10:00:10 -07:00
Florian Fainelli
a4cdbb96ed Documentation: DT: Document SMP DT nodes and properties for BCM63138
Add binding documentation for the additional nodes and properties
required to get the secondary CPU online on the BCM63138 SoC.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-05-13 10:00:04 -07:00
Florian Fainelli
39afb9809c ARM: dts: BCM63xx: Add PMB busses nodes
Add the two BCM63138 PMB busses nodes found on this System-on-a-Chip as
described in their corresponding binding document.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-05-13 09:59:57 -07:00
Florian Fainelli
b3e913bed6 Documentation: DT: Add Broadcom BCM63138 PMB binding
Add a Device Tree binding for the Broadcom BCM63138 Processor Monitor
Bus, which is an internal bus used to access different power and reset
signals within a BCM63138 System-on-a-Chip.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-05-13 09:59:51 -07:00
David S. Miller
1f7bd29bc0 Merge branch 'switchdev-cleanups'
Scott Feldman says:

====================
switchdev: more (minor) cleanups

Fix some sparse warnings and include some documentation review comments that
didn't get picked up in the switchdev Spring Cleanup series.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-13 12:26:28 -04:00
Scott Feldman
1f5dc44c88 switchdev: apply review comments on documentation
There were a few review comments on the switchdev.txt documentation that
didn't get included with the Spring Cleanup series, so include them now.

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-13 12:26:28 -04:00
Scott Feldman
5eb764edee switchdev: align comment with other comments in block
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-13 12:26:27 -04:00
Scott Feldman
7a7ee5312d switchdev: sparse warning: pass ipv4 fib dst as network-byte order
And let driver convert it to host-byte order as needed.

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-13 12:26:27 -04:00
Scott Feldman
22c1f67ea5 switchdev: sparse warning: make __switchdev_port_obj_add static
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-13 12:26:27 -04:00
Jozsef Kadlecsik
a9756e6f63 netfilter: ipset: Use better include files in xt_set.c
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2015-05-13 18:21:13 +02:00
Sergey Popovich
1823fb79e5 netfilter: ipset: Improve preprocessor macros checks
Check if mandatory MTYPE, HTYPE and HOST_MASK macros
defined.

Signed-off-by: Sergey Popovich <popovich_sergei@mail.ua>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2015-05-13 18:21:13 +02:00
Sergey Popovich
58cc06daea netfilter: ipset: Fix hashing for ipv6 sets
HKEY_DATALEN remains defined after first inclusion
of ip_set_hash_gen.h, so it is incorrectly reused
for IPv6 code.

Undefine HKEY_DATALEN in ip_set_hash_gen.h at the end.

Also remove some useless defines of HKEY_DATALEN in
ip_set_hash_{ip{,mark,port},netiface}.c as ip_set_hash_gen.h
defines it correctly for such set types anyway.

Signed-off-by: Sergey Popovich <popovich_sergei@mail.ua>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2015-05-13 18:21:12 +02:00
Sergey Popovich
275e2bc0f2 netfilter: ipset: Fix ext_*() macros
So pointers returned by these macros could be
referenced with -> directly.

Signed-off-by: Sergey Popovich <popovich_sergei@mail.ua>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2015-05-13 18:21:07 +02:00
Pawel Moll
e532ffea4a bus: arm-ccn: Use hrtimer_start() again
hrtimer_start() will no longer defer already expired timers to the
softirq in 4.2, and the __hrtimer_start_range_ns() function is
getting removed, causing build errors when both the tip tree and
the arm-ccn changes are merged.

This changes the code back to using hrtimer_start, which will
do the right thing after this branch gets merged with the
timers update from tip.

As pointed out after a discussion on the mailing list, the result will
not be worse than the what was there before you pulled my updates, as
the code was using normal hrtimer_start(). It's just when I realised
that it should be pinned I looked at what x86 uncore pmu is doing and
shamelessly (and probably a bit mindlessly) copied the "do not wakeup"
version from there.

[arnd: update commit message]
Reported-by: Mark Brown <mark.brown@arm.com>
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-05-13 18:18:00 +02:00
Arnd Bergmann
e355eb0a28 ARM: tegra: Default configuration updates for v4.2-rc1
This is a set of changes to the Tegra default configuration that enable
 various new features (HDMI audio, watchdog) on Toradex Apalis T30.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJVU1LgAAoJEN0jrNd/PrOhzGAP/ja9FwDcPC+wSUc96Onm7pq9
 wH8KK6lrTIJTTDMdCJHgDXzbaZi1+H6nOHE3EvfNLwIgUMbkCt3v7CqiRMVrxK3C
 CMsyMm2dNl+ZaJ9UIVp0ljlFHJWsdVV6KJH5uXVwLvgRbaH//2jD8Mxx4H5Itr+s
 4VVu7+sHgKbkjHM+XZqxygoN8aRmpacxhTXKy0pN6hxEwnMKKV81GRHprs+gdQ2x
 6UkVcYwtXQ3DrcACKhY7UCHWBWk8MbMpGH+JIhSBldkyKM/H9U64u8qUzWlS2IXJ
 uG2e/MH19xl/k9X65lC+Ucnj5/u8iv8jR3srT/tFhHtLMVO+rjgZN4Q+O0nM0Ubw
 4J3bJEvjByGFx/8dP91ByY5G0vpPBSYNPPYEJJoz2ez37mviVWiiUxL4JZX6luAx
 my+zhPFj/VSYgPK0YpZWjDJIZyJRJ9DV0j0lwIFpXvFlDle7lLMkRr++Ei3r3IlW
 U2HH3DPpTuHhwOsqR89dakDk2iAZ3ZMbPDC54Bt7hS0Zsq40VWsbQU7dqP7sqPdr
 8jZCoHklJoZzAPPr1qgIdUZ1QCoNW7N6NToKT6glDd89OMgM5L9yDhug8FcW2YjL
 S9UUr1tXfjovNTNS9JsvnyV5saMYXMKsCfgxvNTUU9b/Jml+vdXf8YYK9ybsh0oL
 vKI8uaKZO5drCgjQGUoI
 =wg5M
 -----END PGP SIGNATURE-----

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

Merge "ARM: tegra: Default configuration updates for v4.2-rc1" from Thierry Reding:

This is a set of changes to the Tegra default configuration that enable
various new features (HDMI audio, watchdog) on Toradex Apalis T30.

* tag 'tegra-for-4.2-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Update default configuration
2015-05-13 18:10:17 +02:00
Arnd Bergmann
a258e3f811 ARM: tegra: Devicetree changes for v4.2-rc1
Contains a couple of fixes and additions to device tree files. The most
 notable change is a fix for a misapplied patch that was only exposed by
 a recent change in the regulator subsystem that caused USB to break on
 Tegra124 recently.
 
 Other than that there are a more or less random assortment of additions
 to enable various features on a couple of boards.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJVU1KlAAoJEN0jrNd/PrOhMKgP/jOIwMgc+RC6uud66kAb8oQ8
 itcNWwhHFv/7fiCeIbCq8qsp51DHPxhDuWeBP/FIhfExJcDD+P2pfrKpXlI1bCrz
 jgOHfgauKSzSEIQcFU3uYWMr7qR7euVtaBsB0v16HtSpTcRnNKv/hvlvYPFYVl5D
 NvWyYB7hjHrbAur97vrJJ9e+RKZGfKo0bOqikyQ5ftbKcASa9HNY6JAeOrV+Delw
 LPA3P98eXcwVSBgdHw++iOqVZNbs+kNXnRV8dcjgWXdXsI2LQGgZrbEb5WS7/29j
 0Jaz9dwMJ4EC9yZaiT2sOXxdOjnSJ5MC1lE/CuCjE8Kz4fsq8sCudTp90fi6eFxT
 QcrneJ7d7LzjprDpKdK8E/YgPHjp5pOVuBvqtJ/RtjHFCVlaZ5OvZMdNX0zqY7SU
 T+3kYNXTcFhJHyQOtajGOSixVyqOEVddjjCvSyH+QXB6MmkH37Jcg6A7J/t6VrX3
 eK0VQMqkB10hZj8pzP/kN4dpiw3YQXxszF9luQ10AjHZvnADyGKesaDXYEjGD3FL
 ux1hjQHTAuRauID4XUzu2vfNQqYbLb0papQ+6RnlgBn4P+jS/45xTZEchUU5Xoj/
 SGTgxqNM4TjCDGf6iYzpbKi/A/T46w5Xt05r2g57qkQPcITVJK6MHtbEmPjWR1jP
 3CJ0qItO/dSTi61vV0XW
 =8R5I
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-4.2-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt

Merge "ARM: tegra: Devicetree changes for v4.2-rc1" from Thierry Reding:

Contains a couple of fixes and additions to device tree files. The most
notable change is a fix for a misapplied patch that was only exposed by
a recent change in the regulator subsystem that caused USB to break on
Tegra124 recently.

Other than that there are a more or less random assortment of additions
to enable various features on a couple of boards.

* tag 'tegra-for-4.2-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Fix hda2codec_2x clock and reset names
  ARM: tegra: Add Tegra30 HDA support
  ARM: tegra: Cardhu device-tree comment spelling fix
  ARM: tegra: venice2: Set min-/max-microvolt for VDD_LED supply
  ARM: tegra: venice2: Mark eMMC as non-removable
  ARM: tegra: jetson-tk1: Enable HDA support
  ARM: tegra: Add missing HDMI +5V regulator
  ARM: tegra: cardhu: Add power and volume keys
  ARM: tegra: Correct which USB controller has the UTMI pad registers
2015-05-13 18:02:49 +02:00
Arnd Bergmann
2516a932ef ARM: tegra: Core SoC changes for v4.2-rc1
A couple of changes to the core SoC support code. Perhaps the most
 important part is a fix for a regression in LP1 suspend/resume code that
 was introduced a while back.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJVU1HFAAoJEN0jrNd/PrOhZNQP/ji9c+i3NPHn8Ll1bd9G8ppB
 Mv3SCjRqen1FVgrjuduGGlw+d6iJxVQvYM9tZ09ciFBLEsYzardiPpWeTau7stbn
 AKehXQQLoaj8ZZDJta09aLSjwddm9OkYGfceRykPnRoSRNDiWxGA71KXiYTN3TxZ
 A1mEJ7oIUZhZvltcriNeU9R/54/slLq00tPaD6XsH32l6GTdlS591mDgPBVia8TC
 HkcbXhutHInXtaP0IAaWHYrS2hp0Gy5/bIabKgjmK1bd1tBgf8g3hxe1YkUIaeWf
 j9F3Pb6SV54GSTV0p6hDsX/FnD7j9/ly3XQasdMp/+YOMCG+RfQjPhri2q32NIBm
 QDeG7BYUQJ8ktAFuGgOiwxpp9plTUBSMDDYOraHSJf2FVqH2NTlLkm9vamm5d6wb
 edlkyTmy5xeUCX4+hADgEbSTxSagXzSiZ4mLPtCL656ASwGriEg/HoyVnzHWNvJa
 6il5eEg6qaTYh2Ui+4z6BYZx8DQ8tQ51sg9lW/Y+QL71jopAHqS3wjnKJ/RlcePQ
 TD4tYhf6ALMLGZWGB/VYRwKPxYuI+owzf7P7mBzX0NtbY1PxsiQA2ximO7Y+XegE
 Ou2rO2lQVofH3WbzhfYgT4/+c0NtDpdI2FGsEMhsPYE3zLTyO+d8gsEQsI6oGkrU
 I/soe1xKK/4BZT6IZTP7
 =BR2n
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-4.2-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc

Merge "ARM: tegra: Core SoC changes for v4.2-rc1" from Thierry Reding:

A couple of changes to the core SoC support code. Perhaps the most
important part is a fix for a regression in LP1 suspend/resume code that
was introduced a while back.

* tag 'tegra-for-4.2-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  soc/tegra: pmc: move to using a restart handler
  ARM: tegra20: Store CPU "resettable" status in IRAM
  soc/tegra: Watch wait_for_completion_timeout() return type
2015-05-13 18:01:18 +02:00
Arnd Bergmann
44fb3026ad ARM: tegra: Add EMC driver for v4.2-rc1
This introduces the EMC driver that's required to scale the external
 memory frequency.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJVU1FHAAoJEN0jrNd/PrOhClAQAKDOt5OYvadTfmPogJiwxlQl
 7NvVVsnIzHfScANP6B/pynoC8Gfx1owRdLzPPWKM860gtdtaA9pXOWRuxQV8NLcR
 5WQO4Z4sNXyvA704MNFK+EqydCN2Iu/Z+2Ups8VHZ9VmukSNaCu/se6JvW+GJMm1
 DHytjzHeckNUruNrZnXLA6ckwymDbMtCBV3W9hIeKe9aPjJrgjR7Rlhhu7cX9XGF
 XSCF9eigh4MsyLgf3cWMoVl2NIePCW3sbAQEKkiM5xzPo21VlpPyja7OWoytcQkC
 HEMmuICfwT8XEd7fTabW+WHxTnVhkL+OZ833p+LSBUCeXJ82N8vSV8HZlRHly9LZ
 diXoJ9+2l/C02FtnnB7BtLxnyQ2NF6LAP1CvYZ7eF/Z+lxthErs0bIXyjC0RTuBN
 9y6t0/VhEGMv6ApOly1VrHLtU6LnQEbYryvlOjvP4NQVb6jQc165UdPZtXufgx9o
 VprQoOIHdBzMnThI7ndRWgZcayn+VmJy0TvjTGmhLcurwigbCjkqYdwhq2c7Z0F2
 FpEOCqWMJ0mywQXoZadIk5ON51IVRin0otyKed14PY9QU6c6hJ6NCZQi1pQnB95W
 Ut7ZrdZnZMIjMui8EOzeJc82mjKL3agpbYTQqqiIV+kHY9dXpxSOOHd4DbMN5Kc2
 3xvgkGtj61VOlGiGnp/W
 =QeY4
 -----END PGP SIGNATURE-----

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

Merge "ARM: tegra: Add EMC driver for v4.2-rc1" from Thierry Reding:

This introduces the EMC driver that's required to scale the external
memory frequency.

* tag 'tegra-for-4.2-emc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  memory: tegra: Add EMC frequency debugfs entry
  memory: tegra: Add EMC (external memory controller) driver
  memory: tegra: Add API needed by the EMC driver
  of: Add Tegra124 EMC bindings
  of: Document timings subnode of nvidia,tegra-mc
2015-05-13 17:59:35 +02:00
Arnd Bergmann
92d19e26d6 ARM: tegra: RAM code access for v4.2-rc1
The RAM code is used by the memory and external memory controllers to
 determine which set of timings to use for memory frequency scaling.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJVU1A5AAoJEN0jrNd/PrOhd9IP/iKCdG7BcPX5V+ae7u+12quN
 iMvYQBW7z9g292XnFvrB7pOqJaZIp0qLGAWpqA8DqOmF2nLVt5yw8yBB9kEWeeJ6
 0Il3xUneZ7NNpdN5NzCWkVfKdr2xFIvWfsl4LrW4fr7C0VaeMi9xq+cFBxK82Xpz
 9z9PDDz02ZnVGbaNZJNR7Tc5Ub0dEKHeRlpCFi9wJi0DXrURIklXuLPCoCiEH4KV
 K6AuC69ChR4m0nQqhkbeXK4395nfKEIgV+Rmlp6/spJoaQBFC5WELtEzzDLuPS2+
 4asfoFZgqEI0tSbG7sczJ4wdPrissYTULfpMW7cVC98vtzMmZLTixoAsgTss9CxS
 wmkKyrrgbHM7yxqMksIF7b1z385E7OgNaMMmNPKHfKbzyuoHo+qomFo3WfMLHoZt
 2sNvg8qfD0ueCsrsy4zNLoBq+QgwXyDRRO8DnAlToUD7sadqBbPpb3gJd2tBUVjI
 v29hf/k3TnMVJJo+uRcZfAaQMvhDr2SK1XDSTzJ3Emkvch70d9idlxmf2H+auSY7
 Fbv+NHmdjQeoARicwKAR2ZMc9RVrtQ2/FCMxirX/lagnB3ky+3W3CkhRGuid3yNq
 koxW15TY+4YIbgPXXxAwc5uL5IeBQ8YfR7kupSaGLL+FmDD2VBSw7bogc9Plb941
 PKocKOFnw3/HRY3mOtjQ
 =yv05
 -----END PGP SIGNATURE-----

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

Merge "ARM: tegra: RAM code access for v4.2-rc1" from Thierry Reding:

The RAM code is used by the memory and external memory controllers to
determine which set of timings to use for memory frequency scaling.

* tag 'tegra-for-4.2-ramcode' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  soc/tegra: fuse: Add RAM code reader helper
  of: Document long-ram-code property in nvidia,tegra20-apbmisc
2015-05-13 17:56:47 +02:00
Arnd Bergmann
fe7a5bfe18 ARM: tegra: Memory controller updates for v4.2-rc1
Adds support for Tegra132 (which is mostly the same as for Tegra124,
 except for cache maintenance). debugfs support is also introduced for
 the SMMU part of the memory controller, which allows users to inspect
 the translation state for SWGROUPs and memory clients.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJVU1AnAAoJEN0jrNd/PrOhWI8P/jqbjvaCbsbVciS4myB8xYhP
 A4pny5L38xmz6ngKliBEfW10nwq2JsH+dKAlXzRYMej4QghKjVrVzY2AtYQ3v5wv
 MeUx+yJTA54PxRHnI+dAiD7ak8ZswKsFADSVxbbOVHmI+4LQ9PAryW1lhQqikP+8
 FzVXWzNrCh1Ikv9qiOYimbKycCYVwzf1cpOnaYgDt+WRfCZBYRaVP2KdTblgC8yu
 BM2FiPoWUKdB+YCMYJB7qJtfZOe+lF6lUA8nUVaydnW3F9ll+fCnG/Ypk1iRkXr7
 rrAW6IIvkvlLpxb4o27QkuSZYNEvjwbpNAfYEocZ7v/bLAa1Knwjj3MUItgE6MFp
 zZuZ0bJ135DvGvNmkPpq3bK8c+iDsqqW2XjmHY6DCSDS9rYzyvu9b37XOYsV9HVr
 iMY3Zd8gjrtzMwiE3xLaGxaz20osuWLU4JbOHHRVpgf2u5AWGEfN/kdO+ZJlerFG
 7Z3t8svJaGaHB0EICvRxx/1dcnyW/FAS/7GC2Pb3afHBlqmxXdHa6cGzpbFlmEfz
 miYgVlEZziJXL+MsUPNHUoupSe9jo/oxm8YOIXR7z9pI9Xg2OWOxhv0afG+i1Y/a
 AniEnEmeon+wmL0699bDCvvtEEyRW+k2/mT9xp/M9Nr48DLRHYRVuiNYXd/wAk1t
 xu63NH9f+I/4pMb1H+Za
 =86m4
 -----END PGP SIGNATURE-----

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

Merge "ARM: tegra: Memory controller updates for v4.2-rc1" from Thierry Reding:

Adds support for Tegra132 (which is mostly the same as for Tegra124,
except for cache maintenance). debugfs support is also introduced for
the SMMU part of the memory controller, which allows users to inspect
the translation state for SWGROUPs and memory clients.

* tag 'tegra-for-4.2-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  memory: tegra: Disable ARBITRATION_EMEM interrupt
  memory: tegra: Add Tegra132 support
  iommu/tegra-smmu: Add debugfs support
  memory: tegra: Add SWGROUP names
2015-05-13 17:54:39 +02:00
Arnd Bergmann
bf300afa3f ARM: tegra: Cleanup patches for v4.2-rc1
Just a couple of trivial cleanups such as a typofix and conversion of
 hexadecimal numbers to all lower-case in DTS files for consistency.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJVU1ARAAoJEN0jrNd/PrOhwAQP/i+e61tVe8GhV1w0404+u3dM
 50ZQNvhsLxh8WmXlfaiFIByDgga8QbmSCCTm3GZwKx24REMTab0OepZHwon1GWSi
 DAV0mjb1jA1/rv63/USQWVR0OcPAABJbXX1zXI1WTndBfR9l8TqrtXFC0mC9ZOPg
 2n04vFjIEG2dC9urqiIb/WkFwyn2nJhVGSbBSQXwYiceuyo1KsSisWayyO/ms0tU
 g3SKtmzfrmx4UYWW3dDa/pg7tzUayzK/L8BM0bnBZH2P2Xb9f1UhCupONJ4Gv8By
 4tD2kVSe0tYivoJw6bOICfL39aUpcRnO7vUMLW34/kABjaSIzoH3uB+8MflyOhKt
 BHXKwYLXYJfSrwcd0DlLo/Y+xsPM3NCYkhniRq8atZHKecTb49WSr9ItLFw4lriD
 5vyEvQryQdzNTxuLKQgVJyZBeV+81lFb0ESNzhkD1XTMxkPV7HKVPIRZT0EsiTrh
 DIqZIsWfA5umo/1zUTP5io1U4S25xe++pXiC14nHgNudiIIK2mF7km6zhAoghvXI
 igtDqS0VlOQ7l5xlw44UQfFgRgzqyxeu2urQamNjMGQIgV6fX/jULaBm1Xjeyt2U
 zvEyORKnkIxlvQFQ7YbL9gPxA6d6d4W3OrbEEHeZsclKEmq3JP30fdVSn+p0/aWx
 dibf82nNBM+yjTGsORi3
 =OrUc
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-4.2-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/cleanup

Merge "ARM: tegra: Cleanup patches for v4.2-rc1" from Thierry Reding:

Just a couple of trivial cleanups such as a typofix and conversion of
hexadecimal numbers to all lower-case in DTS files for consistency.

* tag 'tegra-for-4.2-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Fix typo (reset -> rest) in comment
  ARM: tegra: Use lower-case hexadecimal digits
2015-05-13 17:52:57 +02:00
Arnd Bergmann
94db5b98d0 SoCFPGA updates for v4.2
- Add big endian support
 - Add earlyprintk support on UART1 that is used on Arria10
 - Remove the need to map uart_io_desc
 - Use of_iomap to map the SCU
 - Remove socfpga_smp_init_cpus as arm_dt_init_cpu_maps is already doing
   the CPU mapping.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJVU1X6AAoJEBmUBAuBoyj0ixoP/3l2MxAxQt+SRz70y3ceFqx+
 IVbGpcDQdm7RohCFQVV7PVtpjm+RllYjjlRYWN/5/xfUEgjUgCiYlEPch+zFBDvA
 u9jpK7EdXHUYjAYmlti+Rw4jXXsYy+DzkZeMm6t/MlSj61exKW9iRU+/cdhXDyLx
 m81fGf+M8V/2xMIbHC6f/6xk2+a8WtTwCoh1FaCJLp+qkedQ4QOJPDjYSWBiubXH
 g7ydcuIiBpOuc57E1rzFWHeJgQu9VO+hLrNrazrfN/awbonPEL7hMJR2+odrDzHw
 wnwijqQCRDW1dZOAKNulH7h/9IzxjFyyIjdAbUF8ZplxIT0vtLbYPldd/435XJFX
 9VCUzVfAc0Vu5sfl3InbcRNoJDkCPavqcug1pYJkJlE8TeHcV8ylC7uzhWWrIRWa
 mzJq+j3p/E2pbvfv9YHccNaGRL4p9icN0eojM3fSwAlG9rAsDGFGNJH3Qb4tuwem
 H3MyhrIr9eveVBSkvz71sPy+ZHRL7EcPVFggpyXG2kNptb/K1P6cdDBO+mfl7ymM
 oVaKaGfpm3sCF9h/vLDWlsZUVF9eEsWO4qx5b0852T94WPkG+qg8p+MCYX2/7lGO
 41nKAWZpKRQj/9LvQpxlPnZSUhqcOPuHVVgMCDaXbwN9tGo7hJuaHpq4abElH3Ha
 h1lu5YGA9V0wf+zbK3S/
 =60ig
 -----END PGP SIGNATURE-----

Merge tag 'socfpga_updates_for_v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/soc

Merge "SoCFPGA updates for v4.2" from Dinh Nguyen:

- Add big endian support
- Add earlyprintk support on UART1 that is used on Arria10
- Remove the need to map uart_io_desc
- Use of_iomap to map the SCU
- Remove socfpga_smp_init_cpus as arm_dt_init_cpu_maps is already doing
  the CPU mapping.

* tag 'socfpga_updates_for_v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: use of_iomap to map the SCU
  ARM: socfpga: remove the need to map uart_io_desc
  ARM: socfpga: Add support for UART1 debug uart for earlyprintk
  ARM: socfpga: support big endian for socfpga
  ARM: socfpga: enable big endian for secondary core(s)
  ARM: debug: fix big endian operation for 8250 word mode
2015-05-13 17:49:03 +02:00
Arnd Bergmann
2cac46a415 SoCFPGA update for v4.2 part 2
- Add a DTS node for the A9 SCU
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJVU1L4AAoJEBmUBAuBoyj05zEP/02UJVcqCHT2P/z/1XJnIwed
 hZgO0Oej4ZEc+futAIx6IeMEkgNoIDZX1rdijiQe3Uv2QK8niC7R8yOjwcZrM8jZ
 ws/jyKWpCBsV0J+lzZevxa3DpxMHPmcx0W9gAqYpikrwgbXt0Dyy62CQkp+XKZ5d
 mluxSEbkSlORddzD8eQbM1yuVlFGg9RAzdwaeZk4j6x+vq2Zk+jEwq5EKLBIiO/U
 kGwu/mEryiWl+lzqV7Nlagt4uLASsT5ZxEjr4zUx9ddDTJo4mqStqONdDPMTdf9h
 0qzHrWa9mMhI7RLoOWBuvTEcvEVPSRNhVfo6cY8ZnQcZ/V5tj4sG3jAPUFXkFSMd
 iZW3mud5P45ugbKiumR5R7ve3t6yxhvNqWH9FZqfnlPPNXtCaUqBGB772A0Xr2Hz
 mRPu2Vl9cjmGdrWQHqF5sViPdm52E8Het3/HO0ccsx4aoH+jhgGKeqmiK779EKTA
 lA0NPBrL5PRzjNacNwnR7RxtLpcISf5CbsV0ojiIDtB8x11TCg1Zct+ogeE03luT
 YpTNuOgTEg7Gy4oa6LPPXahUS+6RffHmASjlt15xaWx/x5MaCXTyk3H4JtSumDiL
 blFzdQmNUcO2YpggSgyS0UzRFyqYJIRPq7lHKMJz5NMfaHVzu4VzoDKmJVo4zG2T
 BftEOP7ROh5wq1HkWJs3
 =23ne
 -----END PGP SIGNATURE-----

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

Merge "SoCFPGA update for v4.2 part 2" from Dinh Nguyen:
- Add a DTS node for the A9 SCU

* tag 'socfpga_dts_for_v4.2_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: dts: add the a9-scu node
2015-05-13 17:47:47 +02:00
Arnd Bergmann
2b424c7a0b Some misc improvements defining additional supply regulators, enabling
the Cortex-A12 HW PMU on the rk3288 and the tsadc on some more rk3288
 boards, as well as some usb properties and marking the radxarock pmic
 as system-power-controller.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJVU2Y0AAoJEPOmecmc0R2BXCQIAIV6yQP+f6ACIPJEVRk8yD3W
 YyJ/mXgrSD/RaaFYnEO3PPVC8TibVI6a7SIoa4y92g0LW7VYn7UQY1wzlrt3rzR5
 rY71uB/Ew0yQBJe1rsw+Sn7couG9U/g3YB/guJmFfO2rS9xn6wICKcLxYNaIp9sb
 WOwzNlpWwpejCdYLzxw9BP0qxFRE2ZlxoF96VB+j5s+IcnvKGGo3twYqtyN5YEjK
 dB7Bbnq6n9VWgYMkuijxyQ00skUNUb+7ciHSO4pksPtuSa4K+GsqjkTu37nkBPmn
 t53c+M93WuI5hplFRM3UwXKH6ELqhEuq0GN4dPzRD5VBWcWYOMXl8AmhfOlR6cU=
 =39uK
 -----END PGP SIGNATURE-----

Merge tag 'v4.2-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "ARM: rockchip: dts changes for 4.2" from Heiko Stuebner:

Some misc improvements defining additional supply regulators, enabling
the Cortex-A12 HW PMU on the rk3288 and the tsadc on some more rk3288
boards, as well as some usb properties and marking the radxarock pmic
as system-power-controller.

* tag 'v4.2-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add system-power-controller to act8846 on radxarock
  ARM: dts: rockchip: add properties for dwc2 usb otg controller
  ARM: dts: rockchip: enable tsadc on rk3288 boards
  ARM: dts: rockchip: add act8846 supplies on rk3288-firefly
  ARM: dts: rockchip: Specify VMMC and VQMMC on rk3288-evb
  ARM: dts: rockchip: Enable Cortex-A12 HW PMU events on rk3288
2015-05-13 17:41:54 +02:00
Chen-Yu Tsai
6d4fa89dcd mfd: axp20x: Enable AXP22X regulators
Now that the axp20x-regulators driver supports different variants of the
AXP family, we can enable regulator support for AXP22X without the risk
of incorrectly configuring regulators.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
2015-05-13 16:26:34 +01:00
Chen-Yu Tsai
97ba5ac1f2 mfd: axp20x: Add AXP22x regulator information to DT bindings
Add the list of regulators for AXP22x to the DT bindings.
This includes the names and supply names.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
2015-05-13 16:26:28 +01:00
Boris BREZILLON
1b82b4e4f9 regulator: axp20x: Add support for AXP22X regulators
Add AXP22X regulator definitions and variant id associations.
This introduces a new "switch" type output for one of the regulators.
It is a switchable secondary output of one regulator, with the same
voltage level as the primary output.

Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
[wens@csie.org: Moved variant choosing to multi family support patch]
[wens@csie.org: Add dc-dc work frequency range]
[wens@csie.org: Add "switch" type output regulator DC1SW]
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
2015-05-13 16:26:18 +01:00
Boris BREZILLON
866bd951f2 regulator: axp20x: Prepare support for multiple AXP chip families
Rework the AXP20X_ macros and probe function to support the several chip
families, so that each family can define it's own set of regulators.

Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
[wens@csie.org: Support different DC-DC work frequency ranges]
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
2015-05-13 16:26:04 +01:00
Chen-Yu Tsai
768a87c8e1 mfd: axp20x: Update DT bindings with AXP22x compatibles
Add AXP221 to the list of supported devices.

Also replace any mention of AXP20x in the document with a
generic "PMIC".

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
2015-05-13 16:25:55 +01:00
Boris BREZILLON
f05be589ff mfd: axp20x: Add AXP22x PMIC support
Add support for the AXP22x PMIC devices to the existing AXP20x driver.
This includes the AXP221 and AXP223, which are identical except for
the external data bus. Only AXP221 is added for now. AXP223 will be
added after it's Reduced Serial Bus (RSB) interface is supported.

AXP22x defines a new set of registers, power supplies and regulators,
but most of the API is similar to the AXP20x ones.

A new irq chip definition is used, even though the available interrupts
on AXP22x is a subset of those on AXP20x. This is done so the interrupt
numbers match those on the datasheet.

This patch only enables the interrupts, system power-off function, and PEK
sub-device. The regulator driver must first support different variants
before we enable it from the mfd driver.

Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
[wens@csie.org: fix interrupts and move regulators to separate patch]
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
2015-05-13 16:25:35 +01:00
Sergej Sawazki
c354b54cfd ASoC: wm8741: Add differential mono mode support
The WM8741 DAC supports several differential output modes (stereo,
stereo reversed, mono left, mono right). Add platform data and DT
bindings to configure it.

Signed-off-by: Sergej Sawazki <ce3a@gmx.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2015-05-13 15:51:36 +01:00
Chen Hanxiao
b749b1b673 workqueue: fix a typo
s/detemined/determined

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2015-05-13 10:23:56 -04:00
Christoph Hellwig
3fd61b2099 nvme: fix kernel memory corruption with short INQUIRY buffers
If userspace asks for an INQUIRY buffer smaller than 36 bytes, the SCSI
translation layer will happily write past the end of the INQUIRY buffer
allocation.

This is fairly easily reproducible by running the libiscsi test
suite and then starting an xfstests run.

Fixes: 4f1982 ("NVMe: Update SCSI Inquiry VPD 83h translation")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
2015-05-13 10:22:12 -04:00
Arnd Bergmann
6c28ab9fef The previous two suspend related fixes both fix the same issue
so only one of them (the newer one) is actually needed.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJVU1d5AAoJEPOmecmc0R2BzasH/A6sT2IN9dwXotpknq9pmUY6
 NU1sp7+1hdQge8ZuKG6G+Ptp9e3auBg6OuC8jUthn3Yb7FaflqqzLWmeSZFYiN8R
 kPqoIio8qryc8n7yYq3lg5PbliXwrSMUkklOxvfb2K4ds3IXzmct+icwgWCQyfSo
 1KsJy1T/xZfSSLtVwl7l6pDVAse/JHFdIasTMyF8Y6wzNdptAyUt+nqodL1OZ4EZ
 BETO/jN7m3Wt7rMY8wZBb7DnR3Cdlh/Rrv5Gt2VtdIo7yE5faba3Xb2inBQCbrmt
 vEuy5uk3cwD3BeWKJRNxisPaxCR8cPbC5I6B/dLvwCtE7SLBpbI2WRhJ4e2wkWQ=
 =Y0kW
 -----END PGP SIGNATURE-----

Merge tag 'v4.1-rockchip-socfixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes

The previous two suspend related fixes both fix the same issue
so only one of them (the newer one) is actually needed.

* tag 'v4.1-rockchip-socfixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  Revert "ARM: rockchip: fix undefined instruction of reset_ctrl_regs"
2015-05-13 16:17:33 +02:00
Heiko Stuebner
3f937cf3db Revert "ARM: rockchip: fix undefined instruction of reset_ctrl_regs"
This reverts commit b403125d3b.

As reported by Chris, both commits
        b403125 "ARM: rockchip: fix undefined instruction of reset_ctrl_regs"
        0ea001d "ARM: rockchip: disable dapswjdp during suspend"
actually fix the same issue and b403125 is the older one, which got
superseded by 0ea001d. Therefore revert the obsolete one again.

Reported-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-05-13 15:47:03 +02:00
Dinh Nguyen
122694a0c7 ARM: socfpga: use of_iomap to map the SCU
Use of_iomap to map the "arm,cortex-a9-scu". By doing this, we can remove
map_io in socfpga.c.

Also, we can remove socfpga_smp_init_cpus, as arm_dt_init_cpu_maps is
already doing the CPU mapping.

Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-05-13 08:41:35 -05:00
Rafael J. Wysocki
819b1bb30d PM / sleep: Fix symbol name in a comment in kernel/power/main.c
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2015-05-13 15:31:12 +02:00
Dinh Nguyen
8508452e57 ARM: socfpga: dts: add the a9-scu node
Add the dts node for the A9 SCU.

Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-05-13 08:30:03 -05:00
Marcel Ziswiler
36b7be6d3e clk: tegra: Fix hda2codec_2x clock name for Tegra30
The HDA to codec clock is named hda2codec_2x, so use the proper name in
the clock table.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
2015-05-13 15:17:14 +02:00
Thierry Reding
31b52ba42d clk: tegra: EMC clock driver depends on EMC driver
The EMC clock driver uses symbols exported by the EMC driver, so it
needs the corresponding dependency to avoid build breakage.

Signed-off-by: Thierry Reding <treding@nvidia.com>
2015-05-13 15:17:13 +02:00
Tomeu Vizoso
890d6a54ea clk: tegra: Have EMC clock implement determine_rate()
As opposed to round_rate(), determine_rate() can take rate constraints
into account when choosing the best rate.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
2015-05-13 15:17:13 +02:00
Tomeu Vizoso
ac67477f8f clk: tegra: Set the EMC clock as the parent of the MC clock
On Tegra124, as we now have a proper driver for the EMC.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
2015-05-13 15:17:12 +02:00
Mikko Perttunen
2db04f16b5 clk: tegra: Add EMC clock driver
The driver is currently only tested on Tegra124 Jetson TK1, but should
work with other Tegra124 boards, provided that correct EMC tables are
provided through the device tree. Older chip models have differing
timing change sequences, so they are not currently supported.

Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
[treding@nvidia.com: use more consistent function names]
Signed-off-by: Thierry Reding <treding@nvidia.com>
2015-05-13 15:17:11 +02:00
Mikko Perttunen
374ffadaf3 clk: tegra: Remove old Tegra124 EMC clock
This clock has never been able to do anything.

Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
2015-05-13 15:17:10 +02:00
Tomeu Vizoso
ef03b35a9a of: document external-memory-controller property in tegra124-car
This property contains a phandle to the EMC driver that is needed by the
EMC clock to request the EMC driver to do its part of the clock change
sequence.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
2015-05-13 15:17:10 +02:00
Tomeu Vizoso
e34812c5ba of: document new emc-timings subnode in nvidia,tegra124-car
The EMC clock needs some extra information for changing its rate.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
2015-05-13 15:17:09 +02:00
Tomeu Vizoso
42c86547f4 clk: Expose clk_hw_reparent() to providers
To be used by clock implementations for switching to a new parent during
rate change.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
2015-05-13 15:17:08 +02:00
Thierry Reding
07aaa0e563 Merge branch 'for-4.2/ramcode' into for-4.2/clk 2015-05-13 15:16:55 +02:00