ARM: dts: msm: refactor DT files for 8996 automotive platforms

Currently, all the SOC (msm8996v3AU or msm8996proAU) specific
overrides are being done in board files. There is a lot of duplication
because of that. Refactor the device tree files for 8996 automotive
platforms so that all the SOC specific overrides can be present in
msm8996v3-auto.dtsi and msm8996pro-auto.dtsi alone. All the
8996v3/8996pro automotive board files will include one of these
files based upon the SOC used.

CRs-Fixed: 1036992
Change-Id: I2306907bbda6c2604bace046b361d1895f324361
Signed-off-by: Atul Raut <araut@codeaurora.org>
Signed-off-by: Tholkappiyan Agaram Raghupathy <traghu@codeaurora.org>
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
This commit is contained in:
Tholkappiyan Agaram Raghupathy 2016-06-30 17:59:05 -07:00 committed by Gerrit - the friendly Code Review server
parent 7ba7b300c9
commit d455affcc8
11 changed files with 137 additions and 347 deletions

View file

@ -15,6 +15,7 @@
#include "apq8096-v3.dtsi"
#include "msm8996-pm8994.dtsi"
#include "msm8996-auto-cdp.dtsi"
#include "msm8996v3-auto.dtsi"
/ {
model = "Qualcomm Technologies, Inc. APQ 8096 v3 AUTO CDP";

View file

@ -15,6 +15,7 @@
#include "apq8096pro.dtsi"
#include "msm8996-pm8994.dtsi"
#include "msm8996-auto-cdp.dtsi"
#include "msm8996pro-auto.dtsi"
/ {
model = "Qualcomm Technologies, Inc. APQ 8096 pro AUTO CDP";
@ -34,22 +35,3 @@
};
};
&gfx_vreg {
qcom,cpr-voltage-ceiling =
/* Speed bin 0 */
<600000 670000 670000 750000 830000 910000 960000 1020000
1070000>,
/* Speed bin 1 */
<600000 670000 670000 750000 830000 910000 960000 1020000
1070000>;
qcom,cpr-voltage-floor =
/* Speed bin 0 */
<600000 600000 600000 600000 600000 600000 600000 600000
600000>,
/* Speed bin 1 */
<600000 600000 600000 600000 600000 600000 600000 600000
600000>;
};

View file

@ -15,6 +15,7 @@
#include "apq8096pro-v1.1.dtsi"
#include "msm8996-pm8994.dtsi"
#include "msm8996-auto-cdp.dtsi"
#include "msm8996pro-auto.dtsi"
/ {
model = "Qualcomm Technologies, Inc. APQ 8096 pro v1.1 AUTO CDP";
@ -34,22 +35,3 @@
};
};
&gfx_vreg {
qcom,cpr-voltage-ceiling =
/* Speed bin 0 */
<600000 670000 670000 750000 830000 910000 960000 1020000
1070000>,
/* Speed bin 1 */
<600000 670000 670000 750000 830000 910000 960000 1020000
1070000>;
qcom,cpr-voltage-floor =
/* Speed bin 0 */
<600000 600000 600000 600000 600000 600000 600000 600000
600000>,
/* Speed bin 1 */
<600000 600000 600000 600000 600000 600000 600000 600000
600000>;
};

View file

@ -966,87 +966,4 @@
/delete-property/ qcom,spkr-sd-n-gpio;
};
&hl7509_en_vreg {
status = "ok";
};
&hl7509_vreg {
status = "ok";
};
&gfx_cpr {
vdd-supply = <&hl7509_vreg>;
qcom,cpr-step-quot-init-min = <20>;
qcom,cpr-step-quot-init-max = <26>;
qcom,voltage-step = <10000>;
/delete-property/ qcom,cpr-enable;
};
&gfx_vreg {
qcom,cpr-voltage-ceiling =
<600000 670000 670000 750000 830000
910000 960000 1020000>;
qcom,cpr-voltage-floor =
<600000 600000 600000 600000 600000
600000 600000 600000>;
};
&pm8994_l3 {
regulator-min-microvolt = <875000>;
regulator-max-microvolt = <875000>;
qcom,init-voltage = <875000>;
};
&pm8994_l11 {
regulator-min-microvolt = <850000>;
regulator-max-microvolt = <850000>;
qcom,init-voltage = <850000>;
};
&pm8994_l17 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
qcom,init-voltage = <1800000>;
};
&pm8994_l23 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
qcom,init-voltage = <1100000>;
};
&pm8994_l27 {
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <800000>;
qcom,init-voltage = <800000>;
};
&pm8994_l29 {
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
qcom,init-voltage = <2500000>;
};
&rpm_bus {
rpm-regulator-ldoa26 {
/delete-node/ pm8994_l26_corner;
/delete-node/ pm8994_l26_floor_corner;
pm8994_l26: regulator-l26 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
qcom,init-voltage = <1100000>;
status = "okay";
};
};
rpm-regulator-ldoa31 {
status = "okay";
pm8994_l31: regulator-l31 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
qcom,init-voltage = <1100000>;
status = "okay";
};
};
};

View file

@ -16,6 +16,7 @@
#include "msm8996-v3.dtsi"
#include "msm8996-pm8994.dtsi"
#include "msm8996-agave-adp.dtsi"
#include "msm8996v3-auto.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996 v3 AUTO ADP";
@ -61,14 +62,6 @@
};
};
&hl7509_en_vreg {
status = "ok";
};
&hl7509_vreg {
status = "ok";
};
&sdhc_2 {
cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on_sbc>;
@ -82,79 +75,3 @@
};
};
&gfx_cpr {
vdd-supply = <&hl7509_vreg>;
qcom,cpr-step-quot-init-min = <20>;
qcom,cpr-step-quot-init-max = <26>;
qcom,voltage-step = <10000>;
/delete-property/ qcom,cpr-enable;
};
&gfx_vreg {
qcom,cpr-voltage-ceiling =
<600000 670000 670000 750000 830000
910000 960000 1020000>;
qcom,cpr-voltage-floor =
<600000 600000 600000 600000 600000
600000 600000 600000>;
};
&pm8994_l3 {
regulator-min-microvolt = <875000>;
regulator-max-microvolt = <875000>;
qcom,init-voltage = <875000>;
};
&pm8994_l11 {
regulator-min-microvolt = <850000>;
regulator-max-microvolt = <850000>;
qcom,init-voltage = <850000>;
};
&pm8994_l17 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
qcom,init-voltage = <1800000>;
};
&pm8994_l23 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
qcom,init-voltage = <1100000>;
};
&pm8994_l27 {
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <800000>;
qcom,init-voltage = <800000>;
};
&pm8994_l29 {
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
qcom,init-voltage = <2500000>;
};
&rpm_bus {
rpm-regulator-ldoa26 {
/delete-node/ pm8994_l26_corner;
/delete-node/ pm8994_l26_floor_corner;
pm8994_l26: regulator-l26 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
qcom,init-voltage = <1100000>;
status = "okay";
};
};
rpm-regulator-ldoa31 {
status = "okay";
pm8994_l31: regulator-l31 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
qcom,init-voltage = <1100000>;
status = "okay";
};
};
};

View file

@ -15,6 +15,7 @@
#include "msm8996-v3.dtsi"
#include "msm8996-pm8994.dtsi"
#include "msm8996-auto-cdp.dtsi"
#include "msm8996v3-auto.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996 v3 AUTO CDP";

View file

@ -16,6 +16,7 @@
#include "msm8996pro.dtsi"
#include "msm8996-pm8994.dtsi"
#include "msm8996-agave-adp.dtsi"
#include "msm8996pro-auto.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro AUTO ADP";
@ -61,14 +62,6 @@
};
};
&hl7509_en_vreg {
status = "ok";
};
&hl7509_vreg {
status = "ok";
};
&sdhc_2 {
cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on_sbc>;
@ -82,99 +75,3 @@
};
};
&gfx_cpr {
vdd-supply = <&hl7509_vreg>;
qcom,cpr-step-quot-init-min = <20>;
qcom,cpr-step-quot-init-max = <26>;
qcom,voltage-step = <10000>;
/delete-property/ qcom,cpr-enable;
};
&gfx_vreg {
qcom,cpr-voltage-ceiling =
<600000 670000 670000 750000 830000
910000 960000 1020000>;
qcom,cpr-voltage-floor =
<600000 600000 600000 600000 600000
600000 600000 600000>;
};
&pm8994_l3 {
regulator-min-microvolt = <875000>;
regulator-max-microvolt = <875000>;
qcom,init-voltage = <875000>;
};
&pm8994_l11 {
regulator-min-microvolt = <850000>;
regulator-max-microvolt = <850000>;
qcom,init-voltage = <850000>;
};
&pm8994_l17 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
qcom,init-voltage = <1800000>;
};
&pm8994_l23 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
qcom,init-voltage = <1100000>;
};
&pm8994_l27 {
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <800000>;
qcom,init-voltage = <800000>;
};
&pm8994_l29 {
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
qcom,init-voltage = <2500000>;
};
&rpm_bus {
rpm-regulator-ldoa26 {
/delete-node/ pm8994_l26_corner;
/delete-node/ pm8994_l26_floor_corner;
pm8994_l26: regulator-l26 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
qcom,init-voltage = <1100000>;
status = "okay";
};
};
rpm-regulator-ldoa31 {
status = "okay";
pm8994_l31: regulator-l31 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
qcom,init-voltage = <1100000>;
status = "okay";
};
};
};
&gfx_vreg {
qcom,cpr-voltage-ceiling =
/* Speed bin 0 */
<600000 670000 670000 750000 830000 910000 960000 1020000
1070000>,
/* Speed bin 1 */
<600000 670000 670000 750000 830000 910000 960000 1020000
1070000>;
qcom,cpr-voltage-floor =
/* Speed bin 0 */
<600000 600000 600000 600000 600000 600000 600000 600000
600000>,
/* Speed bin 1 */
<600000 600000 600000 600000 600000 600000 600000 600000
600000>;
};

View file

@ -15,6 +15,7 @@
#include "msm8996pro.dtsi"
#include "msm8996-pm8994.dtsi"
#include "msm8996-auto-cdp.dtsi"
#include "msm8996pro-auto.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro AUTO CDP";
@ -39,22 +40,3 @@
pinctrl-0 = <&modem_mux>;
};
&gfx_vreg {
qcom,cpr-voltage-ceiling =
/* Speed bin 0 */
<600000 670000 670000 750000 830000 910000 960000 1020000
1070000>,
/* Speed bin 1 */
<600000 670000 670000 750000 830000 910000 960000 1020000
1070000>;
qcom,cpr-voltage-floor =
/* Speed bin 0 */
<600000 600000 600000 600000 600000 600000 600000 600000
600000>,
/* Speed bin 1 */
<600000 600000 600000 600000 600000 600000 600000 600000
600000>;
};

View file

@ -0,0 +1,33 @@
/* Copyright (c) 2016, 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
* only version 2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include "msm8996v3-auto.dtsi"
&gfx_vreg {
qcom,cpr-voltage-ceiling =
/* Speed bin 0 */
<600000 670000 670000 750000 830000 910000 960000 1020000
1070000>,
/* Speed bin 1 */
<600000 670000 670000 750000 830000 910000 960000 1020000
1070000>;
qcom,cpr-voltage-floor =
/* Speed bin 0 */
<600000 600000 600000 600000 600000 600000 600000 600000
600000>,
/* Speed bin 1 */
<600000 600000 600000 600000 600000 600000 600000 600000
600000>;
};

View file

@ -15,6 +15,7 @@
#include "msm8996pro-v1.1.dtsi"
#include "msm8996-pm8994.dtsi"
#include "msm8996-auto-cdp.dtsi"
#include "msm8996pro-auto.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro v1.1 AUTO CDP";
@ -39,22 +40,3 @@
pinctrl-0 = <&modem_mux>;
};
&gfx_vreg {
qcom,cpr-voltage-ceiling =
/* Speed bin 0 */
<600000 670000 670000 750000 830000 910000 960000 1020000
1070000>,
/* Speed bin 1 */
<600000 670000 670000 750000 830000 910000 960000 1020000
1070000>;
qcom,cpr-voltage-floor =
/* Speed bin 0 */
<600000 600000 600000 600000 600000 600000 600000 600000
600000>,
/* Speed bin 1 */
<600000 600000 600000 600000 600000 600000 600000 600000
600000>;
};

View file

@ -0,0 +1,96 @@
/* Copyright (c) 2016, 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
* only version 2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
&hl7509_en_vreg {
status = "ok";
};
&hl7509_vreg {
status = "ok";
};
&gfx_cpr {
vdd-supply = <&hl7509_vreg>;
qcom,cpr-step-quot-init-min = <20>;
qcom,cpr-step-quot-init-max = <26>;
qcom,voltage-step = <10000>;
/delete-property/ qcom,cpr-enable;
};
&gfx_vreg {
qcom,cpr-voltage-ceiling =
<600000 670000 670000 750000 830000
910000 960000 1020000>;
qcom,cpr-voltage-floor =
<600000 600000 600000 600000 600000
600000 600000 600000>;
};
&pm8994_l3 {
regulator-min-microvolt = <875000>;
regulator-max-microvolt = <875000>;
qcom,init-voltage = <875000>;
};
&pm8994_l11 {
regulator-min-microvolt = <850000>;
regulator-max-microvolt = <850000>;
qcom,init-voltage = <850000>;
};
&pm8994_l17 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
qcom,init-voltage = <1800000>;
};
&pm8994_l23 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
qcom,init-voltage = <1100000>;
};
&pm8994_l27 {
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <800000>;
qcom,init-voltage = <800000>;
};
&pm8994_l29 {
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
qcom,init-voltage = <2500000>;
};
&rpm_bus {
rpm-regulator-ldoa26 {
/delete-node/ pm8994_l26_corner;
/delete-node/ pm8994_l26_floor_corner;
pm8994_l26: regulator-l26 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
qcom,init-voltage = <1100000>;
status = "okay";
};
};
rpm-regulator-ldoa31 {
status = "okay";
pm8994_l31: regulator-l31 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
qcom,init-voltage = <1100000>;
status = "okay";
};
};
};