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@xxxxxxx>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
> .../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@xxxxxxxxx>
> +
> +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-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
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@xxxxxxxxx>
> +
> +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: 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
> +
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@xxxxxxxxx>
> +
> +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
