Skip to content

Commit bf1ae36

Browse files
MarijnS95opsiff
authored andcommitted
arm64: dts: qcom: sm6125: Sort spmi_bus node numerically by reg
mainline inclusion from mainline-6.7-rc1 category: bugfix This node has always resided in the wrong spot, making it somewhat harder to contribute new node entries while maintaining proper sorting around it. Move the node up to sit after hsusb_phy1 where it maintains proper numerical sorting on the (first of its many) reg address property. Fixes: cff4bba ("arm64: dts: qcom: Add support for SM6125") Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> Link: https://lore.kernel.org/r/20230723-sm6125-dpu-v4-3-a3f287dd6c07@somainline.org Signed-off-by: Bjorn Andersson <andersson@kernel.org> (cherry picked from commit 3d06cee) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent ba87fe5 commit bf1ae36

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,24 @@
683683
status = "disabled";
684684
};
685685

686+
spmi_bus: spmi@1c40000 {
687+
compatible = "qcom,spmi-pmic-arb";
688+
reg = <0x01c40000 0x1100>,
689+
<0x01e00000 0x2000000>,
690+
<0x03e00000 0x100000>,
691+
<0x03f00000 0xa0000>,
692+
<0x01c0a000 0x26000>;
693+
reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";
694+
interrupt-names = "periph_irq";
695+
interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>;
696+
qcom,ee = <0>;
697+
qcom,channel = <0>;
698+
#address-cells = <2>;
699+
#size-cells = <0>;
700+
interrupt-controller;
701+
#interrupt-cells = <4>;
702+
};
703+
686704
rpm_msg_ram: sram@45f0000 {
687705
compatible = "qcom,rpm-msg-ram";
688706
reg = <0x045f0000 0x7000>;
@@ -1192,24 +1210,6 @@
11921210
reg = <0x04690000 0x10000>;
11931211
};
11941212

1195-
spmi_bus: spmi@1c40000 {
1196-
compatible = "qcom,spmi-pmic-arb";
1197-
reg = <0x01c40000 0x1100>,
1198-
<0x01e00000 0x2000000>,
1199-
<0x03e00000 0x100000>,
1200-
<0x03f00000 0xa0000>,
1201-
<0x01c0a000 0x26000>;
1202-
reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";
1203-
interrupt-names = "periph_irq";
1204-
interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>;
1205-
qcom,ee = <0>;
1206-
qcom,channel = <0>;
1207-
#address-cells = <2>;
1208-
#size-cells = <0>;
1209-
interrupt-controller;
1210-
#interrupt-cells = <4>;
1211-
};
1212-
12131213
apps_smmu: iommu@c600000 {
12141214
compatible = "qcom,sm6125-smmu-500", "qcom,smmu-500", "arm,mmu-500";
12151215
reg = <0x0c600000 0x80000>;

0 commit comments

Comments
 (0)