Merge branch 'for-v3.16-rc/ti-clk-drv' of github.com:t-kristo/linux-pm into clk-fixes-ti (5c726dcd) · Commits · e / devices / android_kernel_sony_msm8998

drivers/clk/ti/apll.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -77,13 +77,11 @@ static int dra7_apll_enable(struct clk_hw *hw)
		if (i == MAX_APLL_WAIT_TRIES) {
		pr_warn("clock: %s failed transition to '%s'\n",
		clk_name, (state) ? "locked" : "bypassed");
		} else {
		r = -EBUSY;
		} else
		pr_debug("clock: %s transition to '%s' in %d loops\n",
		clk_name, (state) ? "locked" : "bypassed", i);

		r = 0;
		}

		return r;
		}

		@@ -338,7 +336,7 @@ static void __init of_omap2_apll_setup(struct device_node *node)
		const char *parent_name;
		u32 val;

		ad = kzalloc(sizeof(*clk_hw), GFP_KERNEL);
		ad = kzalloc(sizeof(*ad), GFP_KERNEL);
		clk_hw = kzalloc(sizeof(*clk_hw), GFP_KERNEL);
		init = kzalloc(sizeof(*init), GFP_KERNEL);

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ static void of_mux_clk_setup(struct device_node *node)
		u8 clk_mux_flags = 0;
		u32 mask = 0;
		u32 shift = 0;
		u32 flags = 0;
		u32 flags = CLK_SET_RATE_NO_REPARENT;

		num_parents = of_clk_get_parent_count(node);
		if (num_parents < 2) {