diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:32:54 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:32:54 -0500 |
commit | 7284a62dfd7066919bf9a7318f6dbc7b51a092db (patch) | |
tree | 70692fb0b0e981e04419f35a389f44702f9c2023 /include | |
parent | 4940421013672aafdc8c372c17b5ddf63423c805 (diff) | |
parent | 7221547e55b7929e4d46983f6f3ca15f36ee4dac (diff) | |
download | linux-stable-7284a62dfd7066919bf9a7318f6dbc7b51a092db.tar.gz linux-stable-7284a62dfd7066919bf9a7318f6dbc7b51a092db.tar.bz2 linux-stable-7284a62dfd7066919bf9a7318f6dbc7b51a092db.zip |
Merge branch 'pci/host-imx6' into next
* pci/host-imx6:
PCI: imx6: Fix spelling mistake: "contol" -> "control"
PCI: imx6: Do not switch speed if Gen2 is disabled
PCI: imx6: Do not wait for speed change on i.MX7
PCI: imx6: Allow probe deferral by reset GPIO
PCI: imx6: Add code to support i.MX7D
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mfd/syscon/imx7-iomuxc-gpr.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mfd/syscon/imx7-iomuxc-gpr.h b/include/linux/mfd/syscon/imx7-iomuxc-gpr.h index 4585d6105d68..abbd52466573 100644 --- a/include/linux/mfd/syscon/imx7-iomuxc-gpr.h +++ b/include/linux/mfd/syscon/imx7-iomuxc-gpr.h @@ -44,4 +44,8 @@ #define IMX7D_GPR5_CSI_MUX_CONTROL_MIPI (0x1 << 4) +#define IMX7D_GPR12_PCIE_PHY_REFCLK_SEL BIT(5) + +#define IMX7D_GPR22_PCIE_PHY_PLL_LOCKED BIT(31) + #endif /* __LINUX_IMX7_IOMUXC_GPR_H */ |