From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Add the CAMCC block for x1e80100. The x1e80100 CAMCC block is an iteration
of previous CAMCC blocks with the exception of having two required
power-domains not just one. And update the compatible for camcc and
videocc nodes on Purwa to match with their respective Purwa (X1P42100)
specific drivers.
Fixes: a8a5ea012471 ("arm64: dts: qcom: x1e80100: Add videocc")
Reviewed-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>
Signed-off-by: Jagadeesh Kona <jagadeesh.kona@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/hamoa.dtsi | 17 +++++++++++++++++
arch/arm64/boot/dts/qcom/purwa.dtsi | 10 ++++++++++
2 files changed, 27 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/hamoa.dtsi b/arch/arm64/boot/dts/qcom/hamoa.dtsi
index db65c392e6189920a137169b14b607c6acac6ce9..029ec012d0a94b05f8d4356ba4a95badeda65c39 100644
--- a/arch/arm64/boot/dts/qcom/hamoa.dtsi
+++ b/arch/arm64/boot/dts/qcom/hamoa.dtsi
@@ -6,6 +6,7 @@
#include <dt-bindings/clock/qcom,rpmh.h>
#include <dt-bindings/clock/qcom,sc8280xp-lpasscc.h>
#include <dt-bindings/clock/qcom,sm8450-videocc.h>
+#include <dt-bindings/clock/qcom,x1e80100-camcc.h>
#include <dt-bindings/clock/qcom,x1e80100-dispcc.h>
#include <dt-bindings/clock/qcom,x1e80100-gcc.h>
#include <dt-bindings/clock/qcom,x1e80100-gpucc.h>
@@ -5464,6 +5465,22 @@ videocc: clock-controller@aaf0000 {
#power-domain-cells = <1>;
};
+ camcc: clock-controller@ade0000 {
+ compatible = "qcom,x1e80100-camcc";
+ reg = <0 0x0ade0000 0 0x20000>;
+ clocks = <&gcc GCC_CAMERA_AHB_CLK>,
+ <&bi_tcxo_div2>,
+ <&bi_tcxo_ao_div2>,
+ <&sleep_clk>;
+ power-domains = <&rpmhpd RPMHPD_MXC>,
+ <&rpmhpd RPMHPD_MMCX>;
+ required-opps = <&rpmhpd_opp_low_svs>,
+ <&rpmhpd_opp_low_svs>;
+ #clock-cells = <1>;
+ #reset-cells = <1>;
+ #power-domain-cells = <1>;
+ };
+
mdss: display-subsystem@ae00000 {
compatible = "qcom,x1e80100-mdss";
reg = <0 0x0ae00000 0 0x1000>;
diff --git a/arch/arm64/boot/dts/qcom/purwa.dtsi b/arch/arm64/boot/dts/qcom/purwa.dtsi
index 2cecd2dd0de8c39f0702d6983bead2bc2adccf9b..46ffe5353f3d2fe20e70fa8373c2591863708c61 100644
--- a/arch/arm64/boot/dts/qcom/purwa.dtsi
+++ b/arch/arm64/boot/dts/qcom/purwa.dtsi
@@ -6,6 +6,8 @@
/* X1P42100 is heavily based on hamoa, with some meaningful differences */
#include "hamoa.dtsi"
+#include <dt-bindings/clock/qcom,sm8650-videocc.h>
+
/delete-node/ &bwmon_cluster0;
/delete-node/ &cluster_pd2;
/delete-node/ &cpu_map_cluster2;
@@ -22,10 +24,18 @@
/delete-node/ &pcie3_phy;
/delete-node/ &thermal_zones;
+&camcc {
+ compatible = "qcom,x1p42100-camcc";
+};
+
&gcc {
compatible = "qcom,x1p42100-gcc", "qcom,x1e80100-gcc";
};
+&videocc {
+ compatible = "qcom,x1p42100-videocc";
+};
+
&gmu {
compatible = "qcom,adreno-gmu-x145.0", "qcom,adreno-gmu";
};
--
2.34.1On 04/03/2026 18:40, Jagadeesh Kona wrote:
> From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
>
> Add the CAMCC block for x1e80100. The x1e80100 CAMCC block is an iteration
> of previous CAMCC blocks with the exception of having two required
> power-domains not just one. And update the compatible for camcc and
> videocc nodes on Purwa to match with their respective Purwa (X1P42100)
> specific drivers.
>
> Fixes: a8a5ea012471 ("arm64: dts: qcom: x1e80100: Add videocc")
How is this a fix? Describe the user-observable bug in such case.
> Reviewed-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>
Three people reviewed this...
Best regards,
Krzysztof
On 05/03/2026 12:58, Krzysztof Kozlowski wrote:
> On 04/03/2026 18:40, Jagadeesh Kona wrote:
>> From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
>>
>> Add the CAMCC block for x1e80100. The x1e80100 CAMCC block is an iteration
>> of previous CAMCC blocks with the exception of having two required
>> power-domains not just one. And update the compatible for camcc and
>> videocc nodes on Purwa to match with their respective Purwa (X1P42100)
>> specific drivers.
>>
>> Fixes: a8a5ea012471 ("arm64: dts: qcom: x1e80100: Add videocc")
>
> How is this a fix? Describe the user-observable bug in such case.
>
>> Reviewed-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
>> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
>> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
>> Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>
>
> Three people reviewed this...
>
Actually I checked now - all the people reviewed commit without fixes
tag and you just added.
OK, this starts looking bad because it is more of such patterns from
Qualcomm these two weeks.
Stop funneling features into LTS kernels.
NAK
Best regards,
Krzysztof
On 3/5/2026 5:30 PM, Krzysztof Kozlowski wrote:
> On 05/03/2026 12:58, Krzysztof Kozlowski wrote:
>> On 04/03/2026 18:40, Jagadeesh Kona wrote:
>>> From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
>>>
>>> Add the CAMCC block for x1e80100. The x1e80100 CAMCC block is an iteration
>>> of previous CAMCC blocks with the exception of having two required
>>> power-domains not just one. And update the compatible for camcc and
>>> videocc nodes on Purwa to match with their respective Purwa (X1P42100)
>>> specific drivers.
>>>
>>> Fixes: a8a5ea012471 ("arm64: dts: qcom: x1e80100: Add videocc")
>>
>> How is this a fix? Describe the user-observable bug in such case.
>>
>>> Reviewed-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
>>> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
>>> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
>>> Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>
>>
>> Three people reviewed this...
>>
>
> Actually I checked now - all the people reviewed commit without fixes
> tag and you just added.
>
> OK, this starts looking bad because it is more of such patterns from
> Qualcomm these two weeks.
>
> Stop funneling features into LTS kernels.
>
> NAK
>
There was a comment in previous series to add fixes tag for Purwa DT
change that updates the compatible for videocc & camcc nodes since Purwa
was using incorrect drivers currently, and squash that patch into this
change.
Since I squashed that other patch into this change, I added fixes tag to
this change, I will drop fixes tag in the next series.
Thanks,
Jagadeesh
On 06/03/2026 15:58, Jagadeesh Kona wrote:
>
>
> On 3/5/2026 5:30 PM, Krzysztof Kozlowski wrote:
>> On 05/03/2026 12:58, Krzysztof Kozlowski wrote:
>>> On 04/03/2026 18:40, Jagadeesh Kona wrote:
>>>> From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
>>>>
>>>> Add the CAMCC block for x1e80100. The x1e80100 CAMCC block is an iteration
>>>> of previous CAMCC blocks with the exception of having two required
>>>> power-domains not just one. And update the compatible for camcc and
>>>> videocc nodes on Purwa to match with their respective Purwa (X1P42100)
>>>> specific drivers.
>>>>
>>>> Fixes: a8a5ea012471 ("arm64: dts: qcom: x1e80100: Add videocc")
>>>
>>> How is this a fix? Describe the user-observable bug in such case.
>>>
>>>> Reviewed-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
>>>> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
>>>> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
>>>> Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>
>>>
>>> Three people reviewed this...
>>>
>>
>> Actually I checked now - all the people reviewed commit without fixes
>> tag and you just added.
>>
>> OK, this starts looking bad because it is more of such patterns from
>> Qualcomm these two weeks.
>>
>> Stop funneling features into LTS kernels.
>>
>> NAK
>>
>
> There was a comment in previous series to add fixes tag for Purwa DT
> change that updates the compatible for videocc & camcc nodes since Purwa
> was using incorrect drivers currently, and squash that patch into this
> change.
Fixes cannot be ever squashed with some other work.
>
> Since I squashed that other patch into this change, I added fixes tag to
> this change, I will drop fixes tag in the next series.
>
Best regards,
Krzysztof
On 05/03/2026 12:00, Krzysztof Kozlowski wrote: > Actually I checked now - all the people reviewed commit without fixes > tag and you just added. Eh ... Please don't do that with my SoB patch ! --- bod
On 3/5/2026 6:41 PM, Bryan O'Donoghue wrote: > On 05/03/2026 12:00, Krzysztof Kozlowski wrote: >> Actually I checked now - all the people reviewed commit without fixes >> tag and you just added. > > Eh ... > > Please don't do that with my SoB patch ! > Sorry, based on comments on v1, I squashed other Purwa DT patch to this change and added fixes tag. I will drop the fixes tag in next series. Thanks, Jagadeesh
© 2016 - 2026 Red Hat, Inc.