Skip to content
Snippets Groups Projects
Commit 71b9651b authored by Dietmar Muscholik's avatar Dietmar Muscholik
Browse files

[E81] Correct some minor issues in common devicetree

- correct include guard
- unify regulator configuration a little more
- remove unused stuff
- fix typos in comments
parent babcff4b
No related branches found
No related tags found
2 merge requests!13Merge E81 development branch into trunk,!6Add eDP support for E81
......@@ -18,8 +18,8 @@
*
*****************************************************************************/
#ifndef SECO_E81_DTSI
#define SECO_E81_DTSI
#ifndef E81_COMMON_DTSI
#define E81_COMMON_DTSI
#include <dt-bindings/iio/qcom,spmi-adc7-pm7325.h>
#include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h>
......@@ -121,18 +121,18 @@ reg_0v9_qps: 0v9_qps {
regulator-max-microvolt = <900000>;
gpio = <&pm8350c_gpios 2 GPIO_ACTIVE_HIGH>;
enable-active-high;
regulator-enable-ramp-delay = <4300>;
vin-supply = <&reg_5v_run>;
regulator-enable-ramp-delay = <4300>;
};
reg_1v8_qps: 1v8_qps {
compatible = "regulator-fixed";
regulator-name = "1V8_QPS";
vin-supply = <&reg_0v9_qps>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
gpio = <&pm8350c_gpios 3 GPIO_ACTIVE_HIGH>;
enable-active-high;
vin-supply = <&reg_0v9_qps>; // lie
regulator-enable-ramp-delay = <10000>;
};
......@@ -160,88 +160,18 @@ reg_3v3_wifi: 3v3_wifi {
};
// For some reason, qualcomm defines the reset-gpios in the regulator node
vreg_qps615_rsex: rsex_qps {
reg_qps615_rsex: rsex_qps {
compatible = "regulator-fixed";
regulator-name = "rsex_qps";
vin-supply = <&reg_1v8_qps>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
gpio = <&pm8350c_gpios 1 GPIO_ACTIVE_HIGH>;
enable-active-high;
vin-supply = <&reg_1v8_qps>;
regulator-enable-ramp-delay = <10000>;
};
};
#if 0
// qps615-stuff, copied from qcom/qcs6490-addons-rb3gen2.dtsi
/ {
qps615_0p9_vreg: qps615-0p9-vreg {
compatible = "regulator-fixed";
regulator-name = "qps615_0p9_vreg";
gpio = <&pm8350c_gpios 2 0>;
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
enable-active-high;
regulator-enable-ramp-delay = <4300>;
};
qps615_1p8_vreg: qps615-1p8-vreg {
compatible = "regulator-fixed";
regulator-name = "qps615_1p8_vreg";
gpio = <&pm8350c_gpios 3 0>;
vin-supply = <&qps615_0p9_vreg>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
enable-active-high;
regulator-enable-ramp-delay = <10000>;
};
qps615_rsex_vreg: qps615-rsex-vreg {
compatible = "regulator-fixed";
regulator-name = "qps615_rsex_vreg";
gpio = <&pm8350c_gpios 1 0>;
vin-supply = <&qps615_1p8_vreg>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
enable-active-high;
regulator-enable-ramp-delay = <10000>;
};
upd_3p3_vreg: upd_3p3_vreg {
compatible = "regulator-fixed";
regulator-name = "upd_3p3_vreg";
//gpio = <&pm7250b_gpios 1 0>;
vin-supply = <&qps615_rsex_vreg>;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
//enable-active-high;
regulator-enable-ramp-delay = <10000>;
regulator-always-on;
};
upd_rest_vreg: upd_rest_vreg {
compatible = "regulator-fixed";
regulator-name = "upd_rest_vreg";
//gpio = <&pm8350c_gpios 4 0>;
vin-supply = <&upd_3p3_vreg>;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
//enable-active-high;
regulator-always-on;
};
/*
usbhub_rest_vreg: usbhub_rest_vreg {
compatible = "regulator-fixed";
regulator-name = "usbhub_rest_vreg";
pinctrl-names = "default";
pinctrl-0 = <&pcie1_usb_hub_reset_default>;
gpio = <&tlmm 162 GPIO_ACTIVE_LOW>;
enable-active-high;
};
*/
};
// ... but did not help, even breaks everything
#endif
&apps_rsc {
// PM7325, U1900
......@@ -381,7 +311,7 @@ vreg_l11b_1p504: ldo11 {
regulator-always-on;
};
// according to schematics page 3+4 these regulators are to used
// according to schematics page 3+4 these regulators are not used
/*
vreg_l12b_0p751: ldo12 {
regulator-name = "VREG_L12B_0V8";
......@@ -549,7 +479,7 @@ vreg_l11c_3p3: ldo11 {
regulator-max-microvolt = <3540000>;
regulator-always-on;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
};
};
};
......@@ -763,8 +693,6 @@ &uart10 { // SER2
};
&uart9 { // SER3
compatible = "qcom,geni-uart";
pinctrl-names = "default";
pinctrl-0 = <&qup_uart9_tx>, <&qup_uart9_rx>;
status = "okay";
};
......@@ -865,7 +793,7 @@ &i2c0 {
pcie_switch: qps615@77 {
compatible = "qcom,switch-i2c";
reg = <0x077>;
vdda-supply = <&vreg_qps615_rsex>;
vdda-supply = <&reg_qps615_rsex>;
status = "okay";
};
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment