Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 28323a7

Browse files
committed
Merge tag 'qcom-arm64-for-6.11-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
A few more Arm64 DeviceTree updates for v6.11 This introduces support for Lenovo Thinkpad Yoga slim 7x, LG Leon LTE, and LG K10 (K420n). In addition to this, all Gen-1 platforms gets the DWC3 quirk to disable "SuperSpeed in park mode", which resolves an instabliity issue seen in host mode. For Fairphone 4, PM6150L and PMK8003 thermal sensors are added and thermal zones defined. Two fastrpc contexts on SM6350 are marked as non-secure, to allow non-secure usage. The video clock controller on SM8150 is introduced. IPQ9574 GCC is marked as a interconnect provider. The vibrator block in the PM6150 is described. On SC7280 the download mode register is defined for SCM, allowing it to enable/disable the ramdump support during a system crash. Lastly, add a mailmap entry for Luca Weiss. * tag 'qcom-arm64-for-6.11-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (22 commits) mailmap: Update Luca Weiss's email address arm64: dts: qcom: msm8916-lg-c50: add initial dts for LG Leon LTE arm64: dts: qcom: msm8916-lg-m216: Add initial device tree dt-bindings: arm: qcom: Add msm8916 based LG devices arm64: dts: qcom: ipq9574: Add icc provider ability to gcc dt-bindings: interconnect: Add Qualcomm IPQ9574 support arm64: dts: qcom: sm8150: Add video clock controller node arm64: dts: qcom: pm6150: Add vibrator arm64: dts: qcom: sc7280: Enable download mode register write arm64: dts: qcom: sm7225-fairphone-fp4: Add PM6150L thermals arm64: dts: qcom: sm7225-fairphone-fp4: Add PMK8003 thermals arm64: dts: qcom: sm6350: Add missing qcom,non-secure-domain property arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB arm64: dts: qcom: msm8996: Disable SS instance in Parkmode for USB arm64: dts: qcom: sm6350: Disable SS instance in Parkmode for USB arm64: dts: qcom: sm6115: Disable SS instance in Parkmode for USB arm64: dts: qcom: sdm630: Disable SS instance in Parkmode for USB arm64: dts: qcom: msm8998: Disable SS instance in Parkmode for USB arm64: dts: qcom: ipq8074: Disable SS instance in Parkmode for USB arm64: dts: qcom: ipq6018: Disable SS instance in Parkmode for USB ... Link: https://lore.kernel.org/r/20240709193406.3966-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 4b1a54b + 2881fcf commit 28323a7

22 files changed

+1640
-0
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
385385
Lior David <quic_liord@quicinc.com> <liord@codeaurora.org>
386386
Lorenzo Pieralisi <lpieralisi@kernel.org> <lorenzo.pieralisi@arm.com>
387387
Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net>
388+
Luca Weiss <luca@lucaweiss.eu> <luca@z3ntu.xyz>
388389
Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>
389390
Luo Jie <quic_luoj@quicinc.com> <luoj@codeaurora.org>
390391
Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>

Documentation/devicetree/bindings/arm/qcom.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,8 @@ properties:
210210
- asus,z00l
211211
- gplus,fl8005a
212212
- huawei,g7
213+
- lg,c50
214+
- lg,m216
213215
- longcheer,l8910
214216
- longcheer,l8150
215217
- motorola,harpia
@@ -1039,6 +1041,7 @@ properties:
10391041
- items:
10401042
- enum:
10411043
- asus,vivobook-s15
1044+
- lenovo,yoga-slim7x
10421045
- qcom,x1e80100-crd
10431046
- qcom,x1e80100-qcp
10441047
- const: qcom,x1e80100

Documentation/devicetree/bindings/clock/qcom,ipq9574-gcc.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ properties:
3333
- description: PCIE30 PHY3 pipe clock source
3434
- description: USB3 PHY pipe clock source
3535

36+
'#interconnect-cells':
37+
const: 1
38+
3639
required:
3740
- compatible
3841
- clocks

arch/arm64/boot/dts/qcom/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
3131
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
3232
dtb-$(CONFIG_ARCH_QCOM) += msm8916-gplus-fl8005a.dtb
3333
dtb-$(CONFIG_ARCH_QCOM) += msm8916-huawei-g7.dtb
34+
dtb-$(CONFIG_ARCH_QCOM) += msm8916-lg-c50.dtb
35+
dtb-$(CONFIG_ARCH_QCOM) += msm8916-lg-m216.dtb
3436
dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8150.dtb
3537
dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8910.dtb
3638
dtb-$(CONFIG_ARCH_QCOM) += msm8916-motorola-harpia.dtb
@@ -261,4 +263,5 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8650-mtp.dtb
261263
dtb-$(CONFIG_ARCH_QCOM) += sm8650-qrd.dtb
262264
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-asus-vivobook-s15.dtb
263265
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-crd.dtb
266+
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-lenovo-yoga-slim7x.dtb
264267
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-qcp.dtb

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,7 @@
704704
clocks = <&xo>;
705705
clock-names = "ref";
706706
tx-fifo-resize;
707+
snps,parkmode-disable-ss-quirk;
707708
snps,is-utmi-l1-suspend;
708709
snps,hird-threshold = /bits/ 8 <0x0>;
709710
snps,dis_u2_susphy_quirk;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,7 @@
666666
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
667667
phys = <&qusb_phy_0>, <&ssphy_0>;
668668
phy-names = "usb2-phy", "usb3-phy";
669+
snps,parkmode-disable-ss-quirk;
669670
snps,is-utmi-l1-suspend;
670671
snps,hird-threshold = /bits/ 8 <0x0>;
671672
snps,dis_u2_susphy_quirk;
@@ -715,6 +716,7 @@
715716
interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
716717
phys = <&qusb_phy_1>, <&ssphy_1>;
717718
phy-names = "usb2-phy", "usb3-phy";
719+
snps,parkmode-disable-ss-quirk;
718720
snps,is-utmi-l1-suspend;
719721
snps,hird-threshold = /bits/ 8 <0x0>;
720722
snps,dis_u2_susphy_quirk;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include <dt-bindings/clock/qcom,apss-ipq.h>
1010
#include <dt-bindings/clock/qcom,ipq9574-gcc.h>
11+
#include <dt-bindings/interconnect/qcom,ipq9574.h>
1112
#include <dt-bindings/interrupt-controller/arm-gic.h>
1213
#include <dt-bindings/reset/qcom,ipq9574-gcc.h>
1314
#include <dt-bindings/thermal/thermal.h>
@@ -315,6 +316,7 @@
315316
<0>;
316317
#clock-cells = <1>;
317318
#reset-cells = <1>;
319+
#interconnect-cells = <1>;
318320
};
319321

320322
tcsr_mutex: hwlock@1905000 {
Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
3+
/dts-v1/;
4+
5+
#include "msm8916-pm8916.dtsi"
6+
7+
#include <dt-bindings/gpio/gpio.h>
8+
9+
/ {
10+
model = "LG Leon LTE";
11+
compatible = "lg,c50", "qcom,msm8916";
12+
chassis-type = "handset";
13+
14+
aliases {
15+
mmc0 = &sdhc_1; /* eMMC */
16+
mmc1 = &sdhc_2; /* SD card */
17+
serial0 = &blsp_uart2;
18+
};
19+
20+
chosen {
21+
stdout-path = "serial0";
22+
};
23+
24+
gpio-keys {
25+
compatible = "gpio-keys";
26+
27+
pinctrl-0 = <&gpio_keys_default>;
28+
pinctrl-names = "default";
29+
30+
label = "GPIO Buttons";
31+
32+
volume-up-button {
33+
label = "Volume Up";
34+
gpios = <&tlmm 108 GPIO_ACTIVE_LOW>;
35+
linux,code = <KEY_VOLUMEUP>;
36+
};
37+
38+
volume-down-button {
39+
label = "Volume Down";
40+
gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
41+
linux,code = <KEY_VOLUMEDOWN>;
42+
};
43+
};
44+
45+
reg_sd_vmmc: regulator-sdcard-vmmc {
46+
compatible = "regulator-fixed";
47+
regulator-name = "sdcard-vmmc";
48+
regulator-min-microvolt = <2950000>;
49+
regulator-max-microvolt = <2950000>;
50+
51+
gpio = <&tlmm 60 GPIO_ACTIVE_HIGH>;
52+
enable-active-high;
53+
54+
startup-delay-us = <5000>;
55+
56+
pinctrl-0 = <&sd_vmmc_en_default>;
57+
pinctrl-names = "default";
58+
};
59+
};
60+
61+
&blsp_uart2 {
62+
status = "okay";
63+
};
64+
65+
&pm8916_usbin {
66+
status = "okay";
67+
};
68+
69+
&pm8916_vib {
70+
status = "okay";
71+
};
72+
73+
&sdhc_1 {
74+
status = "okay";
75+
};
76+
77+
&sdhc_2 {
78+
vmmc-supply = <&reg_sd_vmmc>;
79+
80+
pinctrl-0 = <&sdc2_default &sdc2_cd_default>;
81+
pinctrl-1 = <&sdc2_sleep &sdc2_cd_default>;
82+
pinctrl-names = "default", "sleep";
83+
84+
cd-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>;
85+
86+
status = "okay";
87+
};
88+
89+
&usb {
90+
dr_mode = "peripheral";
91+
extcon = <&pm8916_usbin>;
92+
status = "okay";
93+
};
94+
95+
&usb_hs_phy {
96+
extcon = <&pm8916_usbin>;
97+
};
98+
99+
&venus {
100+
status = "okay";
101+
};
102+
103+
&venus_mem {
104+
status = "okay";
105+
};
106+
107+
&wcnss {
108+
status = "okay";
109+
};
110+
111+
&wcnss_iris {
112+
compatible = "qcom,wcn3620";
113+
};
114+
115+
&wcnss_mem {
116+
status = "okay";
117+
};
118+
119+
&tlmm {
120+
gpio_keys_default: gpio-keys-default-state {
121+
pins = "gpio107", "gpio108";
122+
function = "gpio";
123+
drive-strength = <2>;
124+
bias-pull-up;
125+
};
126+
127+
sd_vmmc_en_default: sd-vmmc-en-default-state {
128+
pins = "gpio60";
129+
function = "gpio";
130+
drive-strength = <2>;
131+
bias-disable;
132+
};
133+
134+
sdc2_cd_default: sdc2-cd-default-state {
135+
pins = "gpio38";
136+
function = "gpio";
137+
drive-strength = <2>;
138+
bias-pull-down;
139+
};
140+
};

0 commit comments

Comments
 (0)