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

Commit 37327df8 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_bbif: Rename "qti" device tree prefix back to "qcom""

parents 1793cd85 bf15cc4c

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

+3 −3
Original line number Diff line number Diff line
@@ -3,14 +3,14 @@ QTI Base Band InterFace (BBIF) 
This is a platform driver for accessing the DAC/ADCs in FSM9900.



Required properties:

-compatible: should be "qti,bbif"

-compatible: should be "qcom,bbif"

-reg: specifies the base address of bbif registers.

vdd-lbbrx-supply: regulator used to control low voltage of Base Band RX.

vdd-hbbrx-supply: regulator used to control high voltage of Base Band RX.



Example:

	qti,bbif@fd300000 {

		compatible = "qti,bbif";

	qcom,bbif@fd300000 {

		compatible = "qcom,bbif";

		reg = <0xfd300000 0x10000>;

		vdd-lbbrx-supply = <&pma8084_l4>;

		vdd-hbbrx-supply = <&pma8084_l14>;

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

+2 −2
Original line number Diff line number Diff line
@@ -769,8 +769,8 @@ 
			< 1958400000 950000 569 >;

	};



	qti,bbif@fd300000 {

		compatible = "qti,bbif";

	qcom,bbif@fd300000 {

		compatible = "qcom,bbif";

		reg = <0xfd300000 0x10000>;

		vdd-lbbrx-supply = <&pma8084_l4>;

		vdd-hbbrx-supply = <&pma8084_l14>;

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

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



static struct of_device_id bbif_match_table[] = {

	{ .compatible = "qti,bbif" },

	{ .compatible = "qcom,bbif" },

	{}

};

MODULE_DEVICE_TABLE(of, bbif_match_table);