Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull 64-bit ARM DT updates from Olof Johansson:
 "Just as the 32-bit contents, the 64-bit device tree branch also
  contains a number of additions this release cycle.

  New platforms:
   - LG LG1313
   - Mediatek MT6755
   - Renesas r8a7796
   - Broadcom 2837

  Other platforms with larger updates are:
   - Nvidia X1 platforms (USB 3.0, regulators, display subsystem)
   - Mediatek MT8173 (display subsystem added)
   - Rockchip RK3399 (a lot of new peripherals)
   - ARM Juno reference implementation (SCPI power domains, coresight,
     thermal)"

* tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (118 commits)
  arm64: tegra: Enable HDMI on Jetson TX1
  arm64: tegra: Add sor1_src clock
  arm64: tegra: Add XUSB powergates on Tegra210
  arm64: tegra: Add DPAUX pinctrl bindings
  arm64: tegra: Add ACONNECT bus node for Tegra210
  arm64: tegra: Add audio powergate node for Tegra210
  arm64: tegra: Add regulators for Tegra210 Smaug
  arm64: tegra: Correct Tegra210 XUSB mailbox interrupt
  arm64: tegra: Enable XUSB controller on Jetson TX1
  arm64: tegra: Enable debug serial on Jetson TX1
  arm64: tegra: Add Tegra210 XUSB controller
  arm64: tegra: Add Tegra210 XUSB pad controller
  arm64: tegra: Add DSI panel on Jetson TX1
  arm64: tegra: p2597: Add SDMMC power supplies
  arm64: tegra: Add PMIC support on Jetson TX1
  Revert "ARM64: DTS: meson-gxbb: switch ethernet to real clock"
  arm64: dts: hi6220: Add pl031 RTC support
  arm64: dts: r8a7796/salvator-x: Enable watchdog timer
  arm64: dts: r8a7796: Add RWDT node
  arm64: dts: r8a7796: Use SYSC "always-on" PM Domain
  ...
parents 043248cd 943283ee

Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ Raspberry Pi 2 Model B 
Required root node properties:

compatible = "raspberrypi,2-model-b", "brcm,bcm2836";



Raspberry Pi 3 Model B

Required root node properties:

compatible = "raspberrypi,3-model-b", "brcm,bcm2837";



Raspberry Pi Compute Module

Required root node properties:

compatible = "raspberrypi,compute-module", "brcm,bcm2835";

Documentation/devicetree/bindings/arm/mediatek.txt

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ compatible: Must contain one of 
   "mediatek,mt6580"

   "mediatek,mt6589"

   "mediatek,mt6592"

   "mediatek,mt6755"

   "mediatek,mt6795"

   "mediatek,mt7623"

   "mediatek,mt8127"
@@ -31,6 +32,9 @@ Supported boards: 
- Evaluation board for MT6592:

    Required root node properties:

      - compatible = "mediatek,mt6592-evb", "mediatek,mt6592";

- Evaluation phone for MT6755(Helio P10):

    Required root node properties:

      - compatible = "mediatek,mt6755-evb", "mediatek,mt6755";

- Evaluation board for MT6795(Helio X10):

    Required root node properties:

      - compatible = "mediatek,mt6795-evb", "mediatek,mt6795";

Documentation/devicetree/bindings/arm/shmobile.txt

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ SoCs: 
    compatible = "renesas,r8a7794"

  - R-Car H3 (R8A77950)

    compatible = "renesas,r8a7795"

  - R-Car M3-W (R8A77960)

    compatible = "renesas,r8a7796"





Boards:
@@ -63,5 +65,7 @@ Boards: 
    compatible = "renesas,porter", "renesas,r8a7791"

  - Salvator-X (RTP0RC7795SIPB0010S)

    compatible = "renesas,salvator-x", "renesas,r8a7795";

  - Salvator-X

    compatible = "renesas,salvator-x", "renesas,r8a7796";

  - SILK (RTP0RC7794LCB00011S)

    compatible = "renesas,silk", "renesas,r8a7794"

Documentation/devicetree/bindings/ata/ahci-platform.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ PHYs. 
Required properties:

- compatible        : compatible string, one of:

  - "allwinner,sun4i-a10-ahci"

  - "brcm,iproc-ahci"

  - "hisilicon,hisi-ahci"

  - "cavium,octeon-7130-ahci"

  - "ibm,476gtr-ahci"

Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
	"mediatek,mt8135-sysirq"

	"mediatek,mt8127-sysirq"

	"mediatek,mt6795-sysirq"

	"mediatek,mt6755-sysirq"

	"mediatek,mt6592-sysirq"

	"mediatek,mt6589-sysirq"

	"mediatek,mt6582-sysirq"