diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-11-07 01:41:17 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-07 01:41:17 -0800 |
| commit | f2a461d291eae68d32c2d4977090515e12b0daca (patch) | |
| tree | fc948b85fe153308b0242f0738192b5089fde3ff /arch | |
| parent | 91da619c3a57a7abcfa421200fd8aff275890772 (diff) | |
| parent | 4bf823c3a8e5a19381271662d46c1ddec61437ba (diff) | |
Merge "ARM: dts: msm: Remove the virtual plane implementation on msm8996"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi | 71 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi | 71 |
2 files changed, 0 insertions, 142 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi index 29cab2212088..a71749375aa5 100644 --- a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi @@ -549,77 +549,6 @@ &sde_kms { qcom,mdss-pref-prim-intf = "dsi"; - qcom,sde-plane-id-map { - qcom,sde-plane-id@0 { - reg = <0x0>; - qcom,display-type = "primary"; - qcom,plane-name = "rgb0", "rgb1"; - qcom,plane-type = "primary"; - }; - - qcom,sde-plane-id@1 { - reg = <0x1>; - qcom,display-type = "primary"; - qcom,plane-name = "vig0", "vig1"; - qcom,plane-type = "overlay"; - }; - - qcom,sde-plane-id@2 { - reg = <0x2>; - qcom,display-type = "primary"; - qcom,plane-name = "cursor0"; - qcom,plane-type = "cursor"; - }; - - qcom,sde-plane-id@3 { - reg = <0x3>; - qcom,display-type = "secondary"; - qcom,plane-name = "rgb2"; - qcom,plane-type = "primary"; - }; - - qcom,sde-plane-id@4 { - reg = <0x4>; - qcom,display-type = "secondary"; - qcom,plane-name = "vig2"; - qcom,plane-type = "overlay"; - }; - - qcom,sde-plane-id@5 { - reg = <0x5>; - qcom,display-type = "secondary"; - qcom,plane-name = "dma0"; - qcom,plane-type = "overlay"; - }; - - qcom,sde-plane-id@6 { - reg = <0x6>; - qcom,display-type = "secondary"; - qcom,plane-name = "cursor1"; - qcom,plane-type = "cursor"; - }; - - qcom,sde-plane-id@7 { - reg = <0x7>; - qcom,display-type = "tertiary"; - qcom,plane-name = "rgb3"; - qcom,plane-type = "primary"; - }; - - qcom,sde-plane-id@8 { - reg = <0x8>; - qcom,display-type = "tertiary"; - qcom,plane-name = "vig3"; - qcom,plane-type = "overlay"; - }; - - qcom,sde-plane-id@9 { - reg = <0x9>; - qcom,display-type = "tertiary"; - qcom,plane-name = "dma1"; - qcom,plane-type = "overlay"; - }; - }; }; &dsi_adv_7533_1 { diff --git a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi index 682a745b30e8..ef2bfe4eed57 100644 --- a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi @@ -335,77 +335,6 @@ &sde_kms { qcom,mdss-pref-prim-intf = "dsi"; - qcom,sde-plane-id-map { - qcom,sde-plane-id@0 { - reg = <0x0>; - qcom,display-type = "primary"; - qcom,plane-name = "rgb0", "rgb1"; - qcom,plane-type = "primary"; - }; - - qcom,sde-plane-id@1 { - reg = <0x1>; - qcom,display-type = "primary"; - qcom,plane-name = "vig0", "vig1"; - qcom,plane-type = "overlay"; - }; - - qcom,sde-plane-id@2 { - reg = <0x2>; - qcom,display-type = "primary"; - qcom,plane-name = "cursor0"; - qcom,plane-type = "cursor"; - }; - - qcom,sde-plane-id@3 { - reg = <0x3>; - qcom,display-type = "secondary"; - qcom,plane-name = "rgb2"; - qcom,plane-type = "primary"; - }; - - qcom,sde-plane-id@4 { - reg = <0x4>; - qcom,display-type = "secondary"; - qcom,plane-name = "vig2"; - qcom,plane-type = "overlay"; - }; - - qcom,sde-plane-id@5 { - reg = <0x5>; - qcom,display-type = "secondary"; - qcom,plane-name = "dma0"; - qcom,plane-type = "overlay"; - }; - - qcom,sde-plane-id@6 { - reg = <0x6>; - qcom,display-type = "secondary"; - qcom,plane-name = "cursor1"; - qcom,plane-type = "cursor"; - }; - - qcom,sde-plane-id@7 { - reg = <0x7>; - qcom,display-type = "tertiary"; - qcom,plane-name = "rgb3"; - qcom,plane-type = "primary"; - }; - - qcom,sde-plane-id@8 { - reg = <0x8>; - qcom,display-type = "tertiary"; - qcom,plane-name = "vig3"; - qcom,plane-type = "overlay"; - }; - - qcom,sde-plane-id@9 { - reg = <0x9>; - qcom,display-type = "tertiary"; - qcom,plane-name = "dma1"; - qcom,plane-type = "overlay"; - }; - }; }; &dsi_adv_7533_1 { |