As agreed with David, this is a continuation of his work started at [1].
Changes since his patches: HDMI schema: - Dropped generic pinctrl properties - Dropped data-lanes property, which is not supported by the HDMI driver - Switched to unevaluatedProperties - Moved clocks/regulators/supplies to condition clauses - Specified phy-names as used by existing DT files - Dropped #phy-cells - Dropped power-domains property (which is not used by the device trees) - Marked old GPIO properties as deprecated (in a separate patch)
HDMI PHY schema: - Split into QMP (msm8996) and non-QMP (other) PHY schemas - Added proper clocks/clock-names/reg/reg-names descriptions
The rest of the patches consist of the new work. They further cleanup the platform configs, remove unused supplies, etc.
[1]: https://patchwork.freedesktop.org/series/98353/
Dmitry Baryshkov (7): dt-bindings: display/msm: hdmi: split and convert to yaml dt-bindings: display/msm: hdmi: mark old GPIO properties as deprecated drm/msm/hdmi: drop unused GPIO support drm/msm/hdmi: enable core-vcc/core-vdda-supply for 8996 platform drm/msm/hdmi: drop empty 'none' regulator lists drm/msm/hdmi: drop hpd_regs usage on 8x74/8084 drm/msm/hdmi: merge platform config for 8974/8084/8994/8996
.../devicetree/bindings/display/msm/hdmi.txt | 99 -------- .../bindings/display/msm/qcom,hdmi.yaml | 240 ++++++++++++++++++ .../bindings/phy/qcom,hdmi-phy-other.yaml | 103 ++++++++ .../bindings/phy/qcom,hdmi-phy-qmp.yaml | 84 ++++++ drivers/gpu/drm/msm/hdmi/hdmi.c | 98 +------ drivers/gpu/drm/msm/hdmi/hdmi.h | 13 +- drivers/gpu/drm/msm/hdmi/hdmi_hpd.c | 62 +---- 7 files changed, 447 insertions(+), 252 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/msm/hdmi.txt create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml create mode 100644 Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml create mode 100644 Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml
Convert Qualcomm HDMI binding into HDMI TX and PHY yaml bindings.
Changes to schema: HDMI: - fixed reg-names numbering to match 0..3 instead 0,1,3,4
PHY: - moved into phy/ directory - split into QMP and non-QMP PHY schemas
Co-developed-by: David Heidelberg david@ixit.cz Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org --- .../devicetree/bindings/display/msm/hdmi.txt | 99 -------- .../bindings/display/msm/qcom,hdmi.yaml | 237 ++++++++++++++++++ .../bindings/phy/qcom,hdmi-phy-other.yaml | 103 ++++++++ .../bindings/phy/qcom,hdmi-phy-qmp.yaml | 84 +++++++ 4 files changed, 424 insertions(+), 99 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/msm/hdmi.txt create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml create mode 100644 Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml create mode 100644 Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml
diff --git a/Documentation/devicetree/bindings/display/msm/hdmi.txt b/Documentation/devicetree/bindings/display/msm/hdmi.txt deleted file mode 100644 index 5f90a40da51b..000000000000 --- a/Documentation/devicetree/bindings/display/msm/hdmi.txt +++ /dev/null @@ -1,99 +0,0 @@ -Qualcomm adreno/snapdragon hdmi output - -Required properties: -- compatible: one of the following - * "qcom,hdmi-tx-8996" - * "qcom,hdmi-tx-8994" - * "qcom,hdmi-tx-8084" - * "qcom,hdmi-tx-8974" - * "qcom,hdmi-tx-8660" - * "qcom,hdmi-tx-8960" -- reg: Physical base address and length of the controller's registers -- reg-names: "core_physical" -- interrupts: The interrupt signal from the hdmi block. -- power-domains: Should be <&mmcc MDSS_GDSC>. -- clocks: device clocks - See ../clocks/clock-bindings.txt for details. -- core-vdda-supply: phandle to supply regulator -- hdmi-mux-supply: phandle to mux regulator -- phys: the phandle for the HDMI PHY device -- phy-names: the name of the corresponding PHY device - -Optional properties: -- hpd-gpios: hpd pin -- qcom,hdmi-tx-mux-en-gpios: hdmi mux enable pin -- qcom,hdmi-tx-mux-sel-gpios: hdmi mux select pin -- qcom,hdmi-tx-mux-lpm-gpios: hdmi mux lpm pin -- power-domains: reference to the power domain(s), if available. -- pinctrl-names: the pin control state names; should contain "default" -- pinctrl-0: the default pinctrl state (active) -- pinctrl-1: the "sleep" pinctrl state - -HDMI PHY: -Required properties: -- compatible: Could be the following - * "qcom,hdmi-phy-8660" - * "qcom,hdmi-phy-8960" - * "qcom,hdmi-phy-8974" - * "qcom,hdmi-phy-8084" - * "qcom,hdmi-phy-8996" -- #phy-cells: Number of cells in a PHY specifier; Should be 0. -- reg: Physical base address and length of the registers of the PHY sub blocks. -- reg-names: The names of register regions. The following regions are required: - * "hdmi_phy" - * "hdmi_pll" - For HDMI PHY on msm8996, these additional register regions are required: - * "hdmi_tx_l0" - * "hdmi_tx_l1" - * "hdmi_tx_l3" - * "hdmi_tx_l4" -- power-domains: Should be <&mmcc MDSS_GDSC>. -- clocks: device clocks - See Documentation/devicetree/bindings/clock/clock-bindings.txt for details. -- core-vdda-supply: phandle to vdda regulator device node - -Example: - -/ { - ... - - hdmi: hdmi@4a00000 { - compatible = "qcom,hdmi-tx-8960"; - reg-names = "core_physical"; - reg = <0x04a00000 0x2f0>; - interrupts = <GIC_SPI 79 0>; - power-domains = <&mmcc MDSS_GDSC>; - clock-names = - "core", - "master_iface", - "slave_iface"; - clocks = - <&mmcc HDMI_APP_CLK>, - <&mmcc HDMI_M_AHB_CLK>, - <&mmcc HDMI_S_AHB_CLK>; - qcom,hdmi-tx-ddc-clk = <&msmgpio 70 GPIO_ACTIVE_HIGH>; - qcom,hdmi-tx-ddc-data = <&msmgpio 71 GPIO_ACTIVE_HIGH>; - qcom,hdmi-tx-hpd = <&msmgpio 72 GPIO_ACTIVE_HIGH>; - core-vdda-supply = <&pm8921_hdmi_mvs>; - hdmi-mux-supply = <&ext_3p3v>; - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&hpd_active &ddc_active &cec_active>; - pinctrl-1 = <&hpd_suspend &ddc_suspend &cec_suspend>; - - phys = <&hdmi_phy>; - phy-names = "hdmi_phy"; - }; - - hdmi_phy: phy@4a00400 { - compatible = "qcom,hdmi-phy-8960"; - reg-names = "hdmi_phy", - "hdmi_pll"; - reg = <0x4a00400 0x60>, - <0x4a00500 0x100>; - #phy-cells = <0>; - power-domains = <&mmcc MDSS_GDSC>; - clock-names = "slave_iface"; - clocks = <&mmcc HDMI_S_AHB_CLK>; - core-vdda-supply = <&pm8921_hdmi_mvs>; - }; -}; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml new file mode 100644 index 000000000000..2f485b5d1c5d --- /dev/null +++ b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml @@ -0,0 +1,237 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- + +$id: "http://devicetree.org/schemas/display/msm/qcom,hdmi.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Qualcomm Adreno/Snapdragon HDMI output + +maintainers: + - Rob Clark robdclark@gmail.com + +properties: + compatible: + enum: + - qcom,hdmi-tx-8660 + - qcom,hdmi-tx-8960 + - qcom,hdmi-tx-8974 + - qcom,hdmi-tx-8084 + - qcom,hdmi-tx-8994 + - qcom,hdmi-tx-8996 + + clocks: + minItems: 1 + maxItems: 5 + + clock-names: + minItems: 1 + maxItems: 5 + + reg: + minItems: 1 + maxItems: 3 + description: Physical base address and length of the controller's registers + + reg-names: + minItems: 1 + items: + - const: core_physical + - const: qfprom_physical + - const: hdcp_physical + + interrupts: + maxItems: 1 + description: The interrupt signal from the hdmi block. + + phys: + description: the phandle for the HDMI PHY device + maxItems: 1 + + phy-names: + enum: + - hdmi_phy + - hdmi-phy + + hpd-gpios: + maxItems: 1 + description: hpd pin + + qcom,hdmi-tx-ddc-clk-gpios: + maxItems: 1 + description: HDMI DDC clock + + qcom,hdmi-tx-ddc-data-gpios: + maxItems: 1 + description: HDMI DDC data + + qcom,hdmi-tx-mux-en-gpios: + maxItems: 1 + description: HDMI mux enable pin + + qcom,hdmi-tx-mux-sel-gpios: + maxItems: 1 + description: HDMI mux select pin + + qcom,hdmi-tx-mux-lpm-gpios: + maxItems: 1 + description: HDMI mux lpm pin + + '#sound-dai-cells': + const: 1 + + ports: + type: object + $ref: /schemas/graph.yaml#/properties/ports + properties: + port@0: + $ref: /schemas/graph.yaml#/$defs/port-base + description: | + Input endpoints of the controller. + + port@1: + $ref: /schemas/graph.yaml#/$defs/port-base + description: | + Output endpoints of the controller. + + required: + - port@0 + +required: + - compatible + - clocks + - clock-names + - reg + - reg-names + - interrupts + - phys + - phy-names + +allOf: + - if: + properties: + compatible: + contains: + enum: + - qcom,hdmi-tx-8960 + then: + properties: + clocks: + minItems: 3 + maxItems: 3 + clock-names: + items: + - const: core + - const: master_iface + - const: slave_iface + core-vdda-supply: + description: phandle to VDDA supply regulator + hdmi-mux-supply: + description: phandle to mux regulator + + - if: + properties: + compatible: + contains: + enum: + - qcom,hdmi-tx-8974 + - qcom,hdmi-tx-8084 + - qcom,hdmi-tx-8994 + - qcom,hdmi-tx-8996 + then: + properties: + clocks: + minItems: 5 + clock-names: + items: + - const: mdp_core + - const: iface + - const: core + - const: alt_iface + - const: extp + core-vdda-supply: + description: phandle to VDDA supply regulator + core-vcc-supply: + description: phandle to VCC supply regulator + +unevaluatedProperties: false + +examples: + - | + hdmi: hdmi@4a00000 { + compatible = "qcom,hdmi-tx-8960"; + reg-names = "core_physical"; + reg = <0x04a00000 0x2f0>; + interrupts = <0 79 0>; + clock-names = + "core", + "master_iface", + "slave_iface"; + clocks = + <&clk 61>, + <&clk 72>, + <&clk 98>; + qcom,hdmi-tx-ddc-clk-gpios = <&msmgpio 70 0>; + qcom,hdmi-tx-ddc-data-gpios = <&msmgpio 71 0>; + hpd-gpios = <&msmgpio 72 0>; + core-vdda-supply = <&pm8921_hdmi_mvs>; + hdmi-mux-supply = <&ext_3p3v>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&hpd_active &ddc_active &cec_active>; + pinctrl-1 = <&hpd_suspend &ddc_suspend &cec_suspend>; + + phys = <&hdmi_phy>; + phy-names = "hdmi_phy"; + }; + - | + #include <dt-bindings/clock/qcom,gcc-msm8996.h> + #include <dt-bindings/clock/qcom,mmcc-msm8996.h> + #include <dt-bindings/gpio/gpio.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + hdmi-tx@9a0000 { + compatible = "qcom,hdmi-tx-8996"; + reg = <0x009a0000 0x50c>, + <0x00070000 0x6158>, + <0x009e0000 0xfff>; + reg-names = "core_physical", + "qfprom_physical", + "hdcp_physical"; + + interrupt-parent = <&mdss>; + interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; + + clocks = <&mmcc MDSS_MDP_CLK>, + <&mmcc MDSS_AHB_CLK>, + <&mmcc MDSS_HDMI_CLK>, + <&mmcc MDSS_HDMI_AHB_CLK>, + <&mmcc MDSS_EXTPCLK_CLK>; + clock-names = "mdp_core", + "iface", + "core", + "alt_iface", + "extp"; + + phys = <&hdmi_phy>; + phy-names = "hdmi_phy"; + #sound-dai-cells = <1>; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>; + pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>; + + core-vdda-supply = <&vreg_l12a_1p8>; + core-vcc-supply = <&vreg_s4a_1p8>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + endpoint { + remote-endpoint = <&mdp5_intf3_out>; + }; + }; + }; + }; +... diff --git a/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml new file mode 100644 index 000000000000..79193cf71828 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml @@ -0,0 +1,103 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- + +$id: "http://devicetree.org/schemas/phy/qcom,hdmi-phy-other.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Qualcomm Adreno/Snapdragon HDMI phy + +maintainers: + - Rob Clark robdclark@gmail.com + +properties: + compatible: + contains: + enum: + - qcom,hdmi-phy-8660 + - qcom,hdmi-phy-8960 + - qcom,hdmi-phy-8974 + - qcom,hdmi-phy-8084 + + reg: + minItems: 2 + maxItems: 2 + + reg-names: + items: + - const: hdmi_phy + - const: hdmi_pll + + clocks: + minItems: 1 + maxItems: 2 + + clock-names: + minItems: 1 + maxItems: 2 + + power-domains: + maxItems: 1 + + '#phy-cells': + const: 0 + +allOf: + - if: + properties: + compatible: + contains: + enum: + - qcom,hdmi-phy-8960 + then: + properties: + clocks: + maxItems: 1 + clock-names: + items: + - const: slave_iface + core-vdda-supply: + description: phandle to VDDA supply regulator + + - if: + properties: + compatible: + contains: + enum: + - qcom,hdmi-phy-8974 + then: + properties: + clocks: + maxItems: 2 + clock-names: + items: + - const: iface + - const: alt_iface + core-vdda-supply: + description: phandle to VDDA supply regulator + vddio-supply: + description: phandle to VDD I/O supply regulator + +required: + - compatible + - clocks + - reg + - reg-names + - '#phy-cells' + +unevaluatedProperties: false + +examples: + - | + hdmi_phy: phy@4a00400 { + compatible = "qcom,hdmi-phy-8960"; + reg-names = "hdmi_phy", + "hdmi_pll"; + reg = <0x4a00400 0x60>, + <0x4a00500 0x100>; + #phy-cells = <0>; + power-domains = <&mmcc 1>; + clock-names = "slave_iface"; + clocks = <&clk 21>; + core-vdda-supply = <&pm8921_hdmi_mvs>; + }; diff --git a/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml new file mode 100644 index 000000000000..2b36a4c3d4c3 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml @@ -0,0 +1,84 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- + +$id: "http://devicetree.org/schemas/phy/qcom,hdmi-phy-qmp.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Qualcomm Adreno/Snapdragon QMP HDMI phy + +maintainers: + - Rob Clark robdclark@gmail.com + +properties: + compatible: + contains: + enum: + - qcom,hdmi-phy-8996 + + reg: + maxItems: 6 + + reg-names: + items: + - const: hdmi_pll + - const: hdmi_tx_l0 + - const: hdmi_tx_l1 + - const: hdmi_tx_l2 + - const: hdmi_tx_l3 + - const: hdmi_phy + + clocks: + maxItems: 2 + + clock-names: + items: + - const: iface + - const: ref + + power-domains: + maxItems: 1 + + vcca-supply: true + + vddio-supply: true + + '#phy-cells': + const: 0 + +required: + - compatible + - clocks + - clock-names + - reg + - reg-names + - '#phy-cells' + +unevaluatedProperties: false + +examples: + - | + hdmi-phy@9a0600 { + compatible = "qcom,hdmi-phy-8996"; + reg = <0x009a0600 0x1c4>, + <0x009a0a00 0x124>, + <0x009a0c00 0x124>, + <0x009a0e00 0x124>, + <0x009a1000 0x124>, + <0x009a1200 0x0c8>; + reg-names = "hdmi_pll", + "hdmi_tx_l0", + "hdmi_tx_l1", + "hdmi_tx_l2", + "hdmi_tx_l3", + "hdmi_phy"; + + clocks = <&mmcc 116>, + <&gcc 214>; + clock-names = "iface", + "ref"; + #phy-cells = <0>; + + vddio-supply = <&vreg_l12a_1p8>; + vcca-supply = <&vreg_l28a_0p925>; + };
Thank you for bringing it back to life!
Reviewed-by: David Heidelberg david@ixit.cz
On 07/06/2022 20:58, Dmitry Baryshkov wrote:
Convert Qualcomm HDMI binding into HDMI TX and PHY yaml bindings.
Changes to schema: HDMI:
- fixed reg-names numbering to match 0..3 instead 0,1,3,4
PHY:
- moved into phy/ directory
- split into QMP and non-QMP PHY schemas
Co-developed-by: David Heidelberg david@ixit.cz Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org
.../devicetree/bindings/display/msm/hdmi.txt | 99 -------- .../bindings/display/msm/qcom,hdmi.yaml | 237 ++++++++++++++++++ .../bindings/phy/qcom,hdmi-phy-other.yaml | 103 ++++++++ .../bindings/phy/qcom,hdmi-phy-qmp.yaml | 84 +++++++ 4 files changed, 424 insertions(+), 99 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/msm/hdmi.txt create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml create mode 100644 Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml create mode 100644 Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml
diff --git a/Documentation/devicetree/bindings/display/msm/hdmi.txt b/Documentation/devicetree/bindings/display/msm/hdmi.txt deleted file mode 100644 index 5f90a40da51b..000000000000 --- a/Documentation/devicetree/bindings/display/msm/hdmi.txt +++ /dev/null @@ -1,99 +0,0 @@ -Qualcomm adreno/snapdragon hdmi output
-Required properties: -- compatible: one of the following
- "qcom,hdmi-tx-8996"
- "qcom,hdmi-tx-8994"
- "qcom,hdmi-tx-8084"
- "qcom,hdmi-tx-8974"
- "qcom,hdmi-tx-8660"
- "qcom,hdmi-tx-8960"
-- reg: Physical base address and length of the controller's registers -- reg-names: "core_physical" -- interrupts: The interrupt signal from the hdmi block. -- power-domains: Should be <&mmcc MDSS_GDSC>. -- clocks: device clocks
- See ../clocks/clock-bindings.txt for details.
-- core-vdda-supply: phandle to supply regulator -- hdmi-mux-supply: phandle to mux regulator -- phys: the phandle for the HDMI PHY device -- phy-names: the name of the corresponding PHY device
-Optional properties: -- hpd-gpios: hpd pin -- qcom,hdmi-tx-mux-en-gpios: hdmi mux enable pin -- qcom,hdmi-tx-mux-sel-gpios: hdmi mux select pin -- qcom,hdmi-tx-mux-lpm-gpios: hdmi mux lpm pin -- power-domains: reference to the power domain(s), if available. -- pinctrl-names: the pin control state names; should contain "default" -- pinctrl-0: the default pinctrl state (active) -- pinctrl-1: the "sleep" pinctrl state
-HDMI PHY: -Required properties: -- compatible: Could be the following
- "qcom,hdmi-phy-8660"
- "qcom,hdmi-phy-8960"
- "qcom,hdmi-phy-8974"
- "qcom,hdmi-phy-8084"
- "qcom,hdmi-phy-8996"
-- #phy-cells: Number of cells in a PHY specifier; Should be 0. -- reg: Physical base address and length of the registers of the PHY sub blocks. -- reg-names: The names of register regions. The following regions are required:
- "hdmi_phy"
- "hdmi_pll"
- For HDMI PHY on msm8996, these additional register regions are required:
- "hdmi_tx_l0"
- "hdmi_tx_l1"
- "hdmi_tx_l3"
- "hdmi_tx_l4"
-- power-domains: Should be <&mmcc MDSS_GDSC>. -- clocks: device clocks
- See Documentation/devicetree/bindings/clock/clock-bindings.txt for details.
-- core-vdda-supply: phandle to vdda regulator device node
-Example:
-/ {
- ...
- hdmi: hdmi@4a00000 {
compatible = "qcom,hdmi-tx-8960";reg-names = "core_physical";reg = <0x04a00000 0x2f0>;interrupts = <GIC_SPI 79 0>;power-domains = <&mmcc MDSS_GDSC>;clock-names ="core","master_iface","slave_iface";clocks =<&mmcc HDMI_APP_CLK>,<&mmcc HDMI_M_AHB_CLK>,<&mmcc HDMI_S_AHB_CLK>;qcom,hdmi-tx-ddc-clk = <&msmgpio 70 GPIO_ACTIVE_HIGH>;qcom,hdmi-tx-ddc-data = <&msmgpio 71 GPIO_ACTIVE_HIGH>;qcom,hdmi-tx-hpd = <&msmgpio 72 GPIO_ACTIVE_HIGH>;core-vdda-supply = <&pm8921_hdmi_mvs>;hdmi-mux-supply = <&ext_3p3v>;pinctrl-names = "default", "sleep";pinctrl-0 = <&hpd_active &ddc_active &cec_active>;pinctrl-1 = <&hpd_suspend &ddc_suspend &cec_suspend>;phys = <&hdmi_phy>;phy-names = "hdmi_phy";- };
- hdmi_phy: phy@4a00400 {
compatible = "qcom,hdmi-phy-8960";reg-names = "hdmi_phy","hdmi_pll";reg = <0x4a00400 0x60>,<0x4a00500 0x100>;#phy-cells = <0>;power-domains = <&mmcc MDSS_GDSC>;clock-names = "slave_iface";clocks = <&mmcc HDMI_S_AHB_CLK>;core-vdda-supply = <&pm8921_hdmi_mvs>;- };
-}; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml new file mode 100644 index 000000000000..2f485b5d1c5d --- /dev/null +++ b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml @@ -0,0 +1,237 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +---
+$id: "http://devicetree.org/schemas/display/msm/qcom,hdmi.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+title: Qualcomm Adreno/Snapdragon HDMI output
+maintainers:
- Rob Clark robdclark@gmail.com
+properties:
- compatible:
- enum:
- qcom,hdmi-tx-8660- qcom,hdmi-tx-8960- qcom,hdmi-tx-8974- qcom,hdmi-tx-8084- qcom,hdmi-tx-8994- qcom,hdmi-tx-8996- clocks:
- minItems: 1
- maxItems: 5
- clock-names:
- minItems: 1
- maxItems: 5
- reg:
- minItems: 1
- maxItems: 3
- description: Physical base address and length of the controller's registers
- reg-names:
- minItems: 1
- items:
- const: core_physical- const: qfprom_physical- const: hdcp_physical- interrupts:
- maxItems: 1
- description: The interrupt signal from the hdmi block.
- phys:
- description: the phandle for the HDMI PHY device
- maxItems: 1
- phy-names:
- enum:
- hdmi_phy- hdmi-phy- hpd-gpios:
- maxItems: 1
- description: hpd pin
- qcom,hdmi-tx-ddc-clk-gpios:
- maxItems: 1
- description: HDMI DDC clock
- qcom,hdmi-tx-ddc-data-gpios:
- maxItems: 1
- description: HDMI DDC data
- qcom,hdmi-tx-mux-en-gpios:
- maxItems: 1
- description: HDMI mux enable pin
- qcom,hdmi-tx-mux-sel-gpios:
- maxItems: 1
- description: HDMI mux select pin
- qcom,hdmi-tx-mux-lpm-gpios:
- maxItems: 1
- description: HDMI mux lpm pin
- '#sound-dai-cells':
- const: 1
- ports:
- type: object
- $ref: /schemas/graph.yaml#/properties/ports
- properties:
port@0:$ref: /schemas/graph.yaml#/$defs/port-basedescription: |Input endpoints of the controller.port@1:$ref: /schemas/graph.yaml#/$defs/port-basedescription: |Output endpoints of the controller.- required:
- port@0+required:
- compatible
- clocks
- clock-names
- reg
- reg-names
- interrupts
- phys
- phy-names
+allOf:
- if:
properties:compatible:contains:enum:- qcom,hdmi-tx-8960- then:
properties:clocks:minItems: 3maxItems: 3clock-names:items:- const: core- const: master_iface- const: slave_ifacecore-vdda-supply:description: phandle to VDDA supply regulatorhdmi-mux-supply:description: phandle to mux regulator
- if:
properties:compatible:contains:enum:- qcom,hdmi-tx-8974- qcom,hdmi-tx-8084- qcom,hdmi-tx-8994- qcom,hdmi-tx-8996- then:
properties:clocks:minItems: 5clock-names:items:- const: mdp_core- const: iface- const: core- const: alt_iface- const: extpcore-vdda-supply:description: phandle to VDDA supply regulatorcore-vcc-supply:description: phandle to VCC supply regulator+unevaluatedProperties: false
+examples:
- |
- hdmi: hdmi@4a00000 {
compatible = "qcom,hdmi-tx-8960";reg-names = "core_physical";reg = <0x04a00000 0x2f0>;interrupts = <0 79 0>;clock-names ="core","master_iface","slave_iface";clocks =<&clk 61>,<&clk 72>,<&clk 98>;qcom,hdmi-tx-ddc-clk-gpios = <&msmgpio 70 0>;qcom,hdmi-tx-ddc-data-gpios = <&msmgpio 71 0>;hpd-gpios = <&msmgpio 72 0>;core-vdda-supply = <&pm8921_hdmi_mvs>;hdmi-mux-supply = <&ext_3p3v>;pinctrl-names = "default", "sleep";pinctrl-0 = <&hpd_active &ddc_active &cec_active>;pinctrl-1 = <&hpd_suspend &ddc_suspend &cec_suspend>;phys = <&hdmi_phy>;phy-names = "hdmi_phy";- };
- |
- #include <dt-bindings/clock/qcom,gcc-msm8996.h>
- #include <dt-bindings/clock/qcom,mmcc-msm8996.h>
- #include <dt-bindings/gpio/gpio.h>
- #include <dt-bindings/interrupt-controller/arm-gic.h>
- hdmi-tx@9a0000 {
compatible = "qcom,hdmi-tx-8996";reg = <0x009a0000 0x50c>,<0x00070000 0x6158>,<0x009e0000 0xfff>;reg-names = "core_physical","qfprom_physical","hdcp_physical";interrupt-parent = <&mdss>;interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;clocks = <&mmcc MDSS_MDP_CLK>,<&mmcc MDSS_AHB_CLK>,<&mmcc MDSS_HDMI_CLK>,<&mmcc MDSS_HDMI_AHB_CLK>,<&mmcc MDSS_EXTPCLK_CLK>;clock-names = "mdp_core","iface","core","alt_iface","extp";phys = <&hdmi_phy>;phy-names = "hdmi_phy";#sound-dai-cells = <1>;pinctrl-names = "default", "sleep";pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>;pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>;core-vdda-supply = <&vreg_l12a_1p8>;core-vcc-supply = <&vreg_s4a_1p8>;ports {#address-cells = <1>;#size-cells = <0>;port@0 {reg = <0>;endpoint {remote-endpoint = <&mdp5_intf3_out>;};};};- };
+... diff --git a/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml new file mode 100644 index 000000000000..79193cf71828 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml @@ -0,0 +1,103 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +---
+$id: "http://devicetree.org/schemas/phy/qcom,hdmi-phy-other.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+title: Qualcomm Adreno/Snapdragon HDMI phy
+maintainers:
- Rob Clark robdclark@gmail.com
+properties:
- compatible:
- contains:
enum:- qcom,hdmi-phy-8660- qcom,hdmi-phy-8960- qcom,hdmi-phy-8974- qcom,hdmi-phy-8084- reg:
- minItems: 2
- maxItems: 2
- reg-names:
- items:
- const: hdmi_phy- const: hdmi_pll- clocks:
- minItems: 1
- maxItems: 2
- clock-names:
- minItems: 1
- maxItems: 2
- power-domains:
- maxItems: 1
- '#phy-cells':
- const: 0
+allOf:
- if:
properties:compatible:contains:enum:- qcom,hdmi-phy-8960- then:
properties:clocks:maxItems: 1clock-names:items:- const: slave_ifacecore-vdda-supply:description: phandle to VDDA supply regulator
- if:
properties:compatible:contains:enum:- qcom,hdmi-phy-8974- then:
properties:clocks:maxItems: 2clock-names:items:- const: iface- const: alt_ifacecore-vdda-supply:description: phandle to VDDA supply regulatorvddio-supply:description: phandle to VDD I/O supply regulator+required:
- compatible
- clocks
- reg
- reg-names
- '#phy-cells'
+unevaluatedProperties: false
+examples:
- |
- hdmi_phy: phy@4a00400 {
compatible = "qcom,hdmi-phy-8960";reg-names = "hdmi_phy","hdmi_pll";reg = <0x4a00400 0x60>,<0x4a00500 0x100>;#phy-cells = <0>;power-domains = <&mmcc 1>;clock-names = "slave_iface";clocks = <&clk 21>;core-vdda-supply = <&pm8921_hdmi_mvs>;- };
diff --git a/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml new file mode 100644 index 000000000000..2b36a4c3d4c3 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml @@ -0,0 +1,84 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +---
+$id: "http://devicetree.org/schemas/phy/qcom,hdmi-phy-qmp.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+title: Qualcomm Adreno/Snapdragon QMP HDMI phy
+maintainers:
- Rob Clark robdclark@gmail.com
+properties:
- compatible:
- contains:
enum:- qcom,hdmi-phy-8996- reg:
- maxItems: 6
- reg-names:
- items:
- const: hdmi_pll- const: hdmi_tx_l0- const: hdmi_tx_l1- const: hdmi_tx_l2- const: hdmi_tx_l3- const: hdmi_phy- clocks:
- maxItems: 2
- clock-names:
- items:
- const: iface- const: ref- power-domains:
- maxItems: 1
- vcca-supply: true
- vddio-supply: true
- '#phy-cells':
- const: 0
+required:
- compatible
- clocks
- clock-names
- reg
- reg-names
- '#phy-cells'
+unevaluatedProperties: false
+examples:
- |
- hdmi-phy@9a0600 {
compatible = "qcom,hdmi-phy-8996";reg = <0x009a0600 0x1c4>,<0x009a0a00 0x124>,<0x009a0c00 0x124>,<0x009a0e00 0x124>,<0x009a1000 0x124>,<0x009a1200 0x0c8>;reg-names = "hdmi_pll","hdmi_tx_l0","hdmi_tx_l1","hdmi_tx_l2","hdmi_tx_l3","hdmi_phy";clocks = <&mmcc 116>,<&gcc 214>;clock-names = "iface","ref";#phy-cells = <0>;vddio-supply = <&vreg_l12a_1p8>;vcca-supply = <&vreg_l28a_0p925>;- };
On 07/06/2022 20:58, Dmitry Baryshkov wrote:
Convert Qualcomm HDMI binding into HDMI TX and PHY yaml bindings.
Changes to schema: HDMI:
- fixed reg-names numbering to match 0..3 instead 0,1,3,4
PHY:
- moved into phy/ directory
- split into QMP and non-QMP PHY schemas
Co-developed-by: David Heidelberg david@ixit.cz Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org
.../devicetree/bindings/display/msm/hdmi.txt | 99 -------- .../bindings/display/msm/qcom,hdmi.yaml | 237 ++++++++++++++++++ .../bindings/phy/qcom,hdmi-phy-other.yaml | 103 ++++++++ .../bindings/phy/qcom,hdmi-phy-qmp.yaml | 84 +++++++ 4 files changed, 424 insertions(+), 99 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/msm/hdmi.txt create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml create mode 100644 Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml create mode 100644 Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml
diff --git a/Documentation/devicetree/bindings/display/msm/hdmi.txt b/Documentation/devicetree/bindings/display/msm/hdmi.txt deleted file mode 100644 index 5f90a40da51b..000000000000 --- a/Documentation/devicetree/bindings/display/msm/hdmi.txt +++ /dev/null @@ -1,99 +0,0 @@ -Qualcomm adreno/snapdragon hdmi output
-Required properties: -- compatible: one of the following
- "qcom,hdmi-tx-8996"
- "qcom,hdmi-tx-8994"
- "qcom,hdmi-tx-8084"
- "qcom,hdmi-tx-8974"
- "qcom,hdmi-tx-8660"
- "qcom,hdmi-tx-8960"
-- reg: Physical base address and length of the controller's registers -- reg-names: "core_physical" -- interrupts: The interrupt signal from the hdmi block. -- power-domains: Should be <&mmcc MDSS_GDSC>. -- clocks: device clocks
- See ../clocks/clock-bindings.txt for details.
-- core-vdda-supply: phandle to supply regulator -- hdmi-mux-supply: phandle to mux regulator -- phys: the phandle for the HDMI PHY device -- phy-names: the name of the corresponding PHY device
-Optional properties: -- hpd-gpios: hpd pin -- qcom,hdmi-tx-mux-en-gpios: hdmi mux enable pin -- qcom,hdmi-tx-mux-sel-gpios: hdmi mux select pin -- qcom,hdmi-tx-mux-lpm-gpios: hdmi mux lpm pin -- power-domains: reference to the power domain(s), if available. -- pinctrl-names: the pin control state names; should contain "default" -- pinctrl-0: the default pinctrl state (active) -- pinctrl-1: the "sleep" pinctrl state
-HDMI PHY: -Required properties: -- compatible: Could be the following
- "qcom,hdmi-phy-8660"
- "qcom,hdmi-phy-8960"
- "qcom,hdmi-phy-8974"
- "qcom,hdmi-phy-8084"
- "qcom,hdmi-phy-8996"
-- #phy-cells: Number of cells in a PHY specifier; Should be 0. -- reg: Physical base address and length of the registers of the PHY sub blocks. -- reg-names: The names of register regions. The following regions are required:
- "hdmi_phy"
- "hdmi_pll"
- For HDMI PHY on msm8996, these additional register regions are required:
- "hdmi_tx_l0"
- "hdmi_tx_l1"
- "hdmi_tx_l3"
- "hdmi_tx_l4"
-- power-domains: Should be <&mmcc MDSS_GDSC>. -- clocks: device clocks
- See Documentation/devicetree/bindings/clock/clock-bindings.txt for details.
-- core-vdda-supply: phandle to vdda regulator device node
-Example:
-/ {
- ...
- hdmi: hdmi@4a00000 {
compatible = "qcom,hdmi-tx-8960";reg-names = "core_physical";reg = <0x04a00000 0x2f0>;interrupts = <GIC_SPI 79 0>;power-domains = <&mmcc MDSS_GDSC>;clock-names ="core","master_iface","slave_iface";clocks =<&mmcc HDMI_APP_CLK>,<&mmcc HDMI_M_AHB_CLK>,<&mmcc HDMI_S_AHB_CLK>;qcom,hdmi-tx-ddc-clk = <&msmgpio 70 GPIO_ACTIVE_HIGH>;qcom,hdmi-tx-ddc-data = <&msmgpio 71 GPIO_ACTIVE_HIGH>;qcom,hdmi-tx-hpd = <&msmgpio 72 GPIO_ACTIVE_HIGH>;core-vdda-supply = <&pm8921_hdmi_mvs>;hdmi-mux-supply = <&ext_3p3v>;pinctrl-names = "default", "sleep";pinctrl-0 = <&hpd_active &ddc_active &cec_active>;pinctrl-1 = <&hpd_suspend &ddc_suspend &cec_suspend>;phys = <&hdmi_phy>;phy-names = "hdmi_phy";- };
- hdmi_phy: phy@4a00400 {
compatible = "qcom,hdmi-phy-8960";reg-names = "hdmi_phy","hdmi_pll";reg = <0x4a00400 0x60>,<0x4a00500 0x100>;#phy-cells = <0>;power-domains = <&mmcc MDSS_GDSC>;clock-names = "slave_iface";clocks = <&mmcc HDMI_S_AHB_CLK>;core-vdda-supply = <&pm8921_hdmi_mvs>;- };
-}; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml new file mode 100644 index 000000000000..2f485b5d1c5d --- /dev/null +++ b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml @@ -0,0 +1,237 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +---
+$id: "http://devicetree.org/schemas/display/msm/qcom,hdmi.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
Both go without quotes.
+title: Qualcomm Adreno/Snapdragon HDMI output
+maintainers:
- Rob Clark robdclark@gmail.com
+properties:
- compatible:
- enum:
- qcom,hdmi-tx-8660- qcom,hdmi-tx-8960- qcom,hdmi-tx-8974- qcom,hdmi-tx-8084- qcom,hdmi-tx-8994- qcom,hdmi-tx-8996
Could you order them alphabetically? Helps to avoid conflicts, if ever extended.
- clocks:
- minItems: 1
- maxItems: 5
- clock-names:
- minItems: 1
- maxItems: 5
- reg:
- minItems: 1
- maxItems: 3
- description: Physical base address and length of the controller's registers
Skip description, it's obvious.
- reg-names:
- minItems: 1
- items:
- const: core_physical- const: qfprom_physical- const: hdcp_physical- interrupts:
- maxItems: 1
- description: The interrupt signal from the hdmi block.
Skip description, it's obvious.
- phys:
- description: the phandle for the HDMI PHY device
You can skip description, it's quite obvious... Also in some places description is first in the property, in some last. Just keep one choice. :)
- maxItems: 1
- phy-names:
- enum:
- hdmi_phy- hdmi-phy
Fix the DTS and use only one. Do the drivers actually use it?
- hpd-gpios:
- maxItems: 1
- description: hpd pin
- qcom,hdmi-tx-ddc-clk-gpios:
- maxItems: 1
- description: HDMI DDC clock
- qcom,hdmi-tx-ddc-data-gpios:
- maxItems: 1
- description: HDMI DDC data
- qcom,hdmi-tx-mux-en-gpios:
- maxItems: 1
- description: HDMI mux enable pin
These were not documented before, so mention that in the commit msg, please.
- qcom,hdmi-tx-mux-sel-gpios:
- maxItems: 1
- description: HDMI mux select pin
- qcom,hdmi-tx-mux-lpm-gpios:
- maxItems: 1
- description: HDMI mux lpm pin
- '#sound-dai-cells':
- const: 1
- ports:
- type: object
- $ref: /schemas/graph.yaml#/properties/ports
- properties:
port@0:$ref: /schemas/graph.yaml#/$defs/port-basedescription: |Input endpoints of the controller.port@1:$ref: /schemas/graph.yaml#/$defs/port-basedescription: |Output endpoints of the controller.- required:
- port@0+required:
- compatible
- clocks
- clock-names
- reg
- reg-names
- interrupts
- phys
- phy-names
+allOf:
- if:
properties:compatible:contains:enum:- qcom,hdmi-tx-8960- then:
properties:clocks:minItems: 3maxItems: 3clock-names:items:- const: core- const: master_iface- const: slave_ifacecore-vdda-supply:description: phandle to VDDA supply regulatorhdmi-mux-supply:description: phandle to mux regulator
- if:
properties:compatible:contains:enum:- qcom,hdmi-tx-8974- qcom,hdmi-tx-8084- qcom,hdmi-tx-8994- qcom,hdmi-tx-8996- then:
properties:clocks:minItems: 5clock-names:items:- const: mdp_core- const: iface- const: core- const: alt_iface- const: extpcore-vdda-supply:description: phandle to VDDA supply regulatorcore-vcc-supply:description: phandle to VCC supply regulator+unevaluatedProperties: false
This should be additionalProperties:false, because you do not reference any schema. If it fails on supplies, please define the supplies in the properties list (not in the allOf:if:then) and disallow it on chosen variant (only one I guess)... if the supplies are really not possible on that variant.
+examples:
- |
- hdmi: hdmi@4a00000 {
compatible = "qcom,hdmi-tx-8960";reg-names = "core_physical";reg = <0x04a00000 0x2f0>;interrupts = <0 79 0>;
Use proper defines for GIC and flags. IRQ TYPE none is not correct usually.
clock-names ="core","master_iface","slave_iface";
clock-names = "core", (and align continued lines)
clocks =<&clk 61>,<&clk 72>,<&clk 98>;qcom,hdmi-tx-ddc-clk-gpios = <&msmgpio 70 0>;qcom,hdmi-tx-ddc-data-gpios = <&msmgpio 71 0>;hpd-gpios = <&msmgpio 72 0>;
Proper GPIO flags.
core-vdda-supply = <&pm8921_hdmi_mvs>;hdmi-mux-supply = <&ext_3p3v>;pinctrl-names = "default", "sleep";pinctrl-0 = <&hpd_active &ddc_active &cec_active>;pinctrl-1 = <&hpd_suspend &ddc_suspend &cec_suspend>;phys = <&hdmi_phy>;phy-names = "hdmi_phy";- };
- |
- #include <dt-bindings/clock/qcom,gcc-msm8996.h>
- #include <dt-bindings/clock/qcom,mmcc-msm8996.h>
- #include <dt-bindings/gpio/gpio.h>
- #include <dt-bindings/interrupt-controller/arm-gic.h>
- hdmi-tx@9a0000 {
Node name just "hdmi"
compatible = "qcom,hdmi-tx-8996";reg = <0x009a0000 0x50c>,<0x00070000 0x6158>,<0x009e0000 0xfff>;reg-names = "core_physical","qfprom_physical","hdcp_physical";interrupt-parent = <&mdss>;interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;clocks = <&mmcc MDSS_MDP_CLK>,<&mmcc MDSS_AHB_CLK>,<&mmcc MDSS_HDMI_CLK>,<&mmcc MDSS_HDMI_AHB_CLK>,<&mmcc MDSS_EXTPCLK_CLK>;clock-names = "mdp_core","iface","core","alt_iface","extp";phys = <&hdmi_phy>;phy-names = "hdmi_phy";#sound-dai-cells = <1>;pinctrl-names = "default", "sleep";pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>;pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>;core-vdda-supply = <&vreg_l12a_1p8>;core-vcc-supply = <&vreg_s4a_1p8>;ports {#address-cells = <1>;#size-cells = <0>;port@0 {reg = <0>;endpoint {remote-endpoint = <&mdp5_intf3_out>;};};};- };
+... diff --git a/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml new file mode 100644 index 000000000000..79193cf71828 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml @@ -0,0 +1,103 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +---
+$id: "http://devicetree.org/schemas/phy/qcom,hdmi-phy-other.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
Same comment
+title: Qualcomm Adreno/Snapdragon HDMI phy
+maintainers:
- Rob Clark robdclark@gmail.com
+properties:
- compatible:
- contains:
Remove contains
enum:- qcom,hdmi-phy-8660- qcom,hdmi-phy-8960- qcom,hdmi-phy-8974- qcom,hdmi-phy-8084- reg:
- minItems: 2
- maxItems: 2
maxItems is enough in such case
- reg-names:
- items:
- const: hdmi_phy- const: hdmi_pll- clocks:
- minItems: 1
- maxItems: 2
- clock-names:
- minItems: 1
- maxItems: 2
- power-domains:
- maxItems: 1
- '#phy-cells':
- const: 0
+allOf:
- if:
properties:compatible:contains:enum:- qcom,hdmi-phy-8960- then:
properties:clocks:maxItems: 1clock-names:items:- const: slave_ifacecore-vdda-supply:description: phandle to VDDA supply regulator
- if:
properties:compatible:contains:enum:- qcom,hdmi-phy-8974- then:
properties:clocks:maxItems: 2clock-names:items:- const: iface- const: alt_ifacecore-vdda-supply:description: phandle to VDDA supply regulatorvddio-supply:description: phandle to VDD I/O supply regulator
What are the clocks for other variants? Also between 1-2 with any name?
+required:
- compatible
- clocks
- reg
- reg-names
- '#phy-cells'
+unevaluatedProperties: false
additionalProperties:false
+examples:
- |
- hdmi_phy: phy@4a00400 {
compatible = "qcom,hdmi-phy-8960";reg-names = "hdmi_phy","hdmi_pll";reg = <0x4a00400 0x60>,<0x4a00500 0x100>;#phy-cells = <0>;power-domains = <&mmcc 1>;clock-names = "slave_iface";clocks = <&clk 21>;core-vdda-supply = <&pm8921_hdmi_mvs>;- };
diff --git a/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml new file mode 100644 index 000000000000..2b36a4c3d4c3 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml @@ -0,0 +1,84 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +---
+$id: "http://devicetree.org/schemas/phy/qcom,hdmi-phy-qmp.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
Same comment
+title: Qualcomm Adreno/Snapdragon QMP HDMI phy
+maintainers:
- Rob Clark robdclark@gmail.com
+properties:
- compatible:
- contains:
Remove contains
enum:- qcom,hdmi-phy-8996- reg:
- maxItems: 6
- reg-names:
- items:
- const: hdmi_pll- const: hdmi_tx_l0- const: hdmi_tx_l1- const: hdmi_tx_l2- const: hdmi_tx_l3- const: hdmi_phy- clocks:
- maxItems: 2
- clock-names:
- items:
- const: iface- const: ref- power-domains:
- maxItems: 1
- vcca-supply: true
- vddio-supply: true
- '#phy-cells':
- const: 0
+required:
- compatible
- clocks
- clock-names
- reg
- reg-names
- '#phy-cells'
+unevaluatedProperties: false
additionalProperties:false
+examples:
- |
- hdmi-phy@9a0600 {
Best regards, Krzysztof
On 08/06/2022 11:58, Krzysztof Kozlowski wrote:
On 07/06/2022 20:58, Dmitry Baryshkov wrote:
Convert Qualcomm HDMI binding into HDMI TX and PHY yaml bindings.
Changes to schema: HDMI:
- fixed reg-names numbering to match 0..3 instead 0,1,3,4
PHY:
- moved into phy/ directory
- split into QMP and non-QMP PHY schemas
Co-developed-by: David Heidelberg david@ixit.cz Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org
.../devicetree/bindings/display/msm/hdmi.txt | 99 -------- .../bindings/display/msm/qcom,hdmi.yaml | 237 ++++++++++++++++++ .../bindings/phy/qcom,hdmi-phy-other.yaml | 103 ++++++++ .../bindings/phy/qcom,hdmi-phy-qmp.yaml | 84 +++++++ 4 files changed, 424 insertions(+), 99 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/msm/hdmi.txt create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml create mode 100644 Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml create mode 100644 Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml
diff --git a/Documentation/devicetree/bindings/display/msm/hdmi.txt b/Documentation/devicetree/bindings/display/msm/hdmi.txt deleted file mode 100644 index 5f90a40da51b..000000000000 --- a/Documentation/devicetree/bindings/display/msm/hdmi.txt +++ /dev/null @@ -1,99 +0,0 @@ -Qualcomm adreno/snapdragon hdmi output
-Required properties: -- compatible: one of the following
- "qcom,hdmi-tx-8996"
- "qcom,hdmi-tx-8994"
- "qcom,hdmi-tx-8084"
- "qcom,hdmi-tx-8974"
- "qcom,hdmi-tx-8660"
- "qcom,hdmi-tx-8960"
-- reg: Physical base address and length of the controller's registers -- reg-names: "core_physical" -- interrupts: The interrupt signal from the hdmi block. -- power-domains: Should be <&mmcc MDSS_GDSC>. -- clocks: device clocks
- See ../clocks/clock-bindings.txt for details.
-- core-vdda-supply: phandle to supply regulator -- hdmi-mux-supply: phandle to mux regulator -- phys: the phandle for the HDMI PHY device -- phy-names: the name of the corresponding PHY device
-Optional properties: -- hpd-gpios: hpd pin -- qcom,hdmi-tx-mux-en-gpios: hdmi mux enable pin -- qcom,hdmi-tx-mux-sel-gpios: hdmi mux select pin -- qcom,hdmi-tx-mux-lpm-gpios: hdmi mux lpm pin -- power-domains: reference to the power domain(s), if available. -- pinctrl-names: the pin control state names; should contain "default" -- pinctrl-0: the default pinctrl state (active) -- pinctrl-1: the "sleep" pinctrl state
-HDMI PHY: -Required properties: -- compatible: Could be the following
- "qcom,hdmi-phy-8660"
- "qcom,hdmi-phy-8960"
- "qcom,hdmi-phy-8974"
- "qcom,hdmi-phy-8084"
- "qcom,hdmi-phy-8996"
-- #phy-cells: Number of cells in a PHY specifier; Should be 0. -- reg: Physical base address and length of the registers of the PHY sub blocks. -- reg-names: The names of register regions. The following regions are required:
- "hdmi_phy"
- "hdmi_pll"
- For HDMI PHY on msm8996, these additional register regions are required:
- "hdmi_tx_l0"
- "hdmi_tx_l1"
- "hdmi_tx_l3"
- "hdmi_tx_l4"
-- power-domains: Should be <&mmcc MDSS_GDSC>. -- clocks: device clocks
- See Documentation/devicetree/bindings/clock/clock-bindings.txt for details.
-- core-vdda-supply: phandle to vdda regulator device node
-Example:
-/ {
- ...
- hdmi: hdmi@4a00000 {
compatible = "qcom,hdmi-tx-8960";reg-names = "core_physical";reg = <0x04a00000 0x2f0>;interrupts = <GIC_SPI 79 0>;power-domains = <&mmcc MDSS_GDSC>;clock-names ="core","master_iface","slave_iface";clocks =<&mmcc HDMI_APP_CLK>,<&mmcc HDMI_M_AHB_CLK>,<&mmcc HDMI_S_AHB_CLK>;qcom,hdmi-tx-ddc-clk = <&msmgpio 70 GPIO_ACTIVE_HIGH>;qcom,hdmi-tx-ddc-data = <&msmgpio 71 GPIO_ACTIVE_HIGH>;qcom,hdmi-tx-hpd = <&msmgpio 72 GPIO_ACTIVE_HIGH>;core-vdda-supply = <&pm8921_hdmi_mvs>;hdmi-mux-supply = <&ext_3p3v>;pinctrl-names = "default", "sleep";pinctrl-0 = <&hpd_active &ddc_active &cec_active>;pinctrl-1 = <&hpd_suspend &ddc_suspend &cec_suspend>;phys = <&hdmi_phy>;phy-names = "hdmi_phy";- };
- hdmi_phy: phy@4a00400 {
compatible = "qcom,hdmi-phy-8960";reg-names = "hdmi_phy","hdmi_pll";reg = <0x4a00400 0x60>,<0x4a00500 0x100>;#phy-cells = <0>;power-domains = <&mmcc MDSS_GDSC>;clock-names = "slave_iface";clocks = <&mmcc HDMI_S_AHB_CLK>;core-vdda-supply = <&pm8921_hdmi_mvs>;- };
-}; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml new file mode 100644 index 000000000000..2f485b5d1c5d --- /dev/null +++ b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml @@ -0,0 +1,237 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +---
+$id: "http://devicetree.org/schemas/display/msm/qcom,hdmi.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
Both go without quotes.
+title: Qualcomm Adreno/Snapdragon HDMI output
+maintainers:
- Rob Clark robdclark@gmail.com
+properties:
- compatible:
- enum:
- qcom,hdmi-tx-8660- qcom,hdmi-tx-8960- qcom,hdmi-tx-8974- qcom,hdmi-tx-8084- qcom,hdmi-tx-8994- qcom,hdmi-tx-8996Could you order them alphabetically? Helps to avoid conflicts, if ever extended.
I ordered them 'logically' (basing on the generation). But I'll change the order.
- clocks:
- minItems: 1
- maxItems: 5
- clock-names:
- minItems: 1
- maxItems: 5
- reg:
- minItems: 1
- maxItems: 3
- description: Physical base address and length of the controller's registers
Skip description, it's obvious.
- reg-names:
- minItems: 1
- items:
- const: core_physical- const: qfprom_physical- const: hdcp_physical- interrupts:
- maxItems: 1
- description: The interrupt signal from the hdmi block.
Skip description, it's obvious.
- phys:
- description: the phandle for the HDMI PHY device
You can skip description, it's quite obvious... Also in some places description is first in the property, in some last. Just keep one choice. :)
- maxItems: 1
- phy-names:
- enum:
- hdmi_phy- hdmi-phyFix the DTS and use only one. Do the drivers actually use it?
No, the driver just looks for the first phy entry. Should we mark phy-names as deprecated and remove its usage from actual DTs?
- hpd-gpios:
- maxItems: 1
- description: hpd pin
- qcom,hdmi-tx-ddc-clk-gpios:
- maxItems: 1
- description: HDMI DDC clock
- qcom,hdmi-tx-ddc-data-gpios:
- maxItems: 1
- description: HDMI DDC data
- qcom,hdmi-tx-mux-en-gpios:
- maxItems: 1
- description: HDMI mux enable pin
These were not documented before, so mention that in the commit msg, please.
Fun. qcom,hdmi-tx-mux-* were documented (but not used anywhere) qcom,hdmi-tx-ddc-* were not documented, but were present in the example.
- qcom,hdmi-tx-mux-sel-gpios:
- maxItems: 1
- description: HDMI mux select pin
- qcom,hdmi-tx-mux-lpm-gpios:
- maxItems: 1
- description: HDMI mux lpm pin
- '#sound-dai-cells':
- const: 1
- ports:
- type: object
- $ref: /schemas/graph.yaml#/properties/ports
- properties:
port@0:$ref: /schemas/graph.yaml#/$defs/port-basedescription: |Input endpoints of the controller.port@1:$ref: /schemas/graph.yaml#/$defs/port-basedescription: |Output endpoints of the controller.- required:
- port@0+required:
- compatible
- clocks
- clock-names
- reg
- reg-names
- interrupts
- phys
- phy-names
+allOf:
- if:
properties:compatible:contains:enum:- qcom,hdmi-tx-8960- then:
properties:clocks:minItems: 3maxItems: 3clock-names:items:- const: core- const: master_iface- const: slave_ifacecore-vdda-supply:description: phandle to VDDA supply regulatorhdmi-mux-supply:description: phandle to mux regulator
- if:
properties:compatible:contains:enum:- qcom,hdmi-tx-8974- qcom,hdmi-tx-8084- qcom,hdmi-tx-8994- qcom,hdmi-tx-8996- then:
properties:clocks:minItems: 5clock-names:items:- const: mdp_core- const: iface- const: core- const: alt_iface- const: extpcore-vdda-supply:description: phandle to VDDA supply regulatorcore-vcc-supply:description: phandle to VCC supply regulator+unevaluatedProperties: false
This should be additionalProperties:false, because you do not reference any schema. If it fails on supplies, please define the supplies in the properties list (not in the allOf:if:then) and disallow it on chosen variant (only one I guess)... if the supplies are really not possible on that variant.
The supplies are variant-specific, thus I wanted to define them in the conditional clauses. But I see your point, I'll change it.
+examples:
- |
- hdmi: hdmi@4a00000 {
compatible = "qcom,hdmi-tx-8960";reg-names = "core_physical";reg = <0x04a00000 0x2f0>;interrupts = <0 79 0>;Use proper defines for GIC and flags. IRQ TYPE none is not correct usually.
Ack
clock-names ="core","master_iface","slave_iface";clock-names = "core",(and align continued lines)
clocks =<&clk 61>,<&clk 72>,<&clk 98>;qcom,hdmi-tx-ddc-clk-gpios = <&msmgpio 70 0>;qcom,hdmi-tx-ddc-data-gpios = <&msmgpio 71 0>;hpd-gpios = <&msmgpio 72 0>;Proper GPIO flags.
core-vdda-supply = <&pm8921_hdmi_mvs>;hdmi-mux-supply = <&ext_3p3v>;pinctrl-names = "default", "sleep";pinctrl-0 = <&hpd_active &ddc_active &cec_active>;pinctrl-1 = <&hpd_suspend &ddc_suspend &cec_suspend>;phys = <&hdmi_phy>;phy-names = "hdmi_phy";- };
- |
- #include <dt-bindings/clock/qcom,gcc-msm8996.h>
- #include <dt-bindings/clock/qcom,mmcc-msm8996.h>
- #include <dt-bindings/gpio/gpio.h>
- #include <dt-bindings/interrupt-controller/arm-gic.h>
- hdmi-tx@9a0000 {
Node name just "hdmi"
compatible = "qcom,hdmi-tx-8996";reg = <0x009a0000 0x50c>,<0x00070000 0x6158>,<0x009e0000 0xfff>;reg-names = "core_physical","qfprom_physical","hdcp_physical";interrupt-parent = <&mdss>;interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;clocks = <&mmcc MDSS_MDP_CLK>,<&mmcc MDSS_AHB_CLK>,<&mmcc MDSS_HDMI_CLK>,<&mmcc MDSS_HDMI_AHB_CLK>,<&mmcc MDSS_EXTPCLK_CLK>;clock-names = "mdp_core","iface","core","alt_iface","extp";phys = <&hdmi_phy>;phy-names = "hdmi_phy";#sound-dai-cells = <1>;pinctrl-names = "default", "sleep";pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>;pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>;core-vdda-supply = <&vreg_l12a_1p8>;core-vcc-supply = <&vreg_s4a_1p8>;ports {#address-cells = <1>;#size-cells = <0>;port@0 {reg = <0>;endpoint {remote-endpoint = <&mdp5_intf3_out>;};};};- };
+... diff --git a/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml new file mode 100644 index 000000000000..79193cf71828 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml @@ -0,0 +1,103 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +---
+$id: "http://devicetree.org/schemas/phy/qcom,hdmi-phy-other.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
Same comment
+title: Qualcomm Adreno/Snapdragon HDMI phy
+maintainers:
- Rob Clark robdclark@gmail.com
+properties:
- compatible:
- contains:
Remove contains
enum:- qcom,hdmi-phy-8660- qcom,hdmi-phy-8960- qcom,hdmi-phy-8974- qcom,hdmi-phy-8084- reg:
- minItems: 2
- maxItems: 2
maxItems is enough in such case
- reg-names:
- items:
- const: hdmi_phy- const: hdmi_pll- clocks:
- minItems: 1
- maxItems: 2
- clock-names:
- minItems: 1
- maxItems: 2
- power-domains:
- maxItems: 1
- '#phy-cells':
- const: 0
+allOf:
- if:
properties:compatible:contains:enum:- qcom,hdmi-phy-8960- then:
properties:clocks:maxItems: 1clock-names:items:- const: slave_ifacecore-vdda-supply:description: phandle to VDDA supply regulator
- if:
properties:compatible:contains:enum:- qcom,hdmi-phy-8974- then:
properties:clocks:maxItems: 2clock-names:items:- const: iface- const: alt_ifacecore-vdda-supply:description: phandle to VDDA supply regulatorvddio-supply:description: phandle to VDD I/O supply regulatorWhat are the clocks for other variants? Also between 1-2 with any name?
As you asked about it... 8084 is an alias for 8974, so I'll add it here. As for the 8660... It doesn't declare any clocks, so I'll have to move this requirement to an if clause. Or maybe just split 8660 away.
+required:
- compatible
- clocks
- reg
- reg-names
- '#phy-cells'
+unevaluatedProperties: false
additionalProperties:false
+examples:
- |
- hdmi_phy: phy@4a00400 {
compatible = "qcom,hdmi-phy-8960";reg-names = "hdmi_phy","hdmi_pll";reg = <0x4a00400 0x60>,<0x4a00500 0x100>;#phy-cells = <0>;power-domains = <&mmcc 1>;clock-names = "slave_iface";clocks = <&clk 21>;core-vdda-supply = <&pm8921_hdmi_mvs>;- };
diff --git a/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml new file mode 100644 index 000000000000..2b36a4c3d4c3 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml @@ -0,0 +1,84 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +---
+$id: "http://devicetree.org/schemas/phy/qcom,hdmi-phy-qmp.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
Same comment
+title: Qualcomm Adreno/Snapdragon QMP HDMI phy
+maintainers:
- Rob Clark robdclark@gmail.com
+properties:
- compatible:
- contains:
Remove contains
enum:- qcom,hdmi-phy-8996- reg:
- maxItems: 6
- reg-names:
- items:
- const: hdmi_pll- const: hdmi_tx_l0- const: hdmi_tx_l1- const: hdmi_tx_l2- const: hdmi_tx_l3- const: hdmi_phy- clocks:
- maxItems: 2
- clock-names:
- items:
- const: iface- const: ref- power-domains:
- maxItems: 1
- vcca-supply: true
- vddio-supply: true
- '#phy-cells':
- const: 0
+required:
- compatible
- clocks
- clock-names
- reg
- reg-names
- '#phy-cells'
+unevaluatedProperties: false
additionalProperties:false
+examples:
- |
- hdmi-phy@9a0600 {
Best regards, Krzysztof
Mark obsolete GPIO properties as deprecated. They are not used by existing device trees. While we are at it, also drop them from the schema example.
Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org --- .../devicetree/bindings/display/msm/qcom,hdmi.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml index 2f485b5d1c5d..2b1cac0851ce 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml @@ -59,22 +59,27 @@ properties:
qcom,hdmi-tx-ddc-clk-gpios: maxItems: 1 + deprecated: true description: HDMI DDC clock
qcom,hdmi-tx-ddc-data-gpios: maxItems: 1 + deprecated: true description: HDMI DDC data
qcom,hdmi-tx-mux-en-gpios: maxItems: 1 + deprecated: true description: HDMI mux enable pin
qcom,hdmi-tx-mux-sel-gpios: maxItems: 1 + deprecated: true description: HDMI mux select pin
qcom,hdmi-tx-mux-lpm-gpios: maxItems: 1 + deprecated: true description: HDMI mux lpm pin
'#sound-dai-cells': @@ -171,8 +176,6 @@ examples: <&clk 61>, <&clk 72>, <&clk 98>; - qcom,hdmi-tx-ddc-clk-gpios = <&msmgpio 70 0>; - qcom,hdmi-tx-ddc-data-gpios = <&msmgpio 71 0>; hpd-gpios = <&msmgpio 72 0>; core-vdda-supply = <&pm8921_hdmi_mvs>; hdmi-mux-supply = <&ext_3p3v>;
On 07/06/2022 20:58, Dmitry Baryshkov wrote:
Mark obsolete GPIO properties as deprecated. They are not used by existing device trees. While we are at it, also drop them from the schema example.
Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org
.../devicetree/bindings/display/msm/qcom,hdmi.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml index 2f485b5d1c5d..2b1cac0851ce 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml @@ -59,22 +59,27 @@ properties:
qcom,hdmi-tx-ddc-clk-gpios: maxItems: 1
deprecated: true description: HDMI DDC clock
qcom,hdmi-tx-ddc-data-gpios: maxItems: 1
deprecated: true
This is confusing. These two are not defined in the old bindings, not used by DTS, not used by Linux implementation - why did you add them?
description: HDMI DDC dataqcom,hdmi-tx-mux-en-gpios: maxItems: 1
deprecated: true description: HDMI mux enable pin
qcom,hdmi-tx-mux-sel-gpios: maxItems: 1
deprecated: true description: HDMI mux select pin
qcom,hdmi-tx-mux-lpm-gpios: maxItems: 1
deprecated: true description: HDMI mux lpm pin
'#sound-dai-cells':
@@ -171,8 +176,6 @@ examples: <&clk 61>, <&clk 72>, <&clk 98>;
qcom,hdmi-tx-ddc-clk-gpios = <&msmgpio 70 0>;qcom,hdmi-tx-ddc-data-gpios = <&msmgpio 71 0>; hpd-gpios = <&msmgpio 72 0>; core-vdda-supply = <&pm8921_hdmi_mvs>; hdmi-mux-supply = <&ext_3p3v>;
Best regards, Krzysztof
On 08/06/2022 12:05, Krzysztof Kozlowski wrote:
On 07/06/2022 20:58, Dmitry Baryshkov wrote:
Mark obsolete GPIO properties as deprecated. They are not used by existing device trees. While we are at it, also drop them from the schema example.
Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org
.../devicetree/bindings/display/msm/qcom,hdmi.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml index 2f485b5d1c5d..2b1cac0851ce 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml @@ -59,22 +59,27 @@ properties:
qcom,hdmi-tx-ddc-clk-gpios: maxItems: 1
deprecated: true description: HDMI DDC clock
qcom,hdmi-tx-ddc-data-gpios: maxItems: 1
deprecated: true
This is confusing. These two are not defined in the old bindings, not used by DTS, not used by Linux implementation - why did you add them?
Most probably I added them as they were referenced in the source (and in the example). I'll drop these two completely (and document removing them from the example).
description: HDMI DDC data qcom,hdmi-tx-mux-en-gpios: maxItems: 1
deprecated: true description: HDMI mux enable pin
qcom,hdmi-tx-mux-sel-gpios: maxItems: 1
deprecated: true description: HDMI mux select pin
qcom,hdmi-tx-mux-lpm-gpios: maxItems: 1
deprecated: true description: HDMI mux lpm pin
'#sound-dai-cells':
@@ -171,8 +176,6 @@ examples: <&clk 61>, <&clk 72>, <&clk 98>;
qcom,hdmi-tx-ddc-clk-gpios = <&msmgpio 70 0>;qcom,hdmi-tx-ddc-data-gpios = <&msmgpio 71 0>; hpd-gpios = <&msmgpio 72 0>; core-vdda-supply = <&pm8921_hdmi_mvs>; hdmi-mux-supply = <&ext_3p3v>;
The HDMI driver has code to configure extra GPIOs, which predates pinctrl support. Nowadays all platforms should use pinctrl instead. Neither of upstreamed Qualcomm pltforms uses these properties, so it's safe to drop them.
Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org --- drivers/gpu/drm/msm/hdmi/hdmi.c | 61 +++++----------------------- drivers/gpu/drm/msm/hdmi/hdmi.h | 13 +----- drivers/gpu/drm/msm/hdmi/hdmi_hpd.c | 62 ++--------------------------- 3 files changed, 17 insertions(+), 119 deletions(-)
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index cf24e68864ba..6a22d6977ead 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -406,20 +406,6 @@ static struct hdmi_platform_config hdmi_tx_8996_config = { .hpd_freq = hpd_clk_freq_8x74, };
-static const struct { - const char *name; - const bool output; - const int value; - const char *label; -} msm_hdmi_gpio_pdata[] = { - { "qcom,hdmi-tx-ddc-clk", true, 1, "HDMI_DDC_CLK" }, - { "qcom,hdmi-tx-ddc-data", true, 1, "HDMI_DDC_DATA" }, - { "qcom,hdmi-tx-hpd", false, 1, "HDMI_HPD" }, - { "qcom,hdmi-tx-mux-en", true, 1, "HDMI_MUX_EN" }, - { "qcom,hdmi-tx-mux-sel", true, 0, "HDMI_MUX_SEL" }, - { "qcom,hdmi-tx-mux-lpm", true, 1, "HDMI_MUX_LPM" }, -}; - /* * HDMI audio codec callbacks */ @@ -531,7 +517,7 @@ static int msm_hdmi_bind(struct device *dev, struct device *master, void *data) struct hdmi_platform_config *hdmi_cfg; struct hdmi *hdmi; struct device_node *of_node = dev->of_node; - int i, err; + int err;
hdmi_cfg = (struct hdmi_platform_config *) of_device_get_match_data(dev); @@ -543,41 +529,16 @@ static int msm_hdmi_bind(struct device *dev, struct device *master, void *data) hdmi_cfg->mmio_name = "core_physical"; hdmi_cfg->qfprom_mmio_name = "qfprom_physical";
- for (i = 0; i < HDMI_MAX_NUM_GPIO; i++) { - const char *name = msm_hdmi_gpio_pdata[i].name; - struct gpio_desc *gpiod; - - /* - * We are fetching the GPIO lines "as is" since the connector - * code is enabling and disabling the lines. Until that point - * the power-on default value will be kept. - */ - gpiod = devm_gpiod_get_optional(dev, name, GPIOD_ASIS); - /* This will catch e.g. -PROBE_DEFER */ - if (IS_ERR(gpiod)) - return PTR_ERR(gpiod); - if (!gpiod) { - /* Try a second time, stripping down the name */ - char name3[32]; - - /* - * Try again after stripping out the "qcom,hdmi-tx" - * prefix. This is mainly to match "hpd-gpios" used - * in the upstream bindings. - */ - if (sscanf(name, "qcom,hdmi-tx-%s", name3)) - gpiod = devm_gpiod_get_optional(dev, name3, GPIOD_ASIS); - if (IS_ERR(gpiod)) - return PTR_ERR(gpiod); - if (!gpiod) - DBG("failed to get gpio: %s", name); - } - hdmi_cfg->gpios[i].gpiod = gpiod; - if (gpiod) - gpiod_set_consumer_name(gpiod, msm_hdmi_gpio_pdata[i].label); - hdmi_cfg->gpios[i].output = msm_hdmi_gpio_pdata[i].output; - hdmi_cfg->gpios[i].value = msm_hdmi_gpio_pdata[i].value; - } + hdmi->hpd_gpiod = devm_gpiod_get_optional(dev, "hpd", GPIOD_IN); + /* This will catch e.g. -PROBE_DEFER */ + if (IS_ERR(hdmi->hpd_gpiod)) + return PTR_ERR(hdmi->hpd_gpiod); + + if (!hdmi->hpd_gpiod) + DBG("failed to get HPD gpio"); + + if (hdmi->hpd_gpiod) + gpiod_set_consumer_name(hdmi->hpd_gpiod, "HDMI_HPD");
dev->platform_data = hdmi_cfg;
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h index 736f348befb3..a6c88d157bc3 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.h +++ b/drivers/gpu/drm/msm/hdmi/hdmi.h @@ -19,17 +19,9 @@ #include "msm_drv.h" #include "hdmi.xml.h"
-#define HDMI_MAX_NUM_GPIO 6 - struct hdmi_phy; struct hdmi_platform_config;
-struct hdmi_gpio_data { - struct gpio_desc *gpiod; - bool output; - int value; -}; - struct hdmi_audio { bool enabled; struct hdmi_audio_infoframe infoframe; @@ -61,6 +53,8 @@ struct hdmi { struct clk **hpd_clks; struct clk **pwr_clks;
+ struct gpio_desc *hpd_gpiod; + struct hdmi_phy *phy; struct device *phy_dev;
@@ -109,9 +103,6 @@ struct hdmi_platform_config { /* clks that need to be on for screen pwr (ie pixel clk): */ const char **pwr_clk_names; int pwr_clk_cnt; - - /* gpio's: */ - struct hdmi_gpio_data gpios[HDMI_MAX_NUM_GPIO]; };
struct hdmi_bridge { diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c b/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c index 75605ddac7c4..bfa827b47989 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c @@ -60,48 +60,6 @@ static void msm_hdmi_phy_reset(struct hdmi *hdmi) } }
-static int gpio_config(struct hdmi *hdmi, bool on) -{ - const struct hdmi_platform_config *config = hdmi->config; - int i; - - if (on) { - for (i = 0; i < HDMI_MAX_NUM_GPIO; i++) { - struct hdmi_gpio_data gpio = config->gpios[i]; - - if (gpio.gpiod) { - if (gpio.output) { - gpiod_direction_output(gpio.gpiod, - gpio.value); - } else { - gpiod_direction_input(gpio.gpiod); - gpiod_set_value_cansleep(gpio.gpiod, - gpio.value); - } - } - } - - DBG("gpio on"); - } else { - for (i = 0; i < HDMI_MAX_NUM_GPIO; i++) { - struct hdmi_gpio_data gpio = config->gpios[i]; - - if (!gpio.gpiod) - continue; - - if (gpio.output) { - int value = gpio.value ? 0 : 1; - - gpiod_set_value_cansleep(gpio.gpiod, value); - } - } - - DBG("gpio off"); - } - - return 0; -} - static void enable_hpd_clocks(struct hdmi *hdmi, bool enable) { const struct hdmi_platform_config *config = hdmi->config; @@ -154,11 +112,8 @@ int msm_hdmi_hpd_enable(struct drm_bridge *bridge) goto fail; }
- ret = gpio_config(hdmi, true); - if (ret) { - DRM_DEV_ERROR(dev, "failed to configure GPIOs: %d\n", ret); - goto fail; - } + if (hdmi->hpd_gpiod) + gpiod_set_value_cansleep(hdmi->hpd_gpiod, 1);
pm_runtime_get_sync(dev); enable_hpd_clocks(hdmi, true); @@ -207,10 +162,6 @@ void msm_hdmi_hpd_disable(struct hdmi_bridge *hdmi_bridge) enable_hpd_clocks(hdmi, false); pm_runtime_put(dev);
- ret = gpio_config(hdmi, false); - if (ret) - dev_warn(dev, "failed to unconfigure GPIOs: %d\n", ret); - ret = pinctrl_pm_select_sleep_state(dev); if (ret) dev_warn(dev, "pinctrl state chg failed: %d\n", ret); @@ -269,10 +220,7 @@ static enum drm_connector_status detect_reg(struct hdmi *hdmi) #define HPD_GPIO_INDEX 2 static enum drm_connector_status detect_gpio(struct hdmi *hdmi) { - const struct hdmi_platform_config *config = hdmi->config; - struct hdmi_gpio_data hpd_gpio = config->gpios[HPD_GPIO_INDEX]; - - return gpiod_get_value(hpd_gpio.gpiod) ? + return gpiod_get_value(hdmi->hpd_gpiod) ? connector_status_connected : connector_status_disconnected; } @@ -282,8 +230,6 @@ enum drm_connector_status msm_hdmi_bridge_detect( { struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge); struct hdmi *hdmi = hdmi_bridge->hdmi; - const struct hdmi_platform_config *config = hdmi->config; - struct hdmi_gpio_data hpd_gpio = config->gpios[HPD_GPIO_INDEX]; enum drm_connector_status stat_gpio, stat_reg; int retry = 20;
@@ -291,7 +237,7 @@ enum drm_connector_status msm_hdmi_bridge_detect( * some platforms may not have hpd gpio. Rely only on the status * provided by REG_HDMI_HPD_INT_STATUS in this case. */ - if (!hpd_gpio.gpiod) + if (!hdmi->hpd_gpiod) return detect_reg(hdmi);
do {
DB820c makes use of core-vcc-supply and core-vdda-supply, however the driver code doesn't support these regulators. Enable them for HDMI on 8996 platform.
Fixes: 0afbe59edd3f ("drm/msm/hdmi: Add basic HDMI support for msm8996") Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org --- drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 6a22d6977ead..125712c3fca2 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -399,7 +399,7 @@ static struct hdmi_platform_config hdmi_tx_8994_config = { };
static struct hdmi_platform_config hdmi_tx_8996_config = { - HDMI_CFG(pwr_reg, none), + HDMI_CFG(pwr_reg, 8x74), HDMI_CFG(hpd_reg, none), HDMI_CFG(pwr_clk, 8x74), HDMI_CFG(hpd_clk, 8x74),
Several platform configs use empty 'none' regulator arrays. They are not necessary, as the code will use corresponding _cnt field and skip the array completely. Drop them now.
Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org --- drivers/gpu/drm/msm/hdmi/hdmi.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 125712c3fca2..c87a0386647f 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -353,9 +353,6 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi, .item ## _names = item ##_names_ ## entry, \ .item ## _cnt = ARRAY_SIZE(item ## _names_ ## entry)
-static const char *pwr_reg_names_none[] = {}; -static const char *hpd_reg_names_none[] = {}; - static struct hdmi_platform_config hdmi_tx_8660_config;
static const char *hpd_reg_names_8960[] = {"core-vdda", "hdmi-mux"}; @@ -392,7 +389,6 @@ static struct hdmi_platform_config hdmi_tx_8084_config = {
static struct hdmi_platform_config hdmi_tx_8994_config = { HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(hpd_reg, none), HDMI_CFG(pwr_clk, 8x74), HDMI_CFG(hpd_clk, 8x74), .hpd_freq = hpd_clk_freq_8x74, @@ -400,7 +396,6 @@ static struct hdmi_platform_config hdmi_tx_8994_config = {
static struct hdmi_platform_config hdmi_tx_8996_config = { HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(hpd_reg, none), HDMI_CFG(pwr_clk, 8x74), HDMI_CFG(hpd_clk, 8x74), .hpd_freq = hpd_clk_freq_8x74,
The MSM HDMI driver has support for hpd_regs on 8x74/8084: supply regulators that are to be enabled for HPD to work. Currently these regulators contain the hpd_gdsc, which was replaced by the power-domains support and hpd-5v/hpd-5v-en, which are not used by the chip itself. They power up the ESD bridge. However it is a separate device which should be represented separately in the device tree. None of upstreamed devices support these properties. Thus drop support for them from the HDMI driver.
Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org --- drivers/gpu/drm/msm/hdmi/hdmi.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index c87a0386647f..03d8f97b0cd8 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -364,24 +364,19 @@ static struct hdmi_platform_config hdmi_tx_8960_config = { };
static const char *pwr_reg_names_8x74[] = {"core-vdda", "core-vcc"}; -static const char *hpd_reg_names_8x74[] = {"hpd-gdsc", "hpd-5v"}; static const char *pwr_clk_names_8x74[] = {"extp", "alt_iface"}; static const char *hpd_clk_names_8x74[] = {"iface", "core", "mdp_core"}; static unsigned long hpd_clk_freq_8x74[] = {0, 19200000, 0};
static struct hdmi_platform_config hdmi_tx_8974_config = { HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(hpd_reg, 8x74), HDMI_CFG(pwr_clk, 8x74), HDMI_CFG(hpd_clk, 8x74), .hpd_freq = hpd_clk_freq_8x74, };
-static const char *hpd_reg_names_8084[] = {"hpd-gdsc", "hpd-5v", "hpd-5v-en"}; - static struct hdmi_platform_config hdmi_tx_8084_config = { HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(hpd_reg, 8084), HDMI_CFG(pwr_clk, 8x74), HDMI_CFG(hpd_clk, 8x74), .hpd_freq = hpd_clk_freq_8x74,
Since there is no more difference between the HDMI platform data between MSM8974/APQ8084/MSM8994/MSM8996, merge these configs into a single entry.
Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org --- drivers/gpu/drm/msm/hdmi/hdmi.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-)
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 03d8f97b0cd8..8ae60e97cc94 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -375,27 +375,6 @@ static struct hdmi_platform_config hdmi_tx_8974_config = { .hpd_freq = hpd_clk_freq_8x74, };
-static struct hdmi_platform_config hdmi_tx_8084_config = { - HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(pwr_clk, 8x74), - HDMI_CFG(hpd_clk, 8x74), - .hpd_freq = hpd_clk_freq_8x74, -}; - -static struct hdmi_platform_config hdmi_tx_8994_config = { - HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(pwr_clk, 8x74), - HDMI_CFG(hpd_clk, 8x74), - .hpd_freq = hpd_clk_freq_8x74, -}; - -static struct hdmi_platform_config hdmi_tx_8996_config = { - HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(pwr_clk, 8x74), - HDMI_CFG(hpd_clk, 8x74), - .hpd_freq = hpd_clk_freq_8x74, -}; - /* * HDMI audio codec callbacks */ @@ -577,9 +556,9 @@ static int msm_hdmi_dev_remove(struct platform_device *pdev) }
static const struct of_device_id msm_hdmi_dt_match[] = { - { .compatible = "qcom,hdmi-tx-8996", .data = &hdmi_tx_8996_config }, - { .compatible = "qcom,hdmi-tx-8994", .data = &hdmi_tx_8994_config }, - { .compatible = "qcom,hdmi-tx-8084", .data = &hdmi_tx_8084_config }, + { .compatible = "qcom,hdmi-tx-8996", .data = &hdmi_tx_8974_config }, + { .compatible = "qcom,hdmi-tx-8994", .data = &hdmi_tx_8974_config }, + { .compatible = "qcom,hdmi-tx-8084", .data = &hdmi_tx_8974_config }, { .compatible = "qcom,hdmi-tx-8974", .data = &hdmi_tx_8974_config }, { .compatible = "qcom,hdmi-tx-8960", .data = &hdmi_tx_8960_config }, { .compatible = "qcom,hdmi-tx-8660", .data = &hdmi_tx_8660_config },
dri-devel@lists.freedesktop.org
-
David Heidelberg -
Dmitry Baryshkov -
Krzysztof Kozlowski