Merge "ARM: dts: msm: Add clock-krait and msm-cpufreq device for mpq8092" (5167a43c) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/qcom/mpq8092-regulator.dtsi

+10 −0

Original line number	Diff line number	Diff line
		@@ -289,8 +289,18 @@
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		qcom,init-voltage = <1800000>;
		proxy-supply = <&pma8084_l22>;
		qcom,proxy-consumer-enable;
		status = "okay";
		};

		pma8084_l22_ao: regulator-l22-ao {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "8084_l22_ao";
		qcom,set = <1>;
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		};
		};

		rpm-regulator-ldoa23 {

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

+447 −0

Original line number	Diff line number	Diff line
		@@ -275,6 +275,453 @@
		};
		};

		qcom,clock-krait@f9016000 {
		compatible = "qcom,clock-krait-8974";
		reg = <0xf9016000 0x20>,
		<0xf908a000 0x20>,
		<0xf909a000 0x20>,
		<0xf90aa000 0x20>,
		<0xf90ba000 0x20>,
		<0xfc4b80b0 0x08>,
		<0xf9011000 0x50>;
		reg-names = "hfpll_l2_clk", "hfpll0_clk",
		"hfpll1_clk", "hfpll2_clk",
		"hfpll3_clk", "efuse", "meas";
		cpu0-supply = <&krait0_vreg>;
		cpu1-supply = <&krait1_vreg>;
		cpu2-supply = <&krait2_vreg>;
		cpu3-supply = <&krait3_vreg>;
		l2-dig-supply = <&pma8084_s8_corner_ao>;
		hfpll-dig-supply = <&pma8084_s8_corner_ao>;
		hfpll-analog-supply = <&pma8084_l22_ao>;
		qcom,hfpll-config-val = <0x04D0405D>;
		qcom,hfpll-user-vco-mask = <0x00100000>;
		qcom,pvs-config-ver = <1>;

		qcom,l2-fmax =
		< 0 0 >,
		< 576000000 4 /* SVS_SOC */ >,
		< 1651200000 7 /* NORMAL & TURBO same for MPQ8092 */ >;

		qcom,speed0-pvs0-bin-v0 =
		< 0 0 0 >,
		< 300000000 850000 75 >,
		< 345600000 860000 87 >,
		< 422400000 870000 107 >,
		< 499200000 880000 128 >,
		< 576000000 890000 149 >,
		< 652800000 900000 169 >,
		< 729600000 910000 191 >,
		< 806400000 920000 213 >,
		< 883200000 930000 235 >,
		< 960000000 940000 257 >,
		< 1036800000 950000 280 >,
		< 1113600000 965000 304 >,
		< 1190400000 980000 329 >,
		< 1267200000 995000 354 >,
		< 1344000000 1010000 380 >,
		< 1420800000 1025000 406 >,
		< 1497600000 1040000 432 >,
		< 1574400000 1055000 461 >,
		< 1651200000 1070000 490 >,
		< 1728000000 1085000 520 >,
		< 1804800000 1100000 551 >;

		qcom,speed0-pvs1-bin-v0 =
		< 0 0 0 >,
		< 300000000 850000 75 >,
		< 345600000 855000 87 >,
		< 422400000 865000 107 >,
		< 499200000 875000 128 >,
		< 576000000 885000 149 >,
		< 652800000 895000 169 >,
		< 729600000 905000 191 >,
		< 806400000 915000 213 >,
		< 883200000 925000 235 >,
		< 960000000 935000 257 >,
		< 1036800000 945000 280 >,
		< 1113600000 955000 304 >,
		< 1190400000 970000 329 >,
		< 1267200000 985000 354 >,
		< 1344000000 1000000 380 >,
		< 1420800000 1015000 406 >,
		< 1497600000 1030000 432 >,
		< 1574400000 1045000 461 >,
		< 1651200000 1060000 490 >,
		< 1728000000 1075000 520 >,
		< 1804800000 1090000 551 >;

		qcom,speed0-pvs2-bin-v0 =
		< 0 0 0 >,
		< 300000000 825000 75 >,
		< 345600000 835000 87 >,
		< 422400000 845000 107 >,
		< 499200000 855000 128 >,
		< 576000000 865000 149 >,
		< 652800000 875000 169 >,
		< 729600000 885000 191 >,
		< 806400000 895000 213 >,
		< 883200000 905000 235 >,
		< 960000000 915000 257 >,
		< 1036800000 930000 280 >,
		< 1113600000 945000 304 >,
		< 1190400000 960000 329 >,
		< 1267200000 975000 354 >,
		< 1344000000 990000 380 >,
		< 1420800000 1005000 406 >,
		< 1497600000 1020000 432 >,
		< 1574400000 1035000 461 >,
		< 1651200000 1050000 490 >,
		< 1728000000 1065000 520 >,
		< 1804800000 1080000 551 >;

		qcom,speed0-pvs3-bin-v0 =
		< 0 0 0 >,
		< 300000000 825000 75 >,
		< 345600000 830000 87 >,
		< 422400000 840000 107 >,
		< 499200000 850000 128 >,
		< 576000000 860000 149 >,
		< 652800000 870000 169 >,
		< 729600000 880000 191 >,
		< 806400000 890000 213 >,
		< 883200000 900000 235 >,
		< 960000000 910000 257 >,
		< 1036800000 920000 280 >,
		< 1113600000 935000 304 >,
		< 1190400000 950000 329 >,
		< 1267200000 965000 354 >,
		< 1344000000 980000 380 >,
		< 1420800000 995000 406 >,
		< 1497600000 1010000 432 >,
		< 1574400000 1025000 461 >,
		< 1651200000 1040000 490 >,
		< 1728000000 1055000 520 >,
		< 1804800000 1070000 551 >;

		qcom,speed0-pvs4-bin-v0 =
		< 0 0 0 >,
		< 300000000 825000 75 >,
		< 345600000 825000 87 >,
		< 422400000 835000 107 >,
		< 499200000 845000 128 >,
		< 576000000 855000 149 >,
		< 652800000 865000 169 >,
		< 729600000 875000 191 >,
		< 806400000 885000 213 >,
		< 883200000 895000 235 >,
		< 960000000 905000 257 >,
		< 1036800000 915000 280 >,
		< 1113600000 925000 304 >,
		< 1190400000 940000 329 >,
		< 1267200000 955000 354 >,
		< 1344000000 970000 380 >,
		< 1420800000 985000 406 >,
		< 1497600000 1000000 432 >,
		< 1574400000 1015000 461 >,
		< 1651200000 1030000 490 >,
		< 1728000000 1045000 520 >,
		< 1804800000 1060000 551 >;

		qcom,speed0-pvs5-bin-v0 =
		< 0 0 0 >,
		< 300000000 800000 75 >,
		< 345600000 810000 87 >,
		< 422400000 820000 107 >,
		< 499200000 830000 128 >,
		< 576000000 840000 149 >,
		< 652800000 850000 169 >,
		< 729600000 860000 191 >,
		< 806400000 870000 213 >,
		< 883200000 880000 235 >,
		< 960000000 890000 257 >,
		< 1036800000 900000 280 >,
		< 1113600000 915000 304 >,
		< 1190400000 930000 329 >,
		< 1267200000 945000 354 >,
		< 1344000000 960000 380 >,
		< 1420800000 975000 406 >,
		< 1497600000 990000 432 >,
		< 1574400000 1005000 461 >,
		< 1651200000 1020000 490 >,
		< 1728000000 1035000 520 >,
		< 1804800000 1050000 551 >;

		qcom,speed0-pvs6-bin-v0 =
		< 0 0 0 >,
		< 300000000 800000 75 >,
		< 345600000 805000 87 >,
		< 422400000 815000 107 >,
		< 499200000 825000 128 >,
		< 576000000 835000 149 >,
		< 652800000 845000 169 >,
		< 729600000 855000 191 >,
		< 806400000 865000 213 >,
		< 883200000 875000 235 >,
		< 960000000 885000 257 >,
		< 1036800000 895000 280 >,
		< 1113600000 905000 304 >,
		< 1190400000 920000 329 >,
		< 1267200000 935000 354 >,
		< 1344000000 950000 380 >,
		< 1420800000 965000 406 >,
		< 1497600000 980000 432 >,
		< 1574400000 995000 461 >,
		< 1651200000 1010000 490 >,
		< 1728000000 1025000 520 >,
		< 1804800000 1040000 551 >;

		qcom,speed0-pvs7-bin-v0 =
		< 0 0 0 >,
		< 300000000 800000 75 >,
		< 345600000 800000 87 >,
		< 422400000 805000 107 >,
		< 499200000 815000 128 >,
		< 576000000 825000 149 >,
		< 652800000 835000 169 >,
		< 729600000 845000 191 >,
		< 806400000 855000 213 >,
		< 883200000 865000 235 >,
		< 960000000 875000 257 >,
		< 1036800000 885000 280 >,
		< 1113600000 895000 304 >,
		< 1190400000 910000 329 >,
		< 1267200000 925000 354 >,
		< 1344000000 940000 380 >,
		< 1420800000 955000 406 >,
		< 1497600000 970000 432 >,
		< 1574400000 985000 461 >,
		< 1651200000 1000000 490 >,
		< 1728000000 1015000 520 >,
		< 1804800000 1030000 551 >;

		qcom,speed0-pvs8-bin-v0 =
		< 0 0 0 >,
		< 300000000 775000 75 >,
		< 345600000 780000 87 >,
		< 422400000 790000 107 >,
		< 499200000 800000 128 >,
		< 576000000 810000 149 >,
		< 652800000 820000 169 >,
		< 729600000 830000 191 >,
		< 806400000 840000 213 >,
		< 883200000 850000 235 >,
		< 960000000 860000 257 >,
		< 1036800000 870000 280 >,
		< 1113600000 885000 304 >,
		< 1190400000 900000 329 >,
		< 1267200000 915000 354 >,
		< 1344000000 930000 380 >,
		< 1420800000 945000 406 >,
		< 1497600000 960000 432 >,
		< 1574400000 975000 461 >,
		< 1651200000 990000 490 >,
		< 1728000000 1005000 520 >,
		< 1804800000 1020000 551 >;

		qcom,speed0-pvs9-bin-v0 =
		< 0 0 0 >,
		< 300000000 775000 75 >,
		< 345600000 775000 87 >,
		< 422400000 785000 107 >,
		< 499200000 795000 128 >,
		< 576000000 805000 149 >,
		< 652800000 815000 169 >,
		< 729600000 825000 191 >,
		< 806400000 835000 213 >,
		< 883200000 845000 235 >,
		< 960000000 855000 257 >,
		< 1036800000 865000 280 >,
		< 1113600000 875000 304 >,
		< 1190400000 890000 329 >,
		< 1267200000 905000 354 >,
		< 1344000000 920000 380 >,
		< 1420800000 935000 406 >,
		< 1497600000 950000 432 >,
		< 1574400000 965000 461 >,
		< 1651200000 980000 490 >,
		< 1728000000 995000 520 >,
		< 1804800000 1010000 551 >;

		qcom,speed0-pvs10-bin-v0 =
		< 0 0 0 >,
		< 300000000 775000 75 >,
		< 345600000 775000 87 >,
		< 422400000 780000 107 >,
		< 499200000 790000 128 >,
		< 576000000 800000 149 >,
		< 652800000 810000 169 >,
		< 729600000 820000 191 >,
		< 806400000 830000 213 >,
		< 883200000 840000 235 >,
		< 960000000 850000 257 >,
		< 1036800000 860000 280 >,
		< 1113600000 870000 304 >,
		< 1190400000 880000 329 >,
		< 1267200000 895000 354 >,
		< 1344000000 910000 380 >,
		< 1420800000 925000 406 >,
		< 1497600000 940000 432 >,
		< 1574400000 955000 461 >,
		< 1651200000 970000 490 >,
		< 1728000000 985000 520 >,
		< 1804800000 1000000 551 >;

		qcom,speed0-pvs11-bin-v0 =
		< 0 0 0 >,
		< 300000000 750000 75 >,
		< 345600000 755000 87 >,
		< 422400000 765000 107 >,
		< 499200000 775000 128 >,
		< 576000000 785000 149 >,
		< 652800000 795000 169 >,
		< 729600000 805000 191 >,
		< 806400000 815000 213 >,
		< 883200000 825000 235 >,
		< 960000000 835000 257 >,
		< 1036800000 845000 280 >,
		< 1113600000 855000 304 >,
		< 1190400000 870000 329 >,
		< 1267200000 885000 354 >,
		< 1344000000 900000 380 >,
		< 1420800000 915000 406 >,
		< 1497600000 930000 432 >,
		< 1574400000 945000 461 >,
		< 1651200000 960000 490 >,
		< 1728000000 975000 520 >,
		< 1804800000 990000 551 >;

		qcom,speed0-pvs12-bin-v0 =
		< 0 0 0 >,
		< 300000000 750000 75 >,
		< 345600000 750000 87 >,
		< 422400000 755000 107 >,
		< 499200000 765000 128 >,
		< 576000000 775000 149 >,
		< 652800000 785000 169 >,
		< 729600000 795000 191 >,
		< 806400000 805000 213 >,
		< 883200000 815000 235 >,
		< 960000000 825000 257 >,
		< 1036800000 835000 280 >,
		< 1113600000 845000 304 >,
		< 1190400000 860000 329 >,
		< 1267200000 875000 354 >,
		< 1344000000 890000 380 >,
		< 1420800000 905000 406 >,
		< 1497600000 920000 432 >,
		< 1574400000 935000 461 >,
		< 1651200000 950000 490 >,
		< 1728000000 965000 520 >,
		< 1804800000 980000 551 >;

		qcom,speed0-pvs13-bin-v0 =
		< 0 0 0 >,
		< 300000000 750000 75 >,
		< 345600000 750000 87 >,
		< 422400000 750000 107 >,
		< 499200000 760000 128 >,
		< 576000000 770000 149 >,
		< 652800000 780000 169 >,
		< 729600000 790000 191 >,
		< 806400000 800000 213 >,
		< 883200000 810000 235 >,
		< 960000000 820000 257 >,
		< 1036800000 830000 280 >,
		< 1113600000 840000 304 >,
		< 1190400000 850000 329 >,
		< 1267200000 865000 354 >,
		< 1344000000 880000 380 >,
		< 1420800000 895000 406 >,
		< 1497600000 910000 432 >,
		< 1574400000 925000 461 >,
		< 1651200000 940000 490 >,
		< 1728000000 955000 520 >,
		< 1804800000 970000 551 >;

		qcom,speed0-pvs14-bin-v0 =
		< 0 0 0 >,
		< 300000000 750000 75 >,
		< 345600000 750000 87 >,
		< 422400000 750000 107 >,
		< 499200000 750000 128 >,
		< 576000000 760000 149 >,
		< 652800000 770000 169 >,
		< 729600000 780000 191 >,
		< 806400000 790000 213 >,
		< 883200000 800000 235 >,
		< 960000000 810000 257 >,
		< 1036800000 820000 280 >,
		< 1113600000 830000 304 >,
		< 1190400000 840000 329 >,
		< 1267200000 855000 354 >,
		< 1344000000 870000 380 >,
		< 1420800000 885000 406 >,
		< 1497600000 900000 432 >,
		< 1574400000 915000 461 >,
		< 1651200000 930000 490 >,
		< 1728000000 945000 520 >,
		< 1804800000 960000 551 >;

		qcom,speed0-pvs15-bin-v0 =
		< 0 0 0 >,
		< 300000000 750000 75 >,
		< 345600000 750000 87 >,
		< 422400000 750000 107 >,
		< 499200000 750000 128 >,
		< 576000000 750000 149 >,
		< 652800000 760000 169 >,
		< 729600000 770000 191 >,
		< 806400000 780000 213 >,
		< 883200000 790000 235 >,
		< 960000000 800000 257 >,
		< 1036800000 810000 280 >,
		< 1113600000 820000 304 >,
		< 1190400000 830000 329 >,
		< 1267200000 845000 354 >,
		< 1344000000 860000 380 >,
		< 1420800000 875000 406 >,
		< 1497600000 890000 432 >,
		< 1574400000 905000 461 >,
		< 1651200000 920000 490 >,
		< 1728000000 935000 520 >,
		< 1804800000 950000 551 >;
		};

		qcom,cpubw {
		compatible = "qcom,cpubw";
		qcom,cpu-mem-ports = <1 512>;
		qcom,bw-tbl =
		< 8117 /* 532 MHz */ >;
		};

		qcom,msm-cpufreq@0 {
		reg = <0 4>;
		compatible = "qcom,msm-cpufreq";
		qcom,cpufreq-table =
		< 300000 300000 8117 >,
		< 345600 345600 8117 >,
		< 422400 422400 8117 >,
		< 499200 499400 8117 >,
		< 576000 576000 8117 >,
		< 652800 652800 8117 >,
		< 729600 729600 8117 >,
		< 806400 806400 8117 >,
		< 883200 883200 8117 >,
		< 960000 960000 8117 >,
		< 1036800 1036800 8117 >,
		< 1113600 1113600 8117 >,
		< 1190400 1190400 8117 >,
		< 1267200 1267200 8117 >,
		< 1344000 1344000 8117 >,
		< 1420800 1420800 8117 >,
		< 1497600 1497600 8117 >,
		< 1574400 1574400 8117 >,
		< 1651200 1651200 8117 >,
		< 1728000 1651200 8117 >,
		< 1804800 1651200 8117 >;
		};

		usb_otg: usb@f9a55000 {
		compatible = "qcom,hsusb-otg";
		reg = <0xf9a55000 0x400>,

arch/arm/mach-msm/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ obj-$(CONFIG_ARCH_MSMSAMARIUM) += board-samarium.o board-samarium-gpiomux.o
		obj-$(CONFIG_ARCH_MSMSAMARIUM) += clock-samarium.o clock-krait-8974.o clock-mdss-8974.o
		obj-$(CONFIG_ARCH_MPQ8092) += board-8092.o board-8092-gpiomux.o
		obj-$(CONFIG_ARCH_MPQ8092) += clock-8092.o clock-vcap-8092.o clock-mdss-8974.o
		obj-$(CONFIG_ARCH_MPQ8092) += clock-krait-8974.o
		obj-$(CONFIG_ARCH_MSM8226) += board-8226.o board-8226-gpiomux.o
		obj-$(CONFIG_ARCH_MSM8226) += clock-8226.o clock-mdss-8974.o
		obj-$(CONFIG_ARCH_MSM8610) += board-8610.o board-8610-gpiomux.o

arch/arm/mach-msm/clock-8092.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -6627,7 +6627,7 @@ static struct clk_lookup mpq_clocks_8092[] = {
		CLK_LOOKUP("mem_clk", bimc_a_clk.c, ""),
		CLK_LOOKUP("mem_clk", ocmemgx_a_clk.c, ""),
		CLK_LOOKUP("xo_clk", xo_clk_src.c, ""),
		CLK_LOOKUP("xo_clk", xo_a_clk_src.c, ""),
		CLK_LOOKUP("hfpll_src", xo_a_clk_src.c, "f9016000.qcom,clock-krait"),
		CLK_LOOKUP("bus_clk", mmssnoc_ahb_clk.c, ""),
		CLK_LOOKUP("core_clk", gfx3d_clk_src.c, ""),
		CLK_LOOKUP("core_clk", gfx3d_a_clk_src.c, ""),
		@@ -6635,7 +6635,7 @@ static struct clk_lookup mpq_clocks_8092[] = {

		/* PLL */
		CLK_LOOKUP("gpll0", gpll0_clk_src.c, ""),
		CLK_LOOKUP("gpll0_ao", gpll0_ao_clk_src.c, ""),
		CLK_LOOKUP("aux_clk", gpll0_ao_clk_src.c, "f9016000.qcom,clock-krait"),

		/* Voter clocks */
		CLK_LOOKUP("bus_clk", cnoc_msmbus_clk.c, "msm_config_noc"),