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

Commit 0a2bfc30 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: Rename CNSS platform driver device tree name"

parents 364175c7 c8e3bd5a

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

+3 −3
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@ entry below is to invoke the CNSS platform driver and provide handle to 
the WLAN enable GPIO, 3.3V fixed voltage regulator resources.



Required properties:

  - compatible: "qcom,cnss"

  - compatible: "qti,cnss"

  - wlan-en-gpio: WLAN_EN GPIO signal specified by QCA6174 specifications

  - vdd-wlan-supply: phandle to the regulator device tree node



Example:



    qcom,cnss {

        compatible = "qcom,cnss";

    qti,cnss {

        compatible = "qti,cnss";

        wlan-en-gpio = <&msmgpio 82 0>;

        vdd-wlan-supply = <&wlan_vreg>;

    };

arch/arm/boot/dts/qti/apq8084.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -2564,8 +2564,8 @@ 
		interrupts = <0 1 0>;

	};



	qcom,cnss {

		compatible = "qcom,cnss";

	qti,cnss {

		compatible = "qti,cnss";

		wlan-en-gpio = <&msmgpio 82 0>;

		vdd-wlan-supply = <&wlan_vreg>;

	};

drivers/net/wireless/cnss/cnss.c

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ static int cnss_remove(struct platform_device *pdev) 
}



static const struct of_device_id cnss_dt_match[] = {

	{.compatible = "qcom,cnss"},

	{.compatible = "qti,cnss"},

	{}

};