diff options
| author | Linaro CI <ci_notify@linaro.org> | 2023-04-26 13:36:23 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2023-04-26 13:36:23 +0000 |
| commit | 0cbce2f2a7c7ca2306237779fd347652e95435c2 (patch) | |
| tree | 54b901661ce8af0a6ad909a78463b9f914d22686 /Documentation/devicetree/bindings | |
| parent | 180372937c12b16a3d4e1a774578c2c754545905 (diff) | |
| parent | a0bcf59d5a883bf1ea5b4adc4b384dc6c71b5c19 (diff) | |
Merge remote-tracking branch 'msm8939/tracking-qcomlt-msm8939' into integration-linux-qcomlt
# Conflicts:
# Documentation/devicetree/bindings/arm/qcom.yaml
# Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml
# arch/arm64/boot/dts/qcom/Makefile
# arch/arm64/boot/dts/qcom/sdm630.dtsi
Diffstat (limited to 'Documentation/devicetree/bindings')
5 files changed, 42 insertions, 9 deletions
diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml index e75a3efe4dac..91e4c5ad7168 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml @@ -328,6 +328,7 @@ allOf: compatible: contains: enum: + - qcom,sdm630-dsi-ctrl - qcom,sdm660-dsi-ctrl then: properties: diff --git a/Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml b/Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml index cf4a338c4661..21e90cec5832 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml @@ -20,12 +20,30 @@ properties: - qcom,dsi-phy-28nm-lp - qcom,dsi-phy-28nm-8960 + clocks: + maxItems: 2 + + clock-names: + - items: + - const: iface + - const: ref + + '#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 @@ -41,6 +59,10 @@ properties: required: - compatible + - clocks + - clock-names + - "#clock-cells" + - "#phy-cells" - reg - reg-names - vddio-supply 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/sound/qcom,lpass-cpu.yaml b/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml index 6cc8f86c7531..05447acc9bb0 100644 --- a/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml @@ -18,11 +18,14 @@ description: | properties: compatible: - enum: - - qcom,lpass-cpu - - qcom,apq8016-lpass-cpu - - qcom,sc7180-lpass-cpu - - qcom,sc7280-lpass-cpu + oneOf: + - enum: + - qcom,lpass-cpu + - qcom,apq8016-lpass-cpu + - qcom,sc7180-lpass-cpu + - qcom,sc7280-lpass-cpu + - const: qcom,lpass-cpu-apq8016 + deprecated: true reg: minItems: 1 diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt index 72ceea575d58..b2bbbff081ba 100644 --- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt @@ -91,6 +91,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 |