Skip to content

Commit 8c67e55

Browse files
konradybcioandersson
authored andcommitted
arm64: dts: qcom: Split out SA8155P and use correct RPMh power domains
The RPMhPD setup on SA8155P is different compared to SM8150. Correct it to ensure the platform will not try accessing forbidden/missing RPMh entries at boot, as a bad vote will hang the machine. Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> Tested-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Signed-off-by: Bjorn Andersson <andersson@kernel.org> Link: https://lore.kernel.org/r/20230411-topic-hanaau-v2-3-fd3d70844b31@linaro.org
1 parent 57a9d4b commit 8c67e55

File tree

2 files changed

+41
-1
lines changed

2 files changed

+41
-1
lines changed

arch/arm64/boot/dts/qcom/sa8155p-adp.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
99
#include <dt-bindings/gpio/gpio.h>
10-
#include "sm8150.dtsi"
10+
#include "sa8155p.dtsi"
1111
#include "pmm8155au_1.dtsi"
1212
#include "pmm8155au_2.dtsi"
1313

arch/arm64/boot/dts/qcom/sa8155p.dtsi

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
// SPDX-License-Identifier: BSD-3-Clause
2+
/*
3+
* Copyright (c) 2023, Linaro Limited
4+
*
5+
* SA8155P is an automotive variant of SM8150, with some minor changes.
6+
* Most notably, the RPMhPD setup differs: MMCX and LCX/LMX rails are gone,
7+
* though the cmd-db doesn't reflect that and access attemps result in a bite.
8+
*/
9+
10+
#include "sm8150.dtsi"
11+
12+
&dispcc {
13+
power-domains = <&rpmhpd SA8155P_CX>;
14+
};
15+
16+
&mdss_dsi0 {
17+
power-domains = <&rpmhpd SA8155P_CX>;
18+
};
19+
20+
&mdss_dsi1 {
21+
power-domains = <&rpmhpd SA8155P_CX>;
22+
};
23+
24+
&mdss_mdp {
25+
power-domains = <&rpmhpd SA8155P_CX>;
26+
};
27+
28+
&remoteproc_slpi {
29+
power-domains = <&rpmhpd SA8155P_CX>,
30+
<&rpmhpd SA8155P_MX>;
31+
};
32+
33+
&rpmhpd {
34+
/*
35+
* The bindings were crafted such that SA8155P PDs match their
36+
* SM8150 counterparts to make it more maintainable and only
37+
* necessitate adjusting entries that actually differ
38+
*/
39+
compatible = "qcom,sa8155p-rpmhpd";
40+
};

0 commit comments

Comments
 (0)