Skip to content

Commit 6db9253

Browse files
arndbarndb
committed
Merge tag 'qcom-dts-for-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
Qualcomm ARM32 DeviceTree updates for v6.5 NAND support on IPQ4019 boards is restored, after a faulty node rename. On MSM8226 IMEM, PMU and RPM stats are introduced. The Huawei Watch gains vibrator support. On MSM8974, the LGE Nexus 5 gains vibrator support. The APQ8074 Dragonboard marks BLSP2 BAM controlled remotely, DSI panel, audio and modem DSPs are enabled. On SDX65 PCIe controller and PHY are introduced, to provide endpoint functionality. This is enabled on the related MTP. A range of DeviceTree cleanups are also included. * tag 'qcom-dts-for-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (27 commits) ARM: dts: qcom: apq8074-dragonboard: enable DSI panel ARM: dts: qcom: apq8074-dragonboard: enable adsp and MSS ARM: dts: qcom: apq8074-dragonboard: Set DMA as remotely controlled ARM: dts: qcom: apq8026-huawei-sturgeon: Add vibrator ARM: dts: qcom: msm8226: Add IMEM node ARM: dts: qcom: msm8226: Add rpm-stats device node ARM: dts: qcom: msm8226: Add PMU node ARM: dts: qcom: sdx65-mtp: Enable PCIe EP ARM: dts: qcom: sdx65-mtp: Enable PCIe PHY ARM: dts: qcom: sdx65: Add support for PCIe EP ARM: dts: qcom: sdx65: Add support for PCIe PHY ARM: dts: qcom: msm8974: align WCNSS Bluetooth node name with bindings ARM: dts: qcom: apq8084: correct thermal sensor unit-address ARM: dts: qcom: msm8960-cdp: move regulator out of simple-bus ARM: dts: qcom: apq8060-dragonboard: move regulators out of simple-bus ARM: dts: qcom: ipq8064: align USB node names with bindings ARM: dts: qcom: ipq8064: correct LED node names ARM: dts: qcom: ipq8064: drop invalid GCC thermal-sensor unit-address ARM: dts: qcom: ipq8064: drop leading 0 from unit-address ARM: dts: qcom: msm8974: correct pronto unit-address ... Link: https://lore.kernel.org/r/20230611010843.2482142-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 60c2f54 + 925bac3 commit 6db9253

17 files changed

Lines changed: 381 additions & 89 deletions

‎arch/arm/boot/dts/qcom-apq8026-huawei-sturgeon.dts‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include "qcom-msm8226.dtsi"
99
#include "qcom-pm8226.dtsi"
10+
#include <dt-bindings/input/ti-drv260x.h>
1011

1112
/delete-node/ &adsp_region;
1213

@@ -68,6 +69,26 @@
6869
status = "okay";
6970
};
7071

72+
&blsp1_i2c2 {
73+
clock-frequency = <384000>;
74+
75+
status = "okay";
76+
77+
vibrator@5a {
78+
compatible = "ti,drv2605";
79+
reg = <0x5a>;
80+
enable-gpios = <&tlmm 60 GPIO_ACTIVE_HIGH>;
81+
82+
mode = <DRV260X_ERM_MODE>;
83+
library-sel = <DRV260X_ERM_LIB_D>;
84+
vib-rated-mv = <2765>;
85+
vib-overdrive-mv = <3525>;
86+
87+
pinctrl-0 = <&vibrator_default_state>;
88+
pinctrl-names = "default";
89+
};
90+
};
91+
7192
&blsp1_i2c5 {
7293
clock-frequency = <384000>;
7394

@@ -347,6 +368,13 @@
347368
};
348369
};
349370

371+
vibrator_default_state: vibrator-default-state {
372+
pins = "gpio59", "gpio60";
373+
function = "gpio";
374+
drive-strength = <2>;
375+
bias-pull-down;
376+
};
377+
350378
wlan_hostwake_default_state: wlan-hostwake-default-state {
351379
pins = "gpio66";
352380
function = "gpio";

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

Lines changed: 40 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -18,50 +18,46 @@
1818
stdout-path = "serial0:115200n8";
1919
};
2020

21-
regulators {
22-
compatible = "simple-bus";
23-
24-
/* Main power of the board: 3.7V */
25-
vph: regulator-fixed {
26-
compatible = "regulator-fixed";
27-
regulator-min-microvolt = <3700000>;
28-
regulator-max-microvolt = <3700000>;
29-
regulator-name = "VPH";
30-
regulator-type = "voltage";
31-
regulator-always-on;
32-
regulator-boot-on;
33-
};
34-
35-
/* GPIO controlled ethernet power regulator */
36-
dragon_veth: xc622a331mrg {
37-
compatible = "regulator-fixed";
38-
regulator-name = "XC6222A331MR-G";
39-
regulator-min-microvolt = <3300000>;
40-
regulator-max-microvolt = <3300000>;
41-
vin-supply = <&vph>;
42-
gpio = <&pm8058_gpio 40 GPIO_ACTIVE_HIGH>;
43-
enable-active-high;
44-
pinctrl-names = "default";
45-
pinctrl-0 = <&dragon_veth_gpios>;
46-
regulator-always-on;
47-
};
21+
/* Main power of the board: 3.7V */
22+
vph: regulator-fixed {
23+
compatible = "regulator-fixed";
24+
regulator-min-microvolt = <3700000>;
25+
regulator-max-microvolt = <3700000>;
26+
regulator-name = "VPH";
27+
regulator-type = "voltage";
28+
regulator-always-on;
29+
regulator-boot-on;
30+
};
31+
32+
/* GPIO controlled ethernet power regulator */
33+
dragon_veth: xc622a331mrg {
34+
compatible = "regulator-fixed";
35+
regulator-name = "XC6222A331MR-G";
36+
regulator-min-microvolt = <3300000>;
37+
regulator-max-microvolt = <3300000>;
38+
vin-supply = <&vph>;
39+
gpio = <&pm8058_gpio 40 GPIO_ACTIVE_HIGH>;
40+
enable-active-high;
41+
pinctrl-names = "default";
42+
pinctrl-0 = <&dragon_veth_gpios>;
43+
regulator-always-on;
44+
};
4845

49-
/* VDDvario fixed regulator */
50-
dragon_vario: nds332p {
51-
compatible = "regulator-fixed";
52-
regulator-name = "NDS332P";
53-
regulator-min-microvolt = <1800000>;
54-
regulator-max-microvolt = <1800000>;
55-
vin-supply = <&pm8058_s3>;
56-
};
46+
/* VDDvario fixed regulator */
47+
dragon_vario: nds332p {
48+
compatible = "regulator-fixed";
49+
regulator-name = "NDS332P";
50+
regulator-min-microvolt = <1800000>;
51+
regulator-max-microvolt = <1800000>;
52+
vin-supply = <&pm8058_s3>;
53+
};
5754

58-
/* This is a levelshifter for SDCC5 */
59-
dragon_vio_txb: txb0104rgyr {
60-
compatible = "regulator-fixed";
61-
regulator-name = "Dragon SDCC levelshifter";
62-
vin-supply = <&pm8058_l14>;
63-
regulator-always-on;
64-
};
55+
/* This is a levelshifter for SDCC5 */
56+
dragon_vio_txb: txb0104rgyr {
57+
compatible = "regulator-fixed";
58+
regulator-name = "Dragon SDCC levelshifter";
59+
vin-supply = <&pm8058_l14>;
60+
regulator-always-on;
6561
};
6662

6763
/*
@@ -451,7 +447,7 @@
451447
* PM8901 supplies "preliminary regulators" whatever
452448
* that means
453449
*/
454-
pm8901-regulators {
450+
regulators-0 {
455451
vdd_l0-supply = <&pm8901_s4>;
456452
vdd_l1-supply = <&vph>;
457453
vdd_l2-supply = <&vph>;
@@ -537,7 +533,7 @@
537533

538534
};
539535

540-
pm8058-regulators {
536+
regulators-1 {
541537
vdd_l0_l1_lvs-supply = <&pm8058_s3>;
542538
vdd_l2_l11_l12-supply = <&vph>;
543539
vdd_l3_l4_l5-supply = <&vph>;

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

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
#include "qcom-pm8841.dtsi"
55
#include "qcom-pm8941.dtsi"
66

7+
/delete-node/ &mpss_region;
8+
79
/ {
810
model = "Qualcomm APQ8074 Dragonboard";
911
compatible = "qcom,apq8074-dragonboard", "qcom,apq8074";
@@ -17,12 +19,23 @@
1719
chosen {
1820
stdout-path = "serial0:115200n8";
1921
};
22+
23+
reserved-memory {
24+
mpss_region: mpss@ac00000 {
25+
reg = <0x0ac00000 0x2500000>;
26+
no-map;
27+
};
28+
};
2029
};
2130

2231
&blsp1_uart2 {
2332
status = "okay";
2433
};
2534

35+
&blsp2_dma {
36+
qcom,controlled-remotely;
37+
};
38+
2639
&blsp2_i2c5 {
2740
status = "okay";
2841
clock-frequency = <200000>;
@@ -35,6 +48,76 @@
3548
};
3649
};
3750

51+
&dsi0 {
52+
vdda-supply = <&pm8941_l2>;
53+
vdd-supply = <&pm8941_l22>;
54+
vddio-supply = <&pm8941_l12>;
55+
56+
status = "okay";
57+
58+
panel: panel@0 {
59+
compatible = "sharp,ls043t1le01-qhd";
60+
reg = <0>;
61+
62+
avdd-supply = <&pm8941_l22>;
63+
backlight = <&pm8941_wled>;
64+
reset-gpios = <&pm8941_gpios 19 GPIO_ACTIVE_HIGH>;
65+
66+
port {
67+
panel_in: endpoint {
68+
remote-endpoint = <&dsi0_out>;
69+
};
70+
};
71+
};
72+
};
73+
74+
&dsi0_out {
75+
remote-endpoint = <&panel_in>;
76+
data-lanes = <0 1 2 3>;
77+
};
78+
79+
&dsi0_phy {
80+
status = "okay";
81+
82+
vddio-supply = <&pm8941_l12>;
83+
};
84+
85+
&gpu {
86+
status = "okay";
87+
};
88+
89+
&mdss {
90+
status = "okay";
91+
};
92+
93+
&pm8941_wled {
94+
qcom,cs-out;
95+
qcom,switching-freq = <3200>;
96+
qcom,ovp = <32>;
97+
qcom,num-strings = <1>;
98+
99+
status = "okay";
100+
};
101+
102+
&remoteproc_adsp {
103+
cx-supply = <&pm8841_s2>;
104+
105+
firmware-name = "qcom/apq8074/adsp.mbn";
106+
107+
status = "okay";
108+
};
109+
110+
&remoteproc_mss {
111+
cx-supply = <&pm8841_s2>;
112+
mss-supply = <&pm8841_s3>;
113+
mx-supply = <&pm8841_s1>;
114+
pll-supply = <&pm8941_l12>;
115+
116+
firmware-name = "qcom/apq8074/mba.mbn", "qcom/apq8074/modem.mbn";
117+
118+
status = "okay";
119+
};
120+
38121
&rpm_requests {
39122
regulators-0 {
40123
compatible = "qcom,rpm-pm8841-regulators";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@
506506
};
507507
};
508508

509-
tsens: thermal-sensor@fc4a8000 {
509+
tsens: thermal-sensor@fc4a9000 {
510510
compatible = "qcom,msm8974-tsens", "qcom,tsens-v0_1";
511511
reg = <0xfc4a9000 0x1000>, /* TM */
512512
<0xfc4a8000 0x1000>; /* SROT */

‎arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
dma-controller@7984000 {
1212
status = "okay";
1313
};
14-
15-
qpic-nand@79b0000 {
16-
status = "okay";
17-
};
1814
};
1915
};
16+
17+
&nand {
18+
status = "okay";
19+
};

‎arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@
102102
status = "okay";
103103
perst-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
104104
};
105-
106-
qpic-nand@79b0000 {
107-
pinctrl-0 = <&nand_pins>;
108-
pinctrl-names = "default";
109-
};
110105
};
111106
};
107+
108+
&nand {
109+
pinctrl-0 = <&nand_pins>;
110+
pinctrl-names = "default";
111+
};

‎arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
dma-controller@7984000 {
6666
status = "okay";
6767
};
68-
69-
qpic-nand@79b0000 {
70-
pinctrl-0 = <&nand_pins>;
71-
pinctrl-names = "default";
72-
status = "okay";
73-
};
7468
};
7569
};
70+
71+
&nand {
72+
pinctrl-0 = <&nand_pins>;
73+
pinctrl-names = "default";
74+
status = "okay";
75+
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@
323323
pinctrl-0 = <&leds_pins>;
324324
pinctrl-names = "default";
325325

326-
led@7 {
326+
led-0 {
327327
label = "rb3011:green:user";
328328
color = <LED_COLOR_ID_GREEN>;
329329
gpios = <&qcom_pinmux 33 GPIO_ACTIVE_HIGH>;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,34 +92,34 @@
9292
pinctrl-0 = <&leds_pins>;
9393
pinctrl-names = "default";
9494

95-
led@7 {
95+
led-0 {
9696
label = "led_usb1";
9797
gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
9898
linux,default-trigger = "usbdev";
9999
default-state = "off";
100100
};
101101

102-
led@8 {
102+
led-1 {
103103
label = "led_usb3";
104104
gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
105105
linux,default-trigger = "usbdev";
106106
default-state = "off";
107107
};
108108

109-
led@9 {
109+
led-2 {
110110
label = "status_led_fail";
111111
function = LED_FUNCTION_STATUS;
112112
gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
113113
default-state = "off";
114114
};
115115

116-
led@26 {
116+
led-3 {
117117
label = "sata_led";
118118
gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
119119
default-state = "off";
120120
};
121121

122-
led@53 {
122+
led-4 {
123123
label = "status_led_pass";
124124
function = LED_FUNCTION_STATUS;
125125
gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;

0 commit comments

Comments
 (0)