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

Commit 51c75088 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: Add device entry for CNSS platform driver for MSM8992"

parents a4f1be7c 4b015e52

arch/arm/boot/dts/qcom/msm8992-pinctrl.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -741,6 +741,17 @@ 
			};

		};



		cnss_pins {

			qcom,pins = <&gp 112>, <&gp 113>;

			qcom,num-grp-pins = <2>;

			qcom,pin-func = <0>;

			label = "cnss_pins";

			cnss_default: default {

				drive-strength = <16>;

				bias-pull-down;

			};

		};



		pmx_i2c_2 {

			qcom,pins = <&gp 6>, <&gp 7>; /* SDA, SCL */

			qcom,num-grp-pins = <2>;

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

+8 −0
Original line number Diff line number Diff line
@@ -599,6 +599,14 @@ 
		qcom,acc-sel-l1-bit-size = <1>;

	};



	wlan_vreg: wlan_vreg {

		compatible = "regulator-fixed";

		regulator-name = "wlan_vreg";

		startup-delay-us = <4000>;

		enable-active-high;

		gpio = <&pm8994_gpios 9 0>;

	};



	apc0_vreg_corner: regulator@f9019000 {

		compatible = "qcom,cpr-regulator";

		reg = <0xf9019000 0x1000>, <0xf900d064 4>, <0xfc4bc000 0x1000>;

arch/arm/boot/dts/qcom/msm8992.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
 * GNU General Public License for more details.

 */



/memreserve/ 0x00000000 0x00001000;



#include "skeleton64.dtsi"

#include <dt-bindings/clock/msm-clocks-8992.h>
@@ -940,6 +942,20 @@ 
		max-clock-frequency-hz = <125000000>, <0>, <1011000>, <0>, <0>, <0>, <0>, <0>;

	};



	qcom,cnss {

		compatible = "qcom,cnss";

		wlan-bootstrap-gpio = <&msm_gpio 112 0>;

		wlan-en-gpio = <&msm_gpio 113 0>;

		vdd-wlan-supply = <&wlan_vreg>;

		vdd-wlan-io-supply = <&pm8994_s4>;

		vdd-wlan-xtal-supply = <&pm8994_l30>;

		qcom,notify-modem-status;

		pinctrl-names = "default";

		pinctrl-0 = <&cnss_default>;

		qcom,wlan-rc-num = <0>;

		qcom,wlan-ramdump-dynamic = <0x200000>;

	};



	ipa_hw: qcom,ipa@fd4c0000 {

		compatible = "qcom,ipa";

		reg = <0xfd4c0000 0x29000>,