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

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

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

Pull ARM/arm64 Devicetree updates from Olof Johansson:
 "As usual, device tree updates is the bulk of our material in this
  merge window. This time around, 559 patches affecting both 32- and
  64-bit platforms.

  Changes are too many to list individually, but some of the larger
  ones:

  New platform/SoC support:

   - Automotive:
     + Renesas R-Car D3 (R8A77995)
     + TI DT76x
     + MediaTek mt2712e
   - Communication-oriented:
     + Qualcomm IPQ8074
     + Broadcom Stingray
     + Marvell Armada 8080
   - Set top box:
     + Uniphier PXs3

  Besides some vendor reference boards for the SoC above, there are also
  several new boards/machines:

   - TI AM335x Moxa UC-8100-ME-T open platform
   - TI AM57xx Beaglebone X15 Rev C
   - Microchip/Atmel sama5d27 SoM1 EK
   - Broadcom Raspberry Pi Zero W
   - Gemini-based D-Link DIR-685 router
   - Freescale i.MX6:
     + Toradex Apalis module + Apalis and Ixora carrier boards
     + Engicam GEAM6UL Starter Kit
   - Freescale i.MX53-based Beckhoff CX9020 Embedded PC
   - Mediatek mt7623-based BananaPi R2
   - Several Allwinner-based single-board computers:
  + Cubietruck plus
  + Bananapi M3, M2M and M64
  + NanoPi A64
  + A64-OLinuXino
  + Pine64
   - Rockchip RK3328 Pine64/Rock64 board support
   - Rockchip RK3399 boards:
  + RK3399 Sapphire module on Excavator carrier (RK3399 reference design)
  + Theobroma Systems RK3399-Q7 SoM
   - ZTE ZX296718 PCBOX Board"

* tag 'armsoc-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (559 commits)
  ARM: dts: at91: at91sam9g45: add AC97
  arm64: dts: marvell: mcbin: enable more networking ports
  arm64: dts: marvell: add a reference to the sysctrl syscon in the ppv2 node
  arm64: dts: marvell: add TX interrupts for PPv2.2
  arm64: dts: uniphier: add PXs3 SoC support
  ARM: dts: uniphier: add pinctrl groups of ethernet phy mode
  ARM: dts: uniphier: fix size of sdctrl nodes
  ARM: dts: uniphier: add AIDET nodes
  arm64: dts: uniphier: fix size of sdctrl node
  arm64: dts: uniphier: add AIDET nodes
  Revert "ARM: dts: sun8i: h3: Enable dwmac-sun8i on the Beelink X2"
  arm64: dts: uniphier: add reset controller node of analog amplifier
  arm64: dts: marvell: add Device Tree files for Armada-8KP
  arm64: dts: rockchip: add Haikou baseboard with RK3399-Q7 SoM
  arm64: dts: rockchip: add RK3399-Q7 (Puma) SoM
  dt-bindings: add rk3399-q7 SoM
  ARM: dts: rockchip: enable usb for rv1108-evb
  ARM: dts: rockchip: add usb nodes for rv1108 SoCs
  dt-bindings: update grf-binding for rv1108 SoCs
  ARM: dts: aspeed-g4: fix AHB window size of the SMC controllers
  ...
parents ae46654b b884026a

Documentation/devicetree/bindings/arm/amlogic.txt

+12 −0
Original line number Diff line number Diff line 
Amlogic MesonX device tree bindings

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



Work in progress statement:



Device tree files and bindings applying to Amlogic SoCs and boards are

considered "unstable". Any Amlogic device tree binding may change at

any time. Be sure to use a device tree binary and a kernel image

generated from the same source tree.



Please refer to Documentation/devicetree/bindings/ABI.txt for a definition of a

stable binding/ABI.



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



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

  Required root node property:

    compatible: "amlogic,meson6"

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

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ Raspberry Pi Zero 
Required root node properties:

compatible = "raspberrypi,model-zero", "brcm,bcm2835";



Raspberry Pi Zero W

Required root node properties:

compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";



Generic BCM2835 board

Required root node properties:

compatible = "brcm,bcm2835";

Documentation/devicetree/bindings/arm/bhf.txt

0 → 100644
+6 −0
Original line number Diff line number Diff line 
Beckhoff Automation Platforms Device Tree Bindings

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



CX9020 Embedded PC

Required root node properties:

    - compatible = "bhf,cx9020", "fsl,imx53";

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ described below. 
			    "arm,realview-smp"

			    "brcm,bcm11351-cpu-method"

			    "brcm,bcm23550"

			    "brcm,bcm2836-smp"

			    "brcm,bcm-nsp-smp"

			    "brcm,brahma-b15"

			    "marvell,armada-375-smp"

Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt

0 → 100644
+15 −0
Original line number Diff line number Diff line 
Marvell Armada 8KPlus Platforms Device Tree Bindings

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



Boards using a SoC of the Marvell Armada 8KP families must carry

the following root node property:



 - compatible, with one of the following values:



   - "marvell,armada-8080", "marvell,armada-ap810-octa", "marvell,armada-ap810"

     when the SoC being used is the Armada 8080



Example:



compatible = "marvell,armada-8080-db", "marvell,armada-8080",

	     "marvell,armada-ap810-octa", "marvell,armada-ap810"