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

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

Merge "msm: fsm_rfic: Rename "qti" device tree prefix back to "qcom""

parents 5d01f286 954aad4d

Documentation/devicetree/bindings/arm/msm/msm_rfic.txt

+6 −6
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ Example for rfic driver using SSBI as a parent: 
		qcom,controller-type = "geni-ssbi-arbiter";



		rfic@1 {

			compatible = "qti,rfic";

			compatible = "qcom,rfic";

		};

	};
@@ -34,7 +34,7 @@ Example for rfic driver using SSBI as a parent: 
driver entry is independent and does not use ssbi driver.



Required properties:

-compatible: should be "qti,rfic"

-compatible: should be "qcom,rfic"

-reg: specifies the base address of the GRFC registers.

vdd-switch-supply: regulator used to control RF switches.

vdd-wtr-supply: regulator used to control WTR.
@@ -43,8 +43,8 @@ vdd-ftr2-supply: regulator used to control FTR2. 
vdd-mtr-supply: regulator used to control MTR.



Example:

	qti,rfic@fd4a4090 {

		compatible = "qti,rfic";

	qcom,rfic@fd4a4090 {

		compatible = "qcom,rfic";

		reg = <0xfd4a4090 0x40>;

		vdd-switch-supply = <&pma8084_l18>;

		vdd-wtr-supply = <&pma8084_l19>;
@@ -53,7 +53,7 @@ Example: 
		vdd-mtr-supply = <&pma8084_l26>;

	};



	qti,pdm@f9b10000 {

		compatible = "qti,rfic";

	qcom,pdm@f9b10000 {

		compatible = "qcom,rfic";

		reg = <0xf9b10000 0x8000>;

	};

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

+11 −11
Original line number Diff line number Diff line
@@ -776,8 +776,8 @@ 
		vdd-hbbrx-supply = <&pma8084_l14>;

	};



	qti,rfic@fd4a4090 {

		compatible = "qti,rfic";

	qcom,rfic@fd4a4090 {

		compatible = "qcom,rfic";

		reg = <0xfd4a4090 0x40>;

		vdd-switch-supply = <&pma8084_l18>;

		vdd-wtr-supply = <&pma8084_l19>;
@@ -786,8 +786,8 @@ 
		vdd-mtr-supply = <&pma8084_l26>;

	};



	qti,pdm@f9b10000 {

		compatible = "qti,rfic";

	qcom,pdm@f9b10000 {

		compatible = "qcom,rfic";

		reg = <0xf9b10000 0x8000>;

	};
@@ -798,7 +798,7 @@ 
		qcom,controller-type = "geni-ssbi-arbiter";



		rfic@1 {

			compatible = "qti,rfic";

			compatible = "qcom,rfic";

		};

	};
@@ -809,7 +809,7 @@ 
		qcom,controller-type = "geni-ssbi-arbiter";



		rfic@2 {

			compatible = "qti,rfic";

			compatible = "qcom,rfic";

		};

	};
@@ -820,7 +820,7 @@ 
		qcom,controller-type = "geni-ssbi-arbiter";



		rfic@3 {

			compatible = "qti,rfic";

			compatible = "qcom,rfic";

		};

	};
@@ -831,7 +831,7 @@ 
		qcom,controller-type = "geni-ssbi-arbiter";



		rfic@4 {

			compatible = "qti,rfic";

			compatible = "qcom,rfic";

		};

	};
@@ -842,7 +842,7 @@ 
		qcom,controller-type = "geni-ssbi-arbiter";



		rfic@5 {

			compatible = "qti,rfic";

			compatible = "qcom,rfic";

		};

	};
@@ -853,7 +853,7 @@ 
		qcom,controller-type = "geni-ssbi-arbiter";



		rfic@6 {

			compatible = "qti,rfic";

			compatible = "qcom,rfic";

		};

	};
@@ -864,7 +864,7 @@ 
		qcom,controller-type = "geni-ssbi-arbiter";



		rfic@7 {

			compatible = "qti,rfic";

			compatible = "qcom,rfic";

		};

	};

arch/arm/mach-msm/rfic-fsm9900.c

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



static struct of_device_id rfic_match_table[] = {

	{ .compatible = "qti,rfic" },

	{ .compatible = "qcom,rfic" },

	{}

};

MODULE_DEVICE_TABLE(of, rfic_match_table);