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

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

Merge "msm: Change vendor name from 'qcom' to 'qti' for mpm_counter"

parents 4c7ece16 34b0f151

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

+3 −3
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ driver provides an api to get this value. 


The required nodes for the MPM timetick counter driver are:



- compatible: "qcom,mpm2-sleep-counter"

- compatible: "qti,mpm2-sleep-counter"

- reg: Specifies the physical address of the timetick count register.

- clock-frequency: the physical counter frequency.



Example:

	qcom,mpm2-sleep-counter@fc4a3000 {

		compatible = "qcom,mpm2-sleep-counter";

	qti,mpm2-sleep-counter@fc4a3000 {

		compatible = "qti,mpm2-sleep-counter";

		reg = <0xfc4a3000 0x1000>;

		clock-frequency = <32768>;

	};

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

+2 −2
Original line number Diff line number Diff line
@@ -98,8 +98,8 @@ 
		qcom,direct-connect-irqs = <8>;

	};



	qcom,mpm2-sleep-counter@fc4a3000 {

		compatible = "qcom,mpm2-sleep-counter";

	qti,mpm2-sleep-counter@fc4a3000 {

		compatible = "qti,mpm2-sleep-counter";

		reg = <0xfc4a3000 0x1000>;

		clock-frequency = <32768>;

	};

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

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ 
		interrupt-names = "cdc-int";

	};



	qcom,mpm2-sleep-counter@fc4a3000 {

		compatible = "qcom,mpm2-sleep-counter";

	qti,mpm2-sleep-counter@fc4a3000 {

		compatible = "qti,mpm2-sleep-counter";

		reg = <0xfc4a3000 0x1000>;

		clock-frequency = <32768>;

	};

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

+2 −2
Original line number Diff line number Diff line
@@ -256,8 +256,8 @@ 
	};





	qcom,mpm2-sleep-counter@fc4a3000 {

		compatible = "qcom,mpm2-sleep-counter";

	qti,mpm2-sleep-counter@fc4a3000 {

		compatible = "qti,mpm2-sleep-counter";

		reg = <0xfc4a3000 0x1000>;

		clock-frequency = <32768>;

	};

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

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ 
		qcom,direct-connect-irqs = <8>;

	};



	qcom,mpm2-sleep-counter@fc4a3000 {

		compatible = "qcom,mpm2-sleep-counter";

	qti,mpm2-sleep-counter@fc4a3000 {

		compatible = "qti,mpm2-sleep-counter";

		reg = <0xfc4a3000 0x1000>;

		clock-frequency = <32768>;

	};