diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-08-09 12:12:52 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-08-09 12:12:52 +0200 |
| commit | d0ed4c60abfb9a4ab6cd416d1dea9df6266f8fc7 (patch) | |
| tree | 8fd3af1a9e788333e85d2a51a4fc2a9858a9a95a /arch/arm/boot/dts/dra7.dtsi | |
| parent | 72a361a5b91c77b33ab2533674fdcec4de3278d0 (diff) | |
| parent | aba941392aeef2d1bc064a1e4b09293473ef7b9b (diff) | |
Merge branch 'acpi-scan' to satisfy dependencies.
Diffstat (limited to 'arch/arm/boot/dts/dra7.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/dra7.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 9dcd14edc202..e03495a799ce 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -1580,7 +1580,6 @@ dr_mode = "otg"; snps,dis_u3_susphy_quirk; snps,dis_u2_susphy_quirk; - snps,dis_metastability_quirk; }; }; @@ -1608,6 +1607,7 @@ dr_mode = "otg"; snps,dis_u3_susphy_quirk; snps,dis_u2_susphy_quirk; + snps,dis_metastability_quirk; }; }; |