duff/android_kernel_motorola_sm6225
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 20e221fb05 on remote branch

Browse Source 
Change-Id: Ia55b9c58339200596cbc6ad91c40f721bf114e0c
This commit is contained in:
Linux Build Service Account committed 2020-10-23 20:38:18 -07:00
2 parents 63997e1ad0 20e221fb05
commit 6ff409d360
30 files changed
+686 -120
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bindings/clock/qcom,aop-qmp.txt
+2
View File
@@ -7,6 +7,8 @@ Required properties :
- mboxes : list of QMP mailbox phandle and channel identifier tuples.
- mbox-names: List of identifier strings for each mailbox channel.
Must contain "qdss_clk".
- qcom,clk-stop-bimc-log: Presence indicates a BIMC logging request will
be sent to AOP during kernel panic.
Example :
clock_qdss: qcom,aopclk {
bindings/clock/qcom,rpmh-clk.txt
+1
View File
@@ -11,6 +11,7 @@ Required properties :
"qcom,sdm845-rpmh-clk"
"qcom,lito-rpmh-clk"
"qcom,lagoon-rpmh-clk"
"qcom,litomagnus-rpmh-clk"
- #clock-cells : must contain 1
bindings/cnss/cnss-wlan.txt
+2
View File
@@ -77,6 +77,8 @@ Optional properties:
and off sequences.
- qcom,converged-dt: Boolean property to decide whether it supports multiple
WLAN devices.
- cnss-enable-self-recovery: Boolean property to enable self recovery when
recovery is trigeered with reason link down.
Example:
qcom/bengal-gpu.dtsi
+2 -2
View File
@@ -128,8 +128,8 @@
<&gpucc GPU_CC_CX_GMU_CLK>,
<&gpucc GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK>;
clock-names = "core_clk", "rbbmtimer_clk", "mem_clk",
"iface_clk", "mem_iface_clk", "gmu_clk",
clock-names = "core_clk", "rbbmtimer_clk", "iface_clk",
"ahb_clk", "mem_clk", "gmu_clk",
"smmu_vote";
/* Bus Scale Settings */
qcom/bengal-pinctrl.dtsi
+10 -1
View File
@@ -56,7 +56,16 @@
<94 0 &wakegpio 47 0>,
<95 0 &wakegpio 48 0>,
<96 0 &wakegpio 49 0>,
<97 0 &wakegpio 50 0>;
<97 0 &wakegpio 50 0>,
<99 0 &wakegpio 64 0>, /* LPI_GPIO 7 */
<102 0 &wakegpio 65 0>, /* LPI_GPIO 10 */
<103 0 &wakegpio 66 0>, /* LPI_GPIO 11 */
<104 0 &wakegpio 67 0>, /* LPI_GPIO 12 */
<105 0 &wakegpio 69 0>, /* LPI_GPIO 17 */
<106 0 &wakegpio 14 0>, /* LPI_GPIO 16 */
<107 0 &wakegpio 7 0>, /* LPI_GPIO 17 */
<109 0 &wakegpio 37 0>, /* LPI_GPIO 19 */
<112 0 &wakegpio 25 0>; /* LPI_GPIO 24 */
irqdomain-map-pass-thru = <0 0xff>;
irqdomain-map-mask = <0xff 0>;
qcom/bengal.dtsi
+3 -2
View File
@@ -446,7 +446,7 @@
};
chosen {
bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7";
bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kpti=off";
};
soc: soc { };
@@ -630,6 +630,7 @@
bluetooth: bt_wcn3990 {
compatible = "qca,wcn3990";
qca,bt-sw-ctrl-gpio = <&tlmm 87 0>; /* SW_CTRL */
qca,bt-vdd-io-supply = <&L9A>; /* IO */
qca,bt-vdd-core-supply = <&L17A>; /* RFA */
qca,bt-vdd-pa-supply = <&L23A>; /* CH0 */
@@ -1317,7 +1318,7 @@
};
pmic {
qcom,dump-size = <0x10000>;
qcom,dump-size = <0x40000>;
qcom,dump-id = <0xe4>;
};
qcom/fg-gen4-batterydata-goertek-6100mah.dtsi
+115 -61
View File
@@ -1,69 +1,123 @@
qcom,4295629_goertek_vdl_6100mah_pm660_jan9th2020 {
/* #4295629_Goertek_VDL_6100mAH_PM660_averaged_MasterSlave_Jan9th2020*/
qcom,4295629_goertek_vdl_6100mah_pm8150b_sep18th2020 {
/* 4295629_Goertek_MorpheusVDL_6100mAh_avged_MasterSlave_Sept18th2020 */
qcom,max-voltage-uv = <4350000>;
qcom,fg-cc-cv-threshold-mv = <4340>;
qcom,nom-batt-capacity-mah = <6100>;
qcom,batt-id-kohm = <35>;
qcom,battery-beta = <4250>;
qcom,battery-type = "4295629_goertek_vdl_6100mah_pm660_jan9th2020";
qcom,checksum = <0xFBA6>;
qcom,gui-version = "PM660GUI - 0.0.0.45";
qcom,therm-room-temp = <100000>;
qcom,battery-type = "4295629_goertek_vdl_6100mah_pm8150b_sep18th2020";
qcom,therm-coefficients = <0x2318 0xd0c 0xdaf7 0xc556 0x848d>;
qcom,therm-center-offset = <0x70>;
qcom,therm-pull-up = <100>;
qcom,rslow-normal-coeffs = <0x4d 0xf4 0xd1 0x12>;
qcom,rslow-low-coeffs = <0x5e 0x15 0x67 0x07>;
qcom,checksum = <0xF24D>;
qcom,gui-version = "PM855GUI - 1.0.0.14";
qcom,fg-profile-data = [
6B 1E 62 F4
65 02 85 EC
D2 1C 12 02
82 0D D8 0A
F8 17 76 23
F1 44 B7 53
67 00 00 00
11 00 00 00
00 00 50 C5
02 C5 02 00
25 00 08 00
C6 DB F3 E4
B7 05 9F FB
D7 EA F1 12
F7 06 2C 32
25 06 09 20
27 00 14 00
5B 1F 5D FC
D2 03 A9 FD
D0 1C D6 02
3E 0C 04 12
A7 18 67 23
A6 44 4B 5A
69 00 00 00
0F 00 00 00
00 00 76 D5
6C CA 06 BB
1C 00 00 00
1D EA F3 E4
BF 06 0B FA
71 FD 12 01
FB FD 5F 13
99 33 CC FF
07 10 00 00
59 19 99 45
1C 00 40 00
DF 00 0A FA
FF 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
00 00 00 00
09 00 8B E2
ED DD A2 DB
26 D4 00 00
39 B5 DC 83
F7 87 C8 82
DF 8D 03 80
23 00 4D F4
D1 12 76 04
FC 02 CE 07
32 00 FD EA
E4 ED F5 CB
20 03 47 DA
69 B2 EF 1A
85 01 DA BB
60 00 46 00
46 00 44 00
38 00 30 00
34 00 3B 00
49 00 48 00
4B 00 60 00
3E 00 3C 00
3C 00 39 00
33 00 59 00
4B 64 4A 00
44 00 47 08
60 F0 51 00
4D 00 54 10
4D 10 47 00
74 20 5D 40
51 50 4C 11
4B 00 D8 00
DB 1F 97 05
05 EA 53 04
44 1C CD 0B
6E 0D 86 22
0A 18 23 43
50 5D 3E 03
6F 11 84 1E
FD FE 89 02
19 04 D3 1C
23 FA 5B 05
00 03 DF 17
A2 23 B1 44
12 52 67 14
85 1E EB E5
A6 CA 6B CF
DD 1C FD A2
7A 05 EF B2
E6 17 01 83
B9 85 5E A2
7D A0 09 80
5B FA 8F FC
EA 02 D0 03
00 00 BC DD
86 EA FC 07
19 F2 EC D5
FB 1F 17 00
A9 EC 27 02
05 06 B1 01
CE 07 32 00
84 01 37 02
C9 05 EE 02
DF 05 44 03
58 02 50 03
9E 05 4D 00
3F 00 41 00
42 64 47 00
4A 00 42 08
49 00 45 00
47 00 3E 10
4B 10 3F 00
47 28 47 48
4F 60 57 0C
41 00 55 F8
52 08 50 00
39 00 48 00
3B 08 47 10
49 00 5B 20
68 40 4A 58
55 0F 4E 00
45 00 2A 00
D8 F8 05 20
A7 05 32 0A
96 0E CE 1C
71 23 9E 45
70 52 7E 18
44 02 1B 05
90 02 6A 11
3F 0A 85 1F
07 04 06 02
BB 06 CE 1C
EE 02 17 04
13 02 9F 18
88 03 67 04
8C 02 6A 00
08 1F 7E 06
70 03 FD 05
D0 1C 6B 02
17 05 24 03
AC 18 14 03
3A 05 76 03
6C 00 DF 00
C0 00 FA 00
59 19 00 00
];
};
qcom/kona-sde.dtsi
+33
View File
@@ -306,6 +306,39 @@
<1 590 0 150000>,
<1 590 0 300000>;
};
qcom,sde-limits {
qcom,sde-linewidth-limits {
qcom,sde-limit-name = "sspp_linewidth_usecases";
qcom,sde-limit-cases = "vig", "dma", "scale", "inline_rot";
qcom,sde-limit-ids= <0x1 0x2 0x4 0x8>;
qcom,sde-limit-values = <0x1 4096>,
<0x5 2560>,
<0x2 4096>,
<0x9 1088>;
};
qcom,sde-bw-limits {
qcom,sde-limit-name = "sde_bwlimit_usecases";
qcom,sde-limit-cases = "per_vig_pipe",
"per_dma_pipe",
"total_max_bw",
"camera_concurrency",
"cwb_concurrency";
qcom,sde-limit-ids = <0x1 0x2 0x4 0x8 0x10>;
qcom,sde-limit-values = <0x1 5300000>,
<0x11 5300000>,
<0x9 4400000>,
<0x19 4400000>,
<0x2 5300000>,
<0x12 5300000>,
<0xa 4400000>,
<0x1a 4400000>,
<0x4 16600000>,
<0x14 16600000>,
<0xc 13700000>,
<0x1c 13700000>;
};
};
};
sde_dp: qcom,dp_display@ae90000 {
qcom/kona-v2-gpu.dtsi
-1
View File
@@ -279,7 +279,6 @@
#size-cells = <0>;
qcom,speed-bin = <3>;
qcom,initial-pwrlevel = <4>;
qcom,throttle-pwrlevel = <0>;
qcom,gpu-pwrlevel@0 {
reg = <0>;
qcom/kona-xrfusion-ult.dtsi
+6 -4
View File
@@ -257,14 +257,16 @@
"MIC BIAS1", "Digital Mic2",
"DMIC3", "MIC BIAS1",
"MIC BIAS1", "Digital Mic3",
"DMIC4", "MIC BIAS3",
"MIC BIAS3", "Digital Mic4",
"DMIC4", "MIC BIAS1",
"MIC BIAS1", "Digital Mic4",
"DMIC5", "MIC BIAS3",
"MIC BIAS3", "Digital Mic5",
"DMIC6", "MIC BIAS4",
"MIC BIAS4", "Digital Mic6",
"DMIC6", "MIC BIAS3",
"MIC BIAS3", "Digital Mic6",
"DMIC7", "MIC BIAS4",
"MIC BIAS4", "Digital Mic7",
"DMIC8", "MIC BIAS4",
"MIC BIAS4", "Digital Mic8",
"IN1_HPHL", "HPHL_OUT",
"IN2_HPHR", "HPHR_OUT",
"IN3_AUX", "AUX_OUT",
qcom/kona.dtsi
+9 -1
View File
@@ -347,7 +347,7 @@
};
chosen {
bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7";
bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kpti=off";
};
firmware: firmware {
@@ -393,6 +393,12 @@
no-map;
};
reserved_xbl_uefi_log: res_xbl_uefi_log_region@80880000 {
compatible = "removed-dma-pool";
no-map;
reg = <0x0 0x80880000 0x0 0x14000>;
};
smem_mem: smem_region@80900000 {
no-map;
reg = <0x0 0x80900000 0x0 0x200000>;
@@ -2445,6 +2451,7 @@
#clock-cells = <1>;
mboxes = <&qmp_aop 0>;
mbox-names = "qdss_clk";
qcom,clk-stop-bimc-log;
};
clock_gcc: qcom,gcc@100000 {
@@ -4722,6 +4729,7 @@
cnss-daemon-support;
qcom,cmd_db_name = "smpf2";
qcom,set-wlaon-pwr-ctrl;
cnss-enable-self-recovery;
qcom,msm-bus,name = "msm-cnss";
qcom,msm-bus,num-cases = <7>;
qcom/lagoon.dtsi
+2 -1
View File
@@ -325,7 +325,7 @@
};
chosen {
bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7 earlycon=msm_geni_serial,0x98c000";
bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7 earlycon=msm_geni_serial,0x98c000 kpti=off";
};
soc: soc { };
@@ -536,6 +536,7 @@
bluetooth: bt_wcn3990 {
compatible = "qca,wcn3990";
qca,bt-sw-ctrl-gpio = <&tlmm 69 0>; /* SW_CTRL */
qca,bt-vdd-io-supply = <&L11A>; /* IO */
qca,bt-vdd-core-supply = <&L2E>; /* RFA */
qca,bt-vdd-pa-supply = <&L10E>; /* CH0 */
qcom/lito.dtsi
+22 -1
View File
@@ -352,6 +352,12 @@
no-map;
};
reserved_xbl_uefi_log: res_xbl_uefi_log_region@80880000 {
compatible = "removed-dma-pool";
no-map;
reg = <0x0 0x80880000 0x0 0x14000>;
};
sec_apps_mem: sec_apps_region@808ff000 {
compatible = "removed-dma-pool";
no-map;
@@ -528,7 +534,7 @@
};
chosen {
bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7 earlycon=msm_geni_serial,0x888000";
bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7 earlycon=msm_geni_serial,0x888000 kpti=off";
};
soc: soc { };
@@ -2457,6 +2463,21 @@
qcom,dump-size = <0x1000>;
qcom,dump-id = <0x163>;
};
osm_reg {
qcom,dump-size = <0x400>;
qcom,dump-id = <0x163>;
};
pcu_reg {
qcom,dump-size = <0x400>;
qcom,dump-id = <0x164>;
};
fsm_data {
qcom,dump-size = <0x400>;
qcom,dump-id = <0x165>;
};
};
qcom,chd_silver {
qcom/litomagnus-cdp-overlay.dts
+8
View File
@@ -11,3 +11,11 @@
qcom,msm-id = <400 0x20000>, <440 0x20000>;
qcom,board-id = <1 1>;
};
/*
* overriding adsp-fw-names with empty string
* to allow default adsp img load
*/
&adsp_loader {
adsp-fw-names="";
};
qcom/litomagnus-cdp.dtsi
+68
View File
@@ -3,3 +3,71 @@
&soc {
};
&usb_qmp_dp_phy {
/delete-property/vdd-supply;
vdd-supply = <&L11A>;
};
&sde_dp {
vdda-0p9-supply = <&L11A>;
};
&swr0 {
wsa883x_0221: wsa883x@02170221 {
compatible = "qcom,wsa883x";
reg = <0x02 0x02170221>;
qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
qcom,bolero-handle = <&bolero>;
cdc-vdd-1p8-supply = <&S4A>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
};
wsa883x_0222: wsa883x@02170222 {
compatible = "qcom,wsa883x";
reg = <0x02 0x02170222>;
qcom,spkr-sd-n-node = <&wsa_spkr_en2>;
qcom,bolero-handle = <&bolero>;
cdc-vdd-1p8-supply = <&S4A>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
};
};
&wsa881x_0211 {
status = "disabled";
};
&wsa881x_0212 {
status = "disabled";
};
&wsa881x_0213 {
status = "disabled";
};
&wsa881x_0214 {
status = "disabled";
};
&lito_snd {
qcom,model = "lito-orchidmtp-snd-card";
qcom,wsa-max-devs = <2>;
qcom,wsa-devs = <&wsa883x_0221>, <&wsa883x_0222>;
qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight";
};
&pm8150_rtc {
status = "disabled";
};
&pmk8350_adc_tm {
status = "disabled";
};
qcom/litomagnus-mtp-overlay.dts
+8
View File
@@ -11,3 +11,11 @@
qcom,msm-id = <400 0x20000>, <440 0x20000>;
qcom,board-id = <8 1>;
};
/*
* overriding adsp-fw-names with empty string
* to allow default adsp img load
*/
&adsp_loader {
adsp-fw-names="";
};
qcom/litomagnus-mtp.dtsi
+120
View File
@@ -1,5 +1,125 @@
#include "lito-mtp.dtsi"
#include <dt-bindings/iio/qcom,spmi-vadc.h>
&soc {
};
&usb_qmp_dp_phy {
/delete-property/vdd-supply;
vdd-supply = <&L11A>;
};
&sde_dp {
vdda-0p9-supply = <&L11A>;
};
&swr0 {
wsa883x_0221: wsa883x@02170221 {
compatible = "qcom,wsa883x";
reg = <0x02 0x02170221>;
qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
qcom,bolero-handle = <&bolero>;
cdc-vdd-1p8-supply = <&S4A>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
};
wsa883x_0222: wsa883x@02170222 {
compatible = "qcom,wsa883x";
reg = <0x02 0x02170222>;
qcom,spkr-sd-n-node = <&wsa_spkr_en2>;
qcom,bolero-handle = <&bolero>;
cdc-vdd-1p8-supply = <&S4A>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
};
};
&wsa881x_0211 {
status = "disabled";
};
&wsa881x_0212 {
status = "disabled";
};
&wsa881x_0213 {
status = "disabled";
};
&wsa881x_0214 {
status = "disabled";
};
&lito_snd {
qcom,model = "lito-orchidmtp-snd-card";
qcom,wsa-max-devs = <2>;
qcom,wsa-devs = <&wsa883x_0221>, <&wsa883x_0222>;
qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight";
};
&pm8150_rtc {
status = "disabled";
};
&pmk8350_adc_tm {
status = "disabled";
};
&pm7250b_vadc {
smb1390_therm@e {
qcom,scale-fn-type = <ADC_SCALE_HW_CALIB_PM5_SMB1398_TEMP>;
};
};
&pm7250b_gpios {
smb_stat {
smb_stat_default: smb_stat_default {
pins = "gpio6";
function = "normal";
input-enable;
bias-pull-up;
qcom,pull-up-strength = <PMIC_GPIO_PULL_UP_30>;
power-source = <0>;
};
};
};
&qupv3_se9_i2c {
qcom,clk-freq-out = <100000>;
status = "ok"
#include "smb1398.dtsi"
};
&smb1396 {
interrupts = <0x2 0xc5 0x0 IRQ_TYPE_LEVEL_LOW>;
interrupt-parent = <&spmi_bus>;
interrupt-names = "smb1396";
pinctrl-names = "default";
qcom,enable-toggle-stat;
pinctrl-0 = <&smb_stat_default>;
status = "ok"
};
&smb1396_div2_cp_master {
io-channels = <&pm7250b_vadc ADC_AMUX_THM2>;
qcom,parallel-input-mode = <1>; /* USBIN */
qcom,parallel-output-mode = <2>; /* VBAT */
qcom,min-ilim-ua = <1000000>;
status = "ok"
};
&smb1396_slave {
status = "ok"
};
&smb1396_div2_cp_slave {
status = "ok"
};
qcom/litomagnus.dtsi
+14
View File
@@ -1,6 +1,20 @@
#include "lito-v2.dtsi"
#include "pmk8350.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Litomagnus";
compatible = "qcom,lito";
};
&pm8008_regulators {
vdd_l6-supply = <&BOB>;
};
&rpmhcc {
compatible = "qcom,litomagnus-rpmh-clk";
#clock-cells = <1>;
};
&apps_rsc {
/delete-node/ rpmh-regulator-ldoa7;
};
qcom/msm-audio.dtsi
+45 -13
View File
@@ -2,6 +2,19 @@
status = "okay";
};
&pm660_gpios {
pmi_clk {
pmi_clk_default: pmi_clk_default {
status = "ok"
pins = "gpio3";
function = "func1";
output-enable;
output-low;
qcom,drive-strength = <2>;
};
};
};
&soc {
pcm0: qcom,msm-pcm {
compatible = "qcom,msm-pcm-dsp";
@@ -95,7 +108,7 @@
dai_dp: qcom,msm-dai-q6-dp {
compatible = "qcom,msm-dai-q6-hdmi";
qcom,msm-dai-q6-dev-id = <24608>;
qcom,msm-dai-q6-dev-id = <0>;
};
loopback: qcom,msm-pcm-loopback {
@@ -661,12 +674,13 @@
};
tasha_snd: sound-9335 {
status = "disabled";
compatible = "qcom,sdm660-asoc-snd-tasha";
qcom,model = "sdm660-tasha-snd-card";
qcom,wcn-btfm;
qcom,mi2s-audio-intf;
qcom,auxpcm-audio-intf;
qcom,ext-disp-audio-rx;
qcom,wcn-btfm;
qcom,msm-mi2s-master = <1>, <1>, <1>, <1>;
qcom,audio-routing =
"AIF4 VI", "MCLK",
@@ -696,7 +710,6 @@
"MIC BIAS4", "Digital Mic5",
"SpkrLeft IN", "SPK1 OUT",
"SpkrRight IN", "SPK2 OUT";
qcom,msm-mbhc-hphl-swh = <1>;
qcom,msm-mbhc-gnd-swh = <1>;
qcom,us-euro-gpios = <&us_euro_gpio>;
@@ -715,11 +728,12 @@
"msm-pcm-routing", "msm-cpe-lsm",
"msm-compr-dsp", "msm-pcm-dsp-noirq",
"msm-cpe-lsm.3";
asoc-cpu = <&dai_dp>, <&dai_mi2s0>,
<&dai_mi2s1>,
<&dai_mi2s2>, <&dai_mi2s3>,
asoc-cpu = <&dai_dp>,
<&dai_mi2s0>, <&dai_mi2s1>, <&dai_mi2s2>,
<&dai_mi2s3>, <&dai_mi2s4>,
<&dai_pri_auxpcm>, <&dai_sec_auxpcm>,
<&dai_tert_auxpcm>, <&dai_quat_auxpcm>,
<&dai_quin_auxpcm>,
<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,
<&sb_2_rx>, <&sb_2_tx>, <&sb_3_rx>, <&sb_3_tx>,
<&sb_4_rx>, <&sb_4_tx>, <&sb_5_tx>,
@@ -732,12 +746,16 @@
<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,
<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,
<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,
<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>;
asoc-cpu-names = "msm-dai-q6-dp.24608", "msm-dai-q6-mi2s.0",
"msm-dai-q6-mi2s.1",
"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>,
<&dai_quin_tdm_rx_0>, <&dai_quin_tdm_tx_0>,
<&proxy_rx>, <&proxy_tx>;
asoc-cpu-names = "msm-dai-q6-dp.0", "msm-dai-q6-mi2s.0",
"msm-dai-q6-mi2s.1", "msm-dai-q6-mi2s.2",
"msm-dai-q6-mi2s.3", "msm-dai-q6-mi2s.4",
"msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",
"msm-dai-q6-auxpcm.3", "msm-dai-q6-auxpcm.4",
"msm-dai-q6-auxpcm.5",
"msm-dai-q6-dev.16384", "msm-dai-q6-dev.16385",
"msm-dai-q6-dev.16386", "msm-dai-q6-dev.16387",
"msm-dai-q6-dev.16388", "msm-dai-q6-dev.16389",
@@ -755,15 +773,17 @@
"msm-dai-q6-tdm.36865", "msm-dai-q6-tdm.36880",
"msm-dai-q6-tdm.36881", "msm-dai-q6-tdm.36896",
"msm-dai-q6-tdm.36897", "msm-dai-q6-tdm.36912",
"msm-dai-q6-tdm.36913";
"msm-dai-q6-tdm.36913", "msm-dai-q6-tdm.36928",
"msm-dai-q6-tdm.36929",
"msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195";
asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;
asoc-codec-names = "msm-stub-codec.1",
"msm-ext-disp-audio-codec-rx";
"msm-ext-disp-audio-codec-rx";
qcom,wsa-max-devs = <2>;
qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_212>,
<&wsa881x_213>, <&wsa881x_214>;
qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",
"SpkrLeft", "SpkrRight";
"SpkrLeft", "SpkrRight";
};
us_euro_gpio: msm_cdc_pinctrl@75 {
@@ -784,11 +804,23 @@
clock_audio: audio_ext_clk {
status = "disabled";
compatible = "qcom,audio-ref-clk";
qcom,codec-ext-clk-src = <13>;
pinctrl-names = "default";
pinctrl-0 = <&pmi_clk_default>;
qcom,audio-ref-clk-gpio = <&pm660_gpios 3 0>;
clock-names = "osr_clk";
clocks = <&clock_rpmcc RPM_SMD_DIV_CLK1>;
qcom,node_has_rpm_clock;
#clock-cells = <1>;
};
clock_audio_native: audio_ext_clk_native {
status = "disabled";
compatible = "qcom,audio-ref-clk";
qcom,codec-ext-clk-src = <3>;
qcom,use-pinctrl = <1>;
clock-names = "osr_clk";
#clock-cells = <1>;
qcom,codec-mclk-clk-freq = <11289600>;
qcom,mclk-clk-reg = <0x15020018 0x0>;
pinctrl-names = "sleep", "active";
qcom/orchid-cdp.dtsi
+33 -3
View File
@@ -4,13 +4,35 @@
};
&wsa_macro {
&usb_qmp_dp_phy {
/delete-property/vdd-supply;
vdd-supply = <&L11A>;
};
&sde_dp {
vdda-0p9-supply = <&L11A>;
};
&sde_dsi {
qcom,dsi-default-panel = <&dsi_sw43404_amoled_fhd_plus_cmd>;
};
&sde_dsi1 {
status = "disabled";
};
&mdss_mdp {
connectors = <&sde_wb &sde_dsi &sde_dp &sde_rscc>;
};
&swr0 {
wsa883x_0221: wsa883x@02170221 {
compatible = "qcom,wsa883x";
reg = <0x02 0x02170221>;
qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
qcom,bolero-handle = <&bolero>;
cdc-vdd-1p8-supply = <&L11A>;
cdc-vdd-1p8-supply = <&S4A>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
@@ -23,7 +45,7 @@
qcom,spkr-sd-n-node = <&wsa_spkr_en2>;
qcom,bolero-handle = <&bolero>;
cdc-vdd-1p8-supply = <&L11A>;
cdc-vdd-1p8-supply = <&S4A>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
@@ -53,3 +75,11 @@
qcom,wsa-devs = <&wsa883x_0221>, <&wsa883x_0222>;
qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight";
};
&pm8150_rtc {
status = "disabled";
};
&pmk8350_adc_tm {
status = "disabled";
};
qcom/orchid-mtp.dtsi
+86 -3
View File
@@ -1,16 +1,39 @@
#include "lito-mtp.dtsi"
#include <dt-bindings/iio/qcom,spmi-vadc.h>
&soc {
};
&wsa_macro {
&usb_qmp_dp_phy {
/delete-property/vdd-supply;
vdd-supply = <&L11A>;
};
&sde_dp {
vdda-0p9-supply = <&L11A>;
};
&sde_dsi {
qcom,dsi-default-panel = <&dsi_sw43404_amoled_fhd_plus_cmd>;
};
&sde_dsi1 {
status = "disabled";
};
&mdss_mdp {
connectors = <&sde_wb &sde_dsi &sde_dp &sde_rscc>;
};
&swr0 {
wsa883x_0221: wsa883x@02170221 {
compatible = "qcom,wsa883x";
reg = <0x02 0x02170221>;
qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
qcom,bolero-handle = <&bolero>;
cdc-vdd-1p8-supply = <&L11A>;
cdc-vdd-1p8-supply = <&S4A>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
@@ -23,7 +46,7 @@
qcom,spkr-sd-n-node = <&wsa_spkr_en2>;
qcom,bolero-handle = <&bolero>;
cdc-vdd-1p8-supply = <&L11A>;
cdc-vdd-1p8-supply = <&S4A>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
@@ -53,3 +76,63 @@
qcom,wsa-devs = <&wsa883x_0221>, <&wsa883x_0222>;
qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight";
};
&pm8150_rtc {
status = "disabled";
};
&pmk8350_adc_tm {
status = "disabled";
};
&pm7250b_vadc {
smb1390_therm@e {
qcom,scale-fn-type = <ADC_SCALE_HW_CALIB_PM5_SMB1398_TEMP>;
};
};
&pm7250b_gpios {
smb_stat {
smb_stat_default: smb_stat_default {
pins = "gpio6";
function = "normal";
input-enable;
bias-pull-up;
qcom,pull-up-strength = <PMIC_GPIO_PULL_UP_30>;
power-source = <0>;
};
};
};
&qupv3_se9_i2c {
qcom,clk-freq-out = <100000>;
status = "ok"
#include "smb1398.dtsi"
};
&smb1396 {
interrupts = <0x2 0xc5 0x0 IRQ_TYPE_LEVEL_LOW>;
interrupt-parent = <&spmi_bus>;
interrupt-names = "smb1396";
pinctrl-names = "default";
qcom,enable-toggle-stat;
pinctrl-0 = <&smb_stat_default>;
status = "ok"
};
&smb1396_div2_cp_master {
io-channels = <&pm7250b_vadc ADC_AMUX_THM2>;
qcom,parallel-input-mode = <1>; /* USBIN */
qcom,parallel-output-mode = <2>; /* VBAT */
qcom,min-ilim-ua = <1000000>;
status = "ok"
};
&smb1396_slave {
status = "ok"
};
&smb1396_div2_cp_slave {
status = "ok"
};
qcom/orchid.dtsi
+46
View File
@@ -1,7 +1,53 @@
#include "lito-v2.dtsi"
#include "pmk8350.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Orchid";
compatible = "qcom,orchid";
qcom,msm-id = <476 0x10000>;
};
&sde_dp {
/delete-property/ qcom,mst-enable;
};
&mdss_dsi1 {
status = "disabled";
};
&mdss_dsi_phy1 {
status = "disabled";
};
&mdss_dsi1_pll {
status = "disabled";
};
&pm8008_regulators {
vdd_l6-supply = <&BOB>;
};
&apps_rsc {
/delete-node/ rpmh-regulator-ldoa7;
};
&mdss_mdp {
qcom,sde-intf-off = <0x6b000 0x6b800>;
qcom,sde-intf-type = "dp", "dsi";
qcom,sde-sspp-type = "vig", "dma", "dma", "dma";
qcom,sde-sspp-off = <0x5000 0x25000 0x27000 0x29000>;
qcom,sde-sspp-xin-id = <0 1 5 9>;
qcom,sde-sspp-excl-rect = <1 1 1 1>;
qcom,sde-sspp-smart-dma-priority = <4 1 2 3>;
qcom,sde-max-per-pipe-bw-kbps = <4700000 4700000 4700000
4700000>;
qcom,sde-max-per-pipe-bw-high-kbps = <4700000 4700000 4700000
4700000>;
qcom,sde-sspp-clk-ctrl = <0x2ac 0>, <0x2ac 8>, <0x2b4 8>,
<0x2c4 8>;
};
&rpmhcc {
compatible = "qcom,litomagnus-rpmh-clk";
#clock-cells = <1>;
};
qcom/pmk8350.dtsi
+2 -2
View File
@@ -14,8 +14,8 @@
qcom,pmk8350@6 {
compatible = "qcom,spmi-pmic";
reg = <6 SPMI_USID>;
#address-cells = <1>;
#size-cells = <1>;
#address-cells = <2>;
#size-cells = <0>;
pmk8350_revid: qcom,revid@100 {
compatible = "qcom,qpnp-revid";
qcom/scuba-gpu.dtsi
+1 -1
View File
@@ -122,7 +122,7 @@
<&gcc GCC_GPU_MEMNOC_GFX_CLK>,
<&gpucc GPU_CC_CX_GMU_CLK>,
<&gpucc GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK>,
<&gcc GCC_BIMC_GPU_AXI_CLK>;
<&rpmcc RPM_SMD_BIMC_GPU_CLK>;
clock-names = "core_clk", "rbbmtimer_clk", "mem_clk",
"iface_clk", "mem_iface_clk", "gmu_clk",
qcom/scuba-low-ram.dtsi
+4
View File
@@ -34,6 +34,10 @@
alignment = <0x0 0x400000>;
size = <0x0 0x400000>;
};
linux,cma {
size = <0x0 0x1000000>;
};
};
};
qcom/scuba.dtsi
+2 -1
View File
@@ -324,7 +324,7 @@
};
chosen {
bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7";
bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kpti=off";
};
soc: soc { };
@@ -2222,6 +2222,7 @@
bluetooth: bt_wcn3990 {
compatible = "qca,wcn3990";
qca,bt-sw-ctrl-gpio = <&tlmm 87 0>; /* SW_CTRL */
qca,bt-vdd-io-supply = <&L15A>; /* IO */
qca,bt-vdd-core-supply = <&L10A>; /* RFA */
qca,bt-vdd-pa-supply = <&L22A>; /* CH0 */
qcom/sdm660-audio.dtsi
+7 -17
View File
@@ -15,6 +15,7 @@
qcom,mi2s-audio-intf;
qcom,auxpcm-audio-intf;
qcom,wcn-btfm;
qcom,ext-disp-audio-rx;
qcom,msm-mi2s-master = <1>, <1>, <1>, <1>;
qcom,msm-mclk-freq = <9600000>;
qcom,msm-mbhc-hphl-swh = <1>;
@@ -87,7 +88,7 @@
<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>,
<&dai_quin_tdm_rx_0>, <&dai_quin_tdm_tx_0>,
<&proxy_rx>, <&proxy_tx>;
asoc-cpu-names = "msm-dai-q6-dp.24608",
asoc-cpu-names = "msm-dai-q6-dp.0",
"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.7",
@@ -129,6 +130,7 @@
qcom,mi2s-audio-intf;
qcom,auxpcm-audio-intf;
qcom,wcn-btfm;
qcom,ext-disp-audio-rx;
qcom,msm-mi2s-master = <1>, <1>, <1>, <1>;
qcom,audio-routing =
"AIF4 VI", "MCLK",
@@ -197,7 +199,7 @@
<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>,
<&dai_quin_tdm_rx_0>, <&dai_quin_tdm_tx_0>,
<&proxy_rx>, <&proxy_tx>;
asoc-cpu-names = "msm-dai-q6-dp.24608", "msm-dai-q6-mi2s.0",
asoc-cpu-names = "msm-dai-q6-dp.0", "msm-dai-q6-mi2s.0",
"msm-dai-q6-mi2s.1", "msm-dai-q6-mi2s.2",
"msm-dai-q6-mi2s.3", "msm-dai-q6-mi2s.4",
"msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",
@@ -232,7 +234,6 @@
qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",
"SpkrLeft", "SpkrRight";
};
};
&slim_aud {
@@ -243,6 +244,7 @@
};
wcd9335: tasha_codec {
status = "disabled";
compatible = "qcom,tasha-slim-pgd";
elemental-addr = [00 01 a0 01 17 02];
@@ -254,8 +256,8 @@
qcom,wcd-rst-gpio-node = <&wcd_rst_gpio>;
clock-names = "wcd_clk", "wcd_native_clk";
clocks = <&clock_audio AUDIO_PMI_CLK>,
<&clock_audio AUDIO_LPASS_MCLK_2>;
clocks = <&clock_audio 0>,
<&clock_audio_native 0>;
cdc-vdd-mic-bias-supply = <&pm660l_bob>;
qcom,cdc-vdd-mic-bias-voltage = <3300000 3300000>;
@@ -487,15 +489,3 @@
};
};
};
&pm660_gpios {
gpio@c200 {
status = "ok"
qcom,mode = <1>;
qcom,pull = <4>;
qcom,vin-sel = <0>;
qcom,src-sel = <2>;
qcom,master-en = <1>;
qcom,out-strength = <2>;
};
};
qcom/sdm660-qrd-external-codec-overlay.dts
+5 -1
View File
@@ -7,7 +7,6 @@
#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "sdm660-wcd.dtsi"
#include "sdm660-qrd.dtsi"
/ {
@@ -53,6 +52,11 @@
qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
};
&pm660l_wled {
qcom,string-cfg = <3>;
status = "ok"
};
&soc {
hbtp {
compatible = "qcom,hbtp-input";
qcom/sdm660-qrd.dtsi
+25 -2
View File
@@ -245,10 +245,32 @@
};
};
/delete-node/ &tasha_hph_en0;
/delete-node/ &tasha_hph_en1;
&wcd934x_cdc {
status = "disabled";
};
&tavil_snd {
status = "disabled";
};
&clock_audio_lnbb {
status = "disabled";
};
&clock_audio {
status = "ok"
};
&clock_audio_native {
status = "ok"
};
&wcd9335 {
status = "ok"
};
&tasha_snd {
status = "ok"
qcom,model = "sdm660-tasha-skus-snd-card";
qcom,audio-routing =
"AIF4 VI", "MCLK",
@@ -264,6 +286,7 @@
"MIC BIAS3", "Digital Mic5",
"SpkrLeft IN", "SPK1 OUT";
qcom,msm-mbhc-hphl-swh = <1>;
qcom,msm-mbhc-gnd-swh = <1>;
/delete-property/ qcom,us-euro-gpios;
/delete-property/ qcom,hph-en0-gpio;
/delete-property/ qcom,hph-en1-gpio;
qcom/sdm660.dtsi
+5 -3
View File
@@ -503,12 +503,12 @@
};
cont_splash_mem: splash_region@9d400000 {
reg = <0x0 0x9d400000 0x0 0x23ff000>;
reg = <0x0 0x9d400000 0x0 0x2300000>;
label = "cont_splash_mem";
};
dfps_data_mem: dfps_data_mem@0x9f7ff000 {
reg = <0 0x9f7ff000 0 0x00001000>;
dfps_data_mem: dfps_data_mem@0x9f700000 {
reg = <0x0 0x9f700000 0x0 0x00100000>;
label = "dfps_data_mem";
};
};
@@ -1105,6 +1105,7 @@
compatible = "qcom,arm-memlat-mon";
qcom,cpulist = <&CPU0 &CPU1 &CPU2 &CPU3>;
qcom,target-dev = <&cpu0_cpu_ddr_lat>;
qcom,cachemiss-ev = <0x17>;
qcom,core-dev-table =
< 902400 MHZ_TO_MBPS(200, 4) >,
< 1401600 MHZ_TO_MBPS(547, 4) >,
@@ -1130,6 +1131,7 @@
compatible = "qcom,arm-memlat-mon";
qcom,cpulist = <&CPU4 &CPU5 &CPU6 &CPU7>;
qcom,target-dev = <&cpu4_cpu_ddr_lat>;
qcom,cachemiss-ev = <0x17>;
qcom,core-dev-table =
< 1113600 MHZ_TO_MBPS(200, 4) >,
< 1401600 MHZ_TO_MBPS(1017, 4) >,