Commit graph

691,473 commits

Author SHA1 Message Date
Arnd Bergmann
71e84db1aa Part two of device tree changes for omaps for v4.9 merge window. This
is mostly usability and non-critical fixes except for the addition of
 beagleboard-x15 rev B1 support:
 
 - Fix omap4 pandaboard SDIO WLAN latencies in idle mode by enabling wakeirq
 
 - Usability fixes for WLAN, USB, LEDs and power button on omap5 boards
 
 - Remove am57xx beagleboard-x15 pinmux configuration as the processor requires
   that it's done in IO isolation in bootloader except for MMC and DCAN
 
 - Add support for beagleboard-x15 rev B1 by moving most of the
   configuration to am57xx-beagle-x15-common.dtsi
 
 - Enable support for more than 2GB of memory for omap5 with LPAE with
   #address-cells
 
 - Fix omap3-gta04 backlight PWM frequency until the PWM driver
 
 - Revert am335x dts changes related to cpufreq as the driver changes
   still have not merged and the dts changes broke cpufreq
 -----BEGIN PGP SIGNATURE-----
 
 iQIuBAABCAAYBQJX2tgCERx0b255QGF0b21pZGUuY29tAAoJEBvUPslcq6VzUg8Q
 ANdFJ1HyqD0fUkIiNb1DCM4oq3dTNiIaTbrDxoUcUJgaf7/IGPDhKjP4Os/14cQf
 F929u90B/ZKx1gVgcdUCUSMzBoTc2bQr4SvtvyJd7irz9sVH+Q0aIleGjPnXxRBS
 qn7IbzeIy054wYU0NkNb3YefCdI1DN96FRhYJXPey1F9FD+tfbFFLKtzyEJvKn7M
 35Y4wvwZcUqGBAbIhkK6BfQIEi2VSZL93xe/d2c5EfGpiXUlH6TshiDk+QxS+lx2
 DqErsJwb+NZ0T8n/GsWaX3YQTH+X1P1aa+W94ZjJswo2buiuLxhrsRxB8Y6gJQ1r
 hPKc9RnoqcxMLEbur0MSHVfYXHWU8kpt4vWwCaJfip5i/xQHpyxuyEeMGif/RtFN
 2V6L3gDgRQ+/S34dVw486cCcGStTicC+xPU011tvNCRuPZ/cwv6nV7nzlA2dchOg
 izd6Y/SVUbOZjPtBNzx/Cq3FZFK5vF3sAQ0/swnJpbl8VaHpjLzHOfG7/+4aQVGH
 VB6zC413y+F3A0vzY640jQ4/enUWlJ5mZ59rO7PQfXhmuvFtZgK/mlCYnGtbI/Nn
 lNV9+WsQ4/n/qIR+SVHpfLKU1NGRf1B/bWsCpeRPCeONktl9V7dpuDRiHZXyAVxZ
 xDAsoscWtT77FWUQryc2hMLP1L+ED9rMnBuObXQRxFoZ
 =HYYB
 -----END PGP SIGNATURE-----

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

Pull "omap dts updates for v4.9 merge window, part 2" from Tony Lindgren:

Part two of device tree changes for omaps for v4.9 merge window. This
is mostly usability and non-critical fixes except for the addition of
beagleboard-x15 rev B1 support:

- Fix omap4 pandaboard SDIO WLAN latencies in idle mode by enabling wakeirq

- Usability fixes for WLAN, USB, LEDs and power button on omap5 boards

- Remove am57xx beagleboard-x15 pinmux configuration as the processor requires
  that it's done in IO isolation in bootloader except for MMC and DCAN

- Add support for beagleboard-x15 rev B1 by moving most of the
  configuration to am57xx-beagle-x15-common.dtsi

- Enable support for more than 2GB of memory for omap5 with LPAE with
  #address-cells

- Fix omap3-gta04 backlight PWM frequency until the PWM driver

- Revert am335x dts changes related to cpufreq as the driver changes
  still have not merged and the dts changes broke cpufreq

* tag 'omap-for-v4.9/dt-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  Revert "ARM: dts: dra7: Move to operating-points-v2 table"
  Revert "ARM: dts: am33xx: Move to operating-points-v2 table and ti-cpufreq driver"
  Revert "ARM: dts: am335x-boneblack: Enable 1GHz OPP for cpu"
  ARM: dts: omap3-gta04: reduce panel backlight PWM frequency to 83Hz
  ARM: dts: Add support for more than 2GB of memory for omap5
  ARM: dts: am57xx-beagle-x15: Add support for rev B1
  ARM: dts: am57xx-beagle-x15: Remove pinmux configurations for erratum i869
  ARM: dts: Fix LEDs for igepv5
  ARM: dts: Add power button support for igepv5
  ARM: dts: Configure omap5 OTG ID pin
  ARM: dts: ARM: dts: Fix omap5 SDIO dat1 interrupt
  ARM: dts: Configure panda SDIO WLAN wakeirq
2016-09-19 17:40:13 +02:00
Arnd Bergmann
590b906618 This pull request adds NAND support to
DA850 based LCDK board.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJX2rLXAAoJEGFBu2jqvgRNOhUP/iVAz9JAUb9lixfxliAlDd2K
 BixVXrAWP/fbheSysepXGqOfr7HNByuDlR8eAp9YG5fyWd1TBVptARcGC+E6GbLn
 Oe1HYc6JVArKcj/3SNH4cSkuoSLa3QkaOEOPCI/IDOjU9aIjmBt4kaCM0mXPlOtn
 HK4BAIxUGf3GnU5siCpFrE3X75piYIlIlEHxUSuPN0f6Oxszk+OtQ908SA2L2DsQ
 i2gcRhrpHlQx2OX9WQhXrF/UWmMwdDSXNcd4gBxTjROtTP7e3zV/Q0bS8ZK5fQHO
 hPtSIVlQRS6QXC15sIq3fedzdJ/VlsO5Apy0CntD0JaVmglERr02W1C06KEjVtRp
 wyTE4aWNjLviKeAwCpE7pLfeClhB4m9rKxoo/nT44XkyUnTmuVhWEKbOjUCEIVV1
 GIOhy2+di+o1bRx7puF7BI/ruO418vbRZfIBjj1gnPNtkzP7lqzgN+63YNWvbXxx
 obOVhNXkFqZH2W9oLOcUr8i6+iTgYAk4OTrn7K2cAnQqGy4Xnu+lTfhuVRi0LhzQ
 Oc5kBuDvP4UN28zK8cYIc6Hc7iHG5wN0V68YHpP5e7vGR1boLtVwQnYyhytEy0+x
 U0KHC8mmxqJFHL70iVr2D6ccdE9kYWQulM1CbqyU610HzBP6ZeqlWvM+gkKBiaRk
 p0tb9WZ5o1bxJZuxPACd
 =q+U6
 -----END PGP SIGNATURE-----

Merge tag 'davinci-for-v4.9/dts-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt

Pull "DaVinci DTS updates for v4.9 (part 2)" from Sekhar Nori:

This pull request adds NAND support to
DA850 based LCDK board.

* tag 'davinci-for-v4.9/dts-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: dts: da850-lcdk: Add NAND to DT
2016-09-19 17:38:38 +02:00
Jani Nikula
8e4f768c43 drm/i915/dsi: double check element parsing against size if present
Be a little paranoid in case the specs change or something.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/27050d48d0ff3d58e79fcacc41ced4c071b01424.1474286487.git.jani.nikula@intel.com
2016-09-19 18:38:11 +03:00
Hans Verkuil
d8feef9bd4 [media] cx23885/saa7134: assign q->dev to the PCI device
Fix a regression caused by commit 2bc46b3ad3 ("[media] media/pci:
convert drivers to use the new vb2_queue dev field").

Three places where q->dev should be set were missed, causing
a WARN.

Fixes: 2bc46b3ad3 ("[media] media/pci: convert drivers to use the new vb2_queue dev field").

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reported-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
2016-09-19 12:38:05 -03:00
Jani Nikula
4b4f497e13 drm/i915/bios: log about presence of DSI sequences we do not run
Leave behind some debugging clues in case some panels don't work
properly.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/b36302b24676af511f4bbf702be21cc7e8f987c2.1474286487.git.jani.nikula@intel.com
2016-09-19 18:38:02 +03:00
Jani Nikula
416062d017 drm/i915/dsi: run backlight on/off sequences in panel enable/disable hooks
Based on the documentation alone, it's anyone's guess when exactly we
should be running these sequences. Add them where it feels logical. The
drm panel hooks don't currently offer us more granularity anyway.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/267c4a2bde2076af18e9b8335c0bef2e26ea3112.1474286487.git.jani.nikula@intel.com
2016-09-19 18:37:54 +03:00
Jani Nikula
b1cb1bd291 drm/i915/dsi: update reset and power sequences in panel prepare/unprepare hooks
Based on the documentation alone, it's anyone's guess when exactly we
should be running these sequences. Add power on/off sequences where they
feel logical and update assert/deassert reset. The drm panel hooks don't
currently offer us more granularity anyway.

v2: update assert/deassert reset as well (Ville)

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1543320494df953fa073e136248238eaa1eed059.1474286487.git.jani.nikula@intel.com
2016-09-19 18:37:45 +03:00
Jani Nikula
044aad65ee drm/i915/dsi: add skip functions for spi and pmic elements
In sequence block v3 these are gracefully skipped anyway, but add the
functions so we can have some debug breadcrumbs.

v2: the pmic block is 15 bytes (Ville)

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/d102ef1f21e6ea9a17655ef31593e68343336a48.1474286487.git.jani.nikula@intel.com
2016-09-19 18:37:36 +03:00
Jani Nikula
0b9407c398 drm/i915/dsi: add debug logging to element execution
Just simple breadcrumbs for now. While at it, rename the i2c skip
function.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/d11c40a99f5ef2419ede87a2ac1858e4c60768b8.1474286487.git.jani.nikula@intel.com
2016-09-19 18:37:23 +03:00
Arnd Bergmann
3179798deb Clock improvement for video playback
This serie allows to increase video resolutions and make audio
 adjustment during a video playback for STiH407 family socs.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJX26QJAAoJEMrHeC97M/+mtRQP+gP+BR2LnphlBgEr8AuEZ9ef
 n2mZrU2VQE2Ck6jyvL8+i7ppa+KMtxzYUutdMYvLmgxnWfAXti8D8Kdk83Zao0HD
 UsFLFQEBYIDmOHjqNIeZELatDxrkk3iogn05/GFyTkBoZptOrRrcKxQpaDehNAiK
 Fg7UYT83Xx/j/F1XlGyGtOoV7qQ090yUCooCOFX0aD9B0Z+jRIQiJAswes1Pcwf3
 HzsvnWXyKgKa2NR+I4gSGTmgynh7P+xOCm0GHgqBJdRjc8RfLofwQhHKu3e2P03q
 N6FvvwAerR3xuyTnAAC7XZutwNSJCHltNeyI+vb88xElEBMuxSx8eGJHrg8yUYHV
 S6r7fFNBxs3V2pD2aMeR3DvAJ69S+cH8h+m1uXWAvyVYrOKCxP1+S9rexbHGIN4l
 fOxRMOQT2jOUPdLUT8A4aKPQmVrRgqWGVc4vcHp4uBYjcf6bIvi99vYS1yvi4bAd
 XS9tNm+nND/N1R1msiHGLUGL05zfsqKpEGw6qiEd7NRXGoCEI1hR4M5Kq+XaBvQ6
 6uqnoenrubODVwBmj9YtazRPhOVDhWJu4val3RV+3WyLY95KxQuk1mpH124IVXza
 QMU+ZmhAylQ+sKnHxrgKvKScfS/EEk+9r45ABMtubjpKmtwrnPOrC776gJ6XEv6H
 yE2mlonaOVunEi7w/59i
 =Fw1N
 -----END PGP SIGNATURE-----

Merge tag 'sti-dt-for-v4.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/dt

Pull "STi clock improvement for video playback" from Patrice Chotard:

This serie allows to increase video resolutions and make audio
adjustment during a video playback for STiH407 family socs.

* tag 'sti-dt-for-v4.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
  ARM: dts: STiH410: clock configuration to address 720p and 1080p
  ARM: dts: STi: STiH407: clock configuration to address 720p and 1080p
  ARM: dts: STiH418: Enable synchronous clock mode for video clocks
  ARM: dts: STiH410: Enable synchronous clock mode for video clocks
  ARM: dts: STiH407: Enable synchronous clock mode for video clocks
  ARM: dts: STiH418: Enable clock propagation for audio clocks
  ARM: dts: STiH410: Enable clock propagation for audio clocks
  ARM: dts: STiH407: Enable clock propagation for audio clocks
  ARM: dts: STiH4xx: Simplify clock binding of STiH4xx platforms
2016-09-19 17:37:07 +02:00
Jani Nikula
f7d3c970f4 drm/i915/dsi: don't debug log "missing" sequences
This is not interesting. They are not "missing", they are just not part
of the VBT sequences for the panel.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/54909b29802398d23f1d26f6589671e69688f904.1474286487.git.jani.nikula@intel.com
2016-09-19 18:37:06 +03:00
Aaro Koskinen
8074d78295 MIPS: Octeon: Fix platform bus probing
Commit 44a7185c2a ("of/platform: Add common method to populate
default bus") added new arch_initcall of_platform_default_populate_init()
that will override device_initcall octeon_publish_devices(). This broke
many OCTEON boards as important devices are not getting probed anymore
(e.g. on EdgeRouter Lite the USB mass storage/rootfs is missing).

Fix by changing octeon_publish_devices() to arch_initcall.

Fixes: 44a7185c2a ("of/platform: Add common method to populate default bus")
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Rob Herring <robh@kernel.org>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14041/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2016-09-19 17:35:44 +02:00
Arnd Bergmann
a60bb261dd STi dts update:
Update gpio-cells and gpio specifier for STiH415/416
 Add PWM capture support for STiH416 and STiH407 family
 Add USB3 support for B2260
 Add HVA support for STiH410
 Add clk_ignore_unused in bootargs of B2260
 Add Flexible Direct Memory Access (FDMA) support for STiH407 family
 Add internal audio codec IP spport for STiH407 family
 Add uniperif player/reader IP blocks for STiH407 family
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJX2T7MAAoJEMrHeC97M/+m6/8P/0mKaMV/p+9P942A3fJEwJsR
 STpES7YBOOvwYE+xhTErz/zjQhaw92Kq/5DFBIcjBRDq7f1G6WTbiDumV/1qaPva
 HOJeaa7aZOYjD0JbFqXZr9t68U/RmRDd2v16EUnhE3WSKe3Vw+vNrLw9oPDlqOKD
 gJ6USjc5C9OTiJ1CMtnDpooBbc/fPNQ8E9VIDD7cCDRNkzt/mu+ceLhgjL4v45ag
 GNPpTALTjMSMlmxy+um+BsAIuAKFNiPMrvq3fwlgKygnrnqwcYloD2Aamo9Rb4F8
 X9yTAlC1X6T1PPsQF+DrU+q2fBF0kyRLenXZAeQNM/N1gR/SmA3P8HZbLYOOhFd0
 HASOPFeZiBwbHGnq4TXCpBganw0tEdap9K2YIulXqKVN51Oc3KUaHgxVS+CJoSVv
 1DjEuwCC3/+7qoiMeK52hZ1k8HgO7+T40Afdq0bE64lE2w/aOvTSe+Ckg1PAGEgm
 /loE+ri79T3S6zXd+guPPZ8xoGsKmNILAfBBCG2D1MNQKEm7nT9Fwc+uvXh962XI
 eAIwZe6OrbENnD4FAou+nSsmzSkPMnPxYYKg5fq3K7txRrQ0/KbIBHkJY+1Jkv1t
 eUwRSfRYU58ln2hUroKeX5+J0Iu0EOhSrKmDiCD5f3e/u9qyb6rVX6MLjdxXj0cv
 3h85baoQfZGahEmpg6rE
 =zoto
 -----END PGP SIGNATURE-----

Merge tag 'sti-dt-for-v4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/dt

Pull "STi dts update" from Patrice Chotard:

Update gpio-cells and gpio specifier for STiH415/416
Add PWM capture support for STiH416 and STiH407 family
Add USB3 support for B2260
Add HVA support for STiH410
Add clk_ignore_unused in bootargs of B2260
Add Flexible Direct Memory Access (FDMA) support for STiH407 family
Add internal audio codec IP spport for STiH407 family
Add uniperif player/reader IP blocks for STiH407 family

* tag 'sti-dt-for-v4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti: (22 commits)
  ARM: DT: STi: stihxxx-b2120: Add DT nodes for STi audio card
  ARM: STi: DT: STiH407: Add uniperif reader dt nodes
  ARM: STi: DT: STiH407: Add uniperif player dt nodes
  ARM: STi: DT: STiH407: Add sti-sasg-codec dt node
  ARM: DT: STiH407: Add spdif_out pinctrl config
  ARM: DT: STiH407: Add i2s_in pinctrl configuration
  ARM: DT: STiH407: Add i2s_out pinctrl configuration
  ARM: STi: DT: STiH407: Add FDMA driver dt nodes.
  ARM: dts: STiH410: Add hva dt nodes
  ARM: dts: STiH410-b2260: add clk_ignore_unused in bootargs
  ARM: dts: STiH410-b2260: add USB3 node
  ARM: dts: STiH416: Define the number of PWM Capture channels
  ARM: dts: STiH416: Define PWM Capture clock
  ARM: dts: STiH416: Declare PWM Capture data lines via Pinctrl
  ARM: dts: STiH416: Supply PWM Capture IRQs
  ARM: dts: STiH407: Declare PWM Capture data lines via Pinctrl
  ARM: dts: STiH407: Supply PWM Capture IRQ
  ARM: dts: STiH416-b2020e: update gpio specifier
  ARM: dts: STiH41x-b2000: update gpio specifier
  ARM: dts: STiHxxx-b2120: update gpio specifier
  ...
2016-09-19 17:35:33 +02:00
Arnd Bergmann
e4077485dd Amlogic DT updates for v4.9
- add PWM support
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJX2YRIAAoJEFk3GJrT+8Zl4FcQAIfpiIarWGHdcOWmS1IpUA+N
 smriERx77w2vZ835w9D4Rv3NkKnt8ZY80hqqYprBLY5zo/41I8hSV9QgR1sR4Hla
 N/K70cxPsc37cXYn7AhumTAhL6n2mMyvoyc38BoZWMAPMDSufMVEp8o/EuDoIWM1
 I0e7q6siO9Qd3U8LczNGWb99jYHTG/27yGd8+UJ3x3IjNkkBiXOui2jVIEn34lfe
 KCnvjL1PdpO5ANxSsAknWmo/+HWUDGBHk0WC0mQUYDGIQ0tWD5EBFQPJYKwfalpn
 PsjDE6/I2FZS50LdWXlO/v+fzc3VCYvg7zxt7SrLdy92wbI/Q60Gb0wsloTUoFrK
 +fxlf6MYg+zqd+EPQ/S3wZVHIuqHwtQXwNxowHX+ipH1zwRmAMsxXf8Sokr3C0gN
 ZLHyNqnhmRDSGhE7Cf+vSdZrx9Rb2aIZ1foIrNlDjKc2mQrzkeOkD+EGJ83ocFJZ
 r+ngUDy+TS8U/OLzicnZ76IuHn+0VLlIjH+h8WIWqct/9GQe/WPZjvs9u+9dXUTq
 4ETCrwMnBGdyGsljFpZ4hunTVwFWHuIZoWB6/kGFyLXxCRbKhEPAB18s3IhF9dvB
 8c293diWoouO96WMLsiIc2p1C9iW5Vo1sFf5/fsdIQkH9NRlHe3KIr6XCICvvwS+
 1Q8AeN6D6/VwRvhHj4/G
 =oBSv
 -----END PGP SIGNATURE-----

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

Pull "Amlogic DT updates for v4.9" from Kevin Hilman:

- add PWM support

* tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: dts: meson8b: Add Meson8b PWM Controller nodes
2016-09-19 17:31:45 +02:00
Arnd Bergmann
fb90bc5060 mvebu dt for 4.9 (part 2)
- convert orion5x based SoC Netgear WNR854T to devicetree
 - remove obsolete orion-gpio binding description
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlfZac0ACgkQCwYYjhRyO9XfyQCgrTqHFOxoFH7T/MKeGMssVnSS
 TawAnR1gDDc313Fs6qZGeG9MWAhyzAG1
 =0M3s
 -----END PGP SIGNATURE-----

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

Pull "mvebu dt for 4.9 (part 2)" from Gregory CLEMENT:

- convert orion5x based SoC Netgear WNR854T to devicetree
- remove obsolete orion-gpio binding description

* tag 'mvebu-dt-4.9-2' of git://git.infradead.org/linux-mvebu:
  ARM: dts: orion5x: Configure WNR854T ethernet PHY LEDs
  ARM: dts: orion5x: Add description for Netgear WNR854T
  ARM: dts: arm: orion5x: Add DT include for mv88f5181
  dt-bindings: arm: add DT binding for Marvell Orion5x SoC family
  ARM: dts: orion5x: Add required properties for orion-wdt to DT node
  dt-binding: mrvl-gpio: remove orion-gpio description
2016-09-19 17:30:06 +02:00
Arnd Bergmann
3598f2470b DT Changes for 4.9:
- add ETM and ETB nodes on sama5d2
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCgAGBQJX2QivAAoJENiigzvaE+LChBsP/1iQ6pZNeIxMUu1oqxuGFpeD
 EVIKJNol6iwcm620LhGtrApuqAvAV82Ba1LGOCQnRk8DwFyXD/GX9MUBkUpXWGC9
 SfE7B8EruHck6P0NpnNJIsJd2SC7MurGBEZqtQ9II/5y7UNO+gAILS+o12tdoyv9
 u3ZMTxOh9RZDDKWtjEv7nqMGcuTHym2ww6xkBZqQ7lfUiaE5ePaZBG6+IWCXCWR9
 gNGWBrLUF6F9rXn4fWNbNsmOWcoUC26k8TbQ59eM6T20DDJ4+QhMrrTdutyNx62P
 hD4udYxp/E2u1BGCS/f5ckw81yJFFTggTaXkhYikhpakS5zYTf5Drt3gnPFDBkX3
 eK2Q3T9xLQrPEnwU8vA0VIVNtscPymeQn0aGF3VsYu7IgN4AmhvRJZoltbMjirqs
 wMZZTbll3KUMqvcWoquyUkCFSsPRgLAUPUJj6FP61Bxc3S5I0FbbQ2Xmbp3C27QC
 Hsk6ME3k/p3WuXysyJwB9Nsvz4cNC1C2W5SxJ5FtuoLOsillQYqKPtV0uu7z0/p2
 XBKU8DzsWYpU6FzAtTOpBmnxYOkENVSVoVaOoW2WCj9PJNi4ySA35hAVGYa4RwdV
 CBJ+OlPKrLoldw93mzPRgLVpuRgjssCaiRZSByuZYocF+R5Pi+mpGlIVb57dHMND
 XNcI2qokW+oAiDDmaK0g
 =ntwD
 -----END PGP SIGNATURE-----

Merge tag 'at91-ab-4.9-dt1' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt

Pull "DT Changes for 4.9" from Alexandre Belloni:
 - add ETM and ETB nodes on sama5d2

* tag 'at91-ab-4.9-dt1' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: dts: at91: sama5d2: add ETM and ETB nodes
2016-09-19 17:28:09 +02:00
Aaro Koskinen
3312eca519 MIPS: Octeon: mangle-port: fix build failure with VDSO code
Commit 1685ddbe35 ("MIPS: Octeon: Changes to support readq()/writeq()
usage.") added bitwise shift operations that assume that unsigned long
is always 64-bits. This broke the build of VDSO code, as it gets compiled
also in "faked" 32-bit mode. Althought the failing inline functions are
never executed in 32-bit mode, they still need to pass the compilation.
Fix by using 64-bit types explicitly.

The patch fixes the following build failure:

  CC      arch/mips/vdso/gettimeofday-o32.o
In file included from los/git/devel/linux/arch/mips/include/asm/io.h:32:0,
                 from los/git/devel/linux/arch/mips/include/asm/page.h:194,
                 from los/git/devel/linux/arch/mips/vdso/vdso.h:26,
                 from los/git/devel/linux/arch/mips/vdso/gettimeofday.c:11:
los/git/devel/linux/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h: In function '__should_swizzle_bits':
los/git/devel/linux/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h:19:40: error: right shift count >= width of type [-Werror=shift-count-overflow]
  unsigned long did = ((unsigned long)a >> 40) & 0xff;
                                        ^~

Fixes: 1685ddbe35 ("MIPS: Octeon: Changes to support readq()/writeq() usage.")
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: David Daney <ddaney@caviumnetworks.com>
Cc: David Daney <david.daney@cavium.com>
Cc: Steven J. Hill <steven.hill@cavium.com>
Cc: Alex Smith <alex.smith@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14039/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2016-09-19 17:21:37 +02:00
Ard Biesheuvel
3f0958d8ae ARM: multi_v7_defconfig: enable CONFIG_EFI
This enables CONFIG_EFI for multi_v7_defconfig, which adds support for
booting via EFI, and for the EFI framebuffer as builtin options. It
also enables the EFI rtc, the EFI variable pseudo-filesystem and the
EFI capsule loader as modules.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-09-19 17:16:34 +02:00
Arnd Bergmann
c55b2d989a X-Gene driver changes queued for v4.9
This patch set includes:
 + X-Gene SoC Performance Monitoring Unit (PMU) driver
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJX24bQAAoJEB11UG/BVQ/gMZEP/3408fNJfE0LiUdcT+pq/4Iq
 udqJwGXAp3yIKUy1Ewl82N9HlyhWI5AFD7lsLbyeKghPDB33atva4h+ywg4h9bDK
 /Iug+E635JLj64w54qLCcenTCzKQQGVMcHNO7QZsKhHyvJbjKjFT1ZhlQiON8DxU
 uovSRergt8MVNwKbPaoE8kWsKIP/WEJWnxu9F4diWo0/W7a3rEta2urqvB2xwaot
 ZaPfm9/DY2rew6rXiUpAEyFCq72zOTHFzMLsU5HRafdANcdYBbF6XwflyaNqgysK
 KcXMNEDtCq6MQYj+B5fcKUrOY0TQLdajNQg/yaOqHwWlIdpFSFzU3ROGgLffPHiX
 t0b6w0dZJOQ2oZ6MwZNLqLDFloSn7uIovDrSQYrWn5AXcB+IU692AoBX2vKCUp95
 0P8EUuISrdgcX1IHGbHySK/zP0Y2s3skXn3+RHbNBvuTCljpa6Qo/5iytrIDW1N7
 8FjtqmqiIVUFrEjZwOxNj5LQMB3B5kQm7EBKtDN+ML3cKE1Bn/RTS8+wpDqoo0Xg
 NVNMSo7BIKDlkJStG1DWy2FlLReO1O1p1DbanSQsWywC9j357W5VuU8X+NjRgBHR
 NJBvpZpJewbOKItnoK4SQa2YrwOrSSPy1JlTWBQICnRvgHH17WXmtkhkjSfWAIFD
 e4ctgF/vMDaH26oKcW6z
 =OqRW
 -----END PGP SIGNATURE-----

Merge tag 'xgene-drivers-for-4.9' of https://github.com/AppliedMicro/xgene-next into next/drivers

Pull "X-Gene driver changes queued for v4.9" from Duc Dang:

This patch set includes:
+ X-Gene SoC Performance Monitoring Unit (PMU) driver

* tag 'xgene-drivers-for-4.9' of https://github.com/AppliedMicro/xgene-next:
  perf: xgene: Add APM X-Gene SoC Performance Monitoring Unit driver
  Documentation: Add documentation for APM X-Gene SoC PMU DTS binding
  MAINTAINERS: Add entry for APM X-Gene SoC PMU driver
2016-09-19 17:05:14 +02:00
Arnd Bergmann
7a4c66d0c1 Samsung drivers/soc update for v4.9:
1. Allow compile testing of exynos-mct clocksource driver on ARM64.
 2. Document Exynos5433 PMU compatible (already used by clkout driver and more
    will be coming soon).
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJX3ruyAAoJEME3ZuaGi4PXDb4P/0cAlxBuOKLgVKuCxhp8XWH7
 eeLSjg0Z0h1fROFPOigj/VSi0so9MGn1/jZarfxwWfX9doJaKoN+cOBAPUyL9ayw
 mq9B5lZbZTK4tpSfQd3VgX2eHoTxVgYcUAP++d5dr1oyAfqhZqq5t87PdnxB9HJe
 3N+lLTqP2iQRhDyG1X1g8t1XSuVg4ukZZj4TGpwXcSoUoBZEwYSudh2qsJDdfzaC
 1Gk2q7AQugJ+C1Adrvi10em08A9fr6BoJvPLXfmKNsROOVbGzxExbKMoTIAbEEJe
 l3AxKMtNdlVzvxZVAmWN1c7O5JDM55ZWnNimfkiE65WGfp6BGpvUC+30tV2QI5g7
 7QD530kdZVHbCNlwhCg8Sd/pOrHgBU2vURh8Au+KHGUAc9xhSmmQ5PbW+Bck6Xy/
 IOJXD0bcuUU+jJcJAY3/Ub0Q6R++H4kM3QcEC89cFicF134oD7SjHYwSv2ku7QVp
 GTVr/6+obkowqi+XP//ske0BAzpYAEQfAnTRxGjVNbkrfIYhD5t9kdZvtewJfLpU
 Ht1/btLrQOYfwLAcEv72Bri5i1aoUEryhG0QMacaNKvw+ZjZ9RL5yqvpXrOzC7sm
 AR5PrBLioFaFc4Gs1Y6ubOVVxPtRu2Oid82YkzoFTBm7krjK9bZtmcJNe0tkzhZK
 zACQbt6GQOHds3VYVZhd
 =WOAL
 -----END PGP SIGNATURE-----

Merge tag 'samsung-drivers-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/drivers

Pull "Samsung drivers/soc update for v4.9" from Krzysztof Kozlowski:

1. Allow compile testing of exynos-mct clocksource driver on ARM64.
2. Document Exynos5433 PMU compatible (already used by clkout driver and more
   will be coming soon).

* tag 'samsung-drivers-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  dt-bindings: EXYNOS: Add Exynos5433 PMU compatible
  clocksource: exynos_mct: Add the support for ARM64
2016-09-19 16:58:46 +02:00
Greg Kroah-Hartman
948c6227e7 staging: greybus: remove CONFIG_PM_RUNTIME from kernel_ver.h
The last thing remaining in kernel_ver.h was the setting of
CONFIG_PM_RUNTIME, which isn't needed in a in-tree implementation.  So
remove the setting of this value, and the .h file entirely as that was
the last thing left in it.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2016-09-19 16:52:07 +02:00
Vivek Goyal
8eac98b8be ovl: during copy up, switch to mounter's creds early
Now, we have the notion that copy up of a file is done with the creds
of mounter of overlay filesystem (as opposed to task). Right now before
we switch creds, we do some vfs_getattr() operations in the context of
task and that itself can fail. We should do that getattr() using the
creds of mounter instead.

So this patch switches to mounter's creds early during copy up process so
that even vfs_getattr() is done with mounter's creds.

Do not call revert_creds() unless we have already called
ovl_override_creds(). [Reported by Arnd Bergmann]

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
2016-09-19 16:50:59 +02:00
Rui Miguel Silva
a0cf5951de staging: greybus: Kconfig: enable possibility to select light driver
Remove BROKEN keyword to allow the light driver to be select now that
we fixed the kernel version dependencies. Also fix the module name in
the help section.

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2016-09-19 16:50:48 +02:00
Rui Miguel Silva
b04f56c6e7 staging: greybus: makefile: fix dependency of spi to spilib
Greybus SPI driver depends on gb-spilib and we need to state that at
makefile to make it link correctly.

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2016-09-19 16:49:53 +02:00
Arnd Bergmann
1c90e170fe i.MX SoC updates for 4.9:
- Set INT_MEM_CLK_LPM bit to get proper WAIT mode support on i.MX6SX.
    This is a workaround for i.MX6SX WAIT mode hardware issue.
  - Enable cpuidle support with 3 low-power states (WFI, WAIT, POWER-OFF)
    for i.MX6UL.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJX1lGaAAoJEFBXWFqHsHzOEckH/RBAAm7WTxFJTvBC0qy7IR6r
 WN47hMMs4Nx5YxLqix7QJW4g5QP97pKgnX4CX7MOn+AC0SB/BBl5jjQqp32nniF4
 jZpi6PsHk41Zr2XX4tdS80FShs1pUFlH6COJSKGWr9fOxF4b144KPLzFSYHJOh7O
 1wA+awsVE/c3o6UPOLm10vo0ApdvYm6/uhXS0JpQtH9nKtL++Bon+o4ruq49pawg
 YtZ1OqRu+FFC5l1jijGdeRD+uLpiqJsfzUDXoJgvGcuTColGVil2M0qzcrIveoF5
 ByAbeoVRxV2wUObRrr4pJpOrD4zJ3lc7e4YU1NJY2pPeayDYEwvpgISa+aeZGXA=
 =QOfe
 -----END PGP SIGNATURE-----

Merge tag 'imx-soc-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc

Pull "i.MX SoC updates for 4.9" from Shawn Guo:

 - Set INT_MEM_CLK_LPM bit to get proper WAIT mode support on i.MX6SX.
   This is a workaround for i.MX6SX WAIT mode hardware issue.
 - Enable cpuidle support with 3 low-power states (WFI, WAIT, POWER-OFF)
   for i.MX6UL.

* tag 'imx-soc-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: build cpuidle-imx6sx.o for imx6ul
  ARM: imx: add cpuidle support for i.mx6ul
  ARM: imx: enable WAIT mode hardware workaround for imx6sx
  ARM: imx: rename imx6q_set_int_mem_clk_lpm() function
2016-09-19 16:48:45 +02:00
Rui Miguel Silva
722a133a6a staging: greybus: power_supply: remove KERNEL_VERSION checks
No need to support older kernel versions in the Greybus Power Supply
driver, so remove the checks as needed, we can now rely on all of the
correct Power Supply core apis being present. Also move some properties
definitions to the power supply greybus code.

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2016-09-19 16:48:44 +02:00
Rui Miguel Silva
2064ae5741 staging: greybus: sdio: remove KERNEL_VERSION checks
No need to support older kernel versions in the Greybus SDIO driver, so
remove the checks as needed, we can now rely on all of the correct SDIO
core apis being present.

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2016-09-19 16:47:49 +02:00
Arnd Bergmann
90793df938 i.MX cleanup for 4.9:
- Drop i.MX1 board files and make i.MX1 a DT only platform.
  - Remove obsolete ENET initialization code for TX28 board, since FEC
    driver handles those setup well now.
  - A couple of cleanups on i.MX31 IOMUX headers to drop duplications
  - A few other random and trivial cleanups
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJX1k9/AAoJEFBXWFqHsHzOcXoH/1OqY6dSOI7MrzwocYhXE+mI
 eqgQ/5/N3EsaA01NQpdreffGfa1FlNwIwZ6+9XY4EateQt2U/dPKWX0xDkMpo8c+
 CNOciiZ4bZ811w+7NfYiEZ0BTIm2ouFuNJLbadPb6tl+0ssUGvEEelH/UbMjT331
 DkzMWaqOv6W2ldKT++UF+IrDCGVUI55leqM5WrQDK8qFkBn6KdnYeFG3+4P58hZ3
 XhXuv00UJUxB1L1E3TPG+1MVxDD8G5ge4ZXtIxzECgyAbAbQboyNkXai+qcr4dN9
 XIleT0YCYtXSEsvEkfWoU3GjZC9pSZmUFhmlWtWmkuFh9H2zAalRZKNVEBNGpQQ=
 =qHgE
 -----END PGP SIGNATURE-----

Merge tag 'imx-cleanup-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/cleanup

Pull "i.MX cleanup for 4.9" from Shawn Guo:

 - Drop i.MX1 board files and make i.MX1 a DT only platform.
 - Remove obsolete ENET initialization code for TX28 board, since FEC
   driver handles those setup well now.
 - A couple of cleanups on i.MX31 IOMUX headers to drop duplications
 - A few other random and trivial cleanups

* tag 'imx-cleanup-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: (trivial) fix typo and grammar
  ARM: imx: use IS_ENABLED() instead of checking for built-in or module
  ARM: imx: remove platform-mxc_rnga
  ARM: imx: no need to select SMP_ON_UP explicitly
  ARM: i.MX: Move SOC_IMX1 into 'Device tree only'
  ARM: i.MX: Remove i.MX1 non-DT support
  ARM: i.MX: Remove i.MX1 Synertronixx SCB9328 board support
  ARM: i.MX: Remove i.MX1 Armadeus APF9328 board support
  ARM: mxs: remove obsolete startup code for TX28
  ARM: i.MX31 iomux: remove duplicates with alternate name
  ARM: i.MX31 iomux: remove plain duplicates
2016-09-19 16:47:02 +02:00
Rui Miguel Silva
a7af2fe6d1 staging: greybus: light: remove KERNEL_VERSION checks
No need to support older kernel versions in the Greybus Light driver, so
remove the checks as needed, we can now rely on all of the correct LED
core apis being present. And compile only if flash and v4l2 flash is
reachable.

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2016-09-19 16:46:34 +02:00
Ville Syrjälä
699fbeeac4 drm/fb-helper: Fix sparse warnings
drm/drm_fb_helper.c:2306:12: warning: symbol 'drm_fb_helper_modinit' was not declared. Should it be static?

While at it, move the lefover static inline to the right place.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1474292035-15695-4-git-send-email-ville.syrjala@linux.intel.com
2016-09-19 16:45:15 +02:00
Ville Syrjälä
c30b440097 drm/blend: Fix sparse warnings
drm/drm_blend.c:207:5: warning: symbol 'drm_atomic_normalize_zpos' was not declared. Should it be static?

Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1474292035-15695-3-git-send-email-ville.syrjala@linux.intel.com
2016-09-19 16:44:45 +02:00
Greg Kroah-Hartman
7434564ca1 staging: greybus: sdio: fix min() type check
The 0-day bot pointed out a type difference in one min() call, so fix it
up by being explicit about the type being compared.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2016-09-19 16:44:41 +02:00
Ville Syrjälä
7135ac54ce drm/atomic-helper: Fix sparse warnings
drm/drm_atomic_helper.c:1696:6: warning: symbol 'plane_crtc_active' was not declared. Should it be static?

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1474292035-15695-2-git-send-email-ville.syrjala@linux.intel.com
2016-09-19 16:44:36 +02:00
Greg Kroah-Hartman
148e0b8f48 staging: greybus: spi: remove KERNEL_VERSION checks
No need to support older kernel versions in the Greybus SPI and spilib
driver, so remove the checks as needed, we can now rely on all of the
correct SPI core apis being present.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2016-09-19 16:43:27 +02:00
Greg Kroah-Hartman
3e4b5b8837 staging: greybus: gpio: it's CONFIG_GPIOLIB, not CONFIG_GPIO
The GPIO dependancy is CONFIG_GPIOLIB, not CONFIG_GPIO, no wonder it
wasn't building properly...

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2016-09-19 16:41:54 +02:00
Greg Kroah-Hartman
b14bb97626 staging: greybus: gpio: remove KERNEL_VERSION checks
No need to support older kernel versions in the Greybus GPIO driver, so
remove the checks as needed, we can now rely on all of the correct
GPIO core apis being present.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2016-09-19 16:41:45 +02:00
Jani Nikula
96106c9729 drm: fix implicit declaration build error on ia64
drivers/gpu/drm/drm_dp_helper.c: In function 'drm_dp_downstream_debug':
>> drivers/gpu/drm/drm_dp_helper.c:551:2: error: implicit declaration of
>> function 'seq_printf' [-Werror=implicit-function-declaration]
     seq_printf(m, "\tDP branch device present: %s\n",
     ^
>> drivers/gpu/drm/drm_dp_helper.c:559:3: error: implicit declaration of
>> function 'seq_puts' [-Werror=implicit-function-declaration]
     seq_puts(m, "\t\tType: DisplayPort\n");
     ^

Reported-by: kbuild test robot <fengguang.wu@intel.com>
References: https://lists.freedesktop.org/archives/intel-gfx/2016-September/106638.html
Fixes: 80209e5f2c ("drm: Add DP branch device info on debugfs")
Cc: Mika Kahola <mika.kahola@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1474020396-14875-1-git-send-email-jani.nikula@intel.com
2016-09-19 16:41:40 +02:00
Wang Nan
f82b77462b tools include: Add mman macros needed by perf for all arch
Some macros required by tools/perf/trace/beauty/mmap.c is not support
for all architectures. For example, MAP_32BIT is defined on x86 only,
alpha doesn't define MADV_HWPOISON and MADV_SOFT_OFFLINE.

This patch regenerates mman.h for each arch, defines these missing
macros for perf. For missing MADV_*, fall back to asm-generic/mman-common
because they are in a 'case ...' statement. For flags, define it to 0.

Following is the script to generate this patch:

 macros=`cat $0 | awk 'V==1 {print}; /^# start macro list/ {V=1}'`
 rm `find ./tools/arch/ -name mman.h`
 for arch in `ls tools/arch`
 do
   [ -d tools/arch/$arch/include/uapi/asm ] || mkdir -p tools/arch/$arch/include/uapi/asm
   src=arch/$arch/include/uapi/asm/mman.h
   target=tools/arch/$arch/include/uapi/asm/mman.h.tmp
   real_target=tools/arch/$arch/include/uapi/asm/mman.h
   guard="TOOLS_ARCH_"`echo $arch | awk '{print toupper($0)}'`_UAPI_ASM_MMAN_FIX_H
   rm -f $target

   [ -f $src ] &&
   for m in $macros
   do
     if grep '#define[ \t]*'$m $src > /dev/null 2>&1
     then
       grep -h '#define[ \t]*'$m $src | sed 's/[ \t]*\/\*.*$//g' >> $target
     fi
   done

   if [ -f $src ]
   then
      grep '#include <asm-generic' $src >> $target
   else
      echo "#include <asm-generic/mman.h>" >> $target
   fi

   touch $real_target
   for m in $macros
   do
     if cat << EOF | gcc -Itools/arch/$arch/include -Itools/arch/$arch/include/uapi -Iinclude/ -Iinclude/uapi -E - | grep $m > /dev/null 2>&1
 #include <uapi/asm/mman.h.tmp>
 #include <uapi/linux/mman.h>
 $m
 EOF
   then
     echo "Fixing $m for $arch"
     echo "/* $m is undefined on $arch, fix it for perf */" >> $target
     if echo $m | grep '^MADV_' > /dev/null 2>&1
     then
       grep -h '#define[ \t]*'$m include/uapi/asm-generic/mman-common.h | sed 's/[ \t]*\/\*.*$//g' >> $target
     else
       echo "#define $m	0" >> $target
     fi
   fi
   done

   real_target=tools/arch/$arch/include/uapi/asm/mman.h
   echo '#ifndef '$guard > $real_target
   echo '#define '$guard >> $real_target
   cat $target | sed 's|asm-generic|uapi/asm-generic|g' >> $real_target
   echo '#endif' >> $real_target
   rm $target
   echo "$real_target"
 done

 exit 0
 # Following macros are extracted from:
 # tools/perf/trace/beauty/mmap.c
 #
 # start macro list
 MADV_DODUMP
 MADV_DOFORK
 MADV_DONTDUMP
 MADV_DONTFORK
 MADV_DONTNEED
 MADV_FREE
 MADV_HUGEPAGE
 MADV_HWPOISON
 MADV_MERGEABLE
 MADV_NOHUGEPAGE
 MADV_NORMAL
 MADV_RANDOM
 MADV_REMOVE
 MADV_SEQUENTIAL
 MADV_SOFT_OFFLINE
 MADV_UNMERGEABLE
 MADV_WILLNEED
 MAP_32BIT
 MAP_ANONYMOUS
 MAP_DENYWRITE
 MAP_EXECUTABLE
 MAP_FILE
 MAP_FIXED
 MAP_GROWSDOWN
 MAP_HUGETLB
 MAP_LOCKED
 MAP_NONBLOCK
 MAP_NORESERVE
 MAP_POPULATE
 MAP_PRIVATE
 MAP_SHARED
 MAP_STACK
 MAP_UNINITIALIZED
 MREMAP_FIXED
 MREMAP_MAYMOVE
 PROT_EXEC
 PROT_GROWSDOWN
 PROT_GROWSUP
 PROT_NONE
 PROT_READ
 PROT_SEM
 PROT_WRITE

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Kim Phillips <kim.phillips@arm.com>
Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Fixes: 277cf08f3f ("perf trace beauty mmap: Fix defines for non !x86_64")
Link: http://lkml.kernel.org/r/1473850649-83389-3-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2016-09-19 11:30:56 -03:00
Greg Kroah-Hartman
06000c0317 staging: greybus: vibrator: remove KERNEL_VERSION checks
No need to support older kernel versions in the Greybus Vibrator driver,
so remove the checks as needed, we can now rely on all of the correct
driver core apis being present.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2016-09-19 16:30:41 +02:00
Greg Kroah-Hartman
be21106d67 staging: greybus: hid: remove KERNEL_VERSION checks
No need to support older kernel versions in the Greybus HID driver, so
remove the checks as needed, we can now rely on all of the "new" apis
being present.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2016-09-19 16:30:41 +02:00
Greg Kroah-Hartman
887520884b staging: greybus: kernel_ver.h: remove lots of stuff
Now that we do not care about the kernel version we are building
against, we can strip out lots of backward compatibilty that was added
to kernel_ver.h in order to write semi-portable driver code.

To start with, remove the functions and #defines that are now in the
kernel tree, no need to have duplicate copies of them all.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2016-09-19 16:30:40 +02:00
Greg Kroah-Hartman
d4f56b47a8 staging: greybus: Add drivers/staging/greybus to the build
This adds a proper Kconfig file for drivers/staging/greybus and fixes up
the Makefile to work correctly within the kernel build system (modules
depend on the .config options, etc.)

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2016-09-19 16:30:37 +02:00
Marian Krivoš
3da30bfc0b HID: support for keyboard - Corsair STRAFE
Add quirk for Corsair STRAFE keyboard, similarly to what we've been
doing for other CORSAIR devices already, in order to avoid long delays
during boot.

[jkosina@suse.cz: reword changelog a little bit]
Signed-off-by: Marian Krivos <marian.krivos@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2016-09-19 16:27:37 +02:00
Wang Nan
f752e90e9c perf trace beauty mmap: Add missing MADV_FREE
tools/perf/trace/beauty/mmap.c forgets to check MADV_FREE.
This patch fixes it.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1473850649-83389-2-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2016-09-19 11:25:07 -03:00
Stephen Rothwell
8ec2ef2b66 blk_mq: linux/blk-mq.h does not include all the headers it depends on
and building block/blk-mq-pci.o should depend on CONFIG_BLOCK

Fixes: 973c4e372c ("blk-mq: provide a default queue mapping for PCI device")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
2016-09-19 08:21:51 -06:00
Colin Ian King
60658e0dc1 sbitmap: initialize weight to zero
Variable weight is not being initialized to zero before it is
used to compute the weight sum. Ensure it is initialized to zero.

Found with static analysis with cppcheck:
[lib/sbitmap.c:177]: (error) Uninitialized variable: weight

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
2016-09-19 08:19:40 -06:00
Marcin Nowakowski
b244614a60 MIPS: Avoid a BUG warning during prctl(PR_SET_FP_MODE, ...)
cpu_has_fpu macro uses smp_processor_id() and is currently executed
with preemption enabled, that triggers the warning at runtime.

It is assumed throughout the kernel that if any CPU has an FPU, then all
CPUs would have an FPU as well, so it is safe to perform the check with
preemption enabled - change the code to use raw_ variant of the check to
avoid the warning.

Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: stable@vger.kernel.org  # 4.0+
Patchwork: https://patchwork.linux-mips.org/patch/14125/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2016-09-19 16:18:05 +02:00
Fabio Estevam
4de349e786 can: flexcan: fix resume function
On a imx6ul-pico board the following error is seen during system suspend:

dpm_run_callback(): platform_pm_resume+0x0/0x54 returns -110
PM: Device 2090000.flexcan failed to resume: error -110

The reason for this suspend error is because when the CAN interface is not
active the clocks are disabled and then flexcan_chip_enable() will
always fail due to a timeout error.

In order to fix this issue, only call flexcan_chip_enable/disable()
when the CAN interface is active.

Based on a patch from Dong Aisheng in the NXP kernel.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2016-09-19 16:09:05 +02:00
Baoquan He
c3db901c54 iommu/amd: Free domain id when free a domain of struct dma_ops_domain
The current code missed freeing domain id when free a domain of
struct dma_ops_domain.

Signed-off-by: Baoquan He <bhe@redhat.com>
Fixes: ec487d1a11 ('x86, AMD IOMMU: add domain allocation and deallocation functions')
Signed-off-by: Joerg Roedel <jroedel@suse.de>
2016-09-19 15:49:01 +02:00
Baoquan He
5c87f62dd1 iommu/amd: Use standard bitmap operation to set bitmap
It will be more readable and safer than the old setting.

Signed-off-by: Baoquan He <bhe@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
2016-09-19 15:49:01 +02:00