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

Commit 915c56bc 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 ARM 64-bit DT updates from Arnd Bergmann:
 "The arm64 device tree changes make up an increasing portion of the
  overall changes, so they are kept separate from the 32-bit devicetree
  changes and from the other arm64 updates.

  Newly added SoCs and boards are:
   - 96Boards Husky board
   - AMD Overdrive board
   - Amlogic S905 SoC and related Tronsmart boxes
   - Annapurna Labs Alpine family and development board
   - Broadcom Vulcan servers
   - Broadcom Northstar 2 SoC
   - Marvell Armada 3700 family and development board
   - Qualcomm MSM8996 SoC

  Additional devices are enabled for existing platforms from Applied
  Micro, Hisilicon, Mediatek, Qualcomm, and Renesas and there are a
  couple of other updates for Rockchip, Xilinx and NXP/Freescale"

* tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (102 commits)
  ARM64: dts: amlogic: Add Tronsmart Vega S95 configs
  Documentation: devicetree: amlogic: Document Tronsmart Vega S95 boards
  ARM64: dts: Prepare configs for Amlogic Meson GXBaby
  Documentation: devicetree: amlogic: Document Meson GXBaby
  devicetree: bindings: Add vendor prefix for Tronsmart
  arm64: dts: qcom: Fix MPP's function used for LED control
  arm64: dts: alpine: add the MSIX node in the Alpine v2 dtsi
  arm64: dts: add the Alpine v2 EVP
  arm64: dts: marvell: re-order Device Tree nodes for Armada AP806
  arm64: dts: marvell: update Armada AP806 clock description
  arm64: dts: marvell: add Device Tree files for Armada 7K/8K
  arm64: dts: apm: Add DT node for X-Gene v2 SLIMpro Mailbox I2C Driver
  arm64: dts: apm: Mailbox device tree node for APM X-Gene v2 platform.
  arm64: dts: apm: Add DT node for X-Gene v1 SLIMpro Mailbox I2C Driver
  arm64: dts: apm: mailbox device tree node for APM X-Gene platform.
  arm64: dts: apm: Update GPIO to control power-off on X-Gene v2 platforms
  arm64: dts: apm: Update GPIO standby controller DT node for X-Gene v2 platforms
  arm64: dts: apm: Update GPIO to control power-off on X-Gene v1 platforms
  arm64: dts: salvator-x: enable USB 2.0 Host of channel 1 and 2
  arm64: dts: salvator-x: enable usb2_phy of channel 1 and 2
  ...
parents 5a6b7e53 8061a17e

Documentation/devicetree/bindings/arm/amlogic.txt

+7 −0
Original line number Diff line number Diff line
@@ -13,8 +13,15 @@ Boards with the Amlogic Meson8b SoC shall have the following properties: 
  Required root node property:

    compatible: "amlogic,meson8b";



Boards with the Amlogic Meson GXBaby SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,meson-gxbb";



Board compatible values:

  - "geniatech,atv1200" (Meson6)

  - "minix,neo-x8" (Meson8)

  - "tronfy,mxq" (Meson8b)

  - "hardkernel,odroid-c1" (Meson8b)

  - "tronsmart,vega-s95-pro", "tronsmart,vega-s95" (Meson gxbb)

  - "tronsmart,vega-s95-meta", "tronsmart,vega-s95" (Meson gxbb)

  - "tronsmart,vega-s95-telos", "tronsmart,vega-s95" (Meson gxbb)

Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
Broadcom Vulcan device tree bindings

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



Boards with Broadcom Vulcan shall have the following root property:



Broadcom Vulcan Evaluation Board:

  compatible = "brcm,vulcan-eval", "brcm,vulcan-soc";



Generic Vulcan board:

  compatible = "brcm,vulcan-soc";

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ nodes to be present and contain the properties described below. 
			    "arm,cortex-r5"

			    "arm,cortex-r7"

			    "brcm,brahma-b15"

			    "brcm,vulcan"

			    "cavium,thunder"

			    "faraday,fa526"

			    "intel,sa110"