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

Commit b24e4d7d 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 CNSS node to device tree"

parents a7b637ad c9527fbb

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

+8 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, 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
@@ -502,4 +502,11 @@ 
			qcom,cpu-num = <3>;

		};

	};



	wlan_vreg: wlan_vreg {

		compatible = "regulator-fixed";

		regulator-name = "wlan_vreg";

		regulator-always-on;

		status = "ok";

	};

};

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

+7 −0
Original line number Diff line number Diff line
@@ -1210,6 +1210,13 @@ 
			<0xfe0c9010 0x4>;

		reg-names = "avtimer_lsb_addr", "avtimer_msb_addr";

	};



	qcom,cnss@0d400000 {

		compatible = "qcom,cnss";

		reg = <0x0d400000 0x200000>;

		reg-name = "ramdump";

		vdd-wlan-supply = <&wlan_vreg>;

	};

};



&gdsc_venus {