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

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

Merge "clk: msm: gcc-8952: Reorganize clock override functions"

parents 1bd805b7 7827e103

drivers/clk/msm/clock-gcc-8952.c

+11 −11
Original line number Diff line number Diff line
@@ -3875,45 +3875,45 @@ static void override_for_8937(void) 
	OVERRIDE_FMAX1(cci, LOWER, 37500000);

	OVERRIDE_FMAX3(csi0,

		LOWER, 100000000, LOW, 200000000, NOMINAL, 266670000);

	OVERRIDE_FTABLE(csi0, ftbl_gcc_camss_csi0_2_clk);

	OVERRIDE_FTABLE(csi0, ftbl_gcc_camss_csi0_2_clk, 8937);

	OVERRIDE_FMAX3(csi1,

		LOWER, 100000000, LOW, 200000000, NOMINAL, 266670000);

	OVERRIDE_FTABLE(csi1, ftbl_gcc_camss_csi0_2_clk);

	OVERRIDE_FTABLE(csi1, ftbl_gcc_camss_csi0_2_clk, 8937);

	OVERRIDE_FMAX3(csi2,

		LOWER, 100000000, LOW, 200000000, NOMINAL, 266670000);

	OVERRIDE_FTABLE(csi2, ftbl_gcc_camss_csi0_2_clk);

	OVERRIDE_FTABLE(csi2, ftbl_gcc_camss_csi0_2_clk, 8937);

	OVERRIDE_FMAX4(vfe0,

		LOWER, 160000000, LOW, 308570000, NOMINAL, 400000000,

		NOM_PLUS, 432000000);

	OVERRIDE_FTABLE(vfe0, ftbl_gcc_camss_vfe0_1_clk);

	OVERRIDE_FTABLE(vfe0, ftbl_gcc_camss_vfe0_1_clk, 8937);

	OVERRIDE_FMAX4(vfe1,

		LOWER, 160000000, LOW, 308570000, NOMINAL, 400000000,

		NOM_PLUS, 432000000);

	OVERRIDE_FTABLE(vfe1, ftbl_gcc_camss_vfe0_1_clk);

	OVERRIDE_FTABLE(vfe1, ftbl_gcc_camss_vfe0_1_clk, 8937);

	OVERRIDE_FMAX5(gfx3d,

		LOWER, 216000000, LOW, 300000000, NOMINAL, 375000000,

		NOM_PLUS, 400000000, HIGH, 450000000);

	OVERRIDE_FTABLE(gfx3d, ftbl_gcc_oxili_gfx3d_clk);

	OVERRIDE_FTABLE(gfx3d, ftbl_gcc_oxili_gfx3d_clk, 8937);

	OVERRIDE_FMAX5(cpp,

		LOWER, 160000000, LOW, 266670000, NOMINAL, 320000000,

		NOM_PLUS, 342860000, HIGH, 360000000);

	OVERRIDE_FTABLE(cpp, ftbl_gcc_camss_cpp_clk);

	OVERRIDE_FTABLE(cpp, ftbl_gcc_camss_cpp_clk, 8937);

	OVERRIDE_FMAX5(jpeg0,

		LOWER, 133330000, LOW, 200000000, NOMINAL, 266670000,

		NOM_PLUS, 308570000, HIGH, 320000000);

	OVERRIDE_FTABLE(jpeg0, ftbl_gcc_camss_jpeg0_clk);

	OVERRIDE_FTABLE(jpeg0, ftbl_gcc_camss_jpeg0_clk, 8937);

	OVERRIDE_FMAX2(csi0phytimer, LOWER, 100000000, LOW, 200000000);

	OVERRIDE_FMAX2(csi1phytimer, LOWER, 100000000, LOW, 200000000);

	OVERRIDE_FMAX2(gp1, LOWER, 100000000, NOMINAL, 200000000);

	OVERRIDE_FMAX2(gp2, LOWER, 100000000, NOMINAL, 200000000);

	OVERRIDE_FMAX2(gp3, LOWER, 100000000, NOMINAL, 200000000);

	OVERRIDE_FMAX2(byte0, LOWER, 125000000, NOMINAL, 187500000);

	OVERRIDE_FTABLE(byte0, ftbl_gcc_mdss_byte0_clk);

	OVERRIDE_FTABLE(byte0, ftbl_gcc_mdss_byte0_clk, 8937);

	byte0_clk_src.current_freq = ftbl_gcc_mdss_pclk0_clk_8937;

	OVERRIDE_FMAX2(pclk0, LOWER, 166670000, NOMINAL, 250000000);

	OVERRIDE_FTABLE(pclk0, ftbl_gcc_mdss_pclk0_clk);

	OVERRIDE_FTABLE(pclk0, ftbl_gcc_mdss_pclk0_clk, 8937);

	pclk0_clk_src.current_freq = ftbl_gcc_mdss_pclk0_clk_8937;

	OVERRIDE_FTABLE(vcodec0, ftbl_gcc_venus0_vcodec0_clk);

	OVERRIDE_FTABLE(vcodec0, ftbl_gcc_venus0_vcodec0_clk, 8937);

	OVERRIDE_FMAX5(vcodec0,

		LOWER, 166150000, LOW, 240000000, NOMINAL, 308570000,

		NOM_PLUS, 320000000, HIGH, 360000000);

include/dt-bindings/clock/msm-clocks-hwio-8952.h

+2 −2
Original line number Diff line number Diff line
@@ -387,8 +387,8 @@ 
	clkname##_clk_src.c.fmax[VDD_DIG_##l4] = (f4);\

	clkname##_clk_src.c.fmax[VDD_DIG_##l5] = (f5)



#define OVERRIDE_FTABLE(clkname, ftable) \

	clkname##_clk_src.freq_tbl = ftable##_8937

#define OVERRIDE_FTABLE(clkname, ftable, name) \

	clkname##_clk_src.freq_tbl = ftable##_##name



enum vdd_dig_levels {

	VDD_DIG_NONE,