Skip to content

Commit 73ec272

Browse files
arndbarndb
committed
Merge tag 'qcom-arm32-for-6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
Qualcomm ARM32 DeviceTree updates for v6.8 Support is added for HTC One Mini 2, Nokia Lumia 630, Microsoft Lumia 640, Microsoft Lumia 640 XL, Nokia Lumia 735, Nokia Lumia 830, and Motorola Moto G 4G, all built on the MSM8226 platform. The GPU in MSM8226 is described, and MSM8974 gains watchdog support. The PMICs are transitioned to use interrupts-extended to properly reference the PMIC interrupt controller, in accordance with the DeviceTree specification. In addition to this, a variety of stylistic and DeviceTree validation issues are corrected. * tag 'qcom-arm32-for-6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (60 commits) ARM: dts: qcom: msm8974*: Re-enable remoteprocs on various boards ARM: dts: qcom: msm8974: Remove bogus cd-gpio pinctrl ARM: dts: qcom: msm8974-klte: Remove unused property ARM: dts: qcom: msm8926-motorola-peregrine: Add initial device tree ARM: dts: qcom: ipq4019: add dedicated SDHCI compatible ARM: dts: qcom: Use "pcie" as the node name instead of "pci" ARM: dts: qcom: msm8226: Add GPU ARM: dts: qcom: Disable pm8941 & pm8226 smbb charger by default ARM: dts: qcom: minor whitespace cleanup around '=' ARM: dts: qcom: sdx55: fix USB wakeup interrupt types ARM: dts: qcom: Add support for HTC One Mini 2 ARM: dts: qcom: msm8974: Add watchdog node ARM: dts: qcom: sdx65: correct SPMI node name ARM: dts: qcom: sdx65: add missing GCC clocks ARM: dts: qcom: sdx65: correct PCIe EP phy-names ARM: dts: qcom: mdm9615: drop qcom, prefix from SSBI node name ARM: dts: qcom: ipq8064: drop qcom, prefix from SSBI node name ARM: dts: qcom: apq8060-dragonboard: rename mpp ADC channels to adc-channel ARM: dts: qcom: pm8921: Disable keypad by default ARM: dts: qcom: msm8974: move regulators to board files ... Link: https://lore.kernel.org/r/20231219042914.732684-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 7af9a9f + 648002a commit 73ec272

57 files changed

Lines changed: 2398 additions & 990 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎arch/arm/boot/dts/qcom/Makefile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,19 @@ dtb-$(CONFIG_ARCH_QCOM) += \
2323
qcom-ipq4019-ap.dk07.1-c2.dtb \
2424
qcom-ipq8064-ap148.dtb \
2525
qcom-ipq8064-rb3011.dtb \
26+
qcom-msm8226-microsoft-dempsey.dtb \
27+
qcom-msm8226-microsoft-makepeace.dtb \
28+
qcom-msm8226-microsoft-moneypenny.dtb \
2629
qcom-msm8226-samsung-s3ve3g.dtb \
2730
qcom-msm8660-surf.dtb \
2831
qcom-msm8916-samsung-e5.dtb \
2932
qcom-msm8916-samsung-e7.dtb \
3033
qcom-msm8916-samsung-grandmax.dtb \
3134
qcom-msm8916-samsung-serranove.dtb \
35+
qcom-msm8926-htc-memul.dtb \
36+
qcom-msm8926-microsoft-superman-lte.dtb \
37+
qcom-msm8926-microsoft-tesla.dtb \
38+
qcom-msm8926-motorola-peregrine.dtb \
3239
qcom-msm8960-cdp.dtb \
3340
qcom-msm8960-samsung-expressatt.dtb \
3441
qcom-msm8974-lge-nexus5-hammerhead.dtb \

‎arch/arm/boot/dts/qcom/pm8018.dtsi‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2+
/*
3+
* Device Tree Source for Qualcomm PM8018
4+
*
5+
* Copyright (C) 2016 BayLibre, SAS.
6+
* Author : Neil Armstrong <narmstrong@baylibre.com>
7+
*/
8+
9+
&ssbi {
10+
pm8018: pmic {
11+
compatible = "qcom,pm8018", "qcom,pm8921";
12+
#interrupt-cells = <2>;
13+
interrupt-controller;
14+
#address-cells = <1>;
15+
#size-cells = <0>;
16+
17+
pwrkey@1c {
18+
compatible = "qcom,pm8018-pwrkey",
19+
"qcom,pm8921-pwrkey";
20+
reg = <0x1c>;
21+
interrupts-extended = <&pm8018 50 IRQ_TYPE_EDGE_RISING>,
22+
<&pm8018 51 IRQ_TYPE_EDGE_RISING>;
23+
debounce = <15625>;
24+
pull-up;
25+
};
26+
27+
pm8018_mpps: mpps@50 {
28+
compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp";
29+
reg = <0x50>;
30+
interrupt-controller;
31+
#interrupt-cells = <2>;
32+
gpio-controller;
33+
#gpio-cells = <2>;
34+
gpio-ranges = <&pm8018_mpps 0 0 6>;
35+
};
36+
37+
rtc@11d {
38+
compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc";
39+
reg = <0x11d>;
40+
interrupts-extended = <&pm8018 39 IRQ_TYPE_EDGE_RISING>;
41+
allow-set-time;
42+
};
43+
44+
pm8018_gpio: gpio@150 {
45+
compatible = "qcom,pm8058-gpio",
46+
"qcom,ssbi-gpio";
47+
reg = <0x150>;
48+
interrupt-controller;
49+
#interrupt-cells = <2>;
50+
gpio-controller;
51+
gpio-ranges = <&pm8018_gpio 0 0 6>;
52+
#gpio-cells = <2>;
53+
};
54+
};
55+
};

‎arch/arm/boot/dts/qcom/pm8058.dtsi‎

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
3+
&ssbi {
4+
pm8058: pmic {
5+
compatible = "qcom,pm8058";
6+
#interrupt-cells = <2>;
7+
interrupt-controller;
8+
#address-cells = <1>;
9+
#size-cells = <0>;
10+
11+
pwrkey@1c {
12+
compatible = "qcom,pm8058-pwrkey";
13+
reg = <0x1c>;
14+
interrupts-extended = <&pm8058 50 IRQ_TYPE_EDGE_RISING>,
15+
<&pm8058 51 IRQ_TYPE_EDGE_RISING>;
16+
debounce = <15625>;
17+
pull-up;
18+
};
19+
20+
pm8058_led48: led@48 {
21+
compatible = "qcom,pm8058-keypad-led";
22+
reg = <0x48>;
23+
status = "disabled";
24+
};
25+
26+
vibrator@4a {
27+
compatible = "qcom,pm8058-vib";
28+
reg = <0x4a>;
29+
};
30+
31+
pm8058_mpps: mpps@50 {
32+
compatible = "qcom,pm8058-mpp",
33+
"qcom,ssbi-mpp";
34+
reg = <0x50>;
35+
gpio-controller;
36+
#gpio-cells = <2>;
37+
gpio-ranges = <&pm8058_mpps 0 0 12>;
38+
interrupt-controller;
39+
#interrupt-cells = <2>;
40+
};
41+
42+
pm8058_led131: led@131 {
43+
compatible = "qcom,pm8058-led";
44+
reg = <0x131>;
45+
status = "disabled";
46+
};
47+
48+
pm8058_led132: led@132 {
49+
compatible = "qcom,pm8058-led";
50+
reg = <0x132>;
51+
status = "disabled";
52+
};
53+
54+
pm8058_led133: led@133 {
55+
compatible = "qcom,pm8058-led";
56+
reg = <0x133>;
57+
status = "disabled";
58+
};
59+
60+
pm8058_keypad: keypad@148 {
61+
compatible = "qcom,pm8058-keypad";
62+
reg = <0x148>;
63+
interrupts-extended = <&pm8058 74 IRQ_TYPE_EDGE_RISING>,
64+
<&pm8058 75 IRQ_TYPE_EDGE_RISING>;
65+
debounce = <15>;
66+
scan-delay = <32>;
67+
row-hold = <91500>;
68+
};
69+
70+
pm8058_gpio: gpio@150 {
71+
compatible = "qcom,pm8058-gpio",
72+
"qcom,ssbi-gpio";
73+
reg = <0x150>;
74+
interrupt-controller;
75+
#interrupt-cells = <2>;
76+
gpio-controller;
77+
gpio-ranges = <&pm8058_gpio 0 0 44>;
78+
#gpio-cells = <2>;
79+
};
80+
81+
pm8058_xoadc: xoadc@197 {
82+
compatible = "qcom,pm8058-adc";
83+
reg = <0x197>;
84+
interrupts-extended = <&pm8058 76 IRQ_TYPE_EDGE_RISING>;
85+
#address-cells = <2>;
86+
#size-cells = <0>;
87+
#io-channel-cells = <2>;
88+
89+
vcoin: adc-channel@0 {
90+
reg = <0x00 0x00>;
91+
};
92+
93+
vbat: adc-channel@1 {
94+
reg = <0x00 0x01>;
95+
};
96+
97+
dcin: adc-channel@2 {
98+
reg = <0x00 0x02>;
99+
};
100+
101+
ichg: adc-channel@3 {
102+
reg = <0x00 0x03>;
103+
};
104+
105+
vph_pwr: adc-channel@4 {
106+
reg = <0x00 0x04>;
107+
};
108+
109+
usb_vbus: adc-channel@a {
110+
reg = <0x00 0x0a>;
111+
};
112+
113+
die_temp: adc-channel@b {
114+
reg = <0x00 0x0b>;
115+
};
116+
117+
ref_625mv: adc-channel@c {
118+
reg = <0x00 0x0c>;
119+
};
120+
121+
ref_1250mv: adc-channel@d {
122+
reg = <0x00 0x0d>;
123+
};
124+
125+
ref_325mv: adc-channel@e {
126+
reg = <0x00 0x0e>;
127+
};
128+
129+
ref_muxoff: adc-channel@f {
130+
reg = <0x00 0x0f>;
131+
};
132+
};
133+
134+
rtc@1e8 {
135+
compatible = "qcom,pm8058-rtc";
136+
reg = <0x1e8>;
137+
interrupts-extended = <&pm8058 39 IRQ_TYPE_EDGE_RISING>;
138+
allow-set-time;
139+
};
140+
};
141+
};
142+
143+
/ {
144+
/*
145+
* These channels from the ADC are simply hardware monitors.
146+
* That is why the ADC is referred to as "HKADC" - HouseKeeping
147+
* ADC.
148+
*/
149+
iio-hwmon {
150+
compatible = "iio-hwmon";
151+
io-channels = <&pm8058_xoadc 0x00 0x01>, /* Battery */
152+
<&pm8058_xoadc 0x00 0x02>, /* DC in (charger) */
153+
<&pm8058_xoadc 0x00 0x04>, /* VPH the main system voltage */
154+
<&pm8058_xoadc 0x00 0x0b>, /* Die temperature */
155+
<&pm8058_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */
156+
<&pm8058_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */
157+
<&pm8058_xoadc 0x00 0x0e>; /* Reference voltage 0.325V */
158+
};
159+
};

arch/arm/boot/dts/qcom/qcom-pm8226.dtsi renamed to arch/arm/boot/dts/qcom/pm8226.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@
8282
"usb-valid",
8383
"dc-valid";
8484

85+
status = "disabled";
86+
8587
chg_otg: otg-vbus { };
8688
};
8789

‎arch/arm/boot/dts/qcom/pm8821.dtsi‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
3+
/* This PMIC is used on a secondary SSBI bus */
4+
&ssbi2 {
5+
pm8821: pmic {
6+
compatible = "qcom,pm8821";
7+
interrupt-controller;
8+
#interrupt-cells = <2>;
9+
#address-cells = <1>;
10+
#size-cells = <0>;
11+
12+
pm8821_mpps: mpps@50 {
13+
compatible = "qcom,pm8821-mpp", "qcom,ssbi-mpp";
14+
reg = <0x50>;
15+
gpio-controller;
16+
#gpio-cells = <2>;
17+
gpio-ranges = <&pm8821_mpps 0 0 4>;
18+
interrupt-controller;
19+
#interrupt-cells = <2>;
20+
};
21+
};
22+
};

arch/arm/boot/dts/qcom/qcom-pm8841.dtsi renamed to arch/arm/boot/dts/qcom/pm8841.dtsi

File renamed without changes.

0 commit comments

Comments
 (0)