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

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

Merge tag 'v4.18-next-dts64' of... 

Merge tag 'v4.18-next-dts64' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into next/dt

- mt7622:
- add EINT support
- add gpio-ranges property to pinctrl
- add earlycon to rfb1 to find boot errros more easily
- fix uart clock
- add iommu and smi bindings

- mt6797:
- add support for the 96 board x20 development board

- fix cooling-cells of mt7622 and mt8173

* tag 'v4.18-next-dts64' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux

:
  arm64: dts: Add Mediatek X20 Development Board support
  dt-bindings: arm: mediatek: Document Mediatek X20 Development Board
  dt-bindings: mediatek: Add binding for mt2712 IOMMU and SMI
  arm64: dts: mt7622: update a clock property for UART0
  arm64: dts: mt7622: add earlycon to mt7622-rfb1 board
  arm64: dts: mt7622: use gpio-ranges to pinctrl device
  arm64: dts: mediatek: Add missing cooling device properties for CPUs
  arm64: dts: mt7622: add EINT support to pinctrl

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 34fbee10 a8739969

Documentation/devicetree/bindings/arm/mediatek.txt

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ Supported boards: 
- Evaluation board for MT6797(Helio X20):

    Required root node properties:

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

- Mediatek X20 Development Board:

    Required root node properties:

      - compatible = "archermind,mt6797-x20-dev", "mediatek,mt6797";

- Reference board variant 1 for MT7622:

    Required root node properties:

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

Documentation/devicetree/bindings/iommu/mediatek,iommu.txt

+4 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ video decode local arbiter, all these ports are according to the video HW. 
Required properties:

- compatible : must be one of the following string:

	"mediatek,mt2701-m4u" for mt2701 which uses generation one m4u HW.

	"mediatek,mt2712-m4u" for mt2712 which uses generation two m4u HW.

	"mediatek,mt8173-m4u" for mt8173 which uses generation two m4u HW.

- reg : m4u register base and size.

- interrupts : the interrupt of m4u.
@@ -50,8 +51,9 @@ Required properties: 
	according to the local arbiter index, like larb0, larb1, larb2...

- iommu-cells : must be 1. This is the mtk_m4u_id according to the HW.

	Specifies the mtk_m4u_id as defined in

	dt-binding/memory/mt2701-larb-port.h for mt2701 and

	dt-binding/memory/mt8173-larb-port.h for mt8173

	dt-binding/memory/mt2701-larb-port.h for mt2701,

	dt-binding/memory/mt2712-larb-port.h for mt2712, and

	dt-binding/memory/mt8173-larb-port.h for mt8173.



Example:

	iommu: iommu@10205000 {

Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.txt

+4 −2
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ SMI (Smart Multimedia Interface) Common 


The hardware block diagram please check bindings/iommu/mediatek,iommu.txt



Mediatek SMI have two generations of HW architecture, mt8173 uses the second

generation of SMI HW while mt2701 uses the first generation HW of SMI.

Mediatek SMI have two generations of HW architecture, mt2712 and mt8173 use

the second generation of SMI HW while mt2701 uses the first generation HW of

SMI.



There's slight differences between the two SMI, for generation 2, the

register which control the iommu port is at each larb's register base. But
@@ -15,6 +16,7 @@ not needed for SMI generation 2. 
Required properties:

- compatible : must be one of :

	"mediatek,mt2701-smi-common"

	"mediatek,mt2712-smi-common"

	"mediatek,mt8173-smi-common"

- reg : the register and size of the SMI block.

- power-domains : a phandle to the power domain of this local arbiter.

Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt

+3 −2
Original line number Diff line number Diff line
@@ -4,8 +4,9 @@ The hardware block diagram please check bindings/iommu/mediatek,iommu.txt 


Required properties:

- compatible : must be one of :

		"mediatek,mt8173-smi-larb"

		"mediatek,mt2701-smi-larb"

		"mediatek,mt2712-smi-larb"

		"mediatek,mt8173-smi-larb"

- reg : the register and size of this local arbiter.

- mediatek,smi : a phandle to the smi_common node.

- power-domains : a phandle to the power domain of this local arbiter.
@@ -15,7 +16,7 @@ Required properties: 
	    the register.

  - "smi" : It's the clock for transfer data and command.



Required property for mt2701:

Required property for mt2701 and mt2712:

- mediatek,larb-id :the hardware id of this larb.



Example:

arch/arm64/boot/dts/mediatek/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,5 +3,6 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt2712-evb.dtb 
dtb-$(CONFIG_ARCH_MEDIATEK) += mt6755-evb.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt6795-evb.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-evb.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-x20-dev.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-rfb1.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-evb.dtb