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

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

Merge "misc: qfpfuse: change device tree binding prefix"

parents 6bd5af07 446ea2a0

Documentation/devicetree/bindings/misc/qfp-fuse.txt

+9 −5
Original line number Diff line number Diff line
@@ -6,16 +6,20 @@ to read and write the fuse values. The write operation can be done one time 
only.



Required Properties:

compatible: component name used for driver matching, should be "qcom,qfp-fuse"

compatible: component name used for driver matching, should be "qti,qfp-fuse"

reg: physical base address and length of the register set

qcom,blow-status-offset: offset of the blow status registers.

vdd-blow-supply: regulator used to blow fuses. For backward compatibility, the

regulator name must contain the string vdd-blow.



Optional Properties:

- qti,blow-status-offset: offset of the blow status registers.

  The default offset is 0x204C. Include this only if the blow status register

  is at the different offset.



Example:

	qcom,qfpfuse@fc4b8000 {

		compatible = "qcom,qfp-fuse";

	qti,qfpfuse@fc4b8000 {

		compatible = "qti,qfp-fuse";

		reg = <0xfc4b8000 0x7000>;

		qcom,blow-status-offset = 0x204c;

		qti,blow-status-offset = 0x204c;

		vdd-blow-supply: <&vdd_blow>;

	};

arch/arm/boot/dts/qti/fsm9900-cdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
		status = "disabled";

	};



	qcom,fuse@fc4b8000 {

	qti,fuse@fc4b8000 {

		status = "ok";

		vdd-blow-supply = <&pma8084_lvs1>;

	};

arch/arm/boot/dts/qti/fsm9900-mtp.dts

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
		status = "disabled";

	};



	qcom,fuse@fc4b8000 {

	qti,fuse@fc4b8000 {

		status = "ok";

		vdd-blow-supply = <&pma8084_lvs1>;

	};

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

+3 −3
Original line number Diff line number Diff line
@@ -827,10 +827,10 @@ 
		};

	};



	qcom,fuse@fc4b8000 {

		compatible = "qcom,qfp-fuse";

	qti,fuse@fc4b8000 {

		compatible = "qti,qfp-fuse";

		reg = <0xfc4b8000 0x7000>;

		qcom,blow-status-offset = <0x2048>;

		qti,blow-status-offset = <0x2048>;

		status = "disabled";

	};

drivers/misc/qfp_fuse.c

+2 −2
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static int qfp_get_resource(struct platform_device *pdev, 
	if (pdev->dev.of_node) {

		struct device_node *np = pdev->dev.of_node;



		if (of_property_read_u32(np, "qcom,blow-status-offset",

		if (of_property_read_u32(np, "qti,blow-status-offset",

					 &blow_status_offset) == 0) {

			if ((res->start + blow_status_offset) > res->end) {

				pr_err("Invalid blow-status-offset\n");
@@ -453,7 +453,7 @@ static int qfp_fuse_remove(struct platform_device *plat) 
}



static struct of_device_id __attribute__ ((unused)) qfp_fuse_of_match[] = {

	{ .compatible = "qcom,qfp-fuse", },

	{ .compatible = "qti,qfp-fuse", },

	{}

};