summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-05 10:12:23 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-05 10:12:23 -0700
commit0a1b6f63198f6e51d12c8d8c4ed4e7d759b3b73d (patch)
treec1abeac7eef4a6c3d25c25fcce3a727285e70e55 /arch
parentffe5adcb7661d94e952d6b5ed7f493cb4ef0c7bc (diff)
parent257d5d9a9f19ee6c6801589c74791d5422c374e9 (diff)
downloadlinux-0a1b6f63198f6e51d12c8d8c4ed4e7d759b3b73d.tar.bz2
Merge tag 'phy-for-4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-linus
Kishon writes: phy: for 4.2-rc6 *) Fix compiler error when sun4i usb phy driver is built as module *) Fix SATA Lockup issue in dra7 SoC Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/dra7.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 8f1e25bcecbd..4a0718ccf68e 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1140,6 +1140,7 @@
ctrl-module = <&omap_control_sata>;
clocks = <&sys_clkin1>, <&sata_ref_clk>;
clock-names = "sysclk", "refclk";
+ syscon-pllreset = <&scm_conf 0x3fc>;
#phy-cells = <0>;
};