diff options
| author | Richard Zhu <r65037@freescale.com> | 2014-06-25 14:20:16 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-05 14:04:33 +0800 |
| commit | 1a360111634e32f8f78a610e758b8324a36522c9 (patch) | |
| tree | 3ceb35c57ae05980de13793d3f1ccb5270252c29 /arch/arm/cpu/armv7 | |
| parent | 7716b8d781869daca631e30e76dcaa302dcb377c (diff) | |
| download | u-boot-imx-1a360111634e32f8f78a610e758b8324a36522c9.zip u-boot-imx-1a360111634e32f8f78a610e758b8324a36522c9.tar.gz u-boot-imx-1a360111634e32f8f78a610e758b8324a36522c9.tar.bz2 | |
ENGR00319965 pcie: mask the imx6sl out
imx6sl doesn't have the pcie module, mask the pcie
related codes from imx6sl.
Signed-off-by: Richard Zhu <r65037@freescale.com>
(cherry picked from commit acaff11da33f8f0cb1521d3c48e64e7ed9a87bec)
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit 48a4606ef575c72e16e31c167dce042fcb66191c)
Diffstat (limited to 'arch/arm/cpu/armv7')
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index cd38c38..5e77d29 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -454,23 +454,28 @@ static void imx_set_pcie_phy_power_down(void) int arch_cpu_init(void) { -#ifndef CONFIG_MX6SX - /* this bit is not used by imx6sx anymore */ - u32 val; + if (!is_mx6sl() && !is_mx6sx() + && !is_mx6ul() && !is_mx6ull() + && !is_mx6sll()) { + /* + * imx6sl doesn't have pcie at all. + * this bit is not used by imx6sx anymore + */ + u32 val; - /* - * There are about 0.02% percentage, random pcie link down - * when warm-reset is used. - * clear the ref_ssp_en bit16 of gpr1 to workaround it. - * then warm-reset imx6q/dl/solo again. - */ - val = readl(IOMUXC_BASE_ADDR + 0x4); - if (val & (0x1 << 16)) { - val &= ~(0x1 << 16); - writel(val, IOMUXC_BASE_ADDR + 0x4); - reset_cpu(0); + /* + * There are about 0.02% percentage, random pcie link down + * when warm-reset is used. + * clear the ref_ssp_en bit16 of gpr1 to workaround it. + * then warm-reset imx6q/dl/solo again. + */ + val = readl(IOMUXC_BASE_ADDR + 0x4); + if (val & (0x1 << 16)) { + val &= ~(0x1 << 16); + writel(val, IOMUXC_BASE_ADDR + 0x4); + reset_cpu(0); + } } -#endif init_aips(); |