Commit 533dfd60 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'v4.18-rockchip-clk-1' of... 

Merge tag 'v4.18-rockchip-clk-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-rockchip

Pull rockchip clk driver updates from Heiko Stuebner:

Conversion to match_string helper of open-coded string comparison
and removal of the initial devicetree-based gate-clocks, which were
deprecated since 2014.

* tag 'v4.18-rockchip-clk-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  clk: rockchip: remove deprecated gate-clk code and dt-binding
  clk: rockchip: use match_string() helper
parents 60cc43fc 1d646229

Documentation/devicetree/bindings/clock/rockchip.txt

deleted100644 → 0
+0 −77
Original line number Diff line number Diff line 
Device Tree Clock bindings for arch-rockchip



This binding uses the common clock binding[1].



[1] Documentation/devicetree/bindings/clock/clock-bindings.txt



== Gate clocks ==



These bindings are deprecated!

Please use the soc specific CRU bindings instead.



The gate registers form a continuos block which makes the dt node

structure a matter of taste, as either all gates can be put into

one gate clock spanning all registers or they can be divided into

the 10 individual gates containing 16 clocks each.

The code supports both approaches.



Required properties:

- compatible : "rockchip,rk2928-gate-clk"

- reg : shall be the control register address(es) for the clock.

- #clock-cells : from common clock binding; shall be set to 1

- clock-output-names : the corresponding gate names that the clock controls

- clocks : should contain the parent clock for each individual gate,

  therefore the number of clocks elements should match the number of

  clock-output-names



Example using multiple gate clocks:



		clk_gates0: gate-clk@200000d0 {

			compatible = "rockchip,rk2928-gate-clk";

			reg = <0x200000d0 0x4>;

			clocks = <&dummy>, <&dummy>,

				 <&dummy>, <&dummy>,

				 <&dummy>, <&dummy>,

				 <&dummy>, <&dummy>,

				 <&dummy>, <&dummy>,

				 <&dummy>, <&dummy>,

				 <&dummy>, <&dummy>,

				 <&dummy>, <&dummy>;



			clock-output-names =

				"gate_core_periph", "gate_cpu_gpll",

				"gate_ddrphy", "gate_aclk_cpu",

				"gate_hclk_cpu", "gate_pclk_cpu",

				"gate_atclk_cpu", "gate_i2s0",

				"gate_i2s0_frac", "gate_i2s1",

				"gate_i2s1_frac", "gate_i2s2",

				"gate_i2s2_frac", "gate_spdif",

				"gate_spdif_frac", "gate_testclk";



			#clock-cells = <1>;

		};



		clk_gates1: gate-clk@200000d4 {

			compatible = "rockchip,rk2928-gate-clk";

			reg = <0x200000d4 0x4>;

			clocks = <&xin24m>, <&xin24m>,

				 <&xin24m>, <&dummy>,

				 <&dummy>, <&xin24m>,

				 <&xin24m>, <&dummy>,

				 <&xin24m>, <&dummy>,

				 <&xin24m>, <&dummy>,

				 <&xin24m>, <&dummy>,

				 <&xin24m>, <&dummy>;



			clock-output-names =

				"gate_timer0", "gate_timer1",

				"gate_timer2", "gate_jtag",

				"gate_aclk_lcdc1_src", "gate_otgphy0",

				"gate_otgphy1", "gate_ddr_gpll",

				"gate_uart0", "gate_frac_uart0",

				"gate_uart1", "gate_frac_uart1",

				"gate_uart2", "gate_frac_uart2",

				"gate_uart3", "gate_frac_uart3";



			#clock-cells = <1>;

		};

drivers/clk/rockchip/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
# Rockchip Clock specific Makefile

#



obj-y	+= clk-rockchip.o

obj-y	+= clk.o

obj-y	+= clk-pll.o

obj-y	+= clk-cpu.o

drivers/clk/rockchip/clk-rockchip.c

deleted100644 → 0
+0 −98
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013 MundoReader S.L.

 * Author: Heiko Stuebner <heiko@sntech.de>

 *

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

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/clk-provider.h>

#include <linux/clkdev.h>

#include <linux/of.h>

#include <linux/of_address.h>



static DEFINE_SPINLOCK(clk_lock);



/*

 * Gate clocks

 */



static void __init rk2928_gate_clk_init(struct device_node *node)

{

	struct clk_onecell_data *clk_data;

	const char *clk_parent;

	const char *clk_name;

	void __iomem *reg;

	void __iomem *reg_idx;

	int flags;

	int qty;

	int reg_bit;

	int clkflags = CLK_SET_RATE_PARENT;

	int i;



	qty = of_property_count_strings(node, "clock-output-names");

	if (qty < 0) {

		pr_err("%s: error in clock-output-names %d\n", __func__, qty);

		return;

	}



	if (qty == 0) {

		pr_info("%s: nothing to do\n", __func__);

		return;

	}



	reg = of_iomap(node, 0);

	if (!reg)

		return;



	clk_data = kzalloc(sizeof(struct clk_onecell_data), GFP_KERNEL);

	if (!clk_data) {

		iounmap(reg);

		return;

	}



	clk_data->clks = kzalloc(qty * sizeof(struct clk *), GFP_KERNEL);

	if (!clk_data->clks) {

		kfree(clk_data);

		iounmap(reg);

		return;

	}



	flags = CLK_GATE_HIWORD_MASK | CLK_GATE_SET_TO_DISABLE;



	for (i = 0; i < qty; i++) {

		of_property_read_string_index(node, "clock-output-names",

					      i, &clk_name);



		/* ignore empty slots */

		if (!strcmp("reserved", clk_name))

			continue;



		clk_parent = of_clk_get_parent_name(node, i);



		/* keep all gates untouched for now */

		clkflags |= CLK_IGNORE_UNUSED;



		reg_idx = reg + (4 * (i / 16));

		reg_bit = (i % 16);



		clk_data->clks[i] = clk_register_gate(NULL, clk_name,

						      clk_parent, clkflags,

						      reg_idx, reg_bit,

						      flags,

						      &clk_lock);

		WARN_ON(IS_ERR(clk_data->clks[i]));

	}



	clk_data->clk_num = qty;



	of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);

}

CLK_OF_DECLARE(rk2928_gate, "rockchip,rk2928-gate-clk", rk2928_gate_clk_init);

drivers/clk/rockchip/clk.c

+5 −11
Original line number Diff line number Diff line
@@ -274,18 +274,10 @@ static struct clk *rockchip_clk_register_frac_branch( 
		struct clk_mux *frac_mux = &frac->mux;

		struct clk_init_data init;

		struct clk *mux_clk;

		int i, ret;



		frac->mux_frac_idx = -1;

		for (i = 0; i < child->num_parents; i++) {

			if (!strcmp(name, child->parent_names[i])) {

				pr_debug("%s: found fractional parent in mux at pos %d\n",

					 __func__, i);

				frac->mux_frac_idx = i;

				break;

			}

		}

		int ret;



		frac->mux_frac_idx = match_string(child->parent_names,

						  child->num_parents, name);

		frac->mux_ops = &clk_mux_ops;

		frac->clk_nb.notifier_call = rockchip_clk_frac_notifier_cb;
@@ -312,6 +304,8 @@ static struct clk *rockchip_clk_register_frac_branch( 


		/* notifier on the fraction divider to catch rate changes */

		if (frac->mux_frac_idx >= 0) {

			pr_debug("%s: found fractional parent in mux at pos %d\n",

				 __func__, frac->mux_frac_idx);

			ret = clk_notifier_register(clk, &frac->clk_nb);

			if (ret)

				pr_err("%s: failed to register clock notifier for %s\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE