diff options
| author | Linaro CI <ci_notify@linaro.org> | 2023-01-01 22:42:29 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2023-01-01 22:42:29 +0000 |
| commit | f09483b70c9809f1789cab40dc84aa5d9c56f13c (patch) | |
| tree | d7833f0da9cf0b4ad6ffb9b378da30148e4a192a /arch/arm64/boot/dts/qcom/msm8916.dtsi | |
| parent | 9651615555ab990ba813fd27da33659721879b40 (diff) | |
| parent | a0bcf59d5a883bf1ea5b4adc4b384dc6c71b5c19 (diff) | |
Merge remote-tracking branch 'msm8939/tracking-qcomlt-msm8939' into integration-linux-qcomltintegration-linux-qcomlt-20230101-233741-v6.2-rc2-353-gf09483b70c980
# Conflicts:
# Documentation/devicetree/bindings/arm/qcom.yaml
# arch/arm64/boot/dts/qcom/Makefile
Diffstat (limited to 'arch/arm64/boot/dts/qcom/msm8916.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8916.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 2ae21c5ade03..61a503d279b3 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1094,7 +1094,8 @@ }; dsi0: dsi@1a98000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,msm8916-dsi-ctrl", + "qcom,mdss-dsi-ctrl"; reg = <0x01a98000 0x25c>; reg-names = "dsi_ctrl"; |