浏览代码

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
Arnd Bergmann 11 年之前
父节点
当前提交
5a6da55f10
共有 3 个文件被更改,包括 11 次插入1 次删除
  1. 6 0
      arch/arm/boot/dts/k2e.dtsi
  2. 4 0
      arch/arm/boot/dts/k2l.dtsi
  3. 1 1
      arch/arm/boot/dts/keystone.dtsi

+ 6 - 0
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>;
+};

+ 4 - 0
arch/arm/boot/dts/k2l.dtsi

@@ -95,3 +95,7 @@
        /* Pin muxed. Enabled and configured by Bootloader */
        status = "disabled";
 };
+
+&mdio {
+	reg = <0x26200f00 0x100>;
+};

+ 1 - 1
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";
 		};