diff options
| author | Mandar padmawar <mpadmawar@nvidia.com> | 2014-06-10 07:13:21 -0700 |
|---|---|---|
| committer | Mandar padmawar <mpadmawar@nvidia.com> | 2014-06-10 07:15:56 -0700 |
| commit | da616b70c1939e02f9dc962b3d9196fe27cfee39 (patch) | |
| tree | e3dc844dd92f1ea51fe5819d5919dec1f59e5760 /arch/arm/boot | |
| parent | bbf3566b5c9c0106300933665f42e94c18415702 (diff) | |
| parent | dce68ca8e1015cf5bcd33284c0c1c9191e79885d (diff) | |
Merge commit 'refs/changes/82/419382/1' of ssh://git-master:12001/linux-3.10 into promotion_build
Change-Id: I9418a05ad5c56b2e902249218bac2fa594d99f56
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/armada-370-xp.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos5250-arndale.dts | 1 |
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>; }; |