Merge "ARM: dts: msm: Add the MEM ACC and CPR regulator node for MSM8940"

		qcom,ipa-loaduC;

		qcom,ipa-advertise-sg-support;

	};

	/* remove 8937 MEM ACC node */

	/delete-node/ regulator@01946004;

	mem_acc_vreg_corner: regulator@01946004 {

		compatible = "qcom,mem-acc-regulator";

		regulator-name = "mem_acc_corner";

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <3>;

		qcom,acc-reg-addr-list =

			<0x01942138 0x01942130 0x01942120

			 0x01942124 0x01942128>;

		qcom,acc-init-reg-config = <1 0xfff>;

		qcom,num-acc-corners = <3>;

		qcom,boot-acc-corner = <2>;

		qcom,corner1-reg-config =

			/* SVS+ => SVS+ */

			<(-1) (-1)>,     <(-1) (-1)>,   <(-1) (-1)>,

			<(-1) (-1)>,     <(-1) (-1)>,   <(-1) (-1)>,

			<(-1) (-1)>,

			/* SVS+ => NOM */

			<  2 0x555555>,  <  3  0x1041041>, <  4  0x1041041>,

			<  5 0x0000041>, <(-1)      (-1)>, <(-1)      (-1)>,

			<(-1)     (-1)>,

			/* SVS+ => TURBO/NOM+ */

			<  2 0x555555 >,  <  3  0x1041041>, <  4  0x1041041>,

			<  5 0x0000041>,  <  3        0x0>, <  4        0x0>,

			<  5       0x0>;

		qcom,corner2-reg-config =

			/* NOM => SVS+ */

			<  2 0x555555>,  <  3  0x30C30C3>, <  4  0x30C30C3>,

			<  5 0x00000C3>,

			/* NOM => NOM */

			<(-1) (-1)>,     <(-1) (-1)>,   <(-1) (-1)>,

			<(-1) (-1)>,

			/* NOM => TURBO/NOM+ */

			<  2 0x555555>,       <  3  0x0>,    <  4  0x0>,

			<  5	  0x0>;

		qcom,corner3-reg-config =

			/* TURBO/NOM+ => SVS+ */

			<  2 0x555555>,  <  3  0x1041041>, <  4  0x1041041>,

			<  5 0x0000041>, <  3  0x30C30C3>, <  4  0x30C30C3>,

			<  5 0x00000C3>,

			/* TURBO/NOM+ => NOM */

			<  2 0x555555>,  <  3  0x1041041>, <  4  0x1041041>,

			<  5 0x0000041>, <(-1)	    (-1)>, <(-1)      (-1)>,

			<(-1)     (-1)>,

			/* TURBO/NOM+ => TURBO/NOM+ */

			<(-1) (-1)>,     <(-1) (-1)>,   <(-1) (-1)>,

			<(-1) (-1)>,     <(-1) (-1)>,   <(-1) (-1)>,

			<(-1)  (-1)>;

	};

};

&apc_vreg_corner {

	/delete-property/ qcom,cpr-fuse-version-map;

	/delete-property/ qcom,cpr-quotient-adjustment;

	/delete-property/ qcom,cpr-init-voltage-adjustment;

	/delete-property/ qcom,cpr-enable;

};