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

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

Merge "clk: Move the measure functionality from common clock framework"

parents f9cf02e4 947428e5

drivers/clk/clk.c

+1 −5
Original line number Diff line number Diff line
@@ -2874,8 +2874,6 @@ static int clk_debug_create_one(struct clk_core *core, struct dentry *pdentry) 
			goto err_out;

	}



	clk_debug_measure_add(core->hw, core->dentry);



	ret = 0;

	goto out;
@@ -3005,10 +3003,8 @@ static int __init clk_debug_init(void) 
		return -ENOMEM;



	mutex_lock(&clk_debug_lock);

	hlist_for_each_entry(core, &clk_debug_list, debug_node) {

		clk_register_debug(core->hw);

	hlist_for_each_entry(core, &clk_debug_list, debug_node)

		clk_debug_create_one(core, rootdir);

	}



	inited = 1;

	mutex_unlock(&clk_debug_lock);

drivers/clk/clk.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ void __clk_free_clk(struct clk *clk); 


/* Debugfs API to print the enabled clocks */

void clock_debug_print_enabled(void);

int clk_register_debug(struct clk_hw *hw);

int clk_debug_measure_add(struct clk_hw *hw, struct dentry *dentry);

void clk_debug_print_hw(struct clk_core *clk, struct seq_file *f);



#else

drivers/clk/qcom/clk-branch.c

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/regmap.h>



#include "clk-branch.h"

#include "clk-debug.h"

#include "clk-regmap.h"

#include "common.h"
@@ -250,6 +251,7 @@ const struct clk_ops clk_branch2_ops = { 
	.is_enabled = clk_is_enabled_regmap,

	.set_flags = clk_branch_set_flags,

	.list_registers = clk_branch2_list_registers,

	.debug_init = clk_debug_measure_add,

};

EXPORT_SYMBOL_GPL(clk_branch2_ops);
@@ -384,6 +386,7 @@ const struct clk_ops clk_gate2_ops = { 
	.is_enabled = clk_is_enabled_regmap,

	.list_registers = clk_gate2_list_registers,

	.set_flags = clk_gate2_set_flags,

	.debug_init = clk_debug_measure_add,

};

EXPORT_SYMBOL_GPL(clk_gate2_ops);

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

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "common.h"

#include "clk-regmap.h"

#include "clk-rcg.h"

#include "clk-debug.h"



enum {

	LMH_LITE_CLK_SRC,
@@ -757,6 +758,7 @@ static struct clk_ops clk_ops_cpu_osm = { 
	.round_rate = clk_osm_round_rate,

	.list_rate = clk_osm_list_rate,

	.recalc_rate = clk_osm_recalc_rate,

	.debug_init = clk_debug_measure_add,

};



static const struct parent_map gcc_parent_map_1[] = {

drivers/clk/qcom/clk-dummy.c

+4 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -17,6 +17,8 @@ 
#include <linux/slab.h>

#include <linux/reset-controller.h>



#include "clk-debug.h"



struct clk_dummy {

	struct clk_hw hw;

	struct reset_controller_dev reset;
@@ -65,6 +67,7 @@ struct clk_ops clk_dummy_ops = { 
	.round_rate = dummy_clk_round_rate,

	.recalc_rate = dummy_clk_recalc_rate,

	.set_flags = dummy_clk_set_flags,

	.debug_init = clk_debug_measure_add,

};

EXPORT_SYMBOL_GPL(clk_dummy_ops);