github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 23:52:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Qualcomm Arm64 DeviceTree fixes for v6.10

Browse Source 
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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJJBAABCAAzFiEEBd4DzF816k8JZtUlCx85Pw2ZrcUFAmaDbysVHGFuZGVyc3Nv
 bkBrZXJuZWwub3JnAAoJEAsfOT8Nma3FjB4P/i8+CZGdqXeUbfX+QuRKr91W9m7H
 NIdya6FZ6bg3RhmrLLlhmyG3iVVQNYvZ1mjAsK43xtnOU2DX/OMrNAUAdmagC5cI
 VfjPGlHKbGmK5rfDfxYNRocszo/zh4CFQQmVElsBSaZyi1pPkfOWnUZjTzlAetS4
 FMbrDjJyFDPxhzdhPZWyAEAd6eeYMbpEeXOB0NZGdsv3ncfg311cBy2MHEn052J9
 lAOexSfhw1hNTMPSfjK/8OKQiAKuA5DWUxZL+/7/5P72zB0GZUCzDJABRRlaWjsM
 d8eJenuHpluRZxSTtmw5uSmBjbKUW6Q3lhMNeVIcxDhyaMNq2Asw3LIiJFAXQmB3
 goQek5Lc33VRAdnw6Vfphzy2nUBAeT5YBl+aGJb8cVR12BKWN0JiVVm1/Ewxd23j
 GcfKTsLSMI1ZPOsjNgtoqa8O6y76vX1c0+Vn5GvG/8iSa5qlzattMD7hWra5erll
 MhlOr3OikH1rhTTlJNc6WPJwmYbnf4DAemUyzvF9oIXZf5J05ljDW7KUBJyFH7ip
 oIfi6JNsuABcDmT2vMFofw2jJwbo6wb1bxUoTYDITRy45GOs44pZAfuxFz5Z0vST
 kGeqqi4xz3JhNTSLDf50ahJBOHapg5C1c+OSZ22muLGl/7Hzpmd2FhdI85e1+arL
 TcF+8NCZBkpcraLa
 =rkld
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmaL9IAACgkQYKtH/8kJ
 UifKORAAmbEROkWShKsTmVk9sl863SUqu3wPOyFUgY0Dw+xsUZum5yk1mxeuJCaE
 3o5EzRerPwAyEcMw3jWXIYmKvwP4ocIMo7FVKLqD4icEteufM6uq03AeTMfkWi6v
 J97zXSrl7lxr3hRnb5NvKm/gUakuHThRAUkzPxccHrgJz2bMbqD/Jz/lKUw+boip
 Yjw/bk0rz+otSEk5uwG39lDP5eJgukH5cAMBo4YnmAd2KKr56TNPjqRCu2XGNHnU
 HnJnw8v9iar3imUH7RlM6XBbdd2YDAe9nAcgHZ11ACVaO9eYtsLVHA4Ms6p3zUPE
 kVtW8NcObc6MDLABc2x5J4lposaPuuVRquchlaPE7UTSidqkq2jvTcME40Mse+lp
 MfoMhHN35FDtogYFVjvD4dmB1Q0bY74YPl9xa+NuymORJcft/Y3dAbInmsRhBdiC
 ifK892Z76m7eob+ul7egNeY2uDitoSpY8GKL41EG98G+u/g93J/kv9wjO0o2JH62
 RDJge8FY38noqLK3GIk3BIXq9730N+Tau9HGn/Lpqt8JWEAbTcgAH/wjXmKl/GkU
 zFSgyRTbiyOx8tLsW9RF3D/YMPyzyhyAnwz03llX+iFXIws4o2LSGQ2u6ESsAXxP
 BQ+XOj2WxGpaRMN8XIrgV08+TZwP6MkqaNK0PRSRAr+JEpRNVio=
 =R3Mv
 -----END PGP SIGNATURE-----

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/20240702030913.340814-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-07-08 16:15:27 +02:00
commit bcec291967
10 changed files with 61 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm64/boot/dts/qcom/qdu1000.dtsi
View File

@ -1459,9 +1459,23 @@ gem_noc: interconnect@19100000 {
system-cache-controller@19200000 {
compatible = "qcom,qdu1000-llcc";
reg = <0 0x19200000 0 0xd80000>,
reg = <0 0x19200000 0 0x80000>,
<0 0x19300000 0 0x80000>,
<0 0x19600000 0 0x80000>,
<0 0x19700000 0 0x80000>,
<0 0x19a00000 0 0x80000>,
<0 0x19b00000 0 0x80000>,
<0 0x19e00000 0 0x80000>,
<0 0x19f00000 0 0x80000>,
<0 0x1a200000 0 0x80000>;
reg-names = "llcc0_base",
"llcc1_base",
"llcc2_base",
"llcc3_base",
"llcc4_base",
"llcc5_base",
"llcc6_base",
"llcc7_base",
"llcc_broadcast_base";
interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
};

2
arch/arm64/boot/dts/qcom/sa8775p.dtsi
View File

@ -3605,7 +3605,7 @@ arch_timer: timer {
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
<GIC_PPI 12 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
};
pcie0: pcie@1c00000 {

11
arch/arm64/boot/dts/qcom/sc8180x.dtsi
View File

@ -2647,11 +2647,14 @@ usb_sec_dpphy: dp-phy@88ef200 {
system-cache-controller@9200000 {
compatible = "qcom,sc8180x-llcc";
reg = <0 0x09200000 0 0x50000>, <0 0x09280000 0 0x50000>,
<0 0x09300000 0 0x50000>, <0 0x09380000 0 0x50000>,
<0 0x09600000 0 0x50000>;
reg = <0 0x09200000 0 0x58000>, <0 0x09280000 0 0x58000>,
<0 0x09300000 0 0x58000>, <0 0x09380000 0 0x58000>,
<0 0x09400000 0 0x58000>, <0 0x09480000 0 0x58000>,
<0 0x09500000 0 0x58000>, <0 0x09580000 0 0x58000>,
<0 0x09600000 0 0x58000>;
reg-names = "llcc0_base", "llcc1_base", "llcc2_base",
"llcc3_base", "llcc_broadcast_base";
"llcc3_base", "llcc4_base", "llcc5_base",
"llcc6_base", "llcc7_base", "llcc_broadcast_base";
interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;
};

3
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
View File

@ -977,8 +977,7 @@ int-n-pins {
reset-n-pins {
pins = "gpio99";
function = "gpio";
output-high;
drive-strength = <16>;
bias-disable;
};
};

15
arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
View File

@ -655,15 +655,16 @@ &i2c4 {
status = "okay";
/* FIXME: verify */
touchscreen@10 {
compatible = "hid-over-i2c";
compatible = "elan,ekth5015m", "elan,ekth6915";
reg = <0x10>;
hid-descr-addr = <0x1>;
interrupts-extended = <&tlmm 175 IRQ_TYPE_LEVEL_LOW>;
vdd-supply = <&vreg_misc_3p3>;
vddl-supply = <&vreg_s10b>;
reset-gpios = <&tlmm 99 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
no-reset-on-power-off;
vcc33-supply = <&vreg_misc_3p3>;
vccio-supply = <&vreg_misc_3p3>;
pinctrl-names = "default";
pinctrl-0 = <&ts0_default>;
@ -1496,8 +1497,8 @@ int-n-pins {
reset-n-pins {
pins = "gpio99";
function = "gpio";
output-high;
drive-strength = <16>;
drive-strength = <2>;
bias-disable;
};
};

2
arch/arm64/boot/dts/qcom/sc8280xp.dtsi
View File

@ -4623,6 +4623,8 @@ tsens0: thermal-sensor@c263000 {
restart@c264000 {
compatible = "qcom,pshold";
reg = <0 0x0c264000 0 0x4>;
/* TZ seems to block access */
status = "reserved";
};
tsens1: thermal-sensor@c265000 {

1
arch/arm64/boot/dts/qcom/sm6115.dtsi
View File

@ -1090,6 +1090,7 @@ sdhc_1: mmc@4744000 {
power-domains = <&rpmpd SM6115_VDDCX>;
operating-points-v2 = <&sdhc1_opp_table>;
iommus = <&apps_smmu 0x00c0 0x0>;
interconnects = <&system_noc MASTER_SDCC_1 RPM_ALWAYS_TAG
&bimc SLAVE_EBI_CH0 RPM_ALWAYS_TAG>,
<&bimc MASTER_AMPSS_M0 RPM_ALWAYS_TAG

13
arch/arm64/boot/dts/qcom/x1e80100-crd.dts
View File

@ -49,6 +49,15 @@ chosen {
stdout-path = "serial0:115200n8";
};
reserved-memory {
linux,cma {
compatible = "shared-dma-pool";
size = <0x0 0x8000000>;
reusable;
linux,cma-default;
};
};
sound {
compatible = "qcom,x1e80100-sndcard";
model = "X1E80100-CRD";
@ -93,7 +102,7 @@ cpu {
};
codec {
sound-dai = <&wcd938x 1>, <&swr2 0>, <&lpass_txmacro 0>;
sound-dai = <&wcd938x 1>, <&swr2 1>, <&lpass_txmacro 0>;
};
platform {
@ -744,7 +753,7 @@ &swr2 {
wcd_tx: codec@0,3 {
compatible = "sdw20217010d00";
reg = <0 3>;
qcom,tx-port-mapping = <1 1 2 3>;
qcom,tx-port-mapping = <2 2 3 4>;
};
};

9
arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
View File

@ -23,6 +23,15 @@ chosen {
stdout-path = "serial0:115200n8";
};
reserved-memory {
linux,cma {
compatible = "shared-dma-pool";
size = <0x0 0x8000000>;
reusable;
linux,cma-default;
};
};
vph_pwr: vph-pwr-regulator {
compatible = "regulator-fixed";

10
arch/arm64/boot/dts/qcom/x1e80100.dtsi
View File

@ -2737,15 +2737,17 @@ pcie6a: pci@1bf8000 {
device_type = "pci";
compatible = "qcom,pcie-x1e80100";
reg = <0 0x01bf8000 0 0x3000>,
<0 0x70000000 0 0xf1d>,
<0 0x70000f20 0 0xa8>,
<0 0x70000000 0 0xf20>,
<0 0x70000f40 0 0xa8>,
<0 0x70001000 0 0x1000>,
<0 0x70100000 0 0x100000>;
<0 0x70100000 0 0x100000>,
<0 0x01bfb000 0 0x1000>;
reg-names = "parf",
"dbi",
"elbi",
"atu",
"config";
"config",
"mhi";
#address-cells = <3>;
#size-cells = <2>;
ranges = <0x01000000 0 0x00000000 0 0x70200000 0 0x100000>,