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

Commit a46beced authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Support WLAN power control on sa8155"

parents 69fde78e c3e872b8

Documentation/devicetree/bindings/cnss/cnss-wlan.txt

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ Optional properties: 
  - vdd-wlan-xtal-aon-supply: phandle to the LDO-4 regulator. This is needed

                              on platforms where XTAL regulator depends on

                              always on regulator in VDDmin.

  - vdd-wlan-ctrl1-supply: phandle to the DBU1 - 1.8V for QCA6595 or 3.3V for

                           QCA6174 on auto platform.

  - vdd-wlan-ctrl2-supply: phandle to the DBU4 - 2.2V for QCA6595 or 3.85V for

                           QCA6696 on auto platform.

  - vdd-wlan-core-supply: phandle to the 1.3V CORE regulator for QCA6174

  - vdd-wlan-sp2t-supply: phandle to the 2.7V SP2T regulator for QCA6174

  - qcom,smmu-s1-enable: Boolean property to decide whether to enable SMMU

arch/arm64/boot/dts/qcom/sa8155.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -722,6 +722,8 @@ 
		compatible = "qcom,cnss";

		wlan-en-gpio = <&tlmm 169 0>;

		vdd-wlan-supply = <&vreg_wlan>;

		vdd-wlan-ctrl1-supply = <&vreg_conn_pa>;

		vdd-wlan-ctrl2-supply = <&vreg_conn_1p8>;

		reg = <0x10000000 0x10000000>,

			<0x20000000 0x10000>;

		reg-names = "smmu_iova_base", "smmu_iova_ipa";

drivers/net/wireless/cnss2/power.c

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2018, 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
@@ -24,6 +24,8 @@ static struct cnss_vreg_info cnss_vreg_info[] = { 
	{NULL, "vdd-wlan-xtal-aon", 0, 0, 0, 0},

	{NULL, "vdd-wlan-xtal", 1800000, 1800000, 0, 2},

	{NULL, "vdd-wlan", 0, 0, 0, 0},

	{NULL, "vdd-wlan-ctrl1", 0, 0, 0, 0},

	{NULL, "vdd-wlan-ctrl2", 0, 0, 0, 0},

	{NULL, "vdd-wlan-sp2t", 2700000, 2700000, 0, 0},

	{NULL, "wlan-ant-switch", 2700000, 2700000, 20000, 0},

	{NULL, "wlan-soc-swreg", 1200000, 1200000, 0, 0},