evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: dts: msm: Use peripheral nodes from QRD630 on QRD636

Browse source 
Include QRD630 device tree file to leverage peripherals nodes and
delete smb1351 node as it is not present on QRD630 board.

Change-Id: I91b6356bf7267d56af73eee1a1bea3fa5ae944f4
Signed-off-by: Jiangen Jiao <jiangenj@codeaurora.org>
Signed-off-by: Zhenhua Huang <zhenhuah@codeaurora.org>
This commit is contained in:
Jiangen Jiao 2017-09-08 16:58:49 +08:00 • committed by Zhenhua Huang
parent b4728dbe0e
commit c793b29774
3 changed files with 59 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
arch/arm/boot/dts/qcom/sda636-pm660a-qrd-hdk.dts
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -17,10 +17,6 @@
#include "sdm636-qrd.dtsi"
#include "msm-pm660a.dtsi"
&smb1351_charger {
status = "disabled";
};
&i2c_2 {
smb138x: qcom,smb138x@8 {
compatible = "qcom,i2c-pmic";
@ -154,6 +150,8 @@
};
};
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 636 PM660 + PM660A QRD HDK636";
compatible = "qcom,sda636-qrd", "qcom,sda636", "qcom,qrd";
@ -172,15 +170,6 @@
qcom,mdss-pref-prim-intf = "dsi";
};
&mdss_dp_ctrl {
pinctrl-names = "mdss_dp_active", "mdss_dp_sleep";
pinctrl-0 = <&mdss_dp_aux_active &mdss_dp_usbplug_cc_active>;
pinctrl-1 = <&mdss_dp_aux_suspend &mdss_dp_usbplug_cc_suspend>;
qcom,aux-en-gpio = <&tlmm 55 0>;
qcom,aux-sel-gpio = <&tlmm 56 0>;
qcom,usbplug-cc-gpio = <&tlmm 58 0>;
};
&mdss_dsi {
hw-config = "single_dsi";
};
@ -190,6 +179,7 @@
pinctrl-names = "mdss_default", "mdss_sleep";
pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;
pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;
oledb-supply = <&pm660a_oledb>;
lab-supply = <&lab_regulator>;
ibb-supply = <&ibb_regulator>;
qcom,platform-reset-gpio = <&tlmm 53 0>;
@ -203,7 +193,24 @@
qcom,panel-supply-entries = <&dsi_panel_pwr_supply_labibb_amoled>;
};
/delete-node/ &tasha_hph_en0;
/delete-node/ &tasha_hph_en1;
&qusb_phy0 {
qcom,qusb-phy-init-seq = <0xf8 0x80
0xb3 0x84
0x83 0x88
0xc7 0x8c
0x30 0x08
0x79 0x0c
0x21 0x10
0x14 0x9c
0x9f 0x1c
0x00 0x18>;
};
&tasha_snd {
qcom,model = "sdm660-tasha-skus-snd-card";
qcom,audio-routing =
"AIF4 VI", "MCLK",
"RX_BIAS", "MCLK",
@ -218,25 +225,10 @@
"MIC BIAS4", "Digital Mic5",
"SpkrLeft IN", "SPK1 OUT";
qcom,msm-mbhc-hphl-swh = <0>;
};
&usb2s {
status = "okay";
};
&qusb_phy0 {
reg = <0x0c012000 0x180>,
<0x00188018 0x4>;
reg-names = "qusb_phy_base",
"ref_clk_addr";
qcom,qusb-phy-init-seq = <0xf8 0x80
0xb3 0x84
0x83 0x88
0xc7 0x8c
0x30 0x08
0x79 0x0c
0x21 0x10
0x14 0x9c
0x9f 0x1c
0x00 0x18>;
/delete-property/ qcom,us-euro-gpios;
/delete-property/ qcom,hph-en0-gpio;
/delete-property/ qcom,hph-en1-gpio;
qcom,wsa-max-devs = <1>;
qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_213>;
qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrLeft";
};

32
arch/arm/boot/dts/qcom/sdm636-pm660a-qrd.dts
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -15,7 +15,7 @@
#include "sdm636.dtsi"
#include "sdm636-qrd.dtsi"
#include "msm-pm660a.dtsi"
#include "sdm660-internal-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM 636 PM660 + PM660A QRD";
@ -26,6 +26,33 @@
<0x0001001b 0x0202001a 0x0 0x0>;
};
&int_codec {
qcom,model = "sdm660-snd-card-skush";
/delete-property/ qcom,us-euro-gpios;
qcom,audio-routing =
"RX_BIAS", "INT_MCLK0",
"SPK_RX_BIAS", "INT_MCLK0",
"INT_LDO_H", "INT_MCLK0",
"MIC BIAS External2", "Headset Mic",
"AMIC2", "MIC BIAS External2",
"MIC BIAS External", "Digital Mic1",
"DMIC1", "MIC BIAS External",
"MIC BIAS External", "Digital Mic3",
"DMIC3", "MIC BIAS External",
"MIC BIAS External", "Digital Mic4",
"DMIC4", "MIC BIAS External",
"SpkrLeft IN", "SPK1 OUT",
"PDM_IN_RX1", "PDM_OUT_RX1",
"PDM_IN_RX2", "PDM_OUT_RX2",
"PDM_IN_RX3", "PDM_OUT_RX3",
"ADC1_IN", "ADC1_OUT",
"ADC2_IN", "ADC2_OUT",
"ADC3_IN", "ADC3_OUT";
qcom,wsa-max-devs = <1>;
qcom,wsa-devs = <&wsa881x_211_en>, <&wsa881x_213_en>;
qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrLeft";
};
&pm660a_oledb {
status = "okay";
qcom,oledb-default-voltage-mv = <6400>;
@ -44,6 +71,7 @@
pinctrl-names = "mdss_default", "mdss_sleep";
pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;
pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;
oledb-supply = <&pm660a_oledb>;
lab-supply = <&lab_regulator>;
ibb-supply = <&ibb_regulator>;
qcom,platform-reset-gpio = <&tlmm 53 0>;

4
arch/arm/boot/dts/qcom/sdm636-qrd.dtsi
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -10,7 +10,7 @@
* GNU General Public License for more details.
*/
#include "sdm660-qrd.dtsi"
#include "sdm630-qrd.dtsi"
/ {
};