Merge commit '4648e8647fbbd3d2adb983711a54a1c67b7e2bd0' into display-kernel.lnx.11.0.r1-rel

Change-Id: Iff889dc72250b8357aec812ad4d8c1c7508b8a33
Signed-off-by: Rohit Jadhav <quic_rbjadhav@quicinc.com>
This commit is contained in:
Rohit Jadhav
2025-03-07 13:01:03 +05:30
3 changed files with 12 additions and 6 deletions

View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
/* /*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -31,6 +31,9 @@
qcom,sde-off = <0x1000>; qcom,sde-off = <0x1000>;
qcom,sde-len = <0x488>; qcom,sde-len = <0x488>;
qcom,sde-ctl-hyp-off = <0x15000>;
qcom,sde-ctl-hyp-size = <0xc00>;
qcom,sde-ctl-off = <0x16000 0x17000 0x18000 0x19000>; qcom,sde-ctl-off = <0x16000 0x17000 0x18000 0x19000>;
qcom,sde-ctl-size = <0x1000>; qcom,sde-ctl-size = <0x1000>;
qcom,sde-ctl-display-pref = "primary", "none", "none", "none"; qcom,sde-ctl-display-pref = "primary", "none", "none", "none";

View File

@@ -218,8 +218,10 @@
<0xaf33000 0x30>, <0xaf33000 0x30>,
<0xaf34000 0x30>, <0xaf34000 0x30>,
<0xaf35000 0x30>, <0xaf35000 0x30>,
<0xaf36000 0x30>; <0xaf36000 0x30>,
reg-names = "rscc", "wrapper", "scc_0", "scc_1", "scc_2", "scc_3", "scc_4", "scc_5"; <0xaf0f000 0x10>;
reg-names = "rscc", "wrapper", "scc_0", "scc_1", "scc_2", "scc_3", "scc_4", "scc_5",
"disp_cc";
clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>, clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>,
<&dispcc DISP_CC_MDSS_MDP_CLK_SRC>, <&dispcc DISP_CC_MDSS_MDP_CLK_SRC>,

View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
/* /*
* Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h> #include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
@@ -222,8 +222,9 @@
<0xaf33000 0x30>, <0xaf33000 0x30>,
<0xaf34000 0x30>, <0xaf34000 0x30>,
<0xaf35000 0x30>, <0xaf35000 0x30>,
<0xaf36000 0x30>; <0xaf36000 0x30>,
reg-names = "rscc", "wrapper", "scc_0", "scc_1", "scc_2", "scc_3", "scc_4", "scc_5"; <0xaf0f000 0x10>;
reg-names = "rscc", "wrapper", "scc_0", "scc_1", "scc_2", "scc_3", "scc_4", "scc_5", "disp_cc";
clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>, clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>,
<&dispcc DISP_CC_MDSS_MDP_CLK_SRC>, <&dispcc DISP_CC_MDSS_MDP_CLK_SRC>,