aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-10-02 16:47:40 +0200
committerArnd Bergmann <arnd@arndb.de>2014-10-02 16:47:40 +0200
commit5a6da55f10578b10f30ec72dcca6c37cbeac31ed (patch)
tree80b15b3a2794ac39c1544dd273dedc1752115335 /arch
parent3a75d1ad9a14dfbc8ea02824457729b79444e74f (diff)
parent45aa70d1f77e3b88f776a34cf2b38858d922ca9b (diff)
downloadlinux-5a6da55f10578b10f30ec72dcca6c37cbeac31ed.tar.gz
Merge tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt
Pull "Few keystone DTS fixes for 3.18" from Santosh Shilimkar: - IO range fix for USB phy device - Add missing dma-coherent property for K2E USB node - Fix K2L MDIO start address - Fix K2E MDIO start address Signed-off-by: Arnd Bergmann <arnd@arndb.de> * tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: dts: keystone-k2l: fix mdio io start address ARM: dts: keystone-k2e: fix mdio io start address ARM: dts: keystone-k2e: update usb1 node for dma properties ARM: dts: keystone: fix io range for usb_phy0
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/k2e.dtsi6
-rw-r--r--arch/arm/boot/dts/k2l.dtsi4
-rw-r--r--arch/arm/boot/dts/keystone.dtsi2
3 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/k2e.dtsi b/arch/arm/boot/dts/k2e.dtsi
index 13cf35a52ade..c358b4b9a073 100644
--- a/arch/arm/boot/dts/k2e.dtsi
+++ b/arch/arm/boot/dts/k2e.dtsi
@@ -67,6 +67,8 @@
clock-names = "usb";
interrupts = <GIC_SPI 414 IRQ_TYPE_EDGE_RISING>;
ranges;
+ dma-coherent;
+ dma-ranges;
status = "disabled";
dwc3@25010000 {
@@ -85,3 +87,7 @@
};
};
};
+
+&mdio {
+ reg = <0x24200f00 0x100>;
+};
diff --git a/arch/arm/boot/dts/k2l.dtsi b/arch/arm/boot/dts/k2l.dtsi
index 291db43a611d..e32c3baa77b8 100644
--- a/arch/arm/boot/dts/k2l.dtsi
+++ b/arch/arm/boot/dts/k2l.dtsi
@@ -95,3 +95,7 @@
/* Pin muxed. Enabled and configured by Bootloader */
status = "disabled";
};
+
+&mdio {
+ reg = <0x26200f00 0x100>;
+};
diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index 1820d9e34a8f..5d3e83fa2242 100644
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -172,7 +172,7 @@
compatible = "ti,keystone-usbphy";
#address-cells = <1>;
#size-cells = <1>;
- reg = <0x2620738 32>;
+ reg = <0x2620738 24>;
status = "disabled";
};