Merge "clk: Add support to print parent clock names during suspend" (51d444d7) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/clk/clk.c

+11 −5

Original line number	Diff line number	Diff line
		@@ -2712,9 +2712,10 @@ static void clock_debug_print_enabled_clocks(struct seq_file *s)
		struct clk_core *core;
		int cnt = 0;

		clock_debug_output(s, 0, "Enabled clocks:\n");
		if (!mutex_trylock(&clk_debug_lock))
		return;

		mutex_lock(&clk_debug_lock);
		clock_debug_output(s, 0, "Enabled clocks:\n");

		hlist_for_each_entry(core, &clk_debug_list, debug_node)
		cnt += clock_debug_print_clock(core, s);
		@@ -3037,13 +3038,18 @@ EXPORT_SYMBOL_GPL(clk_debugfs_add_file);

		/*
		* Print the names of all enabled clocks and their parents if
		* debug_suspend is set from debugfs.
		* debug_suspend is set from debugfs along with print_parent flag set to 1.
		* Otherwise if print_parent set to 0, print only enabled clocks
		*
		*/
		void clock_debug_print_enabled(void)
		void clock_debug_print_enabled(bool print_parent)
		{
		if (likely(!debug_suspend))
		return;

		if (print_parent)
		clock_debug_print_enabled_clocks(NULL);
		else
		clock_debug_print_enabled_debug_suspend(NULL);
		}
		EXPORT_SYMBOL_GPL(clock_debug_print_enabled);

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ struct clk __clk_create_clk(struct clk_hw hw, const char *dev_id,
		void __clk_free_clk(struct clk *clk);

		/* Debugfs API to print the enabled clocks */
		void clock_debug_print_enabled(void);
		void clock_debug_print_enabled(bool print_parent);
		void clk_debug_print_hw(struct clk_core clk, struct seq_file f);

		#else

+1 −1

Original line number	Diff line number	Diff line
		@@ -1606,7 +1606,7 @@ static int lpm_suspend_enter(suspend_state_t state)
		* clocks that are enabled and preventing the system level
		* LPMs(XO and Vmin).
		*/
		clock_debug_print_enabled();
		clock_debug_print_enabled(true);

		psci_enter_sleep(lpm_cpu, idx, false);