diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-13 16:21:02 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-13 16:21:02 +0200 |
| commit | cbd1d63c772a55e49c4385819b75922979380f8c (patch) | |
| tree | 2d6cd632b20fdba8d4179a40ff45e14d21123522 /arch/arm/boot/dts/keystone.dtsi | |
| parent | 30d430d9b66b79d418db1edaeb55cf58de7e757c (diff) | |
| parent | 11b897a2f7c6d6be93f9f6754438f96eed9236df (diff) | |
Merge tag 'keystone_dts_for_4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt
Merge "ARM: dts: Keystone DTS for 4.9" from Santosh Shilimkar
Add K2G nodes for GPIO, IRQ and Message Manager
* tag 'keystone_dts_for_4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: dts: keystone-k2g: Add Message Manager node
ARM: dts: keystone-k2g: Add DSP GPIO controller node
ARM: dts: keystone-k2g: Add keystone IRQ controller node
ARM: dts: keystone-k2g: Add device state controller node
ARM: dts: keystone: specify usb mode explicitly
Diffstat (limited to 'arch/arm/boot/dts/keystone.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/keystone.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi index e23f46d15c80..02708ba2d4f4 100644 --- a/arch/arm/boot/dts/keystone.dtsi +++ b/arch/arm/boot/dts/keystone.dtsi @@ -188,7 +188,7 @@ status = "disabled"; }; - usb: usb@2680000 { + keystone_usb0: usb@2680000 { compatible = "ti,keystone-dwc3"; #address-cells = <1>; #size-cells = <1>; @@ -201,7 +201,7 @@ dma-ranges; status = "disabled"; - dwc3@2690000 { + usb0: dwc3@2690000 { compatible = "synopsys,dwc3"; reg = <0x2690000 0x70000>; interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>; |