Skip to content

Commit d09d747

Browse files
arndbarndb
committed
Merge tag 'qcom-dts-for-6.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
More Qualcomm ARM32 DeviceTree updates for v6.5 On MSM8960, support for USB is added and the Samsung Galaxy Express is added. GPIO keys and on-board LEDs are described for the APQ8074 Dragonboard. On MSM8226, QFPROM, tsens and thermal zones are defined, and the description of the clock hierarchy is improved. The PCIe endpoint controller on SDX55 gains a interconnect path to DDR defined. Sony Xperia X2 Tablet and Samsung Galaxy Tab 4 are updated following changes in the LP855X DeviceTree binding. * tag 'qcom-dts-for-6.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm: dts: qcom: sdx55: Add interconnect path ARM: dts: qcom: msm8226: Add thermal zones node ARM: dts: qcom: msm8226: Add tsens node and related nvmem cells ARM: dts: qcom: msm8226: Add qfprom node ARM: dts: qcom: pm8941: Add thermal zone config ARM: dts: qcom: pm8841: Add thermal zone config ARM: dts: qcom: pm8226: Add thermal sensor and thermal zone config ARM: dts: qcom: msm8974: rename labels for DSI nodes ARM: dts: qcom: apq8074-dragonboard: add gpio keys ARM: dts: qcom: apq8074-dragonboard: add onboard leds ARM: dts: qcom: Add Samsung Galaxy Express support ARM: dts: qcom: msm8960: Add USB node ARM: dts: qcom: adapt to LP855X bindings changes ARM: dts: qcom: msm8226: Provide clocks to mmcc node ARM: dts: qcom: msm8226: Use XO from rpmcc where possible Link: https://lore.kernel.org/r/20230615163926.1462225-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents f07c965 + 831b802 commit d09d747

14 files changed

Lines changed: 776 additions & 61 deletions

‎arch/arm/boot/dts/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,6 +1083,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \
10831083
qcom-msm8916-samsung-grandmax.dtb \
10841084
qcom-msm8916-samsung-serranove.dtb \
10851085
qcom-msm8960-cdp.dtb \
1086+
qcom-msm8960-samsung-expressatt.dtb \
10861087
qcom-msm8974-lge-nexus5-hammerhead.dtb \
10871088
qcom-msm8974-sony-xperia-rhine-amami.dtb \
10881089
qcom-msm8974-sony-xperia-rhine-honami.dtb \

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

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

100100
dev-ctrl = /bits/ 8 <0x80>;
101101
init-brt = /bits/ 8 <0x3f>;
102-
pwm-period = <100000>;
103102

104103
pwms = <&backlight_pwm 0 100000>;
105104
pwm-names = "lp8556";

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

Lines changed: 70 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
// SPDX-License-Identifier: GPL-2.0
22
#include <dt-bindings/gpio/gpio.h>
3+
#include <dt-bindings/input/input.h>
4+
#include <dt-bindings/leds/common.h>
5+
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
36
#include "qcom-msm8974.dtsi"
47
#include "qcom-pm8841.dtsi"
58
#include "qcom-pm8941.dtsi"
@@ -20,6 +23,26 @@
2023
stdout-path = "serial0:115200n8";
2124
};
2225

26+
gpio-keys {
27+
compatible = "gpio-keys";
28+
autorepeat;
29+
30+
pinctrl-0 = <&msm_keys_default>;
31+
pinctrl-names = "default";
32+
33+
button-volup {
34+
label = "Volume Up";
35+
linux,code = <KEY_VOLUMEUP>;
36+
gpios = <&pm8941_gpios 5 GPIO_ACTIVE_LOW>;
37+
};
38+
39+
button-general {
40+
label = "General";
41+
linux,code = <KEY_PROG1>;
42+
gpios = <&pm8941_gpios 23 GPIO_ACTIVE_LOW>;
43+
};
44+
};
45+
2346
reserved-memory {
2447
mpss_region: mpss@ac00000 {
2548
reg = <0x0ac00000 0x2500000>;
@@ -48,7 +71,15 @@
4871
};
4972
};
5073

51-
&dsi0 {
74+
&gpu {
75+
status = "okay";
76+
};
77+
78+
&mdss {
79+
status = "okay";
80+
};
81+
82+
&mdss_dsi0 {
5283
vdda-supply = <&pm8941_l2>;
5384
vdd-supply = <&pm8941_l22>;
5485
vddio-supply = <&pm8941_l12>;
@@ -65,18 +96,18 @@
6596

6697
port {
6798
panel_in: endpoint {
68-
remote-endpoint = <&dsi0_out>;
99+
remote-endpoint = <&mdss_dsi0_out>;
69100
};
70101
};
71102
};
72103
};
73104

74-
&dsi0_out {
105+
&mdss_dsi0_out {
75106
remote-endpoint = <&panel_in>;
76107
data-lanes = <0 1 2 3>;
77108
};
78109

79-
&dsi0_phy {
110+
&mdss_dsi0_phy {
80111
status = "okay";
81112

82113
vddio-supply = <&pm8941_l12>;
@@ -90,6 +121,41 @@
90121
status = "okay";
91122
};
92123

124+
&pm8941_gpios {
125+
msm_keys_default: pm8941-gpio-keys-state {
126+
pins = "gpio5", "gpio23";
127+
function = "normal";
128+
input-enable;
129+
drive-push-pull;
130+
bias-pull-up;
131+
qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
132+
power-source = <PM8941_GPIO_S3>; /* 1.8V */
133+
};
134+
};
135+
136+
&pm8941_lpg {
137+
qcom,power-source = <1>;
138+
status = "okay";
139+
140+
led@5 {
141+
reg = <5>;
142+
color = <LED_COLOR_ID_BLUE>;
143+
function = LED_FUNCTION_INDICATOR;
144+
};
145+
146+
led@6 {
147+
reg = <6>;
148+
color = <LED_COLOR_ID_GREEN>;
149+
function = LED_FUNCTION_INDICATOR;
150+
};
151+
152+
led@7 {
153+
reg = <7>;
154+
color = <LED_COLOR_ID_RED>;
155+
function = LED_FUNCTION_INDICATOR;
156+
};
157+
};
158+
93159
&pm8941_wled {
94160
qcom,cs-out;
95161
qcom,switching-freq = <3200>;

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

Lines changed: 185 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
interrupt-names = "hc_irq", "pwr_irq";
183183
clocks = <&gcc GCC_SDCC1_AHB_CLK>,
184184
<&gcc GCC_SDCC1_APPS_CLK>,
185-
<&xo_board>;
185+
<&rpmcc RPM_SMD_XO_CLK_SRC>;
186186
clock-names = "iface", "core", "xo";
187187
pinctrl-names = "default";
188188
pinctrl-0 = <&sdhc1_default_state>;
@@ -198,7 +198,7 @@
198198
interrupt-names = "hc_irq", "pwr_irq";
199199
clocks = <&gcc GCC_SDCC2_AHB_CLK>,
200200
<&gcc GCC_SDCC2_APPS_CLK>,
201-
<&xo_board>;
201+
<&rpmcc RPM_SMD_XO_CLK_SRC>;
202202
clock-names = "iface", "core", "xo";
203203
pinctrl-names = "default";
204204
pinctrl-0 = <&sdhc2_default_state>;
@@ -214,7 +214,7 @@
214214
interrupt-names = "hc_irq", "pwr_irq";
215215
clocks = <&gcc GCC_SDCC3_AHB_CLK>,
216216
<&gcc GCC_SDCC3_APPS_CLK>,
217-
<&xo_board>;
217+
<&rpmcc RPM_SMD_XO_CLK_SRC>;
218218
clock-names = "iface", "core", "xo";
219219
pinctrl-names = "default";
220220
pinctrl-0 = <&sdhc3_default_state>;
@@ -368,7 +368,8 @@
368368
compatible = "qcom,usb-hs-phy-msm8226",
369369
"qcom,usb-hs-phy";
370370
#phy-cells = <0>;
371-
clocks = <&xo_board>, <&gcc GCC_USB2A_PHY_SLEEP_CLK>;
371+
clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
372+
<&gcc GCC_USB2A_PHY_SLEEP_CLK>;
372373
clock-names = "ref", "sleep";
373374
resets = <&gcc GCC_USB2A_PHY_BCR>, <&usb 0>;
374375
reset-names = "phy", "por";
@@ -397,6 +398,21 @@
397398
#clock-cells = <1>;
398399
#reset-cells = <1>;
399400
#power-domain-cells = <1>;
401+
402+
clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
403+
<&gcc GCC_MMSS_GPLL0_CLK_SRC>,
404+
<&gcc GPLL0_VOTE>,
405+
<&gcc GPLL1_VOTE>,
406+
<&rpmcc RPM_SMD_GFX3D_CLK_SRC>,
407+
<0>,
408+
<0>;
409+
clock-names = "xo",
410+
"mmss_gpll0_vote",
411+
"gpll0_vote",
412+
"gpll1_vote",
413+
"gfx3d_clk_src",
414+
"dsi0pll",
415+
"dsi0pllbyte";
400416
};
401417

402418
tlmm: pinctrl@fd510000 {
@@ -512,11 +528,131 @@
512528
};
513529
};
514530

531+
tsens: thermal-sensor@fc4a9000 {
532+
compatible = "qcom,msm8226-tsens", "qcom,tsens-v0_1";
533+
reg = <0xfc4a9000 0x1000>, /* TM */
534+
<0xfc4a8000 0x1000>; /* SROT */
535+
nvmem-cells = <&tsens_mode>,
536+
<&tsens_base1>, <&tsens_base2>,
537+
<&tsens_s0_p1>, <&tsens_s0_p2>,
538+
<&tsens_s1_p1>, <&tsens_s1_p2>,
539+
<&tsens_s2_p1>, <&tsens_s2_p2>,
540+
<&tsens_s3_p1>, <&tsens_s3_p2>,
541+
<&tsens_s4_p1>, <&tsens_s4_p2>,
542+
<&tsens_s5_p1>, <&tsens_s5_p2>,
543+
<&tsens_s6_p1>, <&tsens_s6_p2>;
544+
nvmem-cell-names = "mode",
545+
"base1", "base2",
546+
"s0_p1", "s0_p2",
547+
"s1_p1", "s1_p2",
548+
"s2_p1", "s2_p2",
549+
"s3_p1", "s3_p2",
550+
"s4_p1", "s4_p2",
551+
"s5_p1", "s5_p2",
552+
"s6_p1", "s6_p2";
553+
#qcom,sensors = <6>;
554+
interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
555+
interrupt-names = "uplow";
556+
#thermal-sensor-cells = <1>;
557+
};
558+
515559
restart@fc4ab000 {
516560
compatible = "qcom,pshold";
517561
reg = <0xfc4ab000 0x4>;
518562
};
519563

564+
qfprom: qfprom@fc4bc000 {
565+
compatible = "qcom,msm8226-qfprom", "qcom,qfprom";
566+
reg = <0xfc4bc000 0x1000>;
567+
#address-cells = <1>;
568+
#size-cells = <1>;
569+
570+
tsens_base1: base1@1c1 {
571+
reg = <0x1c1 0x2>;
572+
bits = <5 8>;
573+
};
574+
575+
tsens_s0_p1: s0-p1@1c2 {
576+
reg = <0x1c2 0x2>;
577+
bits = <5 6>;
578+
};
579+
580+
tsens_s1_p1: s1-p1@1c4 {
581+
reg = <0x1c4 0x1>;
582+
bits = <0 6>;
583+
};
584+
585+
tsens_s2_p1: s2-p1@1c4 {
586+
reg = <0x1c4 0x2>;
587+
bits = <6 6>;
588+
};
589+
590+
tsens_s3_p1: s3-p1@1c5 {
591+
reg = <0x1c5 0x2>;
592+
bits = <4 6>;
593+
};
594+
595+
tsens_s4_p1: s4-p1@1c6 {
596+
reg = <0x1c6 0x1>;
597+
bits = <2 6>;
598+
};
599+
600+
tsens_s5_p1: s5-p1@1c7 {
601+
reg = <0x1c7 0x1>;
602+
bits = <0 6>;
603+
};
604+
605+
tsens_s6_p1: s6-p1@1ca {
606+
reg = <0x1ca 0x2>;
607+
bits = <4 6>;
608+
};
609+
610+
tsens_base2: base2@1cc {
611+
reg = <0x1cc 0x1>;
612+
bits = <0 8>;
613+
};
614+
615+
tsens_s0_p2: s0-p2@1cd {
616+
reg = <0x1cd 0x1>;
617+
bits = <0 6>;
618+
};
619+
620+
tsens_s1_p2: s1-p2@1cd {
621+
reg = <0x1cd 0x2>;
622+
bits = <6 6>;
623+
};
624+
625+
tsens_s2_p2: s2-p2@1ce {
626+
reg = <0x1ce 0x2>;
627+
bits = <4 6>;
628+
};
629+
630+
tsens_s3_p2: s3-p2@1cf {
631+
reg = <0x1cf 0x1>;
632+
bits = <2 6>;
633+
};
634+
635+
tsens_s4_p2: s4-p2@446 {
636+
reg = <0x446 0x2>;
637+
bits = <4 6>;
638+
};
639+
640+
tsens_s5_p2: s5-p2@447 {
641+
reg = <0x447 0x1>;
642+
bits = <2 6>;
643+
};
644+
645+
tsens_s6_p2: s6-p2@44e {
646+
reg = <0x44e 0x1>;
647+
bits = <1 6>;
648+
};
649+
650+
tsens_mode: mode@44f {
651+
reg = <0x44f 0x1>;
652+
bits = <5 3>;
653+
};
654+
};
655+
520656
spmi_bus: spmi@fc4cf000 {
521657
compatible = "qcom,spmi-pmic-arb";
522658
reg-names = "core", "intr", "cnfg";
@@ -628,7 +764,7 @@
628764
power-domains = <&rpmpd MSM8226_VDDCX>;
629765
power-domain-names = "cx";
630766

631-
clocks = <&xo_board>;
767+
clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>;
632768
clock-names = "xo";
633769

634770
memory-region = <&adsp_region>;
@@ -663,6 +799,50 @@
663799
};
664800
};
665801

802+
thermal-zones {
803+
cpu0-thermal {
804+
polling-delay-passive = <250>;
805+
polling-delay = <1000>;
806+
807+
thermal-sensors = <&tsens 5>;
808+
809+
trips {
810+
cpu_alert0: trip0 {
811+
temperature = <75000>;
812+
hysteresis = <2000>;
813+
type = "passive";
814+
};
815+
816+
cpu_crit0: trip1 {
817+
temperature = <110000>;
818+
hysteresis = <2000>;
819+
type = "critical";
820+
};
821+
};
822+
};
823+
824+
cpu1-thermal {
825+
polling-delay-passive = <250>;
826+
polling-delay = <1000>;
827+
828+
thermal-sensors = <&tsens 2>;
829+
830+
trips {
831+
cpu_alert1: trip0 {
832+
temperature = <75000>;
833+
hysteresis = <2000>;
834+
type = "passive";
835+
};
836+
837+
cpu_crit1: trip1 {
838+
temperature = <110000>;
839+
hysteresis = <2000>;
840+
type = "critical";
841+
};
842+
};
843+
};
844+
};
845+
666846
timer {
667847
compatible = "arm,armv7-timer";
668848
interrupts = <GIC_PPI 2

0 commit comments

Comments
 (0)