aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-05-07 09:50:01 +0100
committerMark Brown <broonie@linaro.org>2014-05-07 09:50:01 +0100
commit03b120027537c2ed889393e4c4e4e2f87c868027 (patch)
treec2a61f39356d3744c1678d87944003d8e420d15a /arch/arm/boot/dts
parentd08b012f0ce31e3e6e76675e880d6fa725b69aeb (diff)
parent5d897eedc505bb8af1f4865ae381eadbfd3bc8c1 (diff)
downloadlinux-linaro-stable-03b120027537c2ed889393e4c4e4e2f87c868027.tar.gz
Merge tag 'v3.10.39' into linux-linaro-lsk
This is the 3.10.39 stable release
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/armada-370-xp.dtsi1
-rw-r--r--arch/arm/boot/dts/exynos5250-arndale.dts1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 4d12d2347c15..ddd068bb1457 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -92,6 +92,7 @@
#size-cells = <0>;
compatible = "marvell,orion-mdio";
reg = <0x72004 0x4>;
+ clocks = <&gateclk 4>;
};
ethernet@70000 {
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 02cfc76d002f..b64cb43a7295 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -263,6 +263,7 @@
regulator-name = "vdd_g3d";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
+ regulator-always-on;
regulator-boot-on;
op_mode = <1>;
};