Commit 73640014 authored by Mike Turquette's avatar Mike Turquette
Browse files

Merge branch 'for_3.14-rcx/clk-fixes' of... 

Merge branch 'for_3.14-rcx/clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into clk-fixes
parents 37a4493e 565bbdcd

arch/arm/boot/dts/keystone-clocks.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ clocks { 
		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk13>;

		clock-output-names = "vcp-3";

		reg = <0x0235000a8 0xb00>, <0x02350060 0x400>;

		reg = <0x023500a8 0xb00>, <0x02350060 0x400>;

		reg-names = "control", "domain";

		domain-id = <24>;

	};

drivers/clk/keystone/gate.c

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ static struct clk *clk_register_psc(struct device *dev, 


	init.name = name;

	init.ops = &clk_psc_ops;

	init.flags = 0;

	init.parent_names = (parent_name ? &parent_name : NULL);

	init.num_parents = (parent_name ? 1 : 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE