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
  ...

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

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
  ...

Merge tag 'renesas-rcar-sysc-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Pull "Renesas ARM Based SoC R-Car SYSC Updates for v4.7" from Simon Horman:

* Add DT bindings for the R-Car System Controller.
  An implementation is intended to follow.

* tag 'renesas-rcar-sysc-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  soc: renesas: Add r8a7795 SYSC PM Domain Binding Definitions
  soc: renesas: Add r8a7794 SYSC PM Domain Binding Definitions
  soc: renesas: Add r8a7793 SYSC PM Domain Binding Definitions
  soc: renesas: Add r8a7791 SYSC PM Domain Binding Definitions
  soc: renesas: Add r8a7790 SYSC PM Domain Binding Definitions
  soc: renesas: Add r8a7779 SYSC PM Domain Binding Definitions
  PM / Domains: Add DT bindings for the R-Car System Controller

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>

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
  ...

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

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

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

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

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

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

This pull request brings in VC4 devicetree support and the other minor
DT changes for 4.7.

Also included is a DRM patch necessary to prevent regressions when
simplefb and vc4 drivers are both present.  The patch was suggested by
the simplefb maintainer as the solution agreed upon at ELCE 2014, and
was acked by the DRM maintainer for merging through this tree.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Controller is present on every BCM4708* board but only few devices have
serial flash attached so mark it as disabled by default.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Add support for battery level reading on the Nexus7 by
enabling the bq27541 driver in the nexus7 dts

Cc: Rob Herring <robh+dt@kernel.org>
Cc: Arnd Bergmann <arnd.bergmann@linaro.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: Andy Gross <agross@codeaurora.org>
Cc: Vinay Simha BN <simhavcs@gmail.com>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Stephen Boyd <stephen.boyd@linaro.org>
Cc: linux-arm-msm@vger.kernel.org
Cc: devicetree@vger.kernel.org
Signed-off-by: John Stultz <john.stultz@linaro.org>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This patch adds support to on board LIS3MDLTR magnetometer.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This patch adds spi nodes required to provide spi bus support on LS
expansion.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This patch adds nodes required to enable 4 i2c buses on the board which
are connected to various sensors and eeprom.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This patch adds support to 4 user leds, wlan and bt led on board.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This patch enables sata and regulators required to get on board sata
working.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This patch adds pcie and regulators required to get on board ATL1C
ethernet working.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This patch adds usb host and otg support on board with required
regulators.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This patch adds eMMC and SD card support with card detect and adding
required regulators.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This patch adds pmic regulator supplies connected on the board.
Rest of the invidual regulators would be added as and when required by
the devices.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This patch adds support to DB600c with basic serial ports.
DB600c is based on APQ8064.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This patch adds support to gsbi7 i2c which is used in some of the new
boards.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This patch adds support to gsbi1 uart and its pinctrls nodes.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This patch fixes pinctrls for spi and i2c nodes whose default and sleep
states are together, which is incorrect.

Without this patch i2c/spi would not be functional.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

One part of the efs memory region is used specifically for sharing file system
buffers between the apps and modem cpus (aka rmtfs), so better reflect this
split.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This adds the blsp_dma node to the device tree and the required
properties for using DMA with serial
Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This adds the crypto nodes to the ipq4019 device tree, it also adds the
BAM node used by crypto as well which the driver currently requires to
operate properly

The crypto driver itself depends on some other patches to qcom_bam_dma
to function properly:

https://lkml.org/lkml/2015/12/1/113

CC: Stanimir Varbanov <svarbanov@mm-sol.com>
Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This adds some operating points for cpu frequeny scaling
Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This will allow boards to enable the I2C bus

CC: Sricharan R <srichara@qti.qualcomm.com>
Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This will allow boards to enable the SPI bus
Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This will allow these types of boards to be rebooted.
Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>