Commit eb785bef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC DT updates from Arnd Bergmann:
 "As usual, this is the largest branch, though this time a little under
  half of the total changes with 307 individual non-merge changesets.

  The largest changes are the addition of new machines, in particular
  the Tegra based Chromebook, the Renesas r8a7794 SoC, and DT support
  for the old i.MX1 platform.

  Other changes include
   - at91: various sam9 and sama5 updates
   - exynos: much extended Peach Pi/Pit (Chromebook 2) support
   - keystone: new peripherals
   - meson: added DT for meson6 SoC
   - mvebu: new device support for Armada 370/375
   - qcom: improved support for IPQ8064 and MSM8x60
   - rockchip: much improved support for rk3288
   - shmobile: lots of updates all over the place
   - sunxi: dts license change
   - sunxi: more a23 device support
   - vexpress: CLCD DT description"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (308 commits)
  ARM: DTS: meson: update DTSI to add watchdog node
  ARM: dts: keystone-k2l: fix mdio io start address
  ARM: dts: keystone-k2e: fix mdio io start address
  ARM: dts: keystone-k2e: update usb1 node for dma properties
  ARM: dts: keystone: fix io range for usb_phy0
  Revert "Merge tag 'hix5hd2-dt-for-3.18' of git://github.com/hisilicon/linux-hisi into next/dt"
  Revert "ARM: dts: hix5hd2: add wdg node"
  ARM: dts: add rk3288 i2s controller
  ARM: vexpress: Add CLCD Device Tree properties
  ARM: bcm2835: add I2S pinctrl to device tree
  ARM: meson: documentation: add bindings documentation
  ARM: meson: dts: add basic Meson/Meson6/Meson6-atv1200 DTSI/DTS
  ARM: dts: mt6589: Change compatible string for GIC
  ARM: dts: mediatek: Add compatible property for aquaris5
  ARM: dts: mt6589-aquaris5: Add boot argument earlyprintk
  ARM: dts: mt6589: Fix typo in GIC unit address
  ARM: dts: Build dtb for Mediatek board
  ARM: dts: keystone: fix bindings for pcie and usb clock nodes
  ARM: dts: keystone: k2l: Fix chip selects for SPI devices
  ARM: dts: keystone: add dsp gpio controllers nodes
  ...
parents cf377ad7 ee48874d

Documentation/arm/Marvell/README

+4 −0
Original line number Diff line number Diff line
@@ -103,6 +103,10 @@ EBU Armada family 
    NOTE: not to be confused with the non-SMP 78xx0 SoCs

    Product Brief: http://www.marvell.com/embedded-processors/armada-xp/assets/Marvell-ArmadaXP-SoC-product%20brief.pdf

    Functional Spec: http://www.marvell.com/embedded-processors/armada-xp/assets/ARMADA-XP-Functional-SpecDatasheet.pdf

    Hardware Specs:

      http://www.marvell.com/embedded-processors/armada-xp/assets/HW_MV78230_OS.PDF

      http://www.marvell.com/embedded-processors/armada-xp/assets/HW_MV78260_OS.PDF

      http://www.marvell.com/embedded-processors/armada-xp/assets/HW_MV78460_OS.PDF



  Core: Sheeva ARMv7 compatible

Documentation/devicetree/bindings/arm/altera/socfpga-sdram-edac.txt

0 → 100644
+15 −0
Original line number Diff line number Diff line 
Altera SOCFPGA SDRAM Error Detection & Correction [EDAC]

The EDAC accesses a range of registers in the SDRAM controller.



Required properties:

- compatible : should contain "altr,sdram-edac";

- altr,sdr-syscon : phandle of the sdr module

- interrupts : Should contain the SDRAM ECC IRQ in the

	appropriate format for the IRQ controller.



Example:

	sdramedac {

		compatible = "altr,sdram-edac";

		altr,sdr-syscon = <&sdr>;

		interrupts = <0 39 4>;

	};

Documentation/devicetree/bindings/arm/amlogic.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
Amlogic MesonX device tree bindings

-------------------------------------------



Boards with the Amlogic Meson6 SoC shall have the following properties:



Required root node property:



compatible = "amlogic,meson6";

Documentation/devicetree/bindings/arm/geniatech.txt

0 → 100644
+5 −0
Original line number Diff line number Diff line 
Geniatech platforms device tree bindings

-------------------------------------------



Geniatech ATV1200

    - compatible = "geniatech,atv1200"

Documentation/devicetree/bindings/arm/mediatek.txt

+6 −0
Original line number Diff line number Diff line
@@ -6,3 +6,9 @@ Required root node property: 


compatible: must contain "mediatek,mt6589"





Supported boards:



- bq Aquaris5 smart phone:

    Required root node properties:

      - compatible = "mundoreader,bq-aquaris5", "mediatek,mt6589";

CRA Git | Maintained and supported by SUSTech CRA and CCSE