diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-03-03 01:02:27 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-03-03 01:02:27 +0300 |
| commit | 720721b5defdb6832c3074cdfdf7ae53d1691de8 (patch) | |
| tree | a5f773fa22d6c45373d3063cba526fe5674a06ed /arch/arm64 | |
| parent | 3bbf58531fce39ffa8290d8473fb392194e6f885 (diff) | |
| parent | 4c1d9ea7402dd808fc511ef6622f957aa795852f (diff) | |
| download | linux-720721b5defdb6832c3074cdfdf7ae53d1691de8.tar.xz | |
Merge tag 'imx-dt64-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt64
Merge "NXP/Freescale arm64 dts update for 4.6" from Shawn Guo:
- Add "snps,quirk-frame-length-adjustment" property to USB3 node for
erratum A009116, which affects NXP/Freescale arm64 SoCs LS1043A and
LS2080A.
* tag 'imx-dt64-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
arm64: dts: ls1043a: Add quirk for Erratum A009116
arm64: dts: ls2080a: Add quirk for Erratum A009116
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi index 42a61549afd4..be72bf5b58b5 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi @@ -407,6 +407,7 @@ reg = <0x0 0x2f00000 0x0 0x10000>; interrupts = <0 60 0x4>; dr_mode = "host"; + snps,quirk-frame-length-adjustment = <0x20>; }; usb1: usb3@3000000 { @@ -414,6 +415,7 @@ reg = <0x0 0x3000000 0x0 0x10000>; interrupts = <0 61 0x4>; dr_mode = "host"; + snps,quirk-frame-length-adjustment = <0x20>; }; usb2: usb3@3100000 { @@ -421,6 +423,7 @@ reg = <0x0 0x3100000 0x0 0x10000>; interrupts = <0 63 0x4>; dr_mode = "host"; + snps,quirk-frame-length-adjustment = <0x20>; }; sata: sata@3200000 { diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi index 2b23d0360683..909a1e3e673b 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi @@ -569,6 +569,7 @@ reg = <0x0 0x3100000 0x0 0x10000>; interrupts = <0 80 0x4>; /* Level high type */ dr_mode = "host"; + snps,quirk-frame-length-adjustment = <0x20>; }; usb1: usb3@3110000 { @@ -577,6 +578,7 @@ reg = <0x0 0x3110000 0x0 0x10000>; interrupts = <0 81 0x4>; /* Level high type */ dr_mode = "host"; + snps,quirk-frame-length-adjustment = <0x20>; }; ccn@4000000 { |