Skip to content

Commit bcec291

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-fixes-for-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes
Qualcomm Arm64 DeviceTree fixes for v6.10 This marks the PSHOLD node on SC8280XP as reserved, to resolve a regression where a reset is triggered instead of a clean shutdown. Also on SC8280XP the touchscreen properties are adjusted to make it properly described on CRD and make it work on the Lenovo Thinkpad X13s. Corrects the LLCC definitions on SC8180X and QDU1000 to allow these drivers and their dependencies to probe. X1 Elite CRD is given more CMA space, to avoid running out during boot, as PCIe SMMU is not accessible. Audio configuration is corrected, on the same. SM6115 SDHC is given an IOMMU stream, to avoid access issues. Lastly the EL2 non-secure physical timer interrupt on SA8775P is corrected from its previous incorrect value. * tag 'qcom-arm64-fixes-for-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: dts: qcom: qdu1000: Fix LLCC reg property arm64: dts: qcom: sm6115: add iommu for sdhc_1 arm64: dts: qcom: x1e80100-crd: fix DAI used for headset recording arm64: dts: qcom: x1e80100-crd: fix WCD audio codec TX port mapping arm64: dts: qcom: sc8280xp-crd: use external pull up for touch reset arm64: dts: qcom: sc8280xp-x13s: fix touchscreen power on arm64: dts: qcom: x1e80100: Fix PCIe 6a reg offsets and add MHI arm64: dts: qcom: sa8775p: Correct IRQ number of EL2 non-secure physical timer arm64: dts: qcom: sc8280xp: Set status = "reserved" on PSHOLD arm64: dts: qcom: x1e80100-*: Allocate some CMA buffers arm64: dts: qcom: sc8180x: Fix LLCC reg property again Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 256abd8 + af355e7 commit bcec291

File tree

10 files changed

+61
-21
lines changed

10 files changed

+61
-21
lines changed

‎arch/arm64/boot/dts/qcom/qdu1000.dtsi

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1459,9 +1459,23 @@
14591459

14601460
system-cache-controller@19200000 {
14611461
compatible = "qcom,qdu1000-llcc";
1462-
reg = <0 0x19200000 0 0xd80000>,
1462+
reg = <0 0x19200000 0 0x80000>,
1463+
<0 0x19300000 0 0x80000>,
1464+
<0 0x19600000 0 0x80000>,
1465+
<0 0x19700000 0 0x80000>,
1466+
<0 0x19a00000 0 0x80000>,
1467+
<0 0x19b00000 0 0x80000>,
1468+
<0 0x19e00000 0 0x80000>,
1469+
<0 0x19f00000 0 0x80000>,
14631470
<0 0x1a200000 0 0x80000>;
14641471
reg-names = "llcc0_base",
1472+
"llcc1_base",
1473+
"llcc2_base",
1474+
"llcc3_base",
1475+
"llcc4_base",
1476+
"llcc5_base",
1477+
"llcc6_base",
1478+
"llcc7_base",
14651479
"llcc_broadcast_base";
14661480
interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
14671481
};

‎arch/arm64/boot/dts/qcom/sa8775p.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3605,7 +3605,7 @@
36053605
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
36063606
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
36073607
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
3608-
<GIC_PPI 12 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
3608+
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
36093609
};
36103610

36113611
pcie0: pcie@1c00000 {

‎arch/arm64/boot/dts/qcom/sc8180x.dtsi

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2647,11 +2647,14 @@
26472647

26482648
system-cache-controller@9200000 {
26492649
compatible = "qcom,sc8180x-llcc";
2650-
reg = <0 0x09200000 0 0x50000>, <0 0x09280000 0 0x50000>,
2651-
<0 0x09300000 0 0x50000>, <0 0x09380000 0 0x50000>,
2652-
<0 0x09600000 0 0x50000>;
2650+
reg = <0 0x09200000 0 0x58000>, <0 0x09280000 0 0x58000>,
2651+
<0 0x09300000 0 0x58000>, <0 0x09380000 0 0x58000>,
2652+
<0 0x09400000 0 0x58000>, <0 0x09480000 0 0x58000>,
2653+
<0 0x09500000 0 0x58000>, <0 0x09580000 0 0x58000>,
2654+
<0 0x09600000 0 0x58000>;
26532655
reg-names = "llcc0_base", "llcc1_base", "llcc2_base",
2654-
"llcc3_base", "llcc_broadcast_base";
2656+
"llcc3_base", "llcc4_base", "llcc5_base",
2657+
"llcc6_base", "llcc7_base", "llcc_broadcast_base";
26552658
interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;
26562659
};
26572660

‎arch/arm64/boot/dts/qcom/sc8280xp-crd.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -977,8 +977,7 @@
977977
reset-n-pins {
978978
pins = "gpio99";
979979
function = "gpio";
980-
output-high;
981-
drive-strength = <16>;
980+
bias-disable;
982981
};
983982
};
984983

‎arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -655,15 +655,16 @@
655655

656656
status = "okay";
657657

658-
/* FIXME: verify */
659658
touchscreen@10 {
660-
compatible = "hid-over-i2c";
659+
compatible = "elan,ekth5015m", "elan,ekth6915";
661660
reg = <0x10>;
662661

663-
hid-descr-addr = <0x1>;
664662
interrupts-extended = <&tlmm 175 IRQ_TYPE_LEVEL_LOW>;
665-
vdd-supply = <&vreg_misc_3p3>;
666-
vddl-supply = <&vreg_s10b>;
663+
reset-gpios = <&tlmm 99 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
664+
no-reset-on-power-off;
665+
666+
vcc33-supply = <&vreg_misc_3p3>;
667+
vccio-supply = <&vreg_misc_3p3>;
667668

668669
pinctrl-names = "default";
669670
pinctrl-0 = <&ts0_default>;
@@ -1496,8 +1497,8 @@
14961497
reset-n-pins {
14971498
pins = "gpio99";
14981499
function = "gpio";
1499-
output-high;
1500-
drive-strength = <16>;
1500+
drive-strength = <2>;
1501+
bias-disable;
15011502
};
15021503
};
15031504

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4623,6 +4623,8 @@
46234623
restart@c264000 {
46244624
compatible = "qcom,pshold";
46254625
reg = <0 0x0c264000 0 0x4>;
4626+
/* TZ seems to block access */
4627+
status = "reserved";
46264628
};
46274629

46284630
tsens1: thermal-sensor@c265000 {

‎arch/arm64/boot/dts/qcom/sm6115.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,6 +1090,7 @@
10901090

10911091
power-domains = <&rpmpd SM6115_VDDCX>;
10921092
operating-points-v2 = <&sdhc1_opp_table>;
1093+
iommus = <&apps_smmu 0x00c0 0x0>;
10931094
interconnects = <&system_noc MASTER_SDCC_1 RPM_ALWAYS_TAG
10941095
&bimc SLAVE_EBI_CH0 RPM_ALWAYS_TAG>,
10951096
<&bimc MASTER_AMPSS_M0 RPM_ALWAYS_TAG

‎arch/arm64/boot/dts/qcom/x1e80100-crd.dts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,15 @@
4949
stdout-path = "serial0:115200n8";
5050
};
5151

52+
reserved-memory {
53+
linux,cma {
54+
compatible = "shared-dma-pool";
55+
size = <0x0 0x8000000>;
56+
reusable;
57+
linux,cma-default;
58+
};
59+
};
60+
5261
sound {
5362
compatible = "qcom,x1e80100-sndcard";
5463
model = "X1E80100-CRD";
@@ -93,7 +102,7 @@
93102
};
94103

95104
codec {
96-
sound-dai = <&wcd938x 1>, <&swr2 0>, <&lpass_txmacro 0>;
105+
sound-dai = <&wcd938x 1>, <&swr2 1>, <&lpass_txmacro 0>;
97106
};
98107

99108
platform {
@@ -744,7 +753,7 @@
744753
wcd_tx: codec@0,3 {
745754
compatible = "sdw20217010d00";
746755
reg = <0 3>;
747-
qcom,tx-port-mapping = <1 1 2 3>;
756+
qcom,tx-port-mapping = <2 2 3 4>;
748757
};
749758
};
750759

‎arch/arm64/boot/dts/qcom/x1e80100-qcp.dts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@
2323
stdout-path = "serial0:115200n8";
2424
};
2525

26+
reserved-memory {
27+
linux,cma {
28+
compatible = "shared-dma-pool";
29+
size = <0x0 0x8000000>;
30+
reusable;
31+
linux,cma-default;
32+
};
33+
};
34+
2635
vph_pwr: vph-pwr-regulator {
2736
compatible = "regulator-fixed";
2837

‎arch/arm64/boot/dts/qcom/x1e80100.dtsi

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2737,15 +2737,17 @@
27372737
device_type = "pci";
27382738
compatible = "qcom,pcie-x1e80100";
27392739
reg = <0 0x01bf8000 0 0x3000>,
2740-
<0 0x70000000 0 0xf1d>,
2741-
<0 0x70000f20 0 0xa8>,
2740+
<0 0x70000000 0 0xf20>,
2741+
<0 0x70000f40 0 0xa8>,
27422742
<0 0x70001000 0 0x1000>,
2743-
<0 0x70100000 0 0x100000>;
2743+
<0 0x70100000 0 0x100000>,
2744+
<0 0x01bfb000 0 0x1000>;
27442745
reg-names = "parf",
27452746
"dbi",
27462747
"elbi",
27472748
"atu",
2748-
"config";
2749+
"config",
2750+
"mhi";
27492751
#address-cells = <3>;
27502752
#size-cells = <2>;
27512753
ranges = <0x01000000 0 0x00000000 0 0x70200000 0 0x100000>,

0 commit comments

Comments
 (0)