Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6eab15e2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Revert change to fix wlan boot issue"

parents 0d1a728f 58b483f6

arch/arm/boot/dts/qcom/mdmfermium-cdp.dtsi

+0 −12
Original line number Diff line number Diff line
@@ -14,18 +14,6 @@ 
#include "mdmfermium.dtsi"

#include "mdmfermium-pinctrl.dtsi"



/ {

	bluetooth: bt_qca6174 {

		compatible = "qca,qca6174";

		qca,bt-reset-gpio = <&pm8019_gpios 2 0>; /* BT_EN */

		qca,bt-vdd-pa-supply = <&rome_vreg>;

		qca,bt-vdd-io-supply = <&mdmfermium_l11>;

		qca,bt-vdd-xtal-supply = <&mdmfermium_l2>;

		qca,bt-vdd-io-voltage-level = <1800000 1800000>;

		qca,bt-vdd-xtal-voltage-level = <1800000 1800000>;

	};

};



&soc {

};

arch/arm/boot/dts/qcom/mdmfermium-mtp.dtsi

+0 −12
Original line number Diff line number Diff line
@@ -14,18 +14,6 @@ 
#include "mdmfermium.dtsi"

#include "mdmfermium-pinctrl.dtsi"



/ {

	bluetooth: bt_qca6174 {

		compatible = "qca,qca6174";

		qca,bt-reset-gpio = <&pm8019_gpios 2 0>; /* BT_EN */

		qca,bt-vdd-pa-supply = <&rome_vreg>;

		qca,bt-vdd-io-supply = <&mdmfermium_l11>;

		qca,bt-vdd-xtal-supply = <&mdmfermium_l2>;

		qca,bt-vdd-io-voltage-level = <1800000 1800000>;

		qca,bt-vdd-xtal-voltage-level = <1800000 1800000>;

	};

};



&soc {

};

arch/arm/boot/dts/qcom/mdmfermium-regulator.dtsi

+0 −9
Original line number Diff line number Diff line
@@ -371,15 +371,6 @@ 
	};



/* Miscellaneous regulators */

	/* Rome 3.3V supply */

	rome_vreg: rome_vreg {

		compatible = "regulator-fixed";

		regulator-name = "rome_vreg";

		startup-delay-us = <4000>;

		enable-active-high;

		gpio = <&pm8019_gpios 3 0>;

	};



	sdcard_ext_vreg: sdcard_ext_vreg {

		compatible = "regulator-fixed";

		regulator-name = "sdcard_ext_vreg";