Skip to content

Commit

Permalink
Merge tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Arnd Bergmann committed Oct 2, 2014
2 parents 3a75d1a + 45aa70d commit 5a6da55
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/k2e.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@
clock-names = "usb";
interrupts = <GIC_SPI 414 IRQ_TYPE_EDGE_RISING>;
ranges;
dma-coherent;
dma-ranges;
status = "disabled";

dwc3@25010000 {
Expand All @@ -85,3 +87,7 @@
};
};
};

&mdio {
reg = <0x24200f00 0x100>;
};
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/k2l.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,7 @@
/* Pin muxed. Enabled and configured by Bootloader */
status = "disabled";
};

&mdio {
reg = <0x26200f00 0x100>;
};
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/keystone.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
compatible = "ti,keystone-usbphy";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x2620738 32>;
reg = <0x2620738 24>;
status = "disabled";
};

Expand Down

0 comments on commit 5a6da55

Please sign in to comment.