diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2018-04-01 18:57:49 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2018-04-01 18:57:49 +0000 |
| commit | 521547fa5f4e4b54a07b897ee4df6ce75f96210e (patch) | |
| tree | 0291322d642bb1596267f65806be7e503fa26bf3 /sys | |
| parent | 29a79119c2df2800ea606f2f6cc5b12db9ccfe93 (diff) | |
Remove unfinished PCIe support from imxccm(4). We can do better than
that when we tackle it again.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/armv7/imx/imxccm.c | 20 | ||||
| -rw-r--r-- | sys/arch/armv7/imx/imxccmvar.h | 3 |
2 files changed, 2 insertions, 21 deletions
diff --git a/sys/arch/armv7/imx/imxccm.c b/sys/arch/armv7/imx/imxccm.c index 90b75606bb2..66928e591e1 100644 --- a/sys/arch/armv7/imx/imxccm.c +++ b/sys/arch/armv7/imx/imxccm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imxccm.c,v 1.11 2018/04/01 18:50:54 patrick Exp $ */ +/* $OpenBSD: imxccm.c,v 1.12 2018/04/01 18:57:48 patrick Exp $ */ /* * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se> * @@ -246,7 +246,6 @@ void imxccm_enable_pll_usb2(void); void imxccm_enable_pll_enet(void); void imxccm_enable_enet(void); void imxccm_enable_sata(void); -void imxccm_enable_pcie(void); int imxccm_match(struct device *parent, void *match, void *aux) @@ -609,23 +608,6 @@ imxccm_enable_sata(void) } void -imxccm_enable_pcie(void) -{ - struct imxccm_softc *sc = imxccm_sc; - - HWRITE4(sc, CCM_PMU_MISC1, - (HREAD4(sc, CCM_PMU_MISC1) & ~CCM_PMU_MISC1_LVDSCLK1_CLK_SEL_MASK) - | CCM_PMU_MISC1_LVDSCLK1_CLK_SEL_SATA - | CCM_PMU_MISC1_LVDSCLK1_OBEN - | CCM_PMU_MISC1_LVDSCLK1_IBEN); - - imxccm_enable_pll_enet(); - HWRITE4(sc, CCM_ANALOG_PLL_ENET_SET, CCM_ANALOG_PLL_ENET_125M_PCIE); - - HSET4(sc, CCM_CCGR4, CCM_CCGR4_125M_PCIE); -} - -void imxccm_disable_usb1_chrg_detect(void) { struct imxccm_softc *sc = imxccm_sc; diff --git a/sys/arch/armv7/imx/imxccmvar.h b/sys/arch/armv7/imx/imxccmvar.h index 04da1768e8b..f6962d735cf 100644 --- a/sys/arch/armv7/imx/imxccmvar.h +++ b/sys/arch/armv7/imx/imxccmvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: imxccmvar.h,v 1.4 2018/04/01 18:50:54 patrick Exp $ */ +/* $OpenBSD: imxccmvar.h,v 1.5 2018/04/01 18:57:48 patrick Exp $ */ /* * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se> * @@ -25,6 +25,5 @@ void imxccm_enable_pll_usb1(void); void imxccm_enable_pll_usb2(void); void imxccm_enable_enet(void); void imxccm_enable_sata(void); -void imxccm_enable_pcie(void); #endif /* IMXCCMVAR_H */ |