Skip to content

Commit 0638dc2

Browse files
committed
Merge tag 'qcom-arm64-fixes-for-6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes
Qualcomm Arm64 DeviceTree fixes for v6.19 Add missing power-domains to the SC8280XP RPM power-domain and ensure these are voted for from the remoteproc instances while powering them up. Clear a couple of DeviceTree validation warnings in SM8550 and SM8650 USB controller nodes. Specify the correct display panel on the OnePlus 6. Correct the UFS clock mapping on Talos, to ensure UFS is properly clocked. Add Abel's old emails address to .mailmap. * tag 'qcom-arm64-fixes-for-6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: dts: qcom: sm8650: Fix compile warnings in USB controller node arm64: dts: qcom: sm8550: Fix compile warnings in USB controller node arm64: dts: qcom: sc8280xp: Add missing VDD_MXC links pmdomain: qcom: rpmhpd: Add MXC to SC8280XP dt-bindings: power: qcom,rpmpd: Add SC8280XP_MXC_AO arm64: dts qcom: sdm845-oneplus-enchilada: Specify panel name within the compatible mailmap: Update email address for Abel Vesa arm64: dts: qcom: talos: Correct UFS clocks ordering Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 0240c89 + 1f6ca55 commit 0638dc2

8 files changed

Lines changed: 22 additions & 13 deletions

File tree

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#
1313
Aaron Durbin <adurbin@google.com>
1414
Abel Vesa <abelvesa@kernel.org> <abel.vesa@nxp.com>
15+
Abel Vesa <abelvesa@kernel.org> <abel.vesa@linaro.org>
1516
Abel Vesa <abelvesa@kernel.org> <abelvesa@gmail.com>
1617
Abhijeet Dharmapurikar <quic_adharmap@quicinc.com> <adharmap@codeaurora.org>
1718
Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5788,8 +5788,12 @@
57885788
clocks = <&rpmhcc RPMH_CXO_CLK>;
57895789
clock-names = "xo";
57905790

5791-
power-domains = <&rpmhpd SC8280XP_NSP>;
5792-
power-domain-names = "nsp";
5791+
power-domains = <&rpmhpd SC8280XP_NSP>,
5792+
<&rpmhpd SC8280XP_CX>,
5793+
<&rpmhpd SC8280XP_MXC>;
5794+
power-domain-names = "nsp",
5795+
"cx",
5796+
"mxc";
57935797

57945798
memory-region = <&pil_nsp0_mem>;
57955799

@@ -5919,8 +5923,12 @@
59195923
clocks = <&rpmhcc RPMH_CXO_CLK>;
59205924
clock-names = "xo";
59215925

5922-
power-domains = <&rpmhpd SC8280XP_NSP>;
5923-
power-domain-names = "nsp";
5926+
power-domains = <&rpmhpd SC8280XP_NSP>,
5927+
<&rpmhpd SC8280XP_CX>,
5928+
<&rpmhpd SC8280XP_MXC>;
5929+
power-domain-names = "nsp",
5930+
"cx",
5931+
"mxc";
59245932

59255933
memory-region = <&pil_nsp1_mem>;
59265934

arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
};
3232

3333
&display_panel {
34-
status = "okay";
34+
compatible = "samsung,sofef00-ams628nw01", "samsung,sofef00";
3535

36-
compatible = "samsung,sofef00";
36+
status = "okay";
3737
};
3838

3939
&bq27441_fg {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4133,8 +4133,6 @@
41334133
usb_1: usb@a600000 {
41344134
compatible = "qcom,sm8550-dwc3", "qcom,snps-dwc3";
41354135
reg = <0x0 0x0a600000 0x0 0xfc100>;
4136-
#address-cells = <1>;
4137-
#size-cells = <0>;
41384136

41394137
clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
41404138
<&gcc GCC_USB30_PRIM_MASTER_CLK>,

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5150,9 +5150,6 @@
51505150

51515151
dma-coherent;
51525152

5153-
#address-cells = <1>;
5154-
#size-cells = <0>;
5155-
51565153
status = "disabled";
51575154

51585155
ports {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,10 +1399,10 @@
13991399
<&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
14001400
<&gcc GCC_UFS_PHY_AHB_CLK>,
14011401
<&gcc GCC_UFS_PHY_UNIPRO_CORE_CLK>,
1402-
<&gcc GCC_UFS_PHY_ICE_CORE_CLK>,
14031402
<&rpmhcc RPMH_CXO_CLK>,
14041403
<&gcc GCC_UFS_PHY_TX_SYMBOL_0_CLK>,
1405-
<&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>;
1404+
<&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>,
1405+
<&gcc GCC_UFS_PHY_ICE_CORE_CLK>;
14061406
clock-names = "core_clk",
14071407
"bus_aggr_clk",
14081408
"iface_clk",

drivers/pmdomain/qcom/rpmhpd.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,8 @@ static struct rpmhpd *sa8540p_rpmhpds[] = {
246246
[SC8280XP_MMCX_AO] = &mmcx_ao,
247247
[SC8280XP_MX] = &mx,
248248
[SC8280XP_MX_AO] = &mx_ao,
249+
[SC8280XP_MXC] = &mxc,
250+
[SC8280XP_MXC_AO] = &mxc_ao,
249251
[SC8280XP_NSP] = &nsp,
250252
};
251253

@@ -700,6 +702,8 @@ static struct rpmhpd *sc8280xp_rpmhpds[] = {
700702
[SC8280XP_MMCX_AO] = &mmcx_ao,
701703
[SC8280XP_MX] = &mx,
702704
[SC8280XP_MX_AO] = &mx_ao,
705+
[SC8280XP_MXC] = &mxc,
706+
[SC8280XP_MXC_AO] = &mxc_ao,
703707
[SC8280XP_NSP] = &nsp,
704708
[SC8280XP_QPHY] = &qphy,
705709
};

include/dt-bindings/power/qcom,rpmhpd.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,5 +264,6 @@
264264
#define SC8280XP_NSP 13
265265
#define SC8280XP_QPHY 14
266266
#define SC8280XP_XO 15
267+
#define SC8280XP_MXC_AO 16
267268

268269
#endif

0 commit comments

Comments
 (0)