summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/armv7/armv7/armv7var.h3
-rw-r--r--sys/arch/armv7/imx/imx.c29
-rw-r--r--sys/arch/armv7/imx/imx_machdep.c3
-rw-r--r--sys/arch/armv7/imx/imxehci.c10
-rw-r--r--sys/arch/armv7/imx/imxenet.c11
-rw-r--r--sys/arch/armv7/imx/imxesdhc.c15
6 files changed, 7 insertions, 64 deletions
diff --git a/sys/arch/armv7/armv7/armv7var.h b/sys/arch/armv7/armv7/armv7var.h
index 731d2049648..7da123df60b 100644
--- a/sys/arch/armv7/armv7/armv7var.h
+++ b/sys/arch/armv7/armv7/armv7var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: armv7var.h,v 1.10 2016/05/01 21:07:40 patrick Exp $ */
+/* $OpenBSD: armv7var.h,v 1.11 2016/05/19 09:54:18 jsg Exp $ */
/*
* Copyright (c) 2005,2008 Dale Rahn <drahn@openbsd.com>
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
@@ -80,7 +80,6 @@ int armv7_submatch(struct device *, void *, void *);
#define BOARD_ID_OMAP4_PANDA 2791
#define BOARD_ID_EXYNOS4_SMDKC210 2838
#define BOARD_ID_EXYNOS4_NURI 3379
-#define BOARD_ID_IMX6_PHYFLEX 3529
#define BOARD_ID_AM335X_BEAGLEBONE 3589
#define BOARD_ID_IMX6_SABRELITE 3769
#define BOARD_ID_EXYNOS5_CHROMEBOOK 3774
diff --git a/sys/arch/armv7/imx/imx.c b/sys/arch/armv7/imx/imx.c
index 541635db12e..fdc454c7eb9 100644
--- a/sys/arch/armv7/imx/imx.c
+++ b/sys/arch/armv7/imx/imx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imx.c,v 1.11 2016/05/17 00:04:35 kettenis Exp $ */
+/* $OpenBSD: imx.c,v 1.12 2016/05/19 09:54:18 jsg Exp $ */
/*
* Copyright (c) 2005,2008 Dale Rahn <drahn@openbsd.com>
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
@@ -58,27 +58,6 @@ struct board_dev hummingboard_devs[] = {
{ NULL, 0 }
};
-struct board_dev phyflex_imx6_devs[] = {
- { "imxccm", 0 },
- { "imxiomuxc", 0 },
- { "imxdog", 0 },
- { "imxocotp", 0 },
- { "imxuart", 3 },
- { "imxgpio", 0 },
- { "imxgpio", 1 },
- { "imxgpio", 2 },
- { "imxgpio", 3 },
- { "imxgpio", 4 },
- { "imxgpio", 5 },
- { "imxgpio", 6 },
- { "imxesdhc", 1 },
- { "imxesdhc", 2 },
- { "ehci", 0 },
- { "imxenet", 0 },
- { "ahci", 0 },
- { NULL, 0 }
-};
-
struct board_dev sabrelite_devs[] = {
{ "imxccm", 0 },
{ "imxiomuxc", 0 },
@@ -219,12 +198,6 @@ struct armv7_board imx_boards[] = {
imx6_init,
},
{
- BOARD_ID_IMX6_PHYFLEX,
- "Phytec phyFLEX-i.MX6",
- phyflex_imx6_devs,
- imx6_init,
- },
- {
BOARD_ID_IMX6_SABRELITE,
"Freescale i.MX6 SABRE Lite",
sabrelite_devs,
diff --git a/sys/arch/armv7/imx/imx_machdep.c b/sys/arch/armv7/imx/imx_machdep.c
index dd661a327ad..79b39002b74 100644
--- a/sys/arch/armv7/imx/imx_machdep.c
+++ b/sys/arch/armv7/imx/imx_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imx_machdep.c,v 1.16 2016/05/18 22:55:23 kettenis Exp $ */
+/* $OpenBSD: imx_machdep.c,v 1.17 2016/05/19 09:54:18 jsg Exp $ */
/*
* Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
*
@@ -67,7 +67,6 @@ imx_platform_init_cons(void)
paddr = 0x021e8000;
break;
/* UART4 */
- case BOARD_ID_IMX6_PHYFLEX:
case BOARD_ID_IMX6_UTILITE:
paddr = 0x021f0000;
break;
diff --git a/sys/arch/armv7/imx/imxehci.c b/sys/arch/armv7/imx/imxehci.c
index b876f1e97d7..b85a18121df 100644
--- a/sys/arch/armv7/imx/imxehci.c
+++ b/sys/arch/armv7/imx/imxehci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxehci.c,v 1.8 2015/05/30 08:09:19 jsg Exp $ */
+/* $OpenBSD: imxehci.c,v 1.9 2016/05/19 09:54:18 jsg Exp $ */
/*
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
*
@@ -74,8 +74,6 @@
#define EHCI_HUMMINGBOARD_USB_H1_PWR 0
#define EHCI_HUMMINGBOARD_USB_OTG_PWR (2*32+22)
#define EHCI_NITROGEN6X_USB_HUB_RST (6*32+12)
-#define EHCI_PHYFLEX_USB_H1_PWR 0
-#define EHCI_PHYFLEX_USB_OTG_PWR 111
#define EHCI_SABRESD_USB_PWR (0*32+29)
#define EHCI_UTILITE_USB_HUB_RST (6*32+8)
@@ -141,12 +139,6 @@ imxehci_attach(struct device *parent, struct device *self, void *aux)
/* enable usb port power */
switch (board_id)
{
- case BOARD_ID_IMX6_PHYFLEX:
- imxgpio_set_dir(EHCI_PHYFLEX_USB_H1_PWR, IMXGPIO_DIR_OUT);
- delay(10);
- imxgpio_set_bit(EHCI_PHYFLEX_USB_H1_PWR);
- delay(10);
- break;
case BOARD_ID_IMX6_CUBOXI:
case BOARD_ID_IMX6_HUMMINGBOARD:
imxgpio_set_bit(EHCI_HUMMINGBOARD_USB_H1_PWR);
diff --git a/sys/arch/armv7/imx/imxenet.c b/sys/arch/armv7/imx/imxenet.c
index 0572a873b4a..5a1e63756af 100644
--- a/sys/arch/armv7/imx/imxenet.c
+++ b/sys/arch/armv7/imx/imxenet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxenet.c,v 1.21 2016/04/13 11:33:59 mpi Exp $ */
+/* $OpenBSD: imxenet.c,v 1.22 2016/05/19 09:54:18 jsg Exp $ */
/*
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
*
@@ -144,8 +144,6 @@
#define ENET_UDOO_PWR (1*32+31)
#define ENET_UTILITE_PHY 0
#define ENET_WANDBOARD_PHY 1
-#define ENET_PHYFLEX_PHY 3
-#define ENET_PHYFLEX_PHY_RST (2*32+23)
#define ENET_NOVENA_PHY 7
#define ENET_NOVENA_PHY_RST (2*32+23)
@@ -248,9 +246,8 @@ imxenet_attach(struct device *parent, struct device *self, void *args)
imxgpio_set_bit(ENET_HUMMINGBOARD_PHY_RST);
delay(2000);
break;
- case BOARD_ID_IMX6_PHYFLEX:
case BOARD_ID_IMX6_SABRELITE:
- /* phyFLEX i.MX6 and SABRE Lite PHY reset */
+ /* SABRE Lite PHY reset */
imxgpio_clear_bit(ENET_SABRELITE_PHY_RST);
imxgpio_set_dir(ENET_SABRELITE_PHY_RST, IMXGPIO_DIR_OUT);
imxgpio_clear_bit(ENET_NITROGEN6X_PHY_RST);
@@ -460,9 +457,6 @@ imxenet_chip_init(struct imxenet_softc *sc)
case BOARD_ID_IMX6_HUMMINGBOARD:
phy = ENET_HUMMINGBOARD_PHY;
break;
- case BOARD_ID_IMX6_PHYFLEX:
- phy = ENET_PHYFLEX_PHY;
- break;
case BOARD_ID_IMX6_SABRELITE:
phy = ENET_SABRELITE_PHY;
break;
@@ -513,7 +507,6 @@ imxenet_chip_init(struct imxenet_softc *sc)
imxenet_miibus_writereg(dev, phy, 0x0d, 0x4002);
imxenet_miibus_writereg(dev, phy, 0x0e, 0x03ff);
break;
- case BOARD_ID_IMX6_PHYFLEX:
case BOARD_ID_IMX6_SABRELITE: /* Micrel KSZ9021 */
/* prefer master mode */
imxenet_miibus_writereg(dev, phy, 0x9, 0x1f00);
diff --git a/sys/arch/armv7/imx/imxesdhc.c b/sys/arch/armv7/imx/imxesdhc.c
index 4a7164f82e5..8701974633a 100644
--- a/sys/arch/armv7/imx/imxesdhc.c
+++ b/sys/arch/armv7/imx/imxesdhc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxesdhc.c,v 1.19 2016/05/15 22:10:24 kettenis Exp $ */
+/* $OpenBSD: imxesdhc.c,v 1.20 2016/05/19 09:54:18 jsg Exp $ */
/*
* Copyright (c) 2009 Dale Rahn <drahn@openbsd.org>
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -538,19 +538,6 @@ imxesdhc_card_detect(sdmmc_chipset_handle_t sch)
}
imxgpio_set_dir(gpio, IMXGPIO_DIR_IN);
return imxgpio_get_bit(gpio) ? 0 : 1;
- case BOARD_ID_IMX6_PHYFLEX:
- switch (sc->unit) {
- case 1:
- gpio = 0*32 + 4;
- break;
- case 2:
- gpio = 0*32 + 27;
- break;
- default:
- return 0;
- }
- imxgpio_set_dir(gpio, IMXGPIO_DIR_IN);
- return imxgpio_get_bit(gpio) ? 0 : 1;
case BOARD_ID_IMX6_SABRELITE:
switch (sc->unit) {
case 2:
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 10:20:28 +0000