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

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

Merge "ARM: dts: msm: Add support for speed-bin 3 for SDM660"

parents 929de7e3 5f00dbaa

arch/arm/boot/dts/qcom/sdm660.dtsi

+32 −3
Original line number Diff line number Diff line
@@ -1244,10 +1244,11 @@ 
		compatible = "qcom,clk-cpu-osm";

		reg = <0x179c0000 0x4000>, <0x17916000 0x1000>,

		      <0x17816000 0x1000>, <0x179d1000 0x1000>,

		      <0x00784130 0x8>, <0x17914800 0x800>;

		      <0x00784130 0x8>, <0x00784130 0x8>,

		      <0x17914800 0x800>;

		reg-names = "osm", "pwrcl_pll", "perfcl_pll",

			    "apcs_common", "perfcl_efuse",

			    "pwrcl_acd";

			    "apcs_common", "pwrcl_efuse",

			    "perfcl_efuse", "pwrcl_acd";



		qcom,acdtd-val = <0x0000a111 0x0000a111>;

		qcom,acdcr-val = <0x002c5ffd 0x002c5ffd>;
@@ -1273,6 +1274,25 @@ 
			<  1747200000 0x0404005b 0x09480048 0x2 7 >,

			<  1843200000 0x04040060 0x094c004c 0x3 8 >;



		qcom,pwrcl-speedbin1-v0 =

			<   300000000 0x0004000f 0x01200020 0x1 1 >,

			<   633600000 0x05040021 0x03200020 0x1 2 >,

			<   902400000 0x0404002f 0x04260026 0x1 3 >,

			<  1113600000 0x0404003a 0x052e002e 0x2 4 >,

			<  1401600000 0x04040049 0x073a003a 0x2 5 >,

			<  1536000000 0x04040050 0x08400040 0x2 6 >,

			<  1747200000 0x0404005b 0x09480048 0x2 7 >,

			<  1843200000 0x04040060 0x094c004c 0x3 8 >;



		qcom,pwrcl-speedbin3-v0 =

			<   300000000 0x0004000f 0x01200020 0x1 1 >,

			<   633600000 0x05040021 0x03200020 0x1 2 >,

			<   902400000 0x0404002f 0x04260026 0x1 3 >,

			<  1113600000 0x0404003a 0x052e002e 0x2 4 >,

			<  1401600000 0x04040049 0x073a003a 0x2 5 >,

			<  1536000000 0x04040050 0x08400040 0x2 6 >,

			<  1612800000 0x04040054 0x09430043 0x2 7 >;



		qcom,perfcl-speedbin0-v0 =

			<   300000000 0x0004000f 0x01200020 0x1 1 >,

			<  1113600000 0x0404003a 0x052e002e 0x1 2 >,
@@ -1291,6 +1311,13 @@ 
			<  2150400000 0x04040070 0x0b590059 0x2 6 >,

			<  2208000000 0x04040073 0x0b5c005c 0x3 7 >;



		qcom,perfcl-speedbin3-v0 =

			<   300000000 0x0004000f 0x01200020 0x1 1 >,

			<  1113600000 0x0404003a 0x052e002e 0x1 2 >,

			<  1401600000 0x04040049 0x073a003a 0x2 3 >,

			<  1747200000 0x0404005b 0x09480048 0x2 4 >,

			<  1804800000 0x0404005e 0x094b004b 0x2 5 >;



		qcom,up-timer = <1000 1000>;

		qcom,down-timer = <1000 1000>;

		qcom,pc-override-index = <0 0>;
@@ -1344,6 +1371,7 @@ 
			< 1113600 >,

			< 1401600 >,

			< 1536000 >,

			< 1612800 >,

			< 1747200 >,

			< 1843200 >;
@@ -1351,6 +1379,7 @@ 
			< 1113600 >,

			< 1401600 >,

			< 1747200 >,

			< 1804800 >,

			< 1958400 >,

			< 2150400 >,

			< 2208000 >,

drivers/clk/qcom/clk-cpu-osm.c

+2 −2
Original line number Diff line number Diff line
@@ -226,8 +226,8 @@ enum clk_osm_trace_packet_id { 
#define PLL_DD_D0_USER_CTL_LO				0x17916208

#define PLL_DD_D1_USER_CTL_LO				0x17816208



#define PWRCL_EFUSE_SHIFT				0

#define PWRCL_EFUSE_MASK				0

#define PWRCL_EFUSE_SHIFT				29

#define PWRCL_EFUSE_MASK				0x7

#define PERFCL_EFUSE_SHIFT				29

#define PERFCL_EFUSE_MASK				0x7