Commit e3f4358e authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'v4.10-rockchip-clk2' of... 

Merge tag 'v4.10-rockchip-clk2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next

Pull rockchip clk driver updates from Heiko Stuebner:

A new clock controller for the rk1108 soc (single-core Cortex-A7+DSP),
a fix making sure the cpuclk rate is actually valid, before trying to
set it and a copy-paste fix for the rk3399's testclk.

* tag 'v4.10-rockchip-clk2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  clk: rockchip: add clock controller for rk1108
  dt-bindings: add documentation for rk1108 cru
  clk: rockchip: add dt-binding header for rk1108
  clk: rockchip: fix copy-paste error in rk3399 testclk
  clk: rockchip: validity should be checked prior to cpu clock rate change
parents 96893e10 e44dde27

Documentation/devicetree/bindings/clock/rockchip,rk1108-cru.txt

0 → 100644
+59 −0
Original line number Diff line number Diff line 
* Rockchip RK1108 Clock and Reset Unit



The RK1108 clock controller generates and supplies clock to various

controllers within the SoC and also implements a reset controller for SoC

peripherals.



Required Properties:



- compatible: should be "rockchip,rk1108-cru"

- reg: physical base address of the controller and length of memory mapped

  region.

- #clock-cells: should be 1.

- #reset-cells: should be 1.



Optional Properties:



- rockchip,grf: phandle to the syscon managing the "general register files"

  If missing pll rates are not changeable, due to the missing pll lock status.



Each clock is assigned an identifier and client nodes can use this identifier

to specify the clock which they consume. All available clocks are defined as

preprocessor macros in the dt-bindings/clock/rk1108-cru.h headers and can be

used in device tree sources. Similar macros exist for the reset sources in

these files.



External clocks:



There are several clocks that are generated outside the SoC. It is expected

that they are defined using standard clock bindings with following

clock-output-names:

 - "xin24m" - crystal input - required,

 - "ext_vip" - external VIP clock - optional

 - "ext_i2s" - external I2S clock - optional

 - "ext_gmac" - external GMAC clock - optional

 - "hdmiphy" - external clock input derived from HDMI PHY - optional

 - "usbphy" - external clock input derived from USB PHY - optional



Example: Clock controller node:



	cru: cru@20200000 {

		compatible = "rockchip,rk1108-cru";

		reg = <0x20200000 0x1000>;

		rockchip,grf = <&grf>;



		#clock-cells = <1>;

		#reset-cells = <1>;

	};



Example: UART controller node that consumes the clock generated by the clock

  controller:



	uart0: serial@10230000 {

		compatible = "rockchip,rk1108-uart", "snps,dw-apb-uart";

		reg = <0x10230000 0x100>;

		interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;

		reg-shift = <2>;

		reg-io-width = <4>;

		clocks = <&cru SCLK_UART0>;

	};

drivers/clk/rockchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ obj-y += clk-mmc-phase.o 
obj-y	+= clk-ddr.o

obj-$(CONFIG_RESET_CONTROLLER)	+= softrst.o



obj-y	+= clk-rk1108.o

obj-y	+= clk-rk3036.o

obj-y	+= clk-rk3188.o

obj-y	+= clk-rk3228.o

drivers/clk/rockchip/clk-cpu.c

+9 −0
Original line number Diff line number Diff line
@@ -124,9 +124,18 @@ static int rockchip_cpuclk_pre_rate_change(struct rockchip_cpuclk *cpuclk, 
					   struct clk_notifier_data *ndata)

{

	const struct rockchip_cpuclk_reg_data *reg_data = cpuclk->reg_data;

	const struct rockchip_cpuclk_rate_table *rate;

	unsigned long alt_prate, alt_div;

	unsigned long flags;



	/* check validity of the new rate */

	rate = rockchip_get_cpuclk_settings(cpuclk, ndata->new_rate);

	if (!rate) {

		pr_err("%s: Invalid rate : %lu for cpuclk\n",

		       __func__, ndata->new_rate);

		return -EINVAL;

	}



	alt_prate = clk_get_rate(cpuclk->alt_parent);



	spin_lock_irqsave(cpuclk->lock, flags);

drivers/clk/rockchip/clk-rk1108.c

0 → 100644
+531 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/clk/rockchip/clk-rk3399.c

+2 −2
Original line number Diff line number Diff line
@@ -1383,8 +1383,8 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { 
	/* clk_test */

	/* clk_test_pre is controlled by CRU_MISC_CON[3] */

	COMPOSITE_NOMUX(0, "clk_test", "clk_test_pre", CLK_IGNORE_UNUSED,

			RK3368_CLKSEL_CON(58), 0, 5, DFLAGS,

			RK3368_CLKGATE_CON(13), 11, GFLAGS),

			RK3399_CLKSEL_CON(58), 0, 5, DFLAGS,

			RK3399_CLKGATE_CON(13), 11, GFLAGS),



	/* ddrc */

	GATE(0, "clk_ddrc_lpll_src", "lpll", 0, RK3399_CLKGATE_CON(3),

CRA Git | Maintained and supported by SUSTech CRA and CCSE