Skip to content

Commit

Permalink
arch: arms: dts: move common code to nubia_common
Browse files Browse the repository at this point in the history 
* move code that common for nx551j and nx549j to nubia_common
  • Loading branch information
@HighwayStar
HighwayStar committed Oct 1, 2019
1 parent 245f9eb commit d3b7a04
Show file tree
Hide file tree
Showing 18 changed files with 144 additions and 350 deletions.
2 changes: 0 additions & 2 deletions arch/arm/boot/dts/qcom/NX549/head.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,5 @@
#include "msm8953-mdss-panels.dtsi"
#include "msm8953-mtp-breathlight.dtsi"
#include "msm8953-mtp.dtsi"
#include "msm8953-regulator.dtsi"
#include "msm-pm8953.dtsi"
#include "msm-pmi8950.dtsi"

39 changes: 0 additions & 39 deletions arch/arm/boot/dts/qcom/NX549/msm-audio.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,45 +44,6 @@

};

ext_codec: sound-9335 {
asoc-cpu = <&dai_pri_auxpcm>,
<&dai_mi2s2>, <&dai_mi2s3>, <&dai_mi2s5>,
<&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>,
<&afe_pcm_rx>, <&afe_pcm_tx>,
<&afe_proxy_rx>, <&afe_proxy_tx>,
<&incall_record_rx>, <&incall_record_tx>,
<&incall_music_rx>, <&incall_music_2_rx>,
<&sb_5_rx>, <&bt_sco_rx>,
<&bt_sco_tx>, <&int_fm_rx>, <&int_fm_tx>;
asoc-cpu-names = "msm-dai-q6-auxpcm.1",
"msm-dai-q6-mi2s.2",
"msm-dai-q6-mi2s.3", "msm-dai-q6-mi2s.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",
"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",
"msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393",
"msm-dai-q6-dev.16395", "msm-dai-q6-dev.224",
"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",
"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",
"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",
"msm-dai-q6-dev.32770", "msm-dai-q6-dev.16394",
"msm-dai-q6-dev.12288", "msm-dai-q6-dev.12289",
"msm-dai-q6-dev.12292", "msm-dai-q6-dev.12293";
};

i2c@78b6000 {
/delete-node/ wsa881x-i2c-codec@e;
/delete-node/ wsa881x-i2c-codec@44;
/delete-node/ wsa881x-i2c-codec@f;
/delete-node/ wsa881x-i2c-codec@45;
};




};


9 changes: 0 additions & 9 deletions arch/arm/boot/dts/qcom/NX549/msm-pmi8950.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,5 @@
};
};

pmi_haptic: qcom,haptic@c000 {
qcom,vmax-mv = <2700>;
status="okay";
qcom,actuator-type = "erm";
qcom,lra-high-z = "none";
qcom,lra-auto-res-mode = "none";
qcom,lra-res-cal-period = <4>;
qcom,ztemt_vibrator_ms =<22>;
};
};
};
11 changes: 0 additions & 11 deletions arch/arm/boot/dts/qcom/NX549/msm8953-audio.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
qcom,model = "msm8953-snd-card-mtp";

qcom,cdc-ext-amp-gpios = <&tlmm 25 0>;
qcom,msm-mbhc-hphl-swh = <1>;
qcom,msm-hs-micbias-type = "external";
/delete-property/ qcom,cdc-us-euro-gpios;

Expand Down Expand Up @@ -110,11 +109,6 @@
&cdc_pdm_lines_2_act &cross_conn_det_act
&cdc_dmic_clk_act &cdc_dmic_lines_act &pri_tlmm_ws_act>;

/delete-property/ asoc-wsa-codec-names;
/delete-property/ asoc-wsa-codec-prefixes;
/delete-property/ msm-vdd-wsa-switch-supply;
/delete-property/ qcom,msm-vdd-wsa-switch-voltage;
/delete-property/ qcom,msm-vdd-wsa-switch-current;
};


Expand All @@ -123,10 +117,5 @@

qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
/delete-property/ qcom,cdc-us-euro-gpios;
/delete-property/ qcom,wsa-devs;
/delete-property/ qcom,wsa-aux-dev-prefix;
/delete-property/ qcom,wsa-max-devs;

};

96 changes: 0 additions & 96 deletions arch/arm/boot/dts/qcom/NX549/msm8953.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,110 +12,14 @@
*/


/ {
firmware: firmware {
android {
compatible = "android,firmware";
fstab {
/delete-node/ vendor;
};
};
};
reserved-memory {
other_ext_mem: other_ext_region@0 {
reg = <0x0 0x84a00000 0x0 0x1e00000>;
};
};


};

&soc {

qcom,bcl {
qcom,ibat-monitor {
qcom,soc-low-threshold = <5>;
};
};


spi_3: spi@78b7000 { /* BLSP1 QUP3 */
status = "disabled";
};

i2c_2: i2c@78b6000 { /* BLSP1 QUP2 */
/* DSI_TO_HDMI I2C configuration */
/delete-node/ adv7533@39;
};

i2c_3: i2c@78b7000 { /* BLSP1 QUP3 */
status = "okay";
};

i2c_5: i2c@7af5000 { /* BLSP2 QUP1 */
qcom,noise-rjct-scl = <3>;
qcom,noise-rjct-sda = <3>;
};

qcom,wdt@b017000 {
qcom,bark-time = <20000>;
qcom,pet-time = <15000>;
};

/delete-node/ qseecom@85b00000;
qcom_seecom: qseecom@84a00000 {
compatible = "qcom,qseecom";
reg = <0x84a00000 0x1900000>;
reg-names = "secapp-region";
qcom,hlos-num-ce-hw-instances = <1>;
qcom,hlos-ce-hw-instance = <0>;
qcom,qsee-ce-hw-instance = <0>;
qcom,disk-encrypt-pipe-pair = <2>;
qcom,support-fde;
qcom,msm-bus,name = "qseecom-noc";
qcom,msm-bus,num-cases = <4>;
qcom,msm-bus,num-paths = <1>;
qcom,support-bus-scaling;
qcom,appsbl-qseecom-support;
qcom,msm-bus,vectors-KBps =
<55 512 0 0>,
<55 512 0 0>,
<55 512 120000 1200000>,
<55 512 393600 3936000>;
clocks = <&clock_gcc clk_crypto_clk_src>,
<&clock_gcc clk_gcc_crypto_clk>,
<&clock_gcc clk_gcc_crypto_ahb_clk>,
<&clock_gcc clk_gcc_crypto_axi_clk>;
clock-names = "core_clk_src", "core_clk",
"iface_clk", "bus_clk";
qcom,ce-opp-freq = <100000000>;
};

qcom,mss@4080000 {
/delete-property/ qcom,pil-mss-memsetup;
/delete-property/ qcom,pas-id;
};



qusb_phy: qusb@79000 {
qcom,qusb-phy-init-seq = <0xF8 0x80
0x53 0x84
0x83 0x88
0xCF 0x8C
0x14 0x9C
0x30 0x08
0x79 0x0C
0x21 0x10
0x00 0x90
0x9F 0x1C
0x00 0x18>;

};




};


1 change: 0 additions & 1 deletion arch/arm/boot/dts/qcom/NX551/head.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@
#include "msm8953-mtp.dtsi"
#include "msm8953-mtp-fg.dtsi"
#include "msm8953-regulator.dtsi"
#include "msm-pm8953.dtsi"
#include "msm-pmi8950.dtsi"
#include "nubia-weipu-chg.dtsi"
37 changes: 0 additions & 37 deletions arch/arm/boot/dts/qcom/NX551/msm-audio.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,43 +25,6 @@

};

ext_codec: sound-9335 {
asoc-cpu = <&dai_pri_auxpcm>,
<&dai_mi2s2>, <&dai_mi2s3>, <&dai_mi2s5>,
<&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>,
<&afe_pcm_rx>, <&afe_pcm_tx>,
<&afe_proxy_rx>, <&afe_proxy_tx>,
<&incall_record_rx>, <&incall_record_tx>,
<&incall_music_rx>, <&incall_music_2_rx>,
<&sb_5_rx>, <&bt_sco_rx>,
<&bt_sco_tx>, <&int_fm_rx>, <&int_fm_tx>;
asoc-cpu-names = "msm-dai-q6-auxpcm.1",
"msm-dai-q6-mi2s.2",
"msm-dai-q6-mi2s.3", "msm-dai-q6-mi2s.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",
"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",
"msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393",
"msm-dai-q6-dev.16395", "msm-dai-q6-dev.224",
"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",
"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",
"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",
"msm-dai-q6-dev.32770", "msm-dai-q6-dev.16394",
"msm-dai-q6-dev.12288", "msm-dai-q6-dev.12289",
"msm-dai-q6-dev.12292", "msm-dai-q6-dev.12293";
};


i2c@78b6000 {
/delete-node/ wsa881x-i2c-codec@e;
/delete-node/ wsa881x-i2c-codec@44;
/delete-node/ wsa881x-i2c-codec@f;
/delete-node/ wsa881x-i2c-codec@45;
};

};


9 changes: 0 additions & 9 deletions arch/arm/boot/dts/qcom/NX551/msm-pmi8950.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,5 @@
/delete-property/ qcom,led-strings-list;
};

pmi_haptic: qcom,haptic@c000 {
qcom,vmax-mv = <2700>;
status="okay";
qcom,actuator-type = "erm";
qcom,lra-high-z = "none";
qcom,lra-auto-res-mode = "none";
qcom,lra-res-cal-period = <4>;
qcom,ztemt_vibrator_ms =<22>;
};
};
};
12 changes: 0 additions & 12 deletions arch/arm/boot/dts/qcom/NX551/msm8953-audio.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

&int_codec {
/delete-property/ qcom,cdc-us-euro-gpios;
qcom,msm-mbhc-hphl-swh = <1>;
qcom,msm-hs-micbias-type = "external";

pinctrl-0 = <&cdc_pdm_lines_sus &cdc_pdm_comp_lines_sus
Expand Down Expand Up @@ -69,11 +68,6 @@
asoc-codec = <&stub_codec>, <&pm8953_diangu_dig>, <&hdmi_dba>;
asoc-codec-names = "msm-stub-codec.1", "cajon_codec",
"msm-hdmi-dba-codec-rx";
/delete-property/ asoc-wsa-codec-names;
/delete-property/ asoc-wsa-codec-prefixes;
/delete-property/ msm-vdd-wsa-switch-supply;
/delete-property/ qcom,msm-vdd-wsa-switch-voltage;
/delete-property/ qcom,msm-vdd-wsa-switch-current;
};

/*
Expand All @@ -84,12 +78,6 @@
//ZTEMT: fengxun added for AL3200
*/

&ext_codec {
/delete-property/ qcom,cdc-us-euro-gpios;
/delete-property/ qcom,wsa-max-devs;
/delete-property/ qcom,wsa-devs;
/delete-property/ qcom,wsa-aux-dev-prefix;
};

//ZTEMT: fengxun added for AL3200
&clock_audio {
Expand Down
17 changes: 0 additions & 17 deletions arch/arm/boot/dts/qcom/NX551/msm8953-regulator.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,4 @@
};
};

rpm-regulator-ldoa22 {
pm8953_l22: regulator-l22 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
qcom,init-voltage = <1800000>;
};
};

};

&soc {
apc_cpr: cpr4-ctrl@b018000 {
/delete-property/ qcom,cpr-panic-reg-addr-list;
/delete-property/ qcom,cpr-panic-reg-name-list;

};

};
Loading

0 comments on commit d3b7a04

Please sign in to comment.