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

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

parents 9477e9ce a53a22f1

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

+6 −6
Original line number Diff line number Diff line
@@ -6,16 +6,16 @@ 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 "qti,qfp-fuse"

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

reg: physical base address and length of the register set

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.

- qcom,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.

- qti,blow-timer: blow timer value.

- qcom,blow-timer: blow timer value.

  The value specifies the blow time in number of blow timer clock cycles.

  The default setting is 0xF0. It meets the requirement for 28nm HPm fuse

  technology with blow timer clock at 19.2Mhz (12us blow time).
@@ -26,9 +26,9 @@ Optional Properties: 
  - 0x1E  (12us) for 28nm LP technology with 2.5Mhz blow timer clock



Example:

	qti,qfpfuse@fc4b8000 {

		compatible = "qti,qfp-fuse";

	qcom,qfpfuse@fc4b8000 {

		compatible = "qcom,qfp-fuse";

		reg = <0xfc4b8000 0x7000>;

		qti,blow-status-offset = 0x204c;

		qcom,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";

	};



	qti,fuse@fc4b8000 {

	qcom,qfpfuse@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";

	};



	qti,fuse@fc4b8000 {

	qcom,qfpfuse@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
@@ -868,10 +868,10 @@ 
		};

	};



	qti,fuse@fc4b8000 {

		compatible = "qti,qfp-fuse";

	qcom,qfpfuse@fc4b8000 {

		compatible = "qcom,qfp-fuse";

		reg = <0xfc4b8000 0x7000>;

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

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

		status = "disabled";

	};

drivers/misc/qfp_fuse.c

+3 −3
Original line number Diff line number Diff line
@@ -355,7 +355,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, "qti,blow-status-offset",

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

					 &blow_status_offset) == 0) {

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

				pr_err("Invalid blow-status-offset\n");
@@ -372,7 +372,7 @@ static int qfp_get_resource(struct platform_device *pdev, 
			return -EINVAL;

		}



		of_property_read_u32(np, "qti,blow-timer", &blow_timer);

		of_property_read_u32(np, "qcom,blow-timer", &blow_timer);



	} else {

		regulator_name = pdev->dev.platform_data;
@@ -460,7 +460,7 @@ static int qfp_fuse_remove(struct platform_device *plat) 
}



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

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

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

	{}

};