diff options
author | Linaro CI <ci_notify@linaro.org> | 2022-08-19 16:56:14 +0000 |
---|---|---|
committer | Linaro CI <ci_notify@linaro.org> | 2022-08-19 16:56:14 +0000 |
commit | afb2213757465a1a6b10034879d97e3190862ca7 (patch) | |
tree | 22711179f237383ecdca6ca1595563cdd194a6dd /Documentation | |
parent | e9430ee415a716606555b1d09712d9e20affaf2d (diff) | |
parent | 4387480e74dd43dc3b76b7ac4a5317062a8b4c12 (diff) |
Merge remote-tracking branch 'msm8939/tracking-qcomlt-msm8939' into integration-linux-qcomltintegration-linux-qcomlt-20220822-012620-v6.0-rc1-154-gafb2213757465a
Diffstat (limited to 'Documentation')
6 files changed, 111 insertions, 17 deletions
diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml index fb1d00bcc847..7766559f3081 100644 --- a/Documentation/devicetree/bindings/arm/qcom.yaml +++ b/Documentation/devicetree/bindings/arm/qcom.yaml @@ -34,6 +34,7 @@ description: | mdm9615 msm8226 msm8916 + msm8939 msm8974 msm8992 msm8994 @@ -150,6 +151,12 @@ properties: - items: - enum: + - sony,kanuti-tulip + - square,apq8039-t2 + - const: qcom,msm8939 + + - items: + - enum: - qcom,msm8960-cdp - const: qcom,msm8960 diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml index 880bfe930830..d7cc702f5a5d 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml @@ -35,22 +35,67 @@ properties: - description: Display escape clock - description: Display AHB clock - description: Display AXI clock + - description: Core MultiMedia SubSystem clock + - description: MDP Core clock + - description: MNOC clock + minItems: 6 + maxItems: 9 clock-names: - items: - - const: byte - - const: byte_intf - - const: pixel - - const: core - - const: iface - - const: bus + oneOf: + - items: + - const: byte + - const: byte_intf + - const: pixel + - const: core + - const: iface + - const: bus + - items: + - const: mdp_core + - const: byte + - const: byte_intf + - const: mnoc + - const: iface + - const: bus + - const: core_mmss + - const: pixel + - const: core + - items: + - const: mdp_core + - const: byte + - const: iface + - const: bus + - const: core_mmss + - const: pixel + - const: core + - items: + - const: mdp_core + - const: iface + - const: bus + - const: byte + - const: pixel + - const: core + - const: core_mmss + - items: + - const: mdp_core + - const: iface + - const: bus + - const: byte + - const: pixel + - const: core + - items: + # DSI v2 + - const: iface + - const: bus + - const: core_mmss + - const: src + - const: byte + - const: pixel + - const: core phys: maxItems: 1 - phy-names: - const: dsi - "#address-cells": true "#size-cells": true @@ -125,6 +170,18 @@ properties: - port@0 - port@1 + vdd-supply: + description: + Phandle to vdd regulator device node + + vddio-supply: + description: + Phandle to vdd-io regulator device node + + vdda-supply: + description: + Phandle to vdda regulator device node + required: - compatible - reg @@ -133,11 +190,9 @@ required: - clocks - clock-names - phys - - phy-names - assigned-clocks - assigned-clock-parents - power-domains - - operating-points-v2 - ports additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml b/Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml index 3d8540a06fe2..f76ffb031409 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml @@ -19,12 +19,33 @@ properties: - qcom,dsi-phy-28nm-lp - qcom,dsi-phy-28nm-8960 + clocks: + minItems: 2 + + clock-names: + items: + - const: iface + description: AHB clock + - const: ref + description: Block reference clock + minItems: 2 + + '#clock-cells': + const: 1 + + "#phy-cells": + const: 0 + reg: items: - description: dsi pll register set - description: dsi phy register set - description: dsi phy regulator register set + qcom,dsi-phy-regulator-ldo-mode: + type: boolean + description: Indicates if the LDO mode PHY regulator is wanted. + reg-names: items: - const: dsi_pll @@ -36,6 +57,10 @@ properties: required: - compatible + - clocks + - clock-names + - "#clock-cells" + - "#phy-cells" - reg - reg-names - vddio-supply diff --git a/Documentation/devicetree/bindings/display/msm/gpu.yaml b/Documentation/devicetree/bindings/display/msm/gpu.yaml index 3397bc31d087..a750dc2a2579 100644 --- a/Documentation/devicetree/bindings/display/msm/gpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/gpu.yaml @@ -58,7 +58,7 @@ properties: - const: ocmem iommus: - maxItems: 1 + maxItems: 2 sram: $ref: /schemas/types.yaml#/definitions/phandle-array diff --git a/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml b/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml index 6a9c96f0352a..1bc412a4ac5e 100644 --- a/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml +++ b/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml @@ -27,10 +27,14 @@ properties: interrupt-names: minItems: 1 - items: - - const: usb_id - - const: usb_vbus - + anyOf: + - items: + - const: usb_id + - const: usb_vbus + - items: + - const: usb_id + - items: + - const: usb_vbus required: - compatible - reg diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt index ba51fb1252b9..6b5b9b422ad5 100644 --- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt @@ -90,6 +90,9 @@ Optional properties: case, the "idle" state needs to pull down the data and strobe pin and the "active" state needs to pull up the strobe pin. - pinctrl-n: alternate pin modes +- pin-switch-delay-us: the optional delay time in (us) to allow for the + application of a pinctrl-n state switch. + i.mx specific properties - fsl,usbmisc: phandler of non-core register device, with one |