-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'mediatek-drm-next-5.14' of https://git.kernel.org/pub/scm/…
…linux/kernel/git/chunkuang.hu/linux into drm-next Mediatek DRM Next for Linux 5.14 1. Add MT8167 HDMI support 2. Fix PM reference leak 3. Add MT8183 DPI dual edge support Signed-off-by: Dave Airlie <airlied@redhat.com> From: Chun-Kuang Hu <chunkuang.hu@kernel.org> Link: https://patchwork.freedesktop.org/patch/msgid/20210616150301.292-1-chunkuang.hu@kernel.org
- Loading branch information
Showing
7 changed files
with
384 additions
and
143 deletions.
There are no files selected for viewing
52 changes: 52 additions & 0 deletions
52
Documentation/devicetree/bindings/display/mediatek/mediatek,cec.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/display/mediatek/mediatek,cec.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Mediatek HDMI CEC Controller Device Tree Bindings | ||
|
||
maintainers: | ||
- CK Hu <ck.hu@mediatek.com> | ||
- Jitao shi <jitao.shi@mediatek.com> | ||
|
||
description: | | ||
The HDMI CEC controller handles hotplug detection and CEC communication. | ||
properties: | ||
compatible: | ||
enum: | ||
- mediatek,mt7623-cec | ||
- mediatek,mt8167-cec | ||
- mediatek,mt8173-cec | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
clocks: | ||
maxItems: 1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
- clocks | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/clock/mt8173-clk.h> | ||
#include <dt-bindings/interrupt-controller/arm-gic.h> | ||
#include <dt-bindings/interrupt-controller/irq.h> | ||
cec: cec@10013000 { | ||
compatible = "mediatek,mt8173-cec"; | ||
reg = <0x10013000 0xbc>; | ||
interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_LOW>; | ||
clocks = <&infracfg CLK_INFRA_CEC>; | ||
}; | ||
... |
58 changes: 58 additions & 0 deletions
58
Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi-ddc.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/display/mediatek/mediatek,hdmi-ddc.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Mediatek HDMI DDC Device Tree Bindings | ||
|
||
maintainers: | ||
- CK Hu <ck.hu@mediatek.com> | ||
- Jitao shi <jitao.shi@mediatek.com> | ||
|
||
description: | | ||
The HDMI DDC i2c controller is used to interface with the HDMI DDC pins. | ||
properties: | ||
compatible: | ||
enum: | ||
- mediatek,mt7623-hdmi-ddc | ||
- mediatek,mt8167-hdmi-ddc | ||
- mediatek,mt8173-hdmi-ddc | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
clocks: | ||
maxItems: 1 | ||
|
||
clock-names: | ||
items: | ||
- const: ddc-i2c | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
- clocks | ||
- clock-names | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/clock/mt8173-clk.h> | ||
#include <dt-bindings/interrupt-controller/arm-gic.h> | ||
#include <dt-bindings/interrupt-controller/irq.h> | ||
hdmi_ddc0: i2c@11012000 { | ||
compatible = "mediatek,mt8173-hdmi-ddc"; | ||
reg = <0x11012000 0x1c>; | ||
interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_LOW>; | ||
clocks = <&pericfg CLK_PERI_I2C5>; | ||
clock-names = "ddc-i2c"; | ||
}; | ||
... |
136 changes: 0 additions & 136 deletions
136
Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.txt
This file was deleted.
Oops, something went wrong.
133 changes: 133 additions & 0 deletions
133
Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,133 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/display/mediatek/mediatek,hdmi.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Mediatek HDMI Encoder Device Tree Bindings | ||
|
||
maintainers: | ||
- CK Hu <ck.hu@mediatek.com> | ||
- Jitao shi <jitao.shi@mediatek.com> | ||
|
||
description: | | ||
The Mediatek HDMI encoder can generate HDMI 1.4a or MHL 2.0 signals from | ||
its parallel input. | ||
properties: | ||
compatible: | ||
enum: | ||
- mediatek,mt2701-hdmi | ||
- mediatek,mt7623-hdmi | ||
- mediatek,mt8167-hdmi | ||
- mediatek,mt8173-hdmi | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
clocks: | ||
items: | ||
- description: Pixel Clock | ||
- description: HDMI PLL | ||
- description: Bit Clock | ||
- description: S/PDIF Clock | ||
|
||
clock-names: | ||
items: | ||
- const: pixel | ||
- const: pll | ||
- const: bclk | ||
- const: spdif | ||
|
||
phys: | ||
maxItems: 1 | ||
|
||
phy-names: | ||
items: | ||
- const: hdmi | ||
|
||
mediatek,syscon-hdmi: | ||
$ref: '/schemas/types.yaml#/definitions/phandle-array' | ||
maxItems: 1 | ||
description: | | ||
phandle link and register offset to the system configuration registers. | ||
ports: | ||
$ref: /schemas/graph.yaml#/properties/ports | ||
|
||
properties: | ||
port@0: | ||
$ref: /schemas/graph.yaml#/properties/port | ||
description: | | ||
Input port node. This port should be connected to a DPI output port. | ||
port@1: | ||
$ref: /schemas/graph.yaml#/properties/port | ||
description: | | ||
Output port node. This port should be connected to the input port of a connector | ||
node that contains a ddc-i2c-bus property, or to the input port of an attached | ||
bridge chip, such as a SlimPort transmitter. | ||
required: | ||
- port@0 | ||
- port@1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
- clocks | ||
- clock-names | ||
- phys | ||
- phy-names | ||
- mediatek,syscon-hdmi | ||
- ports | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/clock/mt8173-clk.h> | ||
#include <dt-bindings/interrupt-controller/arm-gic.h> | ||
#include <dt-bindings/interrupt-controller/irq.h> | ||
hdmi0: hdmi@14025000 { | ||
compatible = "mediatek,mt8173-hdmi"; | ||
reg = <0x14025000 0x400>; | ||
interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_LOW>; | ||
clocks = <&mmsys CLK_MM_HDMI_PIXEL>, | ||
<&mmsys CLK_MM_HDMI_PLLCK>, | ||
<&mmsys CLK_MM_HDMI_AUDIO>, | ||
<&mmsys CLK_MM_HDMI_SPDIF>; | ||
clock-names = "pixel", "pll", "bclk", "spdif"; | ||
pinctrl-names = "default"; | ||
pinctrl-0 = <&hdmi_pin>; | ||
phys = <&hdmi_phy>; | ||
phy-names = "hdmi"; | ||
mediatek,syscon-hdmi = <&mmsys 0x900>; | ||
ports { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
port@0 { | ||
reg = <0>; | ||
hdmi0_in: endpoint { | ||
remote-endpoint = <&dpi0_out>; | ||
}; | ||
}; | ||
port@1 { | ||
reg = <1>; | ||
hdmi0_out: endpoint { | ||
remote-endpoint = <&hdmi_con_in>; | ||
}; | ||
}; | ||
}; | ||
}; | ||
... |
Oops, something went wrong.