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

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

Merge tag 'v4.12-next-dts64' of https://github.com/mbgg/linux-mediatek into next/dt64 

Add device tree nodes for
mt8173:
- split USB SuperSpeed port in HighSpeed and SuperSpeed ports.
- move USB phy clocks up in hierarchy to met new bindings description
- move MDP nodes up in hierarchy to met new bindings description

mt6797:
- add basic SoC support
- add clock driver
- add power domain

dt-bindings:
- clean-up i2c binding description
- add binding for mt2701 i2c node
- add fallback compatible to scpsys binding description
- add bindings description for mt7622 and mt6796

* tag 'v4.12-next-dts64' of https://github.com/mbgg/linux-mediatek

:
  dt-bindings: mediatek: add bindings for MediaTek MT7622 SoC
  arm64: dts: mt8173: Fix mdp device tree
  dt-bindings: i2c: Add Mediatek MT2701 i2c binding
  dt-bindings: i2c-mtk: Add mt7623 binding
  dt-bindings: i2c-mtk: Delete bindings
  dt-bindings: i2c-mt6577: Rename file to reflect bindings
  dt-bindings: mtk-sysirq: Correct bindings for supported SoCs
  arm64: dts: mediatek: add clk and scp nodes for MT6797
  dt-bindings: mediatek: add MT6797 power dt-bindings
  arm64: dts: mediatek: add mt6797 support
  dt-bindings: mediatek: Add bindings for mediatek MT6797 Platform
  arm64: dts: mt8173: move clock from phy node into port nodes
  arm64: dts: mt8173: split usb SuperSpeed port into two ports

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c7404287 5f004746

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/i2c/i2c-mt6577.txt→Documentation/devicetree/bindings/i2c/i2c-mtk.txt

+5 −5
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ The Mediatek's I2C controller is used to interface with I2C devices. 


Required properties:

  - compatible: value should be either of the following.

      (a) "mediatek,mt6577-i2c", for i2c compatible with mt6577 i2c.

      (b) "mediatek,mt6589-i2c", for i2c compatible with mt6589 i2c.

      (c) "mediatek,mt8127-i2c", for i2c compatible with mt8127 i2c.

      (d) "mediatek,mt8135-i2c", for i2c compatible with mt8135 i2c.

      (e) "mediatek,mt8173-i2c", for i2c compatible with mt8173 i2c.

      "mediatek,mt2701-i2c", "mediatek,mt6577-i2c": for Mediatek mt2701

      "mediatek,mt6577-i2c": for i2c compatible with mt6577.

      "mediatek,mt6589-i2c": for i2c compatible with mt6589.

      "mediatek,mt7623-i2c", "mediatek,mt6577-i2c": for i2c compatible with mt7623.

      "mediatek,mt8173-i2c": for i2c compatible with mt8173.

  - reg: physical base address of the controller and dma base, length of memory

    mapped region.

  - interrupts: interrupt number to the cpu.

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

+15 −13
Original line number Diff line number Diff line 
+Mediatek 65xx/67xx/81xx sysirq

+Mediatek MT65xx/MT67xx/MT81xx sysirq



Mediatek SOCs sysirq support controllable irq inverter for each GIC SPI

interrupt.



Required properties:

- compatible: should be one of:

	"mediatek,mt8173-sysirq"

	"mediatek,mt8135-sysirq"

	"mediatek,mt8127-sysirq"

	"mediatek,mt6795-sysirq"

	"mediatek,mt6755-sysirq"

	"mediatek,mt6592-sysirq"

	"mediatek,mt6589-sysirq"

	"mediatek,mt6582-sysirq"

	"mediatek,mt6580-sysirq"

	"mediatek,mt6577-sysirq"

	"mediatek,mt2701-sysirq"

- compatible: should be

	"mediatek,mt8173-sysirq", "mediatek,mt6577-sysirq": for MT8173

	"mediatek,mt8135-sysirq", "mediatek,mt6577-sysirq": for MT8135

	"mediatek,mt8127-sysirq", "mediatek,mt6577-sysirq": for MT8127

	"mediatek,mt7622-sysirq", "mediatek,mt6577-sysirq": for MT7622

	"mediatek,mt6795-sysirq", "mediatek,mt6577-sysirq": for MT6795

	"mediatek,mt6797-sysirq", "mediatek,mt6577-sysirq": for MT6797

	"mediatek,mt6755-sysirq", "mediatek,mt6577-sysirq": for MT6755

	"mediatek,mt6592-sysirq", "mediatek,mt6577-sysirq": for MT6592

	"mediatek,mt6589-sysirq", "mediatek,mt6577-sysirq": for MT6589

	"mediatek,mt6582-sysirq", "mediatek,mt6577-sysirq": for MT6582

	"mediatek,mt6580-sysirq", "mediatek,mt6577-sysirq": for MT6580

	"mediatek,mt6577-sysirq": for MT6577

	"mediatek,mt2701-sysirq", "mediatek,mt6577-sysirq": for MT2701

- interrupt-controller : Identifies the node as an interrupt controller

- #interrupt-cells : Use the same format as specified by GIC in arm,gic.txt.

- interrupt-parent: phandle of irq parent for sysirq. The parent must

Documentation/devicetree/bindings/serial/mtk-uart.txt

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ Required properties: 
  * "mediatek,mt6589-uart" for MT6589 compatible UARTS

  * "mediatek,mt6755-uart" for MT6755 compatible UARTS

  * "mediatek,mt6795-uart" for MT6795 compatible UARTS

  * "mediatek,mt6797-uart" for MT6797 compatible UARTS

  * "mediatek,mt7622-uart" for MT7622 compatible UARTS

  * "mediatek,mt7623-uart" for MT7623 compatible UARTS

  * "mediatek,mt8127-uart" for MT8127 compatible UARTS

  * "mediatek,mt8135-uart" for MT8135 compatible UARTS

Documentation/devicetree/bindings/soc/mediatek/scpsys.txt

+5 −1
Original line number Diff line number Diff line
@@ -9,11 +9,14 @@ domain control. 


The driver implements the Generic PM domain bindings described in

power/power_domain.txt. It provides the power domains defined in

include/dt-bindings/power/mt8173-power.h and mt2701-power.h.

- include/dt-bindings/power/mt8173-power.h

- include/dt-bindings/power/mt6797-power.h

- include/dt-bindings/power/mt2701-power.h



Required properties:

- compatible: Should be one of:

	- "mediatek,mt2701-scpsys"

	- "mediatek,mt6797-scpsys"

	- "mediatek,mt8173-scpsys"

- #power-domain-cells: Must be 1

- reg: Address range of the SCPSYS unit
@@ -22,6 +25,7 @@ Required properties: 
                      These are clocks which hardware needs to be

                      enabled before enabling certain power domains.

	Required clocks for MT2701: "mm", "mfg", "ethif"

	Required clocks for MT6797: "mm", "mfg", "vdec"

	Required clocks for MT8173: "mm", "mfg", "venc", "venc_lt"



Optional properties: