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

Commit 20f7fa8a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: Update fmax and frequency table for hm0_clk_src clock"

parents 773b595b 9561b1ea

drivers/clk/qcom/camcc-lito.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "clk-rcg.h"

#include "clk-regmap.h"

#include "common.h"

#include "vdd-level.h"

#include "vdd-level-lito.h"



static DEFINE_VDD_REGULATORS(vdd_cx, VDD_NUM, 1, vdd_corner);

static DEFINE_VDD_REGULATORS(vdd_mx, VDD_NUM, 1, vdd_corner);

drivers/clk/qcom/dispcc-lito.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include "common.h"

#include "gdsc.h"

#include "reset.h"

#include "vdd-level.h"

#include "vdd-level-lito.h"



static DEFINE_VDD_REGULATORS(vdd_cx, VDD_NUM, 1, vdd_corner);

drivers/clk/qcom/gcc-lito.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include "clk-regmap.h"

#include "common.h"

#include "reset.h"

#include "vdd-level.h"

#include "vdd-level-lito.h"



#define GCC_NPU_MISC				0x4d110

#define GCC_GPU_MISC				0x71028

drivers/clk/qcom/gpucc-lito.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include "clk-regmap.h"

#include "common.h"

#include "reset.h"

#include "vdd-level.h"

#include "vdd-level-lito.h"



static DEFINE_VDD_REGULATORS(vdd_cx, VDD_NUM, 1, vdd_corner);

static DEFINE_VDD_REGULATORS(vdd_mx, VDD_NUM, 1, vdd_corner);

drivers/clk/qcom/npucc-lito.c

+12 −10
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include "clk-regmap.h"

#include "common.h"

#include "reset.h"

#include "vdd-level.h"

#include "vdd-level-lito.h"



static DEFINE_VDD_REGULATORS(vdd_cx, VDD_NUM, 1, vdd_corner);
@@ -283,10 +283,11 @@ static struct clk_fixed_factor npu_cc_crc_div = { 


static const struct freq_tbl ftbl_npu_cc_cal_hm0_clk_src[] = {

	F(200000000, P_NPU_CC_CRC_DIV, 1, 0, 0),

	F(300000000, P_NPU_CC_CRC_DIV, 1, 0, 0),

	F(518400000, P_NPU_CC_CRC_DIV, 1, 0, 0),

	F(633600000, P_NPU_CC_CRC_DIV, 1, 0, 0),

	F(825600000, P_NPU_CC_CRC_DIV, 1, 0, 0),

	F(230000000, P_NPU_CC_CRC_DIV, 1, 0, 0),

	F(422000000, P_NPU_CC_CRC_DIV, 1, 0, 0),

	F(557000000, P_NPU_CC_CRC_DIV, 1, 0, 0),

	F(729000000, P_NPU_CC_CRC_DIV, 1, 0, 0),

	F(844000000, P_NPU_CC_CRC_DIV, 1, 0, 0),

	F(1000000000, P_NPU_CC_CRC_DIV, 1, 0, 0),

	{ }

};
@@ -308,11 +309,12 @@ static struct clk_rcg2 npu_cc_cal_hm0_clk_src = { 
		.num_rate_max = VDD_NUM,

		.rate_max = (unsigned long[VDD_NUM]) {

			[VDD_MIN] = 200000000,

			[VDD_LOWER] = 300000000,

			[VDD_LOW] = 518400000,

			[VDD_LOW_L1] = 633600000,

			[VDD_NOMINAL] = 825600000,

			[VDD_HIGH] = 1000000000},

			[VDD_LOWER] = 230000000,

			[VDD_LOW] = 422000000,

			[VDD_LOW_L1] = 557000000,

			[VDD_NOMINAL] = 729000000,

			[VDD_HIGH] = 844000000,

			[VDD_HIGH_L1] = 1000000000},

	},

};