Skip to content

Commit 3b6d013

Browse files
arndbarndb
committed
Merge tag 'qcom-dts-for-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
Qualcomm ARM32 DeviceTree updates for v6.6 GCC and LCC clock controller parent clocks are introduced on MDM9615. The newly introduced RPM representation is introduced across multiple platforms. Voltage ADC channel names are corrected across multiple platforms. APQ8064 gains a definition for GSBI4. The XO clock for SDHCI is corrected, as is the USB node name, on IPQ4019. USB node name is also corrected for SDX55. The correct PMIC is included on SDX65 MTP. The incorrect spi-max-frequency property is removed from controllers on IPQ8064 and MSM8960. OCMEM and the display subsystem are added to MSM8226. Reset line is added to the PM8941 and the APQ8074 Dragonboard, while a few properties of the Sony Xperia Z2 Tablet touchscreen are corrected. * tag 'qcom-dts-for-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: ARM: dts: qcom: apq8064: add support to gsbi4 uart ARM: dts: qcom: sdx65-mtp: Update the pmic used in sdx65 ARM: dts: qcom: ipq4019: correct SDHCI XO clock ARM: dts: qcom: Use labels with generic node names for ADC channels ARM: dts: qcom-mdm9615: specify gcc clocks ARM: dts: qcom-mdm9615: specify clocks for the lcc device ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names ARM: dts: qcom: msm8974pro-castor: correct inverted X of touchscreen ARM: dts: qcom: apq8064: Drop redundant /smd node ARM: dts: qcom: Add rpm-proc node for SMD platforms ARM: dts: qcom: apq8074-dragonboard: add resin ARM: dts: qcom-pm8941: add resin support ARM: dts: qcom: minor whitespace cleanup around '=' ARM: dts: qcom: msm8960: drop spi-max-frequency from controller ARM: dts: qcom: ipq8064: drop spi-max-frequency from controller ARM: dts: qcom: sdx55: use generic node names for USB ARM: dts: qcom: ipq4019: use generic node names for USB ARM: dts: qcom: msm8226: Add ocmem ARM: dts: qcom: msm8226: Add mdss nodes Link: https://lore.kernel.org/r/20230818024928.2485173-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 5948696 + 3cfa556 commit 3b6d013

20 files changed

Lines changed: 313 additions & 146 deletions

‎arch/arm/boot/dts/qcom/qcom-apq8064-pins.dtsi‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,22 @@
233233
};
234234
};
235235

236+
gsbi4_uart_pin_a: gsbi4-uart-pin-active-state {
237+
rx-pins {
238+
pins = "gpio11";
239+
function = "gsbi4";
240+
drive-strength = <2>;
241+
bias-disable;
242+
};
243+
244+
tx-pins {
245+
pins = "gpio10";
246+
function = "gsbi4";
247+
drive-strength = <4>;
248+
bias-disable;
249+
};
250+
};
251+
236252
gsbi6_uart_2pins: gsbi6_uart_2pins {
237253
mux {
238254
pins = "gpio14", "gpio15";

‎arch/arm/boot/dts/qcom/qcom-apq8064.dtsi‎

Lines changed: 12 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -226,46 +226,6 @@
226226
hwlocks = <&sfpb_mutex 3>;
227227
};
228228

229-
smd {
230-
compatible = "qcom,smd";
231-
232-
modem-edge {
233-
interrupts = <0 37 IRQ_TYPE_EDGE_RISING>;
234-
235-
qcom,ipc = <&l2cc 8 3>;
236-
qcom,smd-edge = <0>;
237-
238-
status = "disabled";
239-
};
240-
241-
q6-edge {
242-
interrupts = <0 90 IRQ_TYPE_EDGE_RISING>;
243-
244-
qcom,ipc = <&l2cc 8 15>;
245-
qcom,smd-edge = <1>;
246-
247-
status = "disabled";
248-
};
249-
250-
dsps-edge {
251-
interrupts = <0 138 IRQ_TYPE_EDGE_RISING>;
252-
253-
qcom,ipc = <&sps_sic_non_secure 0x4080 0>;
254-
qcom,smd-edge = <3>;
255-
256-
status = "disabled";
257-
};
258-
259-
riva-edge {
260-
interrupts = <0 198 IRQ_TYPE_EDGE_RISING>;
261-
262-
qcom,ipc = <&l2cc 8 25>;
263-
qcom,smd-edge = <6>;
264-
265-
status = "disabled";
266-
};
267-
};
268-
269229
smsm {
270230
compatible = "qcom,smsm";
271231

@@ -555,6 +515,18 @@
555515
#size-cells = <1>;
556516
ranges;
557517

518+
gsbi4_serial: serial@16340000 {
519+
compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
520+
reg = <0x16340000 0x100>,
521+
<0x16300000 0x3>;
522+
interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
523+
pinctrl-0 = <&gsbi4_uart_pin_a>;
524+
pinctrl-names = "default";
525+
clocks = <&gcc GSBI4_UART_CLK>, <&gcc GSBI4_H_CLK>;
526+
clock-names = "core", "iface";
527+
status = "disabled";
528+
};
529+
558530
gsbi4_i2c: i2c@16380000 {
559531
compatible = "qcom,i2c-qup-v1.1.1";
560532
pinctrl-0 = <&i2c4_pins>;

‎arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,11 @@
156156
};
157157
};
158158

159+
&pm8941_resin {
160+
linux,code = <KEY_VOLUMEDOWN>;
161+
status = "okay";
162+
};
163+
159164
&pm8941_wled {
160165
qcom,cs-out;
161166
qcom,switching-freq = <3200>;

‎arch/arm/boot/dts/qcom/qcom-apq8084.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -784,10 +784,10 @@
784784
};
785785
};
786786

787-
smd {
788-
compatible = "qcom,smd";
787+
rpm: remoteproc {
788+
compatible = "qcom,apq8084-rpm-proc", "qcom,rpm-proc";
789789

790-
rpm {
790+
smd-edge {
791791
interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;
792792
qcom,ipc = <&apcs 8 0>;
793793
qcom,smd-edge = <15>;

‎arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,11 @@
262262
&usb3 {
263263
status = "okay";
264264

265-
dwc3@8a00000 {
266-
phys = <&usb3_hs_phy>;
267-
phy-names = "usb2-phy";
268265
};
266+
267+
&usb3_dwc {
268+
phys = <&usb3_hs_phy>;
269+
phy-names = "usb2-phy";
269270
};
270271

271272
&usb2_hs_phy {

‎arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,12 @@
230230
interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
231231
interrupt-names = "hc_irq", "pwr_irq";
232232
bus-width = <8>;
233-
clocks = <&gcc GCC_SDCC1_AHB_CLK>, <&gcc GCC_SDCC1_APPS_CLK>,
234-
<&gcc GCC_DCD_XO_CLK>;
235-
clock-names = "iface", "core", "xo";
233+
clocks = <&gcc GCC_SDCC1_AHB_CLK>,
234+
<&gcc GCC_SDCC1_APPS_CLK>,
235+
<&xo>;
236+
clock-names = "iface",
237+
"core",
238+
"xo";
236239
status = "disabled";
237240
};
238241

@@ -416,10 +419,10 @@
416419

417420
pcie0: pci@40000000 {
418421
compatible = "qcom,pcie-ipq4019";
419-
reg = <0x40000000 0xf1d
420-
0x40000f20 0xa8
421-
0x80000 0x2000
422-
0x40100000 0x1000>;
422+
reg = <0x40000000 0xf1d>,
423+
<0x40000f20 0xa8>,
424+
<0x80000 0x2000>,
425+
<0x40100000 0x1000>;
423426
reg-names = "dbi", "elbi", "parf", "config";
424427
device_type = "pci";
425428
linux,pci-domain = <0>;
@@ -543,9 +546,9 @@
543546
<GIC_SPI 46 IRQ_TYPE_EDGE_RISING>,
544547
<GIC_SPI 47 IRQ_TYPE_EDGE_RISING>,
545548
<GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
546-
interrupt-names = "msi0", "msi1", "msi2", "msi3",
547-
"msi4", "msi5", "msi6", "msi7",
548-
"msi8", "msi9", "msi10", "msi11",
549+
interrupt-names = "msi0", "msi1", "msi2", "msi3",
550+
"msi4", "msi5", "msi6", "msi7",
551+
"msi8", "msi9", "msi10", "msi11",
549552
"msi12", "msi13", "msi14", "msi15",
550553
"legacy";
551554
status = "disabled";
@@ -585,9 +588,9 @@
585588
<GIC_SPI 62 IRQ_TYPE_EDGE_RISING>,
586589
<GIC_SPI 63 IRQ_TYPE_EDGE_RISING>,
587590
<GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
588-
interrupt-names = "msi0", "msi1", "msi2", "msi3",
589-
"msi4", "msi5", "msi6", "msi7",
590-
"msi8", "msi9", "msi10", "msi11",
591+
interrupt-names = "msi0", "msi1", "msi2", "msi3",
592+
"msi4", "msi5", "msi6", "msi7",
593+
"msi8", "msi9", "msi10", "msi11",
591594
"msi12", "msi13", "msi14", "msi15",
592595
"legacy";
593596
status = "disabled";
@@ -621,7 +624,7 @@
621624
};
622625
};
623626

624-
usb3_ss_phy: ssphy@9a000 {
627+
usb3_ss_phy: usb-phy@9a000 {
625628
compatible = "qcom,usb-ss-ipq4019-phy";
626629
#phy-cells = <0>;
627630
reg = <0x9a000 0x800>;
@@ -631,7 +634,7 @@
631634
status = "disabled";
632635
};
633636

634-
usb3_hs_phy: hsphy@a6000 {
637+
usb3_hs_phy: usb-phy@a6000 {
635638
compatible = "qcom,usb-hs-ipq4019-phy";
636639
#phy-cells = <0>;
637640
reg = <0xa6000 0x40>;
@@ -641,7 +644,7 @@
641644
status = "disabled";
642645
};
643646

644-
usb3: usb3@8af8800 {
647+
usb3: usb@8af8800 {
645648
compatible = "qcom,ipq4019-dwc3", "qcom,dwc3";
646649
reg = <0x8af8800 0x100>;
647650
#address-cells = <1>;
@@ -653,7 +656,7 @@
653656
ranges;
654657
status = "disabled";
655658

656-
dwc3@8a00000 {
659+
usb3_dwc: usb@8a00000 {
657660
compatible = "snps,dwc3";
658661
reg = <0x8a00000 0xf8000>;
659662
interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
@@ -663,7 +666,7 @@
663666
};
664667
};
665668

666-
usb2_hs_phy: hsphy@a8000 {
669+
usb2_hs_phy: usb-phy@a8000 {
667670
compatible = "qcom,usb-hs-ipq4019-phy";
668671
#phy-cells = <0>;
669672
reg = <0xa8000 0x40>;
@@ -673,7 +676,7 @@
673676
status = "disabled";
674677
};
675678

676-
usb2: usb2@60f8800 {
679+
usb2: usb@60f8800 {
677680
compatible = "qcom,ipq4019-dwc3", "qcom,dwc3";
678681
reg = <0x60f8800 0x100>;
679682
#address-cells = <1>;
@@ -685,7 +688,7 @@
685688
ranges;
686689
status = "disabled";
687690

688-
dwc3@6000000 {
691+
usb@6000000 {
689692
compatible = "snps,dwc3";
690693
reg = <0x6000000 0xf8000>;
691694
interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;

‎arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,6 @@
282282

283283
spi4: spi@1a280000 {
284284
status = "okay";
285-
spi-max-frequency = <50000000>;
286285

287286
pinctrl-0 = <&spi_pins>;
288287
pinctrl-names = "default";

‎arch/arm/boot/dts/qcom/qcom-ipq8064-v1.0.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
spi4: spi@1a280000 {
3232
status = "okay";
33-
spi-max-frequency = <50000000>;
3433

3534
pinctrl-0 = <&spi_pins>;
3635
pinctrl-names = "default";

‎arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <dt-bindings/interrupt-controller/arm-gic.h>
1212
#include <dt-bindings/clock/qcom,gcc-mdm9615.h>
13+
#include <dt-bindings/clock/qcom,lcc-msm8960.h>
1314
#include <dt-bindings/reset/qcom,gcc-mdm9615.h>
1415
#include <dt-bindings/mfd/qcom-rpm.h>
1516
#include <dt-bindings/soc/qcom,gsbi.h>
@@ -39,7 +40,7 @@
3940
};
4041

4142
clocks {
42-
cxo_board {
43+
cxo_board: cxo_board {
4344
compatible = "fixed-clock";
4445
#clock-cells = <0>;
4546
clock-frequency = <19200000>;
@@ -106,13 +107,29 @@
106107
#power-domain-cells = <1>;
107108
#reset-cells = <1>;
108109
reg = <0x900000 0x4000>;
110+
clocks = <&cxo_board>,
111+
<&lcc PLL4>;
109112
};
110113

111114
lcc: clock-controller@28000000 {
112115
compatible = "qcom,lcc-mdm9615";
113116
reg = <0x28000000 0x1000>;
114117
#clock-cells = <1>;
115118
#reset-cells = <1>;
119+
clocks = <&cxo_board>,
120+
<&gcc PLL4_VOTE>,
121+
<0>,
122+
<0>, <0>,
123+
<0>, <0>,
124+
<0>;
125+
clock-names = "cxo",
126+
"pll4_vote",
127+
"mi2s_codec_clk",
128+
"codec_i2s_mic_codec_clk",
129+
"spare_i2s_mic_codec_clk",
130+
"codec_i2s_spkr_codec_clk",
131+
"spare_i2s_spkr_codec_clk",
132+
"pcm_codec_clk";
116133
};
117134

118135
l2cc: clock-controller@2011000 {

0 commit comments

Comments
 (0)