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

Commit b884026a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/dt64' into next/dt 

* next/dt64: (233 commits)
  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
  arm64: dts: uniphier: fix size of sdctrl node
  arm64: dts: uniphier: add AIDET nodes
  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
  arm64: dts: rockchip: add rk3328-rock64 board
  arm64: dts: rockchip: add rk3328 pdm node
  ARM64: dts: meson-gxl-libretech-cc: Add GPIO lines names
  ARM64: dts: meson-gx: Add AO CEC nodes
  ARM64: dts: meson-gx: update AO clkc to new bindings
  arm64: dts: rockchip: add more rk3399 iommu nodes
  arm64: dts: rockchip: add rk3368 iommu nodes
  arm64: dts: rockchip: add rk3328 iommu nodes
  arm64: zynqmp: Add generic compatible string for I2C EEPROM
  ...
parents e3e36ab3 c911171a

Documentation/devicetree/bindings/arm/amlogic.txt

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

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:

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

  Required root node property:

  Required root node property:

    compatible: "amlogic,meson6"

    compatible: "amlogic,meson6"

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

0 → 100644
+15 −0
Original line number Original line 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"

Documentation/devicetree/bindings/arm/mediatek.txt

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




compatible: Must contain one of

compatible: Must contain one of

   "mediatek,mt2701"

   "mediatek,mt2701"

   "mediatek,mt2712"

   "mediatek,mt6580"

   "mediatek,mt6580"

   "mediatek,mt6589"

   "mediatek,mt6589"

   "mediatek,mt6592"

   "mediatek,mt6592"
@@ -25,6 +26,9 @@ Supported boards: 
- Evaluation board for MT2701:

- Evaluation board for MT2701:

    Required root node properties:

    Required root node properties:

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

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

- Evaluation board for MT2712:

    Required root node properties:

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

- Evaluation board for MT6580:

- Evaluation board for MT6580:

    Required root node properties:

    Required root node properties:

      - compatible = "mediatek,mt6580-evbp1", "mediatek,mt6580";

      - compatible = "mediatek,mt6580-evbp1", "mediatek,mt6580";

Documentation/devicetree/bindings/arm/rockchip.txt

+12 −0
Original line number Original line Diff line number Diff line
@@ -134,6 +134,10 @@ Rockchip platforms device tree bindings 
    Required root node properties:

    Required root node properties:

     - compatible = "phytec,rk3288-pcm-947", "phytec,rk3288-phycore-som", "rockchip,rk3288";

     - compatible = "phytec,rk3288-pcm-947", "phytec,rk3288-phycore-som", "rockchip,rk3288";





- Pine64 Rock64 board:

    Required root node properties:

    - compatible = "pine64,rock64", "rockchip,rk3328";



- Rockchip PX3 Evaluation board:

- Rockchip PX3 Evaluation board:

    Required root node properties:

    Required root node properties:

      - compatible = "rockchip,px3-evb", "rockchip,px3", "rockchip,rk3188";

      - compatible = "rockchip,px3-evb", "rockchip,px3", "rockchip,rk3188";
@@ -173,6 +177,14 @@ Rockchip platforms device tree bindings 
    Required root node properties:

    Required root node properties:

      - compatible = "rockchip,rk3399-evb", "rockchip,rk3399";

      - compatible = "rockchip,rk3399-evb", "rockchip,rk3399";





- Rockchip RK3399 Sapphire Excavator board:

    Required root node properties:

      - compatible = "rockchip,rk3399-sapphire-excavator", "rockchip,rk3399";



- Theobroma Systems RK3399-Q7 Haikou Baseboard:

    Required root node properties:

      - compatible = "tsd,rk3399-q7-haikou", "rockchip,rk3399";



- Tronsmart Orion R68 Meta

- Tronsmart Orion R68 Meta

    Required root node properties:

    Required root node properties:

      - compatible = "tronsmart,orion-r68-meta", "rockchip,rk3368";
 
      - compatible = "tronsmart,orion-r68-meta", "rockchip,rk3368";

Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt

+8 −1
Original line number Original line Diff line number Diff line
@@ -16,18 +16,25 @@ Required Properties: 
	   mapped region.

	   mapped region.





- #clock-cells: should be 1.

- #clock-cells: should be 1.

- #reset-cells: should be 1.





Each clock is assigned an identifier and client nodes can use this identifier

Each clock is assigned an identifier and client nodes can use this identifier

to specify the clock which they consume. All available clocks are defined as

to specify the clock which they consume. All available clocks are defined as

preprocessor macros in the dt-bindings/clock/meson8b-clkc.h header and can be

preprocessor macros in the dt-bindings/clock/meson8b-clkc.h header and can be

used in device tree sources.

used in device tree sources.





Similarly a preprocessor macro for each reset line is defined in

dt-bindings/reset/amlogic,meson8b-clkc-reset.h (which can be used from the

device tree sources).





Example: Clock controller node:

Example: Clock controller node:





	clkc: clock-controller@c1104000 {

	clkc: clock-controller@c1104000 {

		#clock-cells = <1>;

		compatible = "amlogic,meson8b-clkc";

		compatible = "amlogic,meson8b-clkc";

		reg = <0xc1108000 0x4>, <0xc1104000 0x460>;

		reg = <0xc1108000 0x4>, <0xc1104000 0x460>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};

	};