Commit 06c14f5c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'mediatek-drm-next-5.10' of... 

Merge tag 'mediatek-drm-next-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux

 into drm-next

Mediatek DRM Next for Linux 5.10

1. Move Mediatek HDMI PHY driver from DRM folder to PHY folder
2. Convert mtk-dpi to drm_bridge API
3. Disable tmds on mt2701

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200914231227.30500-1-chunkuang.hu@kernel.org
parents 200a2186 09e872d5

Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Required properties (all function blocks): 
	"mediatek,<chip>-dpi"        		- DPI controller, see mediatek,dpi.txt

	"mediatek,<chip>-disp-mutex" 		- display mutex

	"mediatek,<chip>-disp-od"    		- overdrive

  the supported chips are mt2701, mt2712 and mt8173.

  the supported chips are mt2701, mt7623, mt2712 and mt8173.

- reg: Physical base address and length of the function block register space

- interrupts: The interrupt signal from the function block (required, except for

  merge and split function blocks).

Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ output bus. 


Required properties:

- compatible: "mediatek,<chip>-dpi"

  the supported chips are mt2701 , mt8173 and mt8183.

  the supported chips are mt2701, mt7623, mt8173 and mt8183.

- reg: Physical base address and length of the controller's registers

- interrupts: The interrupt signal from the function block.

- clocks: device clocks

Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ channel output. 


Required properties:

- compatible: "mediatek,<chip>-dsi"

  the supported chips are mt2701, mt8173 and mt8183.

- the supported chips are mt2701, mt7623, mt8173 and mt8183.

- reg: Physical base address and length of the controller's registers

- interrupts: The interrupt signal from the function block.

- clocks: device clocks
@@ -26,7 +26,7 @@ The MIPI TX configuration module controls the MIPI D-PHY. 


Required properties:

- compatible: "mediatek,<chip>-mipi-tx"

  the supported chips are mt2701, mt8173 and mt8183.

- the supported chips are mt2701, 7623, mt8173 and mt8183.

- reg: Physical base address and length of the controller's registers

- clocks: PLL reference clock

- clock-output-names: name of the output clock line to the DSI encoder

Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.txt

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ its parallel input. 


Required properties:

- compatible: Should be "mediatek,<chip>-hdmi".

- the supported chips are mt2701, mt7623 and mt8173

- reg: Physical base address and length of the controller's registers

- interrupts: The interrupt signal from the function block.

- clocks: device clocks
@@ -32,6 +33,7 @@ The HDMI CEC controller handles hotplug detection and CEC communication. 


Required properties:

- compatible: Should be "mediatek,<chip>-cec"

- the supported chips are mt7623 and mt8173

- reg: Physical base address and length of the controller's registers

- interrupts: The interrupt signal from the function block.

- clocks: device clock
@@ -44,6 +46,7 @@ The Mediatek's I2C controller is used to interface with I2C devices. 


Required properties:

- compatible: Should be "mediatek,<chip>-hdmi-ddc"

- the supported chips are mt7623 and mt8173

- reg: Physical base address and length of the controller's registers

- clocks: device clock

- clock-names: Should be "ddc-i2c".
@@ -56,6 +59,7 @@ output and drives the HDMI pads. 


Required properties:

- compatible: "mediatek,<chip>-hdmi-phy"

- the supported chips are mt2701, mt7623 and mt8173

- reg: Physical base address and length of the module's registers

- clocks: PLL reference clock

- clock-names: must contain "pll_ref"

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -5827,6 +5827,7 @@ L: dri-devel@lists.freedesktop.org 
S:	Supported

F:	Documentation/devicetree/bindings/display/mediatek/

F:	drivers/gpu/drm/mediatek/

F:	drivers/phy/mediatek/phy-mtk-hdmi*









DRM DRIVERS FOR NVIDIA TEGRA









M:	Thierry Reding <thierry.reding@gmail.com>








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE