Skip to content

Commit ce04864

Browse files
committed
Merge tag 'qcom-arm64-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
A few Qualcomm Arm64 DeviceTree fixes for v6.9 This corrects the orientation of the panel of Xiaomi Pad 5 Pro, and corrects a typo in the size of the SPMI channel register size in both SM8550 and SM8650. * tag 'qcom-arm64-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: dts: qcom: sm8250-xiaomi-elish: set rotation arm64: dts: qcom: sm8650: Fix SPMI channels size arm64: dts: qcom: sm8550: Fix SPMI channels size Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents befb226 + 2219626 commit ce04864

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: BSD-3-Clause
22
/*
3-
* Copyright (c) 2022, 2023 Jianhua Lu <[email protected]>
3+
* Copyright (c) 2022-2024 Jianhua Lu <[email protected]>
44
*/
55

66
#include <dt-bindings/arm/qcom,ids.h>
@@ -551,6 +551,7 @@
551551
vddio-supply = <&vreg_l14a_1p88>;
552552
reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;
553553
backlight = <&backlight>;
554+
rotation = <90>;
554555

555556
status = "disabled";
556557

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3318,7 +3318,7 @@
33183318
spmi_bus: spmi@c400000 {
33193319
compatible = "qcom,spmi-pmic-arb";
33203320
reg = <0 0x0c400000 0 0x3000>,
3321-
<0 0x0c500000 0 0x4000000>,
3321+
<0 0x0c500000 0 0x400000>,
33223322
<0 0x0c440000 0 0x80000>,
33233323
<0 0x0c4c0000 0 0x20000>,
33243324
<0 0x0c42d000 0 0x4000>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3749,7 +3749,7 @@
37493749
spmi_bus: spmi@c400000 {
37503750
compatible = "qcom,spmi-pmic-arb";
37513751
reg = <0 0x0c400000 0 0x3000>,
3752-
<0 0x0c500000 0 0x4000000>,
3752+
<0 0x0c500000 0 0x400000>,
37533753
<0 0x0c440000 0 0x80000>,
37543754
<0 0x0c4c0000 0 0x20000>,
37553755
<0 0x0c42d000 0 0x4000>;

0 commit comments

Comments
 (0)