diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-04 01:33:42 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-04 01:33:42 (GMT) |
| commit | c83a824e62277162ad35f52879b2316902c0eff5 (patch) | |
| tree | fa91cdcda24b8822d0f1e52786b2657e4d68be27 /arch/arm/dts | |
| parent | 0ff27d4a94637d4b1937c625d33212375bd118d9 (diff) | |
| parent | add63f94a9c3bbe1af3fdf3f4c56a5185a4c0504 (diff) | |
| download | u-boot-c83a824e62277162ad35f52879b2316902c0eff5.tar.xz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/ls1046aqds_defconfig
configs/ls1046aqds_nand_defconfig
configs/ls1046aqds_qspi_defconfig
configs/ls1046aqds_sdcard_ifc_defconfig
configs/ls1046aqds_sdcard_qspi_defconfig
configs/ls1046ardb_emmc_defconfig
configs/ls1046ardb_qspi_defconfig
configs/ls1046ardb_sdcard_defconfig
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/fsl-ls1046a.dtsi | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/dts/fsl-ls1046a.dtsi b/arch/arm/dts/fsl-ls1046a.dtsi index aaf0ae9..408e81e 100644 --- a/arch/arm/dts/fsl-ls1046a.dtsi +++ b/arch/arm/dts/fsl-ls1046a.dtsi @@ -217,6 +217,27 @@ status = "disabled"; }; + usb0: usb@2f00000 { + compatible = "fsl,layerscape-dwc3"; + reg = <0x0 0x2f00000 0x0 0x10000>; + interrupts = <0 60 4>; + dr_mode = "host"; + }; + + usb1: usb@3000000 { + compatible = "fsl,layerscape-dwc3"; + reg = <0x0 0x3000000 0x0 0x10000>; + interrupts = <0 61 4>; + dr_mode = "host"; + }; + + usb2: usb@3100000 { + compatible = "fsl,layerscape-dwc3"; + reg = <0x0 0x3100000 0x0 0x10000>; + interrupts = <0 63 4>; + dr_mode = "host"; + }; + pcie@3400000 { compatible = "fsl,ls-pcie", "snps,dw-pcie"; reg = <0x00 0x03400000 0x0 0x80000 /* dbi registers */ |