summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/armada-39x.dtsi
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-06-12 00:37:45 +0300
committerKevin Hilman <khilman@linaro.org>2015-06-12 00:37:45 +0300
commitecdf94da6f91310d08081e05db78a6c997b44e4b (patch)
tree0528ddc7e2b34046b3bd98dedf89ca7fee40c1ae /arch/arm/boot/dts/armada-39x.dtsi
parente28f23d8aaf3c3455edcdf646d910757051a07e3 (diff)
parentc65b99f046843d2455aa231747b5a07a999a9f3d (diff)
downloadlinux-ecdf94da6f91310d08081e05db78a6c997b44e4b.tar.xz
Merge tag 'v4.1-rc6' into next/dt
Linux 4.1-rc6 Conflicts: arch/arm/boot/dts/zynq-7000.dtsi Resolution summary: Mainline had an earlier version of the commit, resolve in favor of the newer patch in next/dt branch.
Diffstat (limited to 'arch/arm/boot/dts/armada-39x.dtsi')
-rw-r--r--arch/arm/boot/dts/armada-39x.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi
index 7daf2c2a1793..fc9864f85fc2 100644
--- a/arch/arm/boot/dts/armada-39x.dtsi
+++ b/arch/arm/boot/dts/armada-39x.dtsi
@@ -504,7 +504,7 @@
mainpll: mainpll {
compatible = "fixed-clock";
#clock-cells = <0>;
- clock-frequency = <2000000000>;
+ clock-frequency = <1000000000>;
};
};
};