Merge "clk: msm: clock-osm: don't use version register to enable WDOG status"
This commit is contained in:
commit
b6dff5ca3c
1 changed files with 1 additions and 6 deletions
|
@ -81,7 +81,6 @@ enum clk_osm_trace_packet_id {
|
|||
#define MEM_ACC_SEQ_REG_VAL_START(n) (SEQ_REG(60 + (n)))
|
||||
#define SEQ_REG1_MSM8998_V2 0x1048
|
||||
#define VERSION_REG 0x0
|
||||
#define VERSION_1P1 0x00010100
|
||||
|
||||
#define OSM_TABLE_SIZE 40
|
||||
#define MAX_CLUSTER_CNT 2
|
||||
|
@ -353,7 +352,6 @@ struct clk_osm {
|
|||
unsigned long pbases[NUM_BASES];
|
||||
spinlock_t lock;
|
||||
|
||||
u32 version;
|
||||
u32 cpu_reg_mask;
|
||||
u32 num_entries;
|
||||
u32 cluster_num;
|
||||
|
@ -2569,7 +2567,7 @@ static int debugfs_set_wdog_trace(void *data, u64 val)
|
|||
struct clk_osm *c = data;
|
||||
int regval;
|
||||
|
||||
if (c->version >= VERSION_1P1) {
|
||||
if (msm8998_v2) {
|
||||
regval = clk_osm_read_reg(c, TRACE_CTRL);
|
||||
regval = val ? regval | TRACE_CTRL_ENABLE_WDOG_STATUS :
|
||||
regval & ~TRACE_CTRL_ENABLE_WDOG_STATUS;
|
||||
|
@ -3360,9 +3358,6 @@ static int cpu_clock_osm_driver_probe(struct platform_device *pdev)
|
|||
goto exit2;
|
||||
}
|
||||
|
||||
pwrcl_clk.version = clk_osm_read_reg(&pwrcl_clk, VERSION_REG);
|
||||
perfcl_clk.version = clk_osm_read_reg(&perfcl_clk, VERSION_REG);
|
||||
|
||||
populate_opp_table(pdev);
|
||||
populate_debugfs_dir(&pwrcl_clk);
|
||||
populate_debugfs_dir(&perfcl_clk);
|
||||
|
|
Loading…
Add table
Reference in a new issue