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

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

Merge "msm: pm: Rename power management module to msm-pm"

parents d07f2008 96c5c4bc

Documentation/devicetree/bindings/arm/msm/pm-8x60.txt→Documentation/devicetree/bindings/arm/msm/pm.txt

+6 −6
Original line number Diff line number Diff line 
* MSM PM-8x60

* MSM PM



PM-8x60 is the low power management device for MSM (Snapdragon class) chipsets.

PM is the low power management device for MSM (Snapdragon class) chipsets.

This device sets up different components to do low power modes and registers with

the kernel to be notified of idle and suspend states and when called, follows

through the set of instructions in putting the application cores to the lowest
@@ -9,9 +9,9 @@ The PC debug counter reserves 16 registers in the IMEM memory space which mainta 
a count on the state of power collapse on each core. This count will be useful to

debug the power collapse state on each core.



The required properties for PM-8x60 are:

The required properties for PM are:



- compatible: "qcom,pm-8x60"

- compatible: "qcom,pm"



The optional properties are:
@@ -31,8 +31,8 @@ The optional properties are: 


Example:



qcom,pm-8x60@fe800664 {

		compatible = "qcom,pm-8x60";

qcom,pm@fe800664 {

		compatible = "qcom,pm";

		reg = <0xfe800664 0x40>;

		qcom,pc-mode = "tz_l2_int";

		qcom,use-sync-timer;

arch/arm/boot/dts/qcom/apq8084-pm.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -314,8 +314,8 @@ 
			<41 141>;

	};



	qcom,pm-8x60@fe805664 {

		compatible = "qcom,pm-8x60";

	qcom,pm@fe805664 {

		compatible = "qcom,pm";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

arch/arm/boot/dts/qcom/mdm9630-pm.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -160,8 +160,8 @@ 
			<59 70>;

	};



	qcom,pm-8x60@fe805664 {

		compatible = "qcom,pm-8x60";

	qcom,pm@fe805664 {

		compatible = "qcom,pm";

		reg = <0xfe805664 0x40>;

		qcom,pc-mode = "tz_l2_ext";

		qcom,use-sync-timer;

arch/arm/boot/dts/qcom/msm8226-v1-pm.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -275,8 +275,8 @@ 
			<55  113>;

	};



	qcom,pm-8x60@fe805664 {

		compatible = "qcom,pm-8x60";

	qcom,pm@fe805664 {

		compatible = "qcom,pm";

		reg = <0xfe805664 0x40>;

		qcom,pc-mode = "tz_l2_int";

		qcom,use-sync-timer;

arch/arm/boot/dts/qcom/msm8226-v2-pm.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -287,8 +287,8 @@ 
			<55  113>;

	};



	qcom,pm-8x60@fe805664 {

		compatible = "qcom,pm-8x60";

	qcom,pm@fe805664 {

		compatible = "qcom,pm";

		reg = <0xfe805664 0x40>;

		qcom,pc-mode = "tz_l2_int";

		qcom,use-sync-timer;