Commit 5a6da55f authored Oct 02, 2014 by Arnd Bergmann

Merge tag 'keystone-dts-fixes' of...

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

parents 3a75d1ad 45aa70d1

arch/arm/boot/dts/k2e.dtsi

+6 −0

Original line number	Diff line number	Diff line
		@@ -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>;
		};

arch/arm/boot/dts/k2l.dtsi

+4 −0

Original line number	Diff line number	Diff line
		@@ -95,3 +95,7 @@
		/* Pin muxed. Enabled and configured by Bootloader */
		status = "disabled";
		};

		&mdio {
		reg = <0x26200f00 0x100>;
		};

arch/arm/boot/dts/keystone.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,7 @@
		compatible = "ti,keystone-usbphy";
		#address-cells = <1>;
		#size-cells = <1>;
		reg = <0x2620738 32>;
		reg = <0x2620738 24>;
		status = "disabled";
		};