Skip to content

Commit 6fd3e86

Browse files
arndbarndb
committed
Merge tag 'qcom-dts-for-6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
Qualcomm ARM DeviceTree updates for v6.7 RPM master stats is introduced for MSM8226 and MSM8974. The PCIe PHY of SDX55 is transitioned to the new binding. The hall sensor on the Samsung Galaxy Tab 4 is inverted. A number of fixes reported from DeviceTree validation are fixed. * tag 'qcom-dts-for-6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: ARM: dts: qcom: ipq8064: move keys and leds out of soc node ARM: dts: qcom: mdm9615: populate vsdcc fixed regulator ARM: dts: qcom: apq8060: drop incorrect regulator-type ARM: dts: qcom: apq8064: drop incorrect regulator-type ARM: dts: qcom: sdx65: fix SDHCI clocks order ARM: dts: qcom: apq8064: drop label property from DSI ARM: qcom: msm8974: Add rpm-master-stats node ARM: qcom: msm8226: Add rpm-master-stats node ARM: dts: qcom: apq8026-samsung-matisse-wifi: Fix inverted hall sensor ARM: dts: qcom: drop incorrect cell-index from SPMI ARM: dts: qcom-sdx55: switch PCIe QMP PHY to new style of bindings Link: https://lore.kernel.org/r/20231015204558.855987-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 68f1d41 + 2138c32 commit 6fd3e86

12 files changed

Lines changed: 175 additions & 127 deletions

‎arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545

4646
event-hall-sensor {
4747
label = "Hall Effect Sensor";
48-
gpios = <&tlmm 110 GPIO_ACTIVE_HIGH>;
49-
interrupts = <&tlmm 110 IRQ_TYPE_EDGE_FALLING>;
48+
gpios = <&tlmm 110 GPIO_ACTIVE_LOW>;
5049
linux,input-type = <EV_SW>;
5150
linux,code = <SW_LID>;
5251
debounce-interval = <15>;
52+
linux,can-disable;
5353
wakeup-source;
5454
};
5555
};

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
regulator-min-microvolt = <3700000>;
2525
regulator-max-microvolt = <3700000>;
2626
regulator-name = "VPH";
27-
regulator-type = "voltage";
2827
regulator-always-on;
2928
regulator-boot-on;
3029
};

‎arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
regulator-min-microvolt = <3300000>;
3737
regulator-max-microvolt = <3300000>;
3838
regulator-name = "ext_3p3v";
39-
regulator-type = "voltage";
4039
startup-delay-us = <0>;
4140
gpio = <&tlmm_pinmux 77 GPIO_ACTIVE_HIGH>;
4241
enable-active-high;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
regulator-min-microvolt = <3300000>;
5959
regulator-max-microvolt = <3300000>;
6060
regulator-name = "ext_3p3v";
61-
regulator-type = "voltage";
6261
startup-delay-us = <0>;
6362
gpio = <&tlmm_pinmux 77 GPIO_ACTIVE_HIGH>;
6463
enable-active-high;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,6 @@
12701270
dsi0: dsi@4700000 {
12711271
compatible = "qcom,apq8064-dsi-ctrl",
12721272
"qcom,mdss-dsi-ctrl";
1273-
label = "MDSS DSI CTRL->0";
12741273
#address-cells = <1>;
12751274
#size-cells = <0>;
12761275
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;

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

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,33 @@
2020
stdout-path = "serial0:115200n8";
2121
};
2222

23+
gpio-keys {
24+
compatible = "gpio-keys";
25+
pinctrl-0 = <&buttons_pins>;
26+
pinctrl-names = "default";
27+
28+
button {
29+
label = "reset";
30+
linux,code = <KEY_RESTART>;
31+
gpios = <&qcom_pinmux 66 GPIO_ACTIVE_LOW>;
32+
linux,input-type = <1>;
33+
debounce-interval = <60>;
34+
};
35+
};
36+
37+
leds {
38+
compatible = "gpio-leds";
39+
pinctrl-0 = <&leds_pins>;
40+
pinctrl-names = "default";
41+
42+
led-0 {
43+
label = "rb3011:green:user";
44+
color = <LED_COLOR_ID_GREEN>;
45+
gpios = <&qcom_pinmux 33 GPIO_ACTIVE_HIGH>;
46+
default-state = "off";
47+
};
48+
};
49+
2350
memory@42000000 {
2451
reg = <0x42000000 0x3e000000>;
2552
device_type = "memory";
@@ -302,34 +329,6 @@
302329
};
303330
};
304331
};
305-
306-
gpio-keys {
307-
compatible = "gpio-keys";
308-
pinctrl-0 = <&buttons_pins>;
309-
pinctrl-names = "default";
310-
311-
button {
312-
label = "reset";
313-
linux,code = <KEY_RESTART>;
314-
gpios = <&qcom_pinmux 66 GPIO_ACTIVE_LOW>;
315-
linux,input-type = <1>;
316-
debounce-interval = <60>;
317-
};
318-
};
319-
320-
leds {
321-
compatible = "gpio-leds";
322-
pinctrl-0 = <&leds_pins>;
323-
pinctrl-names = "default";
324-
325-
led-0 {
326-
label = "rb3011:green:user";
327-
color = <LED_COLOR_ID_GREEN>;
328-
gpios = <&qcom_pinmux 33 GPIO_ACTIVE_HIGH>;
329-
default-state = "off";
330-
};
331-
};
332-
333332
};
334333
};
335334

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

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,67 @@
1414
stdout-path = "serial0:115200n8";
1515
};
1616

17+
gpio-keys {
18+
compatible = "gpio-keys";
19+
pinctrl-0 = <&buttons_pins>;
20+
pinctrl-names = "default";
21+
22+
button-1 {
23+
label = "reset";
24+
linux,code = <KEY_RESTART>;
25+
gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
26+
linux,input-type = <1>;
27+
debounce-interval = <60>;
28+
};
29+
button-2 {
30+
label = "wps";
31+
linux,code = <KEY_WPS_BUTTON>;
32+
gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
33+
linux,input-type = <1>;
34+
debounce-interval = <60>;
35+
};
36+
};
37+
38+
leds {
39+
compatible = "gpio-leds";
40+
pinctrl-0 = <&leds_pins>;
41+
pinctrl-names = "default";
42+
43+
led-0 {
44+
label = "led_usb1";
45+
gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
46+
linux,default-trigger = "usbdev";
47+
default-state = "off";
48+
};
49+
50+
led-1 {
51+
label = "led_usb3";
52+
gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
53+
linux,default-trigger = "usbdev";
54+
default-state = "off";
55+
};
56+
57+
led-2 {
58+
label = "status_led_fail";
59+
function = LED_FUNCTION_STATUS;
60+
gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
61+
default-state = "off";
62+
};
63+
64+
led-3 {
65+
label = "sata_led";
66+
gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
67+
default-state = "off";
68+
};
69+
70+
led-4 {
71+
label = "status_led_pass";
72+
function = LED_FUNCTION_STATUS;
73+
gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
74+
default-state = "off";
75+
};
76+
};
77+
1778
soc {
1879
gsbi@16300000 {
1980
qcom,mode = <GSBI_PROT_I2C_UART>;
@@ -64,66 +125,5 @@
64125
ports-implemented = <0x1>;
65126
status = "okay";
66127
};
67-
68-
gpio-keys {
69-
compatible = "gpio-keys";
70-
pinctrl-0 = <&buttons_pins>;
71-
pinctrl-names = "default";
72-
73-
button-1 {
74-
label = "reset";
75-
linux,code = <KEY_RESTART>;
76-
gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
77-
linux,input-type = <1>;
78-
debounce-interval = <60>;
79-
};
80-
button-2 {
81-
label = "wps";
82-
linux,code = <KEY_WPS_BUTTON>;
83-
gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
84-
linux,input-type = <1>;
85-
debounce-interval = <60>;
86-
};
87-
};
88-
89-
leds {
90-
compatible = "gpio-leds";
91-
pinctrl-0 = <&leds_pins>;
92-
pinctrl-names = "default";
93-
94-
led-0 {
95-
label = "led_usb1";
96-
gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
97-
linux,default-trigger = "usbdev";
98-
default-state = "off";
99-
};
100-
101-
led-1 {
102-
label = "led_usb3";
103-
gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
104-
linux,default-trigger = "usbdev";
105-
default-state = "off";
106-
};
107-
108-
led-2 {
109-
label = "status_led_fail";
110-
function = LED_FUNCTION_STATUS;
111-
gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
112-
default-state = "off";
113-
};
114-
115-
led-3 {
116-
label = "sata_led";
117-
gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
118-
default-state = "off";
119-
};
120-
121-
led-4 {
122-
label = "status_led_pass";
123-
function = LED_FUNCTION_STATUS;
124-
gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
125-
default-state = "off";
126-
};
127-
};
128128
};
129129
};

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,12 @@
4747
};
4848
};
4949

50-
regulators {
51-
vsdcc_fixed: vsdcc-regulator {
52-
compatible = "regulator-fixed";
53-
regulator-name = "SDCC Power";
54-
regulator-min-microvolt = <2700000>;
55-
regulator-max-microvolt = <2700000>;
56-
regulator-always-on;
57-
};
50+
vsdcc_fixed: vsdcc-regulator {
51+
compatible = "regulator-fixed";
52+
regulator-name = "SDCC Power";
53+
regulator-min-microvolt = <2700000>;
54+
regulator-max-microvolt = <2700000>;
55+
regulator-always-on;
5856
};
5957

6058
soc: soc {

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,18 @@
5656
rpm: remoteproc {
5757
compatible = "qcom,msm8226-rpm-proc", "qcom,rpm-proc";
5858

59+
master-stats {
60+
compatible = "qcom,rpm-master-stats";
61+
qcom,rpm-msg-ram = <&apss_master_stats>,
62+
<&mpss_master_stats>,
63+
<&lpss_master_stats>,
64+
<&pronto_master_stats>;
65+
qcom,master-names = "APSS",
66+
"MPSS",
67+
"LPSS",
68+
"PRONTO";
69+
};
70+
5971
smd-edge {
6072
interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;
6173
qcom,ipc = <&apcs 8 0>;
@@ -742,6 +754,26 @@
742754
rpm_msg_ram: sram@fc428000 {
743755
compatible = "qcom,rpm-msg-ram";
744756
reg = <0xfc428000 0x4000>;
757+
758+
#address-cells = <1>;
759+
#size-cells = <1>;
760+
ranges = <0 0xfc428000 0x4000>;
761+
762+
apss_master_stats: sram@150 {
763+
reg = <0x150 0x14>;
764+
};
765+
766+
mpss_master_stats: sram@b50 {
767+
reg = <0xb50 0x14>;
768+
};
769+
770+
lpss_master_stats: sram@1550 {
771+
reg = <0x1550 0x14>;
772+
};
773+
774+
pronto_master_stats: sram@1f50 {
775+
reg = <0x1f50 0x14>;
776+
};
745777
};
746778

747779
tcsr_mutex: hwlock@fd484000 {

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,18 @@
116116
rpm: remoteproc {
117117
compatible = "qcom,msm8974-rpm-proc", "qcom,rpm-proc";
118118

119+
master-stats {
120+
compatible = "qcom,rpm-master-stats";
121+
qcom,rpm-msg-ram = <&apss_master_stats>,
122+
<&mpss_master_stats>,
123+
<&lpss_master_stats>,
124+
<&pronto_master_stats>;
125+
qcom,master-names = "APSS",
126+
"MPSS",
127+
"LPSS",
128+
"PRONTO";
129+
};
130+
119131
smd-edge {
120132
interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;
121133
qcom,ipc = <&apcs 8 0>;
@@ -1067,6 +1079,26 @@
10671079
rpm_msg_ram: sram@fc428000 {
10681080
compatible = "qcom,rpm-msg-ram";
10691081
reg = <0xfc428000 0x4000>;
1082+
1083+
#address-cells = <1>;
1084+
#size-cells = <1>;
1085+
ranges = <0 0xfc428000 0x4000>;
1086+
1087+
apss_master_stats: sram@150 {
1088+
reg = <0x150 0x14>;
1089+
};
1090+
1091+
mpss_master_stats: sram@b50 {
1092+
reg = <0xb50 0x14>;
1093+
};
1094+
1095+
lpss_master_stats: sram@1550 {
1096+
reg = <0x1550 0x14>;
1097+
};
1098+
1099+
pronto_master_stats: sram@1f50 {
1100+
reg = <0x1f50 0x14>;
1101+
};
10701102
};
10711103

10721104
bimc: interconnect@fc380000 {

0 commit comments

Comments
 (0)