diff options
| author |   Mike Turquette <mturquette@linaro.org> | 2014-02-18 22:18:52 -0800 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-02-18 22:18:52 -0800 |
| commit | 7364001478597759fc5e00536bbe926ec9c25db0 (patch) | |
| tree | d77eea329b52b89a241f75dcdf3a71effef74cd9 | |
| parent | Merge tag 'mvebu-clk-fixes-3.14' of git://git.infradead.org/linux-mvebu into clk-fixes (diff) | |
| parent | ARM: keystone: dts: fix clkvcp3 control register address (diff) | |
| download | wireguard-linux-7364001478597759fc5e00536bbe926ec9c25db0.tar.xz wireguard-linux-7364001478597759fc5e00536bbe926ec9c25db0.zip | |
Merge branch 'for_3.14-rcx/clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into clk-fixes
| -rw-r--r-- | arch/arm/boot/dts/keystone-clocks.dtsi | 2 | ||||
| -rw-r--r-- | drivers/clk/keystone/gate.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/keystone-clocks.dtsi b/arch/arm/boot/dts/keystone-clocks.dtsi index 2363593e1050..ef58d1c24313 100644 --- a/arch/arm/boot/dts/keystone-clocks.dtsi +++ b/arch/arm/boot/dts/keystone-clocks.dtsi @@ -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>; }; diff --git a/drivers/clk/keystone/gate.c b/drivers/clk/keystone/gate.c index 17a598398a53..86f1e362eafb 100644 --- a/drivers/clk/keystone/gate.c +++ b/drivers/clk/keystone/gate.c @@ -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); |