Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
arch/arm/boot/dts/keystone-clocks.dtsi between commit 0cfc9ccec2a8 ("ARM:
dts: keystone: preparatory patch to support K2L and K2E SOCs") from the
keystone tree and commit 565bbdcd3b91 ("ARM: keystone: dts: fix clkvcp3
control register address") from the clk tree.I fixed it up (by adding the following merge fix patch) and can carry the fix as necessary (no action is required). From: Stephen Rothwell <[email protected]> Date: Wed, 26 Feb 2014 18:12:55 +1100 Subject: [PATCH] ARM: keystone: dts: fix for code movement Signed-off-by: Stephen Rothwell <[email protected]> --- arch/arm/boot/dts/k2hk-clocks.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/k2hk-clocks.dtsi b/arch/arm/boot/dts/k2hk-clocks.dtsi index 4eed84feb761..a71aa2996321 100644 --- a/arch/arm/boot/dts/k2hk-clocks.dtsi +++ b/arch/arm/boot/dts/k2hk-clocks.dtsi @@ -339,7 +339,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>; }; -- 1.9.0 -- Cheers, Stephen Rothwell [email protected]
pgpMTn0npJq11.pgp
Description: PGP signature
