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

Commit a9ceea26 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:
 "Device-tree updates for arm64 platforms. For the first time I can
  remember, this is actually larger than the corresponding branch for
  32-bit platforms overall, though that has more individual changes.

  A significant portion this time is due to added machine support:

   - Initial support for the Realtek RTD1295 SoC, along with the Zidoo
     X9S set-top-box

   - Initial support for Actions Semi S900 and the Bubblegum-96
     single-board-cёmputer.

   - Rockchips support for the rk3399-Firefly single-board-computer gets
     added, this one stands out for being relatively fast, affordable
     and well₋supported, compared to many boards that only fall into one
     or two of the above categories.

   - Mediatek gains support for the mt6797 mobile-phone SoC platform and
     corresponding evaluation board.

   - Amlogic board support gets added for the NanoPi K2 and S905x
     LibreTech CC single-board computers and the R-Box Pro set-top-box

   - Allwinner board support gets added for the OrangePi Win, Orangepi
     Zero Plus 2, NanoPi NEO2 and Orange Pi Prime single board computers
     and the SoPine system-on-module.

   - Renesas board support for Salvator-XS and H3ULCB automotive
     development systems.

   - Socionext Uniphier board support for LD11-global and LD20-global,
     whatever those may be.

   - Broadcom adds support for the new Stingray communication processor
     in its iProc family, along with two reference boards.

  Other updates include:

   - For the hisicon platform, support for Hi3660-Hikey960 gets extended
     significantly.

   - Lots of smaller updates for Renesas, Amlogic, Rockchip, UniPhier,
     Broadcom, Allwinner, Hisilicon, Qualcomm, Marvell, and NXP"

* tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (243 commits)
  ARM64: dts: marvell: armada37xx: Fix timer interrupt specifiers
  Revert "arm64: dts: marvell: add dma-mask in crypto nodes for 7k/8k"
  arm64: dts: mediatek: don't include missing file
  ARM64: dts: meson-gxl: Add Libre Technology CC support
  dt-bindings: arm: amlogic: Add Libre Technology CC board
  dt-bindings: add Libre Technology vendor prefix
  arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K
  arm64: dts: zte: Use - instead of @ for DT OPP entries
  arm64: dts: marvell: add gpio support for Armada 7K/8K
  arm64: dts: marvell: add pinctrl support for Armada 7K/8K
  arm64: dts: marvell: use new binding for the system controller on cp110
  arm64: dts: marvell: remove *-clock-output-names on cp110
  arm64: dts: marvell: use new bindings for xor clocks on ap806
  arm64: dts: marvell: mcbin: enable the mdio node
  arm64: dts: Add Actions Semi S900 and Bubblegum-96
  dt-bindings: Add vendor prefix for uCRobotics
  arm64: dts: marvell: add xmdio nodes for 7k/8k
  arm64: dts: marvell: add a comment on the cp110 slave node status
  arm64: dts: marvell: remove cpm crypto nodes from dts files
  arm64: dts: marvell: cp110: enable the crypto engine at the SoC level
  ...
parents e8547112 ac548add

Documentation/devicetree/bindings/arm/amlogic.txt

+16 −7
Original line number Diff line number Diff line
@@ -29,26 +29,35 @@ Boards with the Amlogic Meson GXM S912 SoC shall have the following properties: 
  Required root node property:

    compatible: "amlogic,s912", "amlogic,meson-gxm";



Board compatible values:

Board compatible values (alphabetically, grouped by SoC):



  - "geniatech,atv1200" (Meson6)



  - "minix,neo-x8" (Meson8)

  - "tronfy,mxq" (Meson8b)



  - "hardkernel,odroid-c1" (Meson8b)

  - "tronfy,mxq" (Meson8b)



  - "amlogic,p200" (Meson gxbb)

  - "amlogic,p201" (Meson gxbb)

  - "friendlyarm,nanopi-k2" (Meson gxbb)

  - "hardkernel,odroid-c2" (Meson gxbb)

  - "nexbox,a95x" (Meson gxbb or Meson gxl s905x)

  - "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)

  - "hardkernel,odroid-c2" (Meson gxbb)

  - "amlogic,p200" (Meson gxbb)

  - "amlogic,p201" (Meson gxbb)

  - "wetek,hub" (Meson gxbb)

  - "wetek,play2" (Meson gxbb)



  - "amlogic,p212" (Meson gxl s905x)

  - "hwacom,amazetv" (Meson gxl s905x)

  - "khadas,vim" (Meson gxl s905x)

  - "libretech,cc" (Meson gxl s905x)



  - "amlogic,p230" (Meson gxl s905d)

  - "amlogic,p231" (Meson gxl s905d)

  - "hwacom,amazetv" (Meson gxl s905x)



  - "amlogic,q200" (Meson gxm s912)

  - "amlogic,q201" (Meson gxm s912)

  - "nexbox,a95x" (Meson gxbb or Meson gxl s905x)

  - "kingnovel,r-box-pro" (Meson gxm S912)

  - "nexbox,a1" (Meson gxm s912)

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

0 → 100644
+12 −0
Original line number Diff line number Diff line 
Broadcom Stingray device tree bindings

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



Boards with Stingray shall have the following properties:



Required root node property:



Stingray Combo SVK board

compatible = "brcm,bcm958742k", "brcm,stingray";



Stingray SST100 board

compatible = "brcm,bcm958742t", "brcm,stingray";

Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ Hi3660 SoC 
Required root node properties:

	- compatible = "hisilicon,hi3660";



HiKey960 Board

Required root node properties:

	- compatible = "hisilicon,hi3660-hikey960", "hisilicon,hi3660";



Hi3798cv200 SoC

Required root node properties:

	- compatible = "hisilicon,hi3798cv200";

Documentation/devicetree/bindings/arm/mediatek.txt

+8 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ compatible: Must contain one of 
   "mediatek,mt6592"

   "mediatek,mt6755"

   "mediatek,mt6795"

   "mediatek,mt6797"

   "mediatek,mt7622"

   "mediatek,mt7623"

   "mediatek,mt8127"

   "mediatek,mt8135"
@@ -38,6 +40,12 @@ Supported boards: 
- Evaluation board for MT6795(Helio X10):

    Required root node properties:

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

- Evaluation board for MT6797(Helio X20):

    Required root node properties:

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

- Reference board variant 1 for MT7622:

    Required root node properties:

      - compatible = "mediatek,mt7622-rfb1", "mediatek,mt7622";

- Evaluation board for MT7623:

    Required root node properties:

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

Documentation/devicetree/bindings/arm/realtek.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Realtek platforms device tree bindings

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





RTD1295 SoC

===========



Required root node properties:



 - compatible :  must contain "realtek,rtd1295"





Root node property compatible must contain, depending on board:



 - Zidoo X9S: "zidoo,x9s"





Example:



    compatible = "zidoo,x9s", "realtek,rtd1295";