diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-10-20 19:45:49 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-10-20 19:45:49 +0300 |
| commit | 525fde0750394dd3874937361570764f6a368e33 (patch) | |
| tree | 77aa31712a9957d935c50f504e98a455bbb72816 /arch | |
| parent | b7c18dc06ad12059abc0961522d446553f8a755b (diff) | |
| parent | f4e833ba2a955bc15c1ccaa5b0b3c2a0d7989bca (diff) | |
| download | linux-525fde0750394dd3874937361570764f6a368e33.tar.xz | |
Merge branch 'remotes/lorenzo/pci/dwc'
- Support 100MHz/200MHz refclocks for i.MX6 (Lucas Stach)
- Add initial power management for i.MX7 (Leonard Crestez)
- Add PME_Turn_Off support for i.MX7 (Leonard Crestez)
- Fix qcom runtime power management error handling (Bjorn Andersson)
- Update TI dra7xx unaligned access errata workaround for host mode as
well as endpoint mode (Vignesh R)
- Fix kirin section mismatch warning (Nathan Chancellor)
* remotes/lorenzo/pci/dwc:
PCI: imx: Add PME_Turn_Off support
ARM: dts: imx7d: Add turnoff reset
dt-bindings: imx6q-pcie: Add turnoff reset for imx7d
reset: imx7: Add PCIE_CTRL_APPS_TURNOFF
PCI: kirin: Fix section mismatch warning
PCI: dwc: pci-dra7xx: Enable errata i870 for both EP and RC mode
dt-bindings: PCI: dra7xx: Add bindings for unaligned access in host mode
PCI: qcom: Fix error handling in runtime PM support
PCI: imx: Initial imx7d pm support
PCI: imx6: Support MPLL reconfiguration for 100MHz and 200MHz refclock
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx7d.dtsi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi index 7234e8330a57..efbdeaaa8dcd 100644 --- a/arch/arm/boot/dts/imx7d.dtsi +++ b/arch/arm/boot/dts/imx7d.dtsi @@ -146,8 +146,9 @@ fsl,max-link-speed = <2>; power-domains = <&pgc_pcie_phy>; resets = <&src IMX7_RESET_PCIEPHY>, - <&src IMX7_RESET_PCIE_CTRL_APPS_EN>; - reset-names = "pciephy", "apps"; + <&src IMX7_RESET_PCIE_CTRL_APPS_EN>, + <&src IMX7_RESET_PCIE_CTRL_APPS_TURNOFF>; + reset-names = "pciephy", "apps", "turnoff"; status = "disabled"; }; }; |