Skip to content

Commit c21cc3d

Browse files
committed
Merge tag 'qcom-arm64-for-5.14-1' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt
Additional Qualcomm ARM64 DT updates for v5.14 After a series of refactorings and additions to the SM8150 and SM8250 platform definitions, this adds new devicetree definitions for Sony Xperia 1, 5, 1II and 5II. It defines the Qualcomm SA8155p automotive platform as a derrivative of SM8150 and introduces the Automotive Deveopment Platform board. Lastly ipq8074 gains the definiton of an additiona I2C master and the SDHCI bus votes for sc7180 are tweaked. * tag 'qcom-arm64-for-5.14-1' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (25 commits) arm64: dts: ipq8074: Add QUP6 I2C node arm64: dts: qcom: sc7180: bus votes for eMMC and SD card arm64: dts: qcom: sm8250-edo: Add Samsung touchscreen arm64: dts: qcom: sm8250-edo: Enable GPI DMA arm64: dts: qcom: sm8250-edo: Enable ADSP/CDSP/SLPI arm64: dts: qcom: sm8250-edo: Enable PCIe arm64: dts: qcom: sm8250: Commonize PCIe pins arm64: dts: qcom: sm8250-edo: Add hardware keys arm64: dts: qcom: sa8155p-adp: Add base dts file arm64: dts: qcom: pmm8155au_2: Add base dts file arm64: dts: qcom: pmm8155au_1: Add base dts file arm64: dts: qcom: sm8250-edo: Fix up double "pinctrl-1" arm64: dts: qcom: sm8[12]50-pm8150: Move RESIN to pm8150 dtsi arm64: dts: qcom: sm8250: Add support for SONY Xperia 1 II / 5 II (Edo platform) arm64: dts: qcom: sm8250: Move gpio.h inclusion to SoC DTSI arm64: dts: qcom: sm8250: Add SDHCI2 sleep mode pinctrl arm64: dts: qcom: sm8150: Add support for SONY Xperia 1 / 5 (Kumano platform) arm64: dts: qcom: sm8150: Disable Adreno and modem by default arm64: dts: qcom: sm8250: Disable Adreno and Venus by default arm64: dts: qcom: sm8250: Add GPI DMA nodes ... Link: https://lore.kernel.org/r/20210621164946.942956-1-bjorn.andersson@linaro.org Signed-off-by: Olof Johansson <olof@lixom.net>
2 parents 73d1774 + abe66bb commit c21cc3d

21 files changed

Lines changed: 2090 additions & 139 deletions

Documentation/devicetree/bindings/arm/qcom.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,20 @@ description: |
3636
msm8992
3737
msm8994
3838
msm8996
39+
sa8155p
3940
sc7180
4041
sc7280
4142
sdm630
4243
sdm660
4344
sdm845
4445
sdx55
46+
sm8150
4547
sm8250
4648
sm8350
4749
4850
The 'board' element must be one of the following strings:
4951
52+
adp
5053
cdp
5154
cp01-c1
5255
dragonboard
@@ -199,6 +202,16 @@ properties:
199202
- qcom,ipq6018-cp01-c1
200203
- const: qcom,ipq6018
201204

205+
- items:
206+
- enum:
207+
- qcom,sa8155p-adp
208+
- const: qcom,sa8155p
209+
210+
- items:
211+
- enum:
212+
- qcom,sm8150-mtp
213+
- const: qcom,sm8150
214+
202215
- items:
203216
- enum:
204217
- qcom,qrb5165-rb5

arch/arm64/boot/dts/qcom/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8998-oneplus-dumpling.dtb
3535
dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb
3636
dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-4000.dtb
3737
dtb-$(CONFIG_ARCH_QCOM) += qrb5165-rb5.dtb
38+
dtb-$(CONFIG_ARCH_QCOM) += sa8155p-adp.dtb
3839
dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb
3940
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1.dtb
4041
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1-lte.dtb
@@ -77,7 +78,11 @@ dtb-$(CONFIG_ARCH_QCOM) += sdm850-lenovo-yoga-c630.dtb
7778
dtb-$(CONFIG_ARCH_QCOM) += sm8150-hdk.dtb
7879
dtb-$(CONFIG_ARCH_QCOM) += sm8150-microsoft-surface-duo.dtb
7980
dtb-$(CONFIG_ARCH_QCOM) += sm8150-mtp.dtb
81+
dtb-$(CONFIG_ARCH_QCOM) += sm8150-sony-xperia-kumano-bahamut.dtb
82+
dtb-$(CONFIG_ARCH_QCOM) += sm8150-sony-xperia-kumano-griffin.dtb
8083
dtb-$(CONFIG_ARCH_QCOM) += sm8250-hdk.dtb
8184
dtb-$(CONFIG_ARCH_QCOM) += sm8250-mtp.dtb
85+
dtb-$(CONFIG_ARCH_QCOM) += sm8250-sony-xperia-edo-pdx203.dtb
86+
dtb-$(CONFIG_ARCH_QCOM) += sm8250-sony-xperia-edo-pdx206.dtb
8287
dtb-$(CONFIG_ARCH_QCOM) += sm8350-hdk.dtb
8388
dtb-$(CONFIG_ARCH_QCOM) += sm8350-mtp.dtb

arch/arm64/boot/dts/qcom/ipq8074.dtsi

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,21 @@
373373
status = "disabled";
374374
};
375375

376+
blsp1_i2c6: i2c@78ba000 {
377+
compatible = "qcom,i2c-qup-v2.2.1";
378+
#address-cells = <1>;
379+
#size-cells = <0>;
380+
reg = <0x078ba000 0x600>;
381+
interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
382+
clocks = <&gcc GCC_BLSP1_AHB_CLK>,
383+
<&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>;
384+
clock-names = "iface", "core";
385+
clock-frequency = <100000>;
386+
dmas = <&blsp_dma 23>, <&blsp_dma 22>;
387+
dma-names = "rx", "tx";
388+
status = "disabled";
389+
};
390+
376391
qpic_bam: dma-controller@7984000 {
377392
compatible = "qcom,bam-v1.7.0";
378393
reg = <0x07984000 0x1a000>;

arch/arm64/boot/dts/qcom/pm8150.dtsi

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@
5050
pon: power-on@800 {
5151
compatible = "qcom,pm8916-pon";
5252
reg = <0x0800>;
53-
pwrkey {
53+
54+
pon_pwrkey: pwrkey {
5455
compatible = "qcom,pm8941-pwrkey";
5556
interrupts = <0x0 0x8 0x0 IRQ_TYPE_EDGE_BOTH>;
5657
debounce = <15625>;
@@ -59,6 +60,15 @@
5960

6061
status = "disabled";
6162
};
63+
64+
pon_resin: resin {
65+
compatible = "qcom,pm8941-resin";
66+
interrupts = <0x0 0x8 0x1 IRQ_TYPE_EDGE_BOTH>;
67+
debounce = <15625>;
68+
bias-pull-up;
69+
70+
status = "disabled";
71+
};
6272
};
6373

6474
pm8150_temp: temp-alarm@2400 {
Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
// SPDX-License-Identifier: BSD-3-Clause
2+
/*
3+
* Copyright (c) 2021, Linaro Limited
4+
*/
5+
6+
#include <dt-bindings/input/input.h>
7+
#include <dt-bindings/interrupt-controller/irq.h>
8+
#include <dt-bindings/spmi/spmi.h>
9+
#include <dt-bindings/iio/qcom,spmi-vadc.h>
10+
11+
/ {
12+
thermal-zones {
13+
pmm8155au-1-thermal {
14+
polling-delay-passive = <100>;
15+
polling-delay = <0>;
16+
17+
thermal-sensors = <&pmm8155au_1_temp>;
18+
19+
trips {
20+
trip0 {
21+
temperature = <95000>;
22+
hysteresis = <0>;
23+
type = "passive";
24+
};
25+
26+
trip1 {
27+
temperature = <115000>;
28+
hysteresis = <0>;
29+
type = "hot";
30+
};
31+
32+
trip2 {
33+
temperature = <145000>;
34+
hysteresis = <0>;
35+
type = "critical";
36+
};
37+
};
38+
};
39+
};
40+
};
41+
42+
&spmi_bus {
43+
pmic@0 {
44+
compatible = "qcom,pmm8155au", "qcom,spmi-pmic";
45+
reg = <0x0 SPMI_USID>;
46+
#address-cells = <1>;
47+
#size-cells = <0>;
48+
49+
pon: power-on@800 {
50+
compatible = "qcom,pm8916-pon";
51+
reg = <0x0800>;
52+
pwrkey {
53+
compatible = "qcom,pm8941-pwrkey";
54+
interrupts = <0x0 0x8 0x0 IRQ_TYPE_EDGE_BOTH>;
55+
debounce = <15625>;
56+
bias-pull-up;
57+
linux,code = <KEY_POWER>;
58+
59+
status = "disabled";
60+
};
61+
};
62+
63+
pmm8155au_1_temp: temp-alarm@2400 {
64+
compatible = "qcom,spmi-temp-alarm";
65+
reg = <0x2400>;
66+
interrupts = <0x0 0x24 0x0 IRQ_TYPE_EDGE_BOTH>;
67+
io-channels = <&pmm8155au_1_adc ADC5_DIE_TEMP>;
68+
io-channel-names = "thermal";
69+
#thermal-sensor-cells = <0>;
70+
};
71+
72+
pmm8155au_1_adc: adc@3100 {
73+
compatible = "qcom,spmi-adc5";
74+
reg = <0x3100>;
75+
#address-cells = <1>;
76+
#size-cells = <0>;
77+
#io-channel-cells = <1>;
78+
interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
79+
80+
ref-gnd@0 {
81+
reg = <ADC5_REF_GND>;
82+
qcom,pre-scaling = <1 1>;
83+
label = "ref_gnd";
84+
};
85+
86+
vref-1p25@1 {
87+
reg = <ADC5_1P25VREF>;
88+
qcom,pre-scaling = <1 1>;
89+
label = "vref_1p25";
90+
};
91+
92+
die-temp@6 {
93+
reg = <ADC5_DIE_TEMP>;
94+
qcom,pre-scaling = <1 1>;
95+
label = "die_temp";
96+
};
97+
};
98+
99+
pmm8155au_1_adc_tm: adc-tm@3500 {
100+
compatible = "qcom,spmi-adc-tm5";
101+
reg = <0x3500>;
102+
interrupts = <0x0 0x35 0x0 IRQ_TYPE_EDGE_RISING>;
103+
#thermal-sensor-cells = <1>;
104+
#address-cells = <1>;
105+
#size-cells = <0>;
106+
status = "disabled";
107+
};
108+
109+
pmm8155au_1_rtc: rtc@6000 {
110+
compatible = "qcom,pm8941-rtc";
111+
reg = <0x6000>;
112+
reg-names = "rtc", "alarm";
113+
interrupts = <0x0 0x61 0x1 IRQ_TYPE_NONE>;
114+
115+
status = "disabled";
116+
};
117+
118+
pmm8155au_1_gpios: gpio@c000 {
119+
compatible = "qcom,pmm8155au-gpio";
120+
reg = <0xc000>;
121+
gpio-controller;
122+
#gpio-cells = <2>;
123+
gpio-ranges = <&pmm8155au_1_gpios 0 0 10>;
124+
interrupt-controller;
125+
#interrupt-cells = <2>;
126+
};
127+
};
128+
129+
pmic@1 {
130+
compatible = "qcom,pmm8155au", "qcom,spmi-pmic";
131+
reg = <0x1 SPMI_USID>;
132+
#address-cells = <1>;
133+
#size-cells = <0>;
134+
};
135+
};
Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
// SPDX-License-Identifier: BSD-3-Clause
2+
/*
3+
* Copyright (c) 2021, Linaro Limited
4+
*/
5+
6+
#include <dt-bindings/input/input.h>
7+
#include <dt-bindings/interrupt-controller/irq.h>
8+
#include <dt-bindings/spmi/spmi.h>
9+
10+
/ {
11+
thermal-zones {
12+
pmm8155au-2-thermal {
13+
polling-delay-passive = <100>;
14+
polling-delay = <0>;
15+
16+
thermal-sensors = <&pmm8155au_2_temp>;
17+
18+
trips {
19+
trip0 {
20+
temperature = <95000>;
21+
hysteresis = <0>;
22+
type = "passive";
23+
};
24+
25+
trip1 {
26+
temperature = <115000>;
27+
hysteresis = <0>;
28+
type = "hot";
29+
};
30+
31+
trip2 {
32+
temperature = <145000>;
33+
hysteresis = <0>;
34+
type = "critical";
35+
};
36+
};
37+
};
38+
};
39+
};
40+
41+
&spmi_bus {
42+
pmic@4 {
43+
compatible = "qcom,pmm8155au", "qcom,spmi-pmic";
44+
reg = <0x4 SPMI_USID>;
45+
#address-cells = <1>;
46+
#size-cells = <0>;
47+
48+
power-on@800 {
49+
compatible = "qcom,pm8916-pon";
50+
reg = <0x0800>;
51+
52+
status = "disabled";
53+
};
54+
55+
pmm8155au_2_temp: temp-alarm@2400 {
56+
compatible = "qcom,spmi-temp-alarm";
57+
reg = <0x2400>;
58+
interrupts = <0x4 0x24 0x0 IRQ_TYPE_EDGE_BOTH>;
59+
io-channels = <&pmm8155au_2_adc ADC5_DIE_TEMP>;
60+
io-channel-names = "thermal";
61+
#thermal-sensor-cells = <0>;
62+
};
63+
64+
pmm8155au_2_adc: adc@3100 {
65+
compatible = "qcom,spmi-adc5";
66+
reg = <0x3100>;
67+
#address-cells = <1>;
68+
#size-cells = <0>;
69+
#io-channel-cells = <1>;
70+
interrupts = <0x4 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
71+
72+
ref-gnd@0 {
73+
reg = <ADC5_REF_GND>;
74+
qcom,pre-scaling = <1 1>;
75+
label = "ref_gnd";
76+
};
77+
78+
vref-1p25@1 {
79+
reg = <ADC5_1P25VREF>;
80+
qcom,pre-scaling = <1 1>;
81+
label = "vref_1p25";
82+
};
83+
84+
die-temp@6 {
85+
reg = <ADC5_DIE_TEMP>;
86+
qcom,pre-scaling = <1 1>;
87+
label = "die_temp";
88+
};
89+
};
90+
91+
pmm8155au_2_gpios: gpio@c000 {
92+
compatible = "qcom,pmm8155au-gpio";
93+
reg = <0xc000>;
94+
gpio-controller;
95+
#gpio-cells = <2>;
96+
gpio-ranges = <&pmm8155au_2_gpios 0 0 10>;
97+
interrupt-controller;
98+
#interrupt-cells = <2>;
99+
};
100+
};
101+
102+
pmic@5 {
103+
compatible = "qcom,pmm8155au", "qcom,spmi-pmic";
104+
reg = <0x5 SPMI_USID>;
105+
#address-cells = <1>;
106+
#size-cells = <0>;
107+
};
108+
};

0 commit comments

Comments
 (0)