Commit graph

127,691 commits

Author SHA1 Message Date
Ashok Kumar
03598fdbc9 arm64/perf: Changed events naming as per the ARM ARM
changed all the common events name definition as per the document
ARM DDI 0487A.g

SoC specific event names follow the general naming style in
the file and doesn't reflect any document.
changed ARMV8_A53_PERFCTR_PREFETCH_LINEFILL to
ARMV8_A53_PERFCTR_PREF_LINEFILL to match with other SoC specific
event names which use _PREF_ style.

corrected typo l21 to l2i.

Signed-off-by: Ashok Kumar <ashoks@broadcom.com>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2016-04-25 14:11:06 +01:00
Ashok Kumar
713755d724 arm64: dts: Add Broadcom Vulcan PMU in dts
Add "brcm,vulcan-pmu" compatible string for Broadcom Vulcan PMU.

Signed-off-by: Ashok Kumar <ashoks@broadcom.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2016-04-25 14:11:06 +01:00
Kevin Hilman
8b182f395a ARM: davinci_all_defconfig: enable SPI and NOR as modules
Enable SPI driver and SPI NOR flash support as modules.

Tested with SPI NOR flash on DA850-EVM.  Basic boot test only to confirm
NOR flash device detection.

Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2016-04-25 18:37:57 +05:30
Mark Rutland
9981293fb0 arm64: make dt_scan_depth1_nodes more readable
Improve the readability of dt_scan_depth1_nodes by removing the nested
conditionals.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2016-04-25 13:54:15 +01:00
Shannon Zhao
2366c7fdb5 ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI
When it's a Xen domain0 booting with ACPI, it will supply a /chosen and
a /hypervisor node in DT. So check if it needs to enable ACPI.

Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Hanjun Guo <hanjun.guo@linaro.org>
Tested-by: Julien Grall <julien.grall@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2016-04-25 13:53:45 +01:00
Sekhar Nori
1e3404131b ARM: davinci_all_defconfig: support systemd
CONFIG_FHANDLE is required by systemd[1], which is the
default init system in more and more distributions.
So lets enable it for DaVinci platforms as well.

While at it, remove stale entry CONFIG_INOTIFY=y

[1] https://github.com/systemd/systemd/blob/master/README#L37

Acked-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2016-04-25 18:19:14 +05:30
Ard Biesheuvel
d8fc68a04d arm64: ptdump: add region marker for kasan shadow region
Annotate the KASAN shadow region with boundary markers, so that its
mappings stand out in the page table dumper output.

Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2016-04-25 12:05:21 +01:00
Ard Biesheuvel
c8f8cca483 arm64: ptdump: use static initializers for vmemmap region boundaries
There is no need to initialize the vmemmap region boundaries dynamically,
since they are compile time constants. So just add these constants to the
global struct initializer, and drop the dynamic assignment and related code.

Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2016-04-25 12:04:39 +01:00
Joonas Lahtinen
ee0629cfd3 drm/i915: Function per early graphics quirk
Move graphics stolen memory related early quirk into a function to
allow easy adding of other graphics quirks to fix memory maps on
machines running old BIOS versions.

While at it;
- _funcs -> _ops to follow de facto naming
- make the iteration code tad more readable
- remove unused variables

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
2016-04-25 13:30:59 +03:00
Joonas Lahtinen
c0dd3460b2 drm/i915: Canonicalize stolen memory calculations
Move the better constructs/comments from i915_gem_stolen.c to
early-quirks.c and increase readability in preparation of only
having one set of functions.

- intel_stolen_base -> gen3_stolen_base
- use phys_addr_t instead of u32 for address for future proofing

v2:
- Print the invalid register values (Chris)
  (Omitting the register prefix as it's visible from backtrace.)

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
2016-04-25 13:30:32 +03:00
Brian Starkey
2b4e38fd7c ARM: dts: vexpress: Add external expansion bus to DT
The VExpress development platform has an external expansion bus which
can be used for additional hardware (e.g. LogicTile Express daughter
boards).

Add this bus to the VExpress CoreTile device-trees.The bus is described
for a CoreTile occupying site 1.

Acked-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Brian Starkey <brian.starkey@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
2016-04-25 11:01:14 +01:00
Sudeep Holla
2cff6dba57 ARM: dts: vexpress: fix node name unit-address presence warnings
Commit b993734718 ("scripts/dtc: Update to upstream version 53bf130b1cdd")
added warnings on node name unit-address presence/absence mismatch in
the device trees.

This patch fixes those warning on all the vexpress platforms where
unit-address is present in node name while the reg/ranges property is
not present.

Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
2016-04-25 11:01:13 +01:00
Krzysztof Kozlowski
a0a966b838 ARM: EXYNOS: Properly skip unitialized parent clock in power domain on
We want to skip reparenting a clock on turning on power domain, if we
do not have the parent yet. The parent is obtained when turning the
domain off. However due to a typo, the loop is continued on IS_ERR() of
clock being reparented, not on the IS_ERR() of the parent.

Theoretically this could lead to OOPS on first turn on of a power
domain, if there was no turn off before. Practically that should never
happen because all power domains are turned on by default (reset value,
bootloader does not turn off them usually) so the first action will be
always turn off.

Fixes: 29e5eea06b ("ARM: EXYNOS: Get current parent clock for power domain on/off")
Reported-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
2016-04-25 11:35:37 +02:00
Christopher Spinrath
b52e345d43 ARM: dts: sun7i: Enable S/PDIF on the Cubietruck
Enable the S/PDIF transmitter present on the Cubietruck.

Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-04-25 09:56:34 +02:00
Caesar Wang
6ddf93e05e arm64: dts: rockchip: move the rk3368 thermal data into rk3368.dtsi
In order to be standard to manage for rockchip SoCs,  move the thermal
data into rk3368 dtsi, we needn't to add a new file for thermal.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2016-04-25 09:54:34 +02:00
Caesar Wang
f87305fa00 ARM: dts: rockchip: move the rk3288 thermal data into rk3288.dtsi
In order to be standard to manage for rockchip SoCs,  move the thermal
data into rk3288 dtsi, we needn't to add a new file for thermal.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2016-04-25 09:52:56 +02:00
Ulrich Hecht
6f92cb2f45 ARM: dts: gose: Enable SDHI controllers
Includes regulator and pin assignments.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-04-25 14:10:11 +10:00
Ulrich Hecht
fc9ee228f5 ARM: dts: r8a7793: Add SDHI controllers
Same as on r8a7791.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-04-25 14:10:10 +10:00
Wolfram Sang
21c7d0fcbe ARM: dts: r8a7790: fix max-frequency for SDHI
The wrong values come from an old datasheet (H2 v0.6). Anything later
has the fixed value of 195MHz (H2 v0.7 up to Gen2-common V2.0).

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-04-25 14:10:09 +10:00
Geert Uytterhoeven
7e2a1bcd21 ARM: dts: kzm9g: Configure NMI key as wake-up source
Add a GPIO key with wake-up capability for the NMI button.
This allows to wake up the system from s2ram without relying on the
buttons on the optional switch board.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-04-25 14:10:09 +10:00
Wolfram Sang
1ca79699cb ARM: dts: r8a7790: lager: Enable UHS-I SDR-50
Add the "1v8" pinctrl state and sd-uhs-sdr50 property to SDHI{0,2}.

Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-04-25 14:10:02 +10:00
Lars Persson
9b61aefce7 ARM: dts: artpec: update clock bindings in artpec6.dtsi
The clock binding for the main clock controller was changed to an
indexed controller style binding on request of the clk
maintainers. This updates the dtsi to use the new bindings.

Signed-off-by: Lars Persson <larper@axis.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-04-25 00:01:06 +02:00
Arnd Bergmann
fe0082d473 Qualcomm Device Tree Changes for v4.7
* Add DB600C support
 * Add IPQ4019 support
 * Add additional nodes for APQ8064
 * Fix APQ8064 pinctrls for i2c/spi
 * Add MSM8974 nodes for smp2p and smd
 * Modify MSM8974 memory reserve for rfsa and rmtfs
 * Add support for BQ27541 on Nexus7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXF+EAAAoJEFKiBbHx2RXV6/8P/jUWHwhQmd8NYvz/JVRjf+dP
 hpwOkx66OwXwgtIrPkvu6edUjd6p6ll7tdwo14PsIjH5wCpSweXlqM/j93ucV0y5
 MhulwfbeGFsMCMjV+4/IeQd7C7dHwu1WFvxoJux+GHhd12cKM67s6/EPJmyc+sUG
 DET11PhwSi12KX1qoPkILNXs2Gtj4PCsqEYZ0gc1Q2vAlfqmNTOKgA7wBGWYby6Z
 6fWrF0sBPEc/G2C4aAia+8Uq/Fh9s8CeGSX2oO6F/iRAag7SKR1j9bUl+/FNK5fR
 6H0kVvmzrrKTnoCoftygy5brSm3OwU1SM3MpTc/QWC8AeHMk4fTItpDSrz4xyeTb
 4+GzU1GWlnE0N3rnJFhPPDbybgJCJ9PrACoFDqIN4mLIyOFeWoT59vXmcJBOYZpJ
 7XMLpooH3WX79vblvZne54BRLTo0LXrxr+FqtUeEljguK5nKKclNI6fijjnV3dU7
 9dTd/xtW0YMta3uU/En+TSLzXXC3Sbx5MXKVhvcvClyhTNG2I3vY2mz7FuXUZpuY
 CAuvjYJdZxEmv8z649TTBG4pQ1oPzp6H/kVlywSIH+Bn0vw1Pn+eImp4cE4TVAuv
 YRaxjceYXTPSsVOdYVrztm4xM0NbZ91i0LiJrgxS0mvOJEmt/JkBF8/mUKWdI8SC
 D/lrNzp0b6QIJ7KU9Vln
 =C5LP
 -----END PGP SIGNATURE-----

Merge tag 'qcom-dt-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt

Merge "Qualcomm Device Tree Changes for v4.7" from Andy Gross:

* Add DB600C support
* Add IPQ4019 support
* Add additional nodes for APQ8064
* Fix APQ8064 pinctrls for i2c/spi
* Add MSM8974 nodes for smp2p and smd
* Modify MSM8974 memory reserve for rfsa and rmtfs
* Add support for BQ27541 on Nexus7

* tag 'qcom-dt-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: (30 commits)
  device-tree: nexus7: Add bq27541 battery interface to dts
  ARM: dts: db600c: add support to magnetometer
  ARM: dts: db600c: add spi support
  ARM: dts: db600c: add i2c support
  ARM: dts: db600c: Add on board leds support
  ARM: dts: db600c: add on board sata support.
  ARM: dts: db600c: add pcie support
  ARM: dts: db600c: add usb support
  ARM: dts: db600c: Add eMMC and SD card support
  ARM: dts: db600c: add pmic regulator supplies
  ARM: dts: db600c: add board support with serial
  ARM: dts: apq8064: add gsbi7 i2c support
  ARM: dts: apq8064: add support to gsbi1 uart
  ARM: dts: apq8064: fix the pinctrls for i2c and spi
  ARM: dts: qcom: apq8064: Add smd node and all edges
  ARM: dts: qcom: apq8064: Add complete smsm node
  ARM: dts: qcom: apq8064: Add syscon for sic-non-secure
  ARM: dts: msm8974: Add modem smp2p and smd nodes
  ARM: dts: msm8974: Add node for second i2c from blsp1
  ARM: dts: msm8974: Split efs in rfsa and rmtfs
  ...
2016-04-24 23:58:18 +02:00
Arnd Bergmann
312ce1d191 This pull request contains Broadcom ARM-based SoC Device Tree changes:
- Rafal adds proper VCC GPIO to be fed to the USB host controllers for known
   BCM5301x devices needing that, he also enables earlycon, and enables the
   SPI-NOR flashes on relevant devices
 
 - Eric adds the VideoCore 4 Device Tree nodes to the BCM283x Device Tree and
   provides a DRM patch to kick out the simplefb framebuffer to avoid conflicts
 
 - Stephan adds proper CPU nodes for the ARM processor on the BCM2835 SoC Device
   Tree
 
 - Martin provides a binding fix for the DMA channel interrupt numbers and
   description
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXG8vRAAoJEIfQlpxEBwcEDHYP/RlOgJ3ZR/Hi5HEatpgrmMXr
 0woUBrOJBwYTwOr2CjM0WUYhcwHUdCu+/ttDW0e+2Aau3tEoTkIA8XkJ7f8TQHXV
 y5hxYqADcXIedgZvQNpDnGH3zLTBad8l/Na+9VQDiCLQ21p68aKrByavWtcWafDG
 tdmVXGcfE9PuDVvG7c+qIaHJZZmgP84NI0uSE671c0OS1PulQi7+auyluhfHVOTW
 I4Cgat+gR0WKaxgqkuIywDDd3wCKxCaXGmaIMQI2XKQ0VUBrJ+h1Wet+YBUrpNI5
 sIzH/Zd0syd1HzWFB+xjA1aFi+su2rYlvF+lP0FAom/ZSaGhYw+Z0/UJf+i9CL6Z
 M1v5MO33aZu88TYRS4IFcmVvl2QYLfXbyA4WL1/KYRw2hWq46lbA1fWm9rMNoK93
 a5q5Zyb5a60mAKOp53B9g4XKeqAxg9spaLK7Yk5Sdi+2Zel4g+g0WFD2nSry6plz
 hnc6wd88sPZBMMq2nWYC5cxNbSOzkcBXzDcLes1wqtG3MTZngBUDLYIvEMiWe5CI
 lT431vMSHJeBAAWg+CrZlAYZ+uEQsLA3HhqSJeXrcJ04pHOOp9W8o8sfxJ3TaNaK
 Bppuqd2YJhTatX+KwpoFKmgxudVsZ+lU9j/+r+gPCEc0iFTRDP7eZiyI5uG02v65
 bt1zHKb+hO68jUmALZbI
 =UhGj
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-4.7/devicetree' of http://github.com/Broadcom/stblinux into next/dt

Merge "Broadcom ARM-based SoC Device Tree changes" from Florian Fainelli:

- Rafal adds proper VCC GPIO to be fed to the USB host controllers for known
  BCM5301x devices needing that, he also enables earlycon, and enables the
  SPI-NOR flashes on relevant devices

- Eric adds the VideoCore 4 Device Tree nodes to the BCM283x Device Tree and
  provides a DRM patch to kick out the simplefb framebuffer to avoid conflicts

- Stephan adds proper CPU nodes for the ARM processor on the BCM2835 SoC Device
  Tree

- Martin provides a binding fix for the DMA channel interrupt numbers and
  description

* tag 'arm-soc/for-4.7/devicetree' of http://github.com/Broadcom/stblinux:
  ARM: BCM5301X: Add DT entry for SPI controller and NOR flash
  dt/bindings: bcm2835: correct description for DMA-int
  ARM: bcm2835: add CPU node for ARM core
  ARM: bcm2835: Add VC4 to the device tree.
  drm/vc4: Kick out the simplefb framebuffer before we set up KMS.
  ARM: BCM5301X: Enable earlycon on tested devices
  ARM: BCM5301X: Set vcc-gpio for USB controllers of few devices
2016-04-24 23:56:38 +02:00
Arnd Bergmann
1ea7c8b6fb First set of device tree changes for omaps for v4.7 merge window:
- Two sets of name and unit address check fixes for dts files.
 
 - DMA, McASP, and timer and regulator related dts changes for dra7
 
 - Add more devices for Nokia N9/N950
 
 - Initial support for am335x ICEv2
 
 - Initial support for am572x-IDK
 
 - Pinctrl changes for am335x-baltos-ir5221
 
 - Initial support for Amazon Kindle Fire (first generation)
 
 - A series of changes to add GPIO controller support for the
   GPMC driver. The driver changes will be merged separately.
 
 - Support for am43xx clkout1
 
 - Pinctrl and RTC changes for am335x-chili
 
 - Add support for dra72-evm rev C (SR2.0)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXGp/XAAoJEBvUPslcq6VzbhwQAKHgA3os+FR8sj2PRMkr4zwn
 o4WVhh3A6rEHPB7gR9QpMrc+12eD4eQEb+HpbEd5P4j40DN0BXC82l0BCza5XRsS
 qBqaPKE983nY3HtisibPufM/0DtMDJmLvUGgAe03mAorrN23pZkvE0MSKVx0EwSl
 q/c/r19rfFTIz1EDTX8loW4gxPI/lr1iU7G1wX4tKpeA75EBdNG7xgyKmbSzfF1e
 MnZP4qhKzCRWPN+w41g7hpjdj0sPx3gxCeLn7ofM2WUnxXyMUTtVgMSdUoFhImxF
 0Ivsh1uiPz2/HKZSclRYy0yHmeEsEHMGiyYGJXw6+PazlTNDSP+71nC++HMm4Gzr
 lYUrIgmCNRtyw9nXWcNtcDTPIgM7HreLK39W4e4O+h4D9pb2w3l6C1qdUZRrjydk
 oODJP7b6OXS3JnOfhO5lsS0rd31CpORWS5lP1NoXfgS3KVV4VNxqDe1bNM3IoqiX
 ypzY4aiRKRQxUB6OMfRXh3uUSICZnIpMmZehobMOyWAWVU/xZOkVWMbm5aZUevnN
 2ywWi5RXryPsa2HiRdtunXA5pM2hHklhabufEC3qz2rO1kPJxIseI2SxkScsDQOi
 Z8g5zL+2JhKZQgo0/9qYT/mTFbNtsjfq2XwNcxOGx+4QPj9GziGcROW84wHOVxlM
 Q/H2+GtOuytXEMVQvjqE
 =zZDR
 -----END PGP SIGNATURE-----

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

Merge "First set of device tree changes for omaps for v4.7 merge window" from Tony Lindgren:

- Two sets of name and unit address check fixes for dts files.

- DMA, McASP, and timer and regulator related dts changes for dra7

- Add more devices for Nokia N9/N950

- Initial support for am335x ICEv2

- Initial support for am572x-IDK

- Pinctrl changes for am335x-baltos-ir5221

- Initial support for Amazon Kindle Fire (first generation)

- A series of changes to add GPIO controller support for the
  GPMC driver. The driver changes will be merged separately.

- Support for am43xx clkout1

- Pinctrl and RTC changes for am335x-chili

- Add support for dra72-evm rev C (SR2.0)

* tag 'omap-for-v4.7/dt-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (61 commits)
  ARM: dts: Add support for dra72-evm rev C (SR2.0)
  ARM: dts: am335x-chilisom: Enable poweroff PMIC sequence using RTC signal
  ARM: dts: am335x-chili*: Move Ethernet MAC description from SOM to board
  ARM: dts: am335x-chili*: Move uart0 description from SOM to board
  ARM: dts: am43xx: add support for clkout1 clock
  ARM: dts: omap3-beagle: Provide NAND ready pin
  ARM: dts: am335x: Provide NAND ready pin
  ARM: dts: am437x: Provide NAND ready pin
  ARM: dts: dra7x-evm: Provide NAND ready pin
  ARM: dts: dm816x: Enable gpio controller for GPMC
  ARM: dts: dm814x: Enable gpio controller for GPMC
  ARM: dts: omap3: Enable gpio controller for GPMC
  ARM: dts: am4372: Enable gpio controller for GPMC
  ARM: dts: am335x: Enable gpio controller for GPMC
  ARM: dts: dra7: Enable gpio controller for GPMC
  ARM: dts: omap5: Enable gpio and interrupt controller for GPMC
  ARM: dts: omap4: Enable gpio and interrupt controller for GPMC
  ARM: dts: omap24xx: Enable gpio and interrupt controller for GPMC
  ARM: dts: omap4-kc1: Power off support
  ARM: dts: omap4-kc1: LEDs support
  ...
2016-04-24 23:43:56 +02:00
Masahiro Yamada
62547ba352 ARM: dts: uniphier: add NAND pinmux node
This commit adds pin-mux nodes for the NAND controller.
Some SoCs support 2 chip selects and the others only support
1 chip select.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-04-24 23:38:18 +02:00
Arnd Bergmann
412252ac8c The i.MX device tree updates for 4.7:
- More i.MX6 System-on-Module board support from Ka-Ro electronics:
    tx6s-8xxx, tx6u-8xxx, tx6q-1xxx, tx6ul-00xx.
  - Nitrogen6_MAX QP and Nitrogen6_SoloX board support from Boundary
    Devices.
  - VF610 based ZII development board support.
  - Add SAI interface audio support for i.MX6SX SDB board.
  - A number of random updates on LS1021A and VF610 dts files.
  - A couple of pinumx updates on i.MX25 and i.MX28.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJXFHWaAAoJEFBXWFqHsHzOIVYH/j6uTUwEa5Ez5j933SDtPd16
 fzL43h7WmMUUgKD4UlOyCSvsfILY5QfkVjEgneeYkBtxZA7T6YYpWE7SeNgjbqtW
 GURIkWOf9vi4k0afJIaR44TZjfij2TDwEYO8ySPfjgrmtX7bJUtB0WxyiqrycSYh
 ibJXnqGfhRxF3Htu+NBrp+NSgreBSqR+SXKQoP/xqzyKFDaFa3msL1YPIRIVrInI
 t/bAvhmMfS5Or+0zZNXa0oem3DmnA+jbVmn/nFgzejsIA94c3Zr4yzKD7SvYDEDI
 Ej4rwB40IWc7vNizbvg3xRhinwxbwD1emqPQm8rqxTpXiLrDn6QjCZocKfP+Wg0=
 =c+YT
 -----END PGP SIGNATURE-----

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

Merge "The i.MX device tree updates for 4.7" from Shawn Guo:

 - More i.MX6 System-on-Module board support from Ka-Ro electronics:
   tx6s-8xxx, tx6u-8xxx, tx6q-1xxx, tx6ul-00xx.
 - Nitrogen6_MAX QP and Nitrogen6_SoloX board support from Boundary
   Devices.
 - VF610 based ZII development board support.
 - Add SAI interface audio support for i.MX6SX SDB board.
 - A number of random updates on LS1021A and VF610 dts files.
 - A couple of pinumx updates on i.MX25 and i.MX28.

* tag 'imx-dt-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (36 commits)
  ARM: dts: imx6qdl-udoo: add 7 inch LCD touchscreen panel support
  ARM: dts: i.MX3x: add keypad port devicetree nodes
  ARM: dts: ls1021a: add pix clock to DCU dts node
  ARM: dts: ls1021a: DSPI has 6 chip-selects
  ARM: dts: ls1021a: Add gpio support for ls1021a platform
  ARM: dts: imx6q-ba16: Remove unused vqmmc-supply
  ARM: dts: ls1021a: add SCFG MSI dts node
  ARM: dts: imx28: add alternative pinmuxing for mac0
  ARM: dts: imx6q-tbs2910: fix fec reset polarity
  ARM: dts: vf610-zii-dev: Add ZII development board.
  ARM: dts: vfxxx: add missing reg properties
  ARM: dts: vf-colibri: increase NAND clock speed
  ARM: dts: vf-colibri: alias the primary FEC as ethernet0
  ARM: dts: imx6sx-sdb: Add SAI support
  bindings: fsl-imx-sdma: Document 'fsl,sdma-event-remap' property
  ARM: dts: imx6sx: Remove unused property
  ARM: dts: imx6sx: Fix SAI DMA index
  ARM: dts: imx6q-ba16: Disable pwm2 by default
  ARM: dts: imx: add Boundary Devices Nitrogen6_SoloX board
  ARM: dts: imx6qdl-sabresd: Pass the hannstar panel compatible string
  ...
2016-04-24 23:36:10 +02:00
Arnd Bergmann
a5cc8c3a71 ARM: tegra: Changes for v4.7-rc1
A couple of patches that cleanup some Kconfig, enable various features,
 use stdout-path to define the debug serial port (so that it doesn't have
 to be manually specified on the kernel command-line) and cleanup and fix
 some minor device trees bugs.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJXEPxMAAoJEN0jrNd/PrOhcDEP/3HEhikUq33Gwdu2E4kBcF9M
 iAOnzaqqknoN5H4aMVl3vlchHmZ62SXD1lvPwb5jWj9lrtxypFQVRkT0RvgjPD+a
 4II5zKSQnCuyWeujOpIGlr4LEEfOc9DXmSicGJL0L9hnszOgQgZWaAFtVpxh4vpQ
 HO/odR89HVSDbA/LQKd5o3GUo5wyVdGUDGqVpUzLy4vdNS3EhVFJto7qfPjPgr9O
 KNuELfmdd52udtWSGDuEhELL1j4wQLfYmeMakye5lCwyAP951tvoTfZyJqQfeg6a
 XVvp5/87cVn3LH1qQsbSEOcMn+lBun//IOPrm9QHiUbX0ysajtYhsYspM78gFaRk
 obHHMyDeaD1w/XCsj/+oBRZW2aHmr6fzl6wLecUIGJ5kMdnKlRNDhouHOeezK/I3
 mfy+RCnHQzJmKQmXygeNVAhMD45fMC8PSC1zGs/fvx6/mR1LAGwguNclm70lQFjV
 UI9RdlljNAdjqpXnxihXtFAwla1gXCvHnjWPMzISZmVgDR+4qVzTUWhrRcQDhBUb
 QhFY9N4A4tdu13R8dCDbqHOpFy47xlkHqAG6Syf7H215PX4vsFQJi5aP5o9Ezm9H
 fBa732SJuspK6xP4SS4Y/afpRoETIlBRfzNN3hMTQRNBAvZV5F93xFy02aAZZTtz
 jA55PgUK4WSZMFuZ9BaG
 =YURX
 -----END PGP SIGNATURE-----

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

Merge "ARM: tegra: Changes for v4.7-rc1" from Thierry Reding:

A couple of patches that cleanup some Kconfig, enable various features,
use stdout-path to define the debug serial port (so that it doesn't have
to be manually specified on the kernel command-line) and cleanup and fix
some minor device trees bugs.

* tag 'tegra-for-4.7-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Correct interrupt type for ARM TWD
  ARM: tegra: Add stdout-path for various boards
  ARM: tegra: Replace legacy *,wakeup property with wakeup-source
  ARM: tegra: Enable watchdog support for Tegra114 and Tegra124
  ARM: tegra: Add high speed UARTs to Jetson TK1 device tree
  ARM: tegra: Fix copy/paste typo in several DTS includes
  ARM: tegra: Remove redundant ARM_L1_CACHE_SHIFT_6 select
2016-04-24 23:27:30 +02:00
Arnd Bergmann
cb3ba4f716 Device-Tree updates for DaVinci. This
contains some clean-up and fixes of
 device-tree data and addition of i2c1
 node for DA850.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJXEM3jAAoJEGFBu2jqvgRNVlYP/0c/6m8c3aiKpIwC7Zs9UhGE
 pUX/tqr2LsfHQVMoLOcphMpEV6rBebgL9IzIYuODHY7ggcrPENjAFqa8luTjbyAE
 BbqRyCLnsVW0BWtYcTS4aUiBeY83E7rV9SIn2z5yHr3iB5b6mPkudeuGpwz3sJV0
 vTFSlXluCIr/slJuFt7FmpR4Ot5jFl3vMT4eZwEFz5CES/ttsR1oOJ1Uw2WY1Ryc
 vDD0lJLDuYGnEZyqeEXrTcUG7FX7oC1n+A1x1EjTf8s+Vf+o63Fc3Pw5QiyffN28
 o5Xnft75xPFgvkc6sQnaGXKnjxd9FOf6sIjz5XhMS6skM4Eq10LMhpdYOlMXOaxi
 HjjyS6XjE5na+Boaxi8m0FZqR3wB7jabkMz7aijznAnLHGQnUXxqyzhpVsJwGR4l
 keTkp0wKv+CCfsgazwJ8CyC56f0aIRl2j7jg7vclwa3BTzP1v8QHJAuRJCGzM5vO
 UIJo+NPH7Cbc5lM/Fvxq1orLScOzhAfUG1ScqXbvWpKuUqEcvSJDEV6bKTExWvmF
 KWLr9enkC/HuNNGPEVWYrbbRCuTqa02BEnBNxF4X2Ha4y/fhbcFDx++RNv7uBBAJ
 /928OM9cvXzEcYi4vJWhR6v4gXEJWBPwh11a8jaGErAT7KL4zJsDWDF3FcMz8Lyw
 f086vz4bOiZL/nM4rVpW
 =oMYh
 -----END PGP SIGNATURE-----

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

Merge "Device-Tree updates for DaVinci" from Sekhar Nori:

This contains some clean-up and fixes of device-tree data and addition
of i2c1 node for DA850.

* tag 'davinci-for-v4.7/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: da8xx-dt: add OF_DEV_AUXDATA entry for i2c1
  ARM: DTS: da850: add node for i2c1
  ARM: dts: davinci: use proper address after @
  ARM: DTS: da850: fix missing #gpio-cells in gpio node
2016-04-24 23:25:44 +02:00
Arnd Bergmann
bb12fbd2cc Nomadik DTS changes for v4.7:
- Add accelerometer for NHK15
 - Add DMA engine definitions and UART channels
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXD/XjAAoJEEEQszewGV1zeeoP/1Q1B++0srhxF5iOR6v7bfg4
 JAsxKTQWWHekGQmxS8RLvf0zo4C3aUvbQvQgAohuO2tsy67nHkkOh75eJFgVrCqB
 hPI7IKhWR52jfmzsDHH75fujqLSJImCrprEN36XnnpIS0wnXjVIGz7ppIhUdWlZM
 ibyyofQ5HdZbb+fw8MfNk/x+YZdFvdA9eojZhXiVzp61YNlhfiEl/eiCpXm0LhFj
 p4K4USj1sTFK0nW9Uxlx8sRBTlgG8NoFZOeoPqaMofjtknuLdAQ4obzmmNSVgtUH
 hbz66FjzJfShzH4J7wVvbDD35CEY+tr2WX8+PcbAkCbk4x7z96lEl0lwU/b9eGu0
 NtNXnw+1n2y3aDGu4JrNKHpbE1JhjJK+ecPbdXD4v/qSKa9r76QElUdLhiu3EvZC
 EHgvzC07kaPYoXrVwNXvuReNhqnfi22+GjaN164kCrh/xX3LGOhG89Kzwrl4fQZL
 7tAc97sdDJvDfCsPeG+IkH7AGul+HXnsMuKBzl+ci0OC1UfnZ3otjTrhSCHmqZ1F
 87LOQInaKE8e76UOzHpDfCMd/J/XfKN5zsoYujIGp4YHQUqRFqkxQP3ixfhMQiPe
 IL/Tg3nKbK46BMCIDV3xo39+YwvVZG6TEwVplbJp9unOxGYk7QkW7Cce7GJDkiXm
 Vnf42Rv3LCVC0fCg+oyf
 =g5ZG
 -----END PGP SIGNATURE-----

Merge tag 'nomadik-dts-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

Merge "Nomadik DTS changes for v4.7" from Linus Walleij:
- Add accelerometer for NHK15
- Add DMA engine definitions and UART channels

* tag 'nomadik-dts-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: nomadik: add DMA engine and some channels
  ARM: dts: nomadik: add accelerometer IRQ and pin setting
2016-04-24 23:23:53 +02:00
Arnd Bergmann
6a6e2d6121 mvebu dt for 4.7 (part 1)
- add hardware monitor support in the NSA320 device tree
 - update makefile with kirkwood-ds112.dtb and kirkwood-nsa320.dtb
 - fix GPIO config on the Linksys boards
 - various Kirkwood DT warning fixup from the newer DT compiler
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlcPztkACgkQCwYYjhRyO9WdhgCfQQ1H5LT+C5WvS1OpXTKIScTo
 of0AoJaa8PvkpVLB4e8mZVXfzBW9Ne6w
 =nKfy
 -----END PGP SIGNATURE-----

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

Merge "mvebu dt for 4.7 (part 1)" from Gregory CLEMENT:

- add hardware monitor support in the NSA320 device tree
- update makefile with kirkwood-ds112.dtb and kirkwood-nsa320.dtb
- fix GPIO config on the Linksys boards
- various Kirkwood DT warning fixup from the newer DT compiler

* tag 'mvebu-dt-4.7-1' of git://git.infradead.org/linux-mvebu:
  ARM: dts: kirkwood: Add DTS for Linksys EA4200v2/EA4500
  ARM: dts: orion5x: add device tree for kurobox-pro
  ARM: dts: kirkwood: Add address go regulator unit name
  ARM: dts: kirkwood: Add address to mbus unit name
  ARM: dts: kirkwood: Remove address from gpio-i2c unit name
  ARM: dts: kirkwood: Fixup pcie DT warnings
  ARM: dts: kirkwood: Add address to ethernet-phy unit name
  ARM: dts: kirkwood: Remove address from dsa unit name
  ARM: dts: kirkwood: Remove node address from leds
  ARM: dts: kirkwood: Remove button address and fixup names
  ARM: dts: kirkwood: add kirkwood-nsa320.dtb to Makefile
  ARM: dts: kirkwood: add kirkwood-ds112.dtb to Makefile
  ARM: mvebu: fix GPIO config on the Linksys boards
  ARM: dts: kirkwood: Add the hardware monitor to the NSA320 device tree
2016-04-24 23:21:34 +02:00
Arnd Bergmann
9744426e6d Samsung Device Tree updates and improvements for v4.7:
1. Enable accelerated AES (Security SubSystem) on Exynos4412-based boards.
 2. Enable HDMI CEC on Exynos4412-based Odroid.
 3. Add regulator supplies for eMMC/SD on Odroid XU3/XU4.
 4. Fix DTC unit name warnings.
 5. Merge topic branch of new Artik5 board.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXDhDsAAoJEME3ZuaGi4PXGWAP/AwEYJl8TgI99Rkx5jU7AH60
 MNptSOYXldI5H7pe2Dj4pXu6p31bZLWzzKH7YjNo2JywpX1dE+sz1wWsMHfYmhff
 WIS5VZVewL4rk9a7VwLaDvyw9OHEbWm2xPViRnhnewl8oePMwJdK44S6DjqO3fFt
 3n8xi/mCGlD1wSTF/zpANg0GoIVO6l5cnvswkm0DrCq5F1jVJ33yTV8PBwT46chu
 bd/gNHP2Cd39zF98gZEqhK9lXReay8FUS8/JSrfnXzL/KB3UJVDxHtIKx8fMdhzT
 skwnr62G39PnHaZhOXT6eJJdY/OOnMn8Wgk3eXioL2AOn2phYuAG3p17ActgEhUq
 561ygQz2MNib6AABdvTfgUZWAjXpoObNVr3320iKMeFhxl5PmoJbwYZK14jzZlp1
 IrrTRJU4dK+sx03ioa13iDVvJjO2li6wd5RAKEPiryoosRJrbRHg0+iAnq+PONtK
 c5QLgkWkeSISfxUtlylnjybX6ek1GMLBNWgmgKVhAO/qb1tn7hmaLWsT8z/ikpwU
 YPim1fS4PK3Ghhqjx/aM1v00q2DwAMi/YWVZ8DaK1mkkKynohuKzUBP9FcPvY8wu
 dvc9ItR3uj0oFAicRrwUc7UXpEUg+IoL0SPOj9dnW01UQTFVzy0UryoGkQDP8Zml
 AhrotWtVWfzdn7U5O97W
 =ha9R
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Merge "Samsung Device Tree updates and improvements for v4.7" from Krzysztof Kozlowski:

1. Enable accelerated AES (Security SubSystem) on Exynos4412-based boards.
2. Enable HDMI CEC on Exynos4412-based Odroid.
3. Add regulator supplies for eMMC/SD on Odroid XU3/XU4.
4. Fix DTC unit name warnings.
5. Merge topic branch of new Artik5 board.

* tag 'samsung-dt-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: s5p: Fix DTC unit name warnings in SMDKv210 board
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos5440
  ARM: dts: exynos: Fix DTC unit name warnings in SMDK5420
  ARM: dts: exynos: Fix DTC unit name warnings in Peach Pit
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos542x
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos5250
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos4x12
  ARM: dts: exynos: Fix DTC unit name warnings in Trats2 board
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos4
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos3250
  ARM: dts: exynos: Fix DTC unit name warnings in cros-adc-thermistors
  ARM: dts: exynos: Add eMMC and SD regulator supplies to Odroid XU3/XU4
  ARM: dts: exynos: Enable the HDMI CEC device on Exynos4412 Odroid boards
  ARM: dts: exynos: Add node for the HDMI CEC device to exynos4
  ARM: dts: exynos: Add HDMI CEC pin definition to exynos4 pinctrl
  ARM: dts: exynos: Enable SSS on Odroid X/X2/U3 family
  ARM: dts: exynos: Enable SSS on Trats2
  ARM: dts: exynos: Add Security SubSystem node to Exynos4
2016-04-24 23:16:48 +02:00
Arnd Bergmann
036f8d0635 Topic branch for Device Tree changes for Exynos 3250 for v4.7:
Merge necessary new clocks from Sylwester (used by new board) and add support
 for Exynos3250-based Artik5 board.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXDgugAAoJEME3ZuaGi4PX8JIP/0UmBC5FLJLgzFRgzVcGvwjS
 nzLRcIqwQ7i/ztT3r3kUndjrHLQAqWRynrNdq0w+W+DYGVEYEToBfVbqdVezJ9i+
 XgfeXvUU/k+4aZHpsrcl6ZST7MD6UQn9qSLB1R3Y4zHVw68gldNPMtDNpyrQJutu
 440+vd5fKZxmcEx8exAIon4AEnPXsDkom2YQTd4NfeKmVHxsfJsv3Irj3DcRrcYV
 StCp7n1UhZmEP3pAhOhyGx6XmU/Qrl4iYZtSwpmDC5PwAt8dHQ8b4Z/N+uP8Ghas
 jCaNTA+z9mKdTyNNdLAefWeIddhCTp1eAdzoV5znBAIDjpGBqZjWKbq77v1m2NqU
 jSmY+m/UpexNnC5b5eYJbjU+l85VhXECog3qjCUjuJtj+nib95icYM536WhTzhRf
 ZEZ/NZyU5ReO10bTYr+YTb4O/iz+SMzfghGvs2HXpVk4X89utG7HUqcYg6zCQIWz
 4sL8JGAhq1bmzzgnS+8km2ZpRD6gmssB+2tG16nJk0tJFplHzU9Wr46Q/ttMeg9I
 d2GK/sE9EFooQH+fqoQmi1aNKb3fEJlUIvqpxfTeFbhnRpOCCfaIq+U9bmg9JxdG
 HuZuEO0ClNFyQN8TBUNmzZL5XzYGPUksbVWyVc4VuZ0PNEXLeMsyzCUmgrLEPQEU
 EzgObFNrzaouu8QN3rii
 =mQfO
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt-exynos3250-artik5-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Merge "Topic branch for Device Tree changes for Exynos 3250 for v4.7" from Krzysztof Kozlowski:

Merge necessary new clocks from Sylwester (used by new board) and add support
for Exynos3250-based Artik5 board.

* tag 'samsung-dt-exynos3250-artik5-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Add MSHC2 DT node for SD card for exynos3250-artik5-eval board
  ARM: dts: exynos: Add exynos3250-artik5 dtsi file for ARTIK5 module
  ARM: dts: exynos: Add MSHC2 DT node for Exynos3250 SoC
  ARM: dts: exynos: Add UART2 DT node for Exynos3250 SoC
  ARM: dts: exynos: Add initial gpio setting of MMC2 device for exynos3250-monk
  ARM: dts: exynos: Add initial pin configuration for exynos3250-rinato
  clk: samsung: exynos3250: Add MMC2 clock
  clk: samsung: exynos3250: Add UART2 clock
  dt-bindings: Add the clock id of UART2 and MMC2 for Exynos3250
2016-04-24 23:12:59 +02:00
Heiko Stuebner
162718cb1a ARM: dts: rockchip: add MiQi board from mqmaker
The MiQi is a rk3288-based devboard from Shenzen based mqmaker, with a
footprint the size of a credit card.

Main available outside connections are 4 usb ports, hdmi, gigabit
ethernet and two expansion headers.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2016-04-24 22:50:39 +02:00
Arnd Bergmann
92f27f98ce Qualcomm Fixes for v4.6-rc2
* Revert BAM usage on MSM8974 boards
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXAILWAAoJEFKiBbHx2RXVfoQQAOS9xxbdKIGEHL8tf++UF6ol
 cjiTq7++NIGjY63AvJ9kYD6x1i41cwwIIlm5hdy7NQBpJ6YjPqNSkOUPrPDtqIWJ
 Von/E0Sqkbqg8RsYoAZK+FMCPOmVceJ9mp/h3+Tk0+ANARmis7D3HLbdKtmO3Rqa
 zveV8X+Y3PcdDr7QWxkuSfYayjUWqI0BIwdq3W0VY/8Vt4iWzkwES+aDegNtFxlI
 Xeau0mzRJEIl0dG4S26BilcylQ3iOe1x1sVCcRJJILKP9CVOfhD8tzCw8MbIOcPk
 iLzI2J5q4Fnkiib+sygbbkXpSij9vraBitDC7L6pBoPibBAVy25sMAGUcWRwrZXZ
 oODZM5H43p7zYMNlNq3mDWPS0+jReGD42QsOEcg8QxCuXs66YfbuWidK1Kowg+oy
 VRVpXYs2YuqUlMz5zhUMpZvXy3hQwcNMrN8wLH/PSJ3fKIeFdSk+Q9gKW9PyZ60r
 uIuSYheN3UQxpeJ2Mr+hkPtuEoZxSsZIb5tq0mJZ9nNnfydYDoQYDGWLwUOABHRC
 Ju65ZQ8P+d15j0W4ai11rh2NshrLUVvLQHYQz1L+MyW9MlavKTCXkWPsvUzp6ffC
 T4WjK7cDnQVypc9ysI+Ir6/RI6WwCNHiSqEvHhBcIWNjxYh8iJHGubZ4qtmIjvPC
 WuxVd1s0O1e2gQ9kafhP
 =rDKB
 -----END PGP SIGNATURE-----

Merge tag 'qcom-fixes-for-4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into fixes

Merge "Qualcomm Fixes for v4.6-rc2" from Andy Gross:

* Revert BAM usage on MSM8974 boards

* tag 'qcom-fixes-for-4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  Revert "dts: msm8974: Add dma channels for blsp2_i2c1 node"
  Revert "dts: msm8974: Add blsp2_bam dma node"
2016-04-23 22:10:48 +02:00
Masahiro Yamada
56896ef5b9 arm64: dts: uniphier: fix I2C nodes of PH1-LD20
The I2C hardware blocks on this SoC are connected as follows:

  I2C0: external connection
  I2C1: external connection
  I2C2: internal connection
  I2C3: external connection
  I2C4: external connection
  I2C5: internal connection
  I2C6: no connection (not accessible)

Delete pinctrl from Ch2, add pinctrl to Ch4, and remove the Ch6 node.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-04-23 22:08:35 +02:00
Linus Torvalds
1ad9bf9fdc Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
 "Misc fixes: two EDAC driver fixes, a Xen crash fix, a HyperV log spam
  fix and a documentation fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86 EDAC, sb_edac.c: Take account of channel hashing when needed
  x86 EDAC, sb_edac.c: Repair damage introduced when "fixing" channel address
  x86/mm/xen: Suppress hugetlbfs in PV guests
  x86/doc: Correct limits in Documentation/x86/x86_64/mm.txt
  x86/hyperv: Avoid reporting bogus NMI status for Gen2 instances
2016-04-23 12:07:29 -07:00
Thor Thayer
c5fb04cc96 ARM: socfpga: Initialize Arria10 OCRAM ECC on startup
Initialize ECC for Arria10 On-Chip RAM on machine startup. The OCRAM
memory must be initialized before data is stored in memory otherwise the
ECC will fail on reads. The previous check-in

  2364d423a7 ("ARM: socfpga: Enable Arria10 OCRAM ECC on startup")

added the OCRAM enable and initialization code but was not called on
startup.

Signed-off-by: Thor Thayer <tthayer@opensource.altera.com>
Acked-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1460394094-23326-1-git-send-email-tthayer@opensource.altera.com
Signed-off-by: Borislav Petkov <bp@suse.de>
2016-04-23 19:22:22 +02:00
Ingo Molnar
84eaae155a Linux 4.6-rc4
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJXFELfAAoJEHm+PkMAQRiGRYIH+wWsUva7TR9arN1ZrURvI17b
 KqyQH8Ov9zJBsIaq/rFXOr5KfNgx7BU9BL9h7QkBy693HXTWf+GTZ1czHM4N12C3
 0ZdHGrLwTHo2zdisiQaFORZSfhSVTUNGXGHXw13bUMgEqatPgkozXEnsvXXNdt1Z
 HtlcuJn3pcj+QIY7qDXZgTLTwgn248hi1AgNag+ntFcWiz21IYaMIi7/mCY9QUIi
 AY+Y3hqFQM7/8cVyThGS5wZPTg1YzdhsLJpoCk0TbS8FvMEnA+ylcTgc15C78bwu
 AxOwM3OCmH4gMsd7Dd/O+i9lE3K6PFrgzdDisYL3P7eHap+EdiLDvVzPDPPx0xg=
 =Q7r3
 -----END PGP SIGNATURE-----

Merge tag 'v4.6-rc4' into sched/core, to refresh the tree

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-23 14:16:36 +02:00
Peter Zijlstra
31b84310c7 x86/perf/rapl: Add missing Broadwell model
With the array aligned as per events/intel/core.c it was fairly
obvious we missed one, add it in.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-23 14:14:27 +02:00
Peter Zijlstra
c416e5aa40 x86/perf/rapl: Reorder model numbers
Re-order the model array to match the order in events/intel/core.c,
to easier spot gaps and such.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-23 14:14:26 +02:00
Srinivas Pandruvada
dcee75b3b7 perf/x86/intel/rapl: Support Skylake RAPL domains
Add Skylake client support for RAPL domains. In addition to RAPL domains
in Broadwell clients, it has support for platform domain (aka PSys). The
PSys domain controls the entire SoC instead of just a CPU package. Unlike
package domain, PSys support requires more than just processor level
implementation. The other parts in the system need additional HW level
signaling, which OEMs need to support. When not supported, the energy
counter register in PSys domain returns 0.

Also corrected error in comment for GPU counter, which previously was
DRAM counter.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com
[ Cnverted to model_match stuff. ]
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: bp@alien8.de
Cc: hpa@zytor.com
Cc: jacob.jun.pan@linux.intel.com
Cc: rjw@rjwysocki.net
Link: http://lkml.kernel.org/r/1460930581-29748-2-git-send-email-srinivas.pandruvada@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-23 14:13:36 +02:00
Kan Liang
f21d5adceb perf/x86/intel: Add LBR filter support for Silvermont and Airmont CPUs
LBR filtering is also supported on the Silvermont and Airmont
microarchitectures. The layout of MSR_LBR_SELECT is the same as Nehalem.

Signed-off-by: Kan Liang <kan.liang@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1460706825-46163-1-git-send-email-kan.liang@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-23 14:12:31 +02:00
Kan Liang
8b92c3a78d perf/x86/intel: Add Goldmont CPU support
Add perf core PMU support for Intel Goldmont CPU cores:

 - The init code is based on Silvermont.

 - There is a new cache event list, based on the Silvermont cache event list.

 - Goldmont has 32 LBR entries. It also uses new LBRv6 format, which
   report the cycle information using upper 16-bit of the LBR_TO.

 - It's recommended to use CPU_CLK_UNHALTED.CORE_P + NPEBS for precise cycles.

For details, please refer to the latest SDM058:

 http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-vol-3b-part-2-manual.pdf

Signed-off-by: Kan Liang <kan.liang@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1460706167-45320-1-git-send-email-kan.liang@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-23 14:12:27 +02:00
Ingo Molnar
65cbbd037b Merge branch 'perf/urgent' into perf/core, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-23 14:12:10 +02:00
Srinivas Pandruvada
e1089602a3 perf/x86/intel/rapl: Add missing Haswell model
Added one missing Haswell model.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: bp@alien8.de
Cc: hpa@zytor.com
Link: http://lkml.kernel.org/r/1460907809-11897-1-git-send-email-srinivas.pandruvada@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-23 13:46:45 +02:00
Andi Kleen
b89c173788 perf/x86/intel: Add model number for Skylake Server to perf
Everything the same as base Skylake, just a new model number.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1460751933-2264-1-git-send-email-andi@firstfloor.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-23 13:46:44 +02:00
Ross Lagerwall
707e59ba49 xen/qspinlock: Don't kick CPU if IRQ is not initialized
The following commit:

  1fb3a8b2cf ("xen/spinlock: Fix locking path engaging too soon under PVHVM.")

... moved the initalization of the kicker interrupt until after
native_cpu_up() is called.

However, when using qspinlocks, a CPU may try to kick another CPU that is
spinning (because it has not yet initialized its kicker interrupt), resulting
in the following crash during boot:

  kernel BUG at /build/linux-Ay7j_C/linux-4.4.0/drivers/xen/events/events_base.c:1210!
  invalid opcode: 0000 [#1] SMP
  ...
  RIP: 0010:[<ffffffff814c97c9>]  [<ffffffff814c97c9>] xen_send_IPI_one+0x59/0x60
  ...
  Call Trace:
   [<ffffffff8102be9e>] xen_qlock_kick+0xe/0x10
   [<ffffffff810cabc2>] __pv_queued_spin_unlock+0xb2/0xf0
   [<ffffffff810ca6d1>] ? __raw_callee_save___pv_queued_spin_unlock+0x11/0x20
   [<ffffffff81052936>] ? check_tsc_warp+0x76/0x150
   [<ffffffff81052aa6>] check_tsc_sync_source+0x96/0x160
   [<ffffffff81051e28>] native_cpu_up+0x3d8/0x9f0
   [<ffffffff8102b315>] xen_hvm_cpu_up+0x35/0x80
   [<ffffffff8108198c>] _cpu_up+0x13c/0x180
   [<ffffffff81081a4a>] cpu_up+0x7a/0xa0
   [<ffffffff81f80dfc>] smp_init+0x7f/0x81
   [<ffffffff81f5a121>] kernel_init_freeable+0xef/0x212
   [<ffffffff81817f30>] ? rest_init+0x80/0x80
   [<ffffffff81817f3e>] kernel_init+0xe/0xe0
   [<ffffffff8182488f>] ret_from_fork+0x3f/0x70
   [<ffffffff81817f30>] ? rest_init+0x80/0x80

To fix this, only send the kick if the target CPU's interrupt has been
initialized. This check isn't racy, because the target is waiting for
the spinlock, so it won't have initialized the interrupt in the
meantime.

Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Cc: xen-devel@lists.xenproject.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-23 13:40:02 +02:00
Kevin Hilman
e6d939bfd4 The i.MX fixes for 4.6:
- The sdhci-esdhc-imx DMA support is broken due to commit 7b91369b46
    ("mmc: sdhci: Set DMA mask when adding host").  It requires device's
    dma_mask be set up properly to get DMA work.  The fixing patch
    initializes the DMA mask to enable the access again.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJXDg+UAAoJEFBXWFqHsHzOxLEH/jbiBkmo4w1JYfOgVwTRF58h
 pCP+OmXvM5gmO0QoyxmxzmISQU8RYkk+dRrM8GNasp9TY3TAc+R6CzrOJrJ4uzFK
 oMuc5f/52/ExRt9MgeGYy/Cy05g1iqUCp2SucyUxrcPSC6I85QOqCIRUFqnuyP7L
 MtHuLudSCOKmAjtWpwHqoHG8/tlWQX2iw0YW8mn1SsSUau/ROtSP21mN6/NxOgcD
 tHg53u3Bq//kWyoccsJ8FbQz7SkKvPq5fOkW3aBv67ZkFuf7fqwve6dGGQ/ojkA0
 g5ikPmaExxH/E5pYFmtdzv6dN8D4n9SVMW5MV42p41JTdnqVmdFiraGwT0z1uf8=
 =Oq+h
 -----END PGP SIGNATURE-----

Merge tag 'imx-fixes-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

Merge "ARM: i.MX fixes for 4.6" from Shawn Guo:

The i.MX fixes for 4.6:
 - The sdhci-esdhc-imx DMA support is broken due to commit 7b91369b46
   ("mmc: sdhci: Set DMA mask when adding host").  It requires device's
   dma_mask be set up properly to get DMA work.  The fixing patch
   initializes the DMA mask to enable the access again.

* tag 'imx-fixes-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: mach-imx: sdhci-esdhc-imx: initialize DMA mask
2016-04-22 16:55:05 -07:00
Kevin Hilman
22c49e5a09 Fixes for omaps for v4.6-rc cycle:
- Clockdomain fix for dra7 timer interrupts
 
 - Two fixes for GPMC EDMA binding, I missed the need for a merge with
   GPMC changes and EDMA changes
 
 - Fix beagle-x15 eSATA by dropping misconfigured extcon_usb1
 
 - Fix occasional external aborts on 36xx with PM that we've been
   chasing for past few months. It turned out to be duplicate restore
   of INTC registers that can in some cases cause us to hit erratum 1.106.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXD8cCAAoJEBvUPslcq6VzKlEQAJsIi+p0Bk8ior9eqEphnWI5
 NdMcu0POJb/SVLPfLzH5WxM/8Rd81Se56uiy1Hpa9cqxFxfStQm9/ltU/8EJEvAC
 XnxwX78jfB7I6BcynKia+M/Sc4CgVxi41iq3lc1AUY5srN7kYyxFTljlMQMKwgTg
 QFM4sFFCARUifO+z3SejgaO3vde0cMlZPh4gGYEx01xxYoqYk5kdWxHN1nRBH9T2
 a/F7GrnMgTgALITP6oij9cb/uLyog7YraDc1fWQzAhm9JdneAbI21MHwkLsEB+Il
 EDGcyq9VKMO8nXD2sGlt1EIjnaPZAd45To/OECGd11N7qog79/LEo5gMN/Is76kO
 cx6nrvqGrOfynt2q3GyfMWiMRn36mk1gZ+FtOGCxRc0ROyqXfLyhKWKZkEK7aotf
 R6Ga/ufNRiw0Ded0XABlt2PD6PPWD+Ly5wiU8AwOraM7XW6415FK07fD+hhZczOG
 66wFC+J8nQGO7VecBrJOnqms2YnPlc4dgfVCo8jnAjRFtfPG9UjnPZBloxlDKMJB
 OSkVPtRLCHiVk1xG51TCKgIgwJ5s957ohb9ImTIikXHsdLu39F3P7Tx4LQfYS8pd
 B2AbktI0VYkJqiuaLjHdbxWBY8AL5UrZynn+pxjbVQcmuqgHGrDD7DWB8nmspvu0
 4HvovFXCm8NvRZBMJhh9
 =6rQp
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.6/fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge "omap fixes for v4.6-rc cycle" from Tony Lindgren:

Fixes for omaps for v4.6-rc cycle:

- Clockdomain fix for dra7 timer interrupts

- Two fixes for GPMC EDMA binding, I missed the need for a merge with
  GPMC changes and EDMA changes

- Fix beagle-x15 eSATA by dropping misconfigured extcon_usb1

- Fix occasional external aborts on 36xx with PM that we've been
  chasing for past few months. It turned out to be duplicate restore
  of INTC registers that can in some cases cause us to hit erratum 1.106.

* tag 'omap-for-v4.6/fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP3: Fix external abort on 36xx waking from off mode idle
  ARM: dts: am57xx-beagle-x15: remove extcon_usb1
  ARM: dts: am437x: Fix GPMC dma properties
  ARM: dts: am33xx: Fix GPMC dma properties
  ARM: DRA7: clockdomain: Implement timer workaround for errata i874
2016-04-22 16:53:49 -07:00