diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2014-01-02 13:16:45 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2014-01-02 13:16:45 -0700 |
| commit | 234bf9f2809a0c6bd6499ea6dd81988e7560c30a (patch) | |
| tree | ecca7ff3f0b44dfbbd36698184ced782d123bf91 | |
| parent | 413d8c0f9e3dbaba7000e1eeb1d6793e04650e5a (diff) | |
sp: remove ethernet, PHY support
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6_sp.c | 27 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/pads-mx6_sp.h | 19 |
2 files changed, 0 insertions, 46 deletions
diff --git a/arch/arm/mach-mx6/board-mx6_sp.c b/arch/arm/mach-mx6/board-mx6_sp.c index 6a8a43a0dd2a..3581152f0455 100644 --- a/arch/arm/mach-mx6/board-mx6_sp.c +++ b/arch/arm/mach-mx6/board-mx6_sp.c @@ -253,32 +253,6 @@ static const struct imxuart_platform_data mx6_arm2_uart2_data __initconst = { .flags = IMXUART_HAVE_RTSCTS, }; -static int mx6_fec_phy_init(struct phy_device *phydev) -{ - /* prefer master mode */ - phy_write(phydev, 0x9, 0x1f00); - - /* min rx data delay */ - phy_write(phydev, 0x0b, 0x8105); - phy_write(phydev, 0x0c, 0x0000); - - /* min tx data delay */ - phy_write(phydev, 0x0b, 0x8106); - phy_write(phydev, 0x0c, 0x0000); - - /* max rx/tx clock delay, min rx/tx control delay */ - phy_write(phydev, 0x0b, 0x8104); - phy_write(phydev, 0x0c, 0xf0f0); - phy_write(phydev, 0x0b, 0x104); - return 0; -} - -static struct fec_platform_data fec_data __initdata = { - .init = mx6_fec_phy_init, - .phy = PHY_INTERFACE_MODE_RGMII, - .phy_irq = gpio_to_irq(ENET_PHY_IRQ) -}; - static int mx6_spi_cs[] = { ST_ECSPI1_CS1, }; @@ -893,7 +867,6 @@ static void __init mx6_board_init(void) imx6q_add_mxc_hdmi(&hdmi_data); imx6q_add_anatop_thermal_imx(1, &mx6_anatop_thermal_data); - imx6_init_fec(fec_data); imx6q_add_pm_imx(0, &mx6_pm_data); imx6q_add_sdhci_usdhc_imx(2, &mx6_sd3_data); imx_add_viv_gpu(&imx6_gpu_data, &imx6_gpu_pdata); diff --git a/arch/arm/mach-mx6/pads-mx6_sp.h b/arch/arm/mach-mx6/pads-mx6_sp.h index 63dc0fb59e2b..e66b1d654864 100644 --- a/arch/arm/mach-mx6/pads-mx6_sp.h +++ b/arch/arm/mach-mx6/pads-mx6_sp.h @@ -72,25 +72,6 @@ static iomux_v3_cfg_t MX6NAME(common_pads)[] = { */ MX6PAD(SD1_DAT1__PWM3_PWMO), /* GPIO1[17], J9 pin 9, also pwm3 */ - /* Ethernet - ENET */ - MX6PAD(ENET_MDIO__ENET_MDIO), - MX6PAD(ENET_MDC__ENET_MDC), - MX6PAD(RGMII_TXC__ENET_RGMII_TXC), - MX6PAD(RGMII_TD0__ENET_RGMII_TD0), - MX6PAD(RGMII_TD1__ENET_RGMII_TD1), - MX6PAD(RGMII_TD2__ENET_RGMII_TD2), - MX6PAD(RGMII_TD3__ENET_RGMII_TD3), - MX6PAD(RGMII_TX_CTL__ENET_RGMII_TX_CTL), - MX6PAD(ENET_REF_CLK__ENET_TX_CLK), - MX6PAD(RGMII_RXC__ENET_RGMII_RXC), - MX6PAD(RGMII_RD0__ENET_RGMII_RD0), - MX6PAD(RGMII_RD1__ENET_RGMII_RD1), - MX6PAD(RGMII_RD2__ENET_RGMII_RD2), - MX6PAD(RGMII_RD3__ENET_RGMII_RD3), - MX6PAD(RGMII_RX_CTL__ENET_RGMII_RX_CTL), - NEW_PAD_CTRL(MX6PAD(ENET_RXD0__GPIO_1_27), WEAK), /* Micrel Phy - Reset */ - NEW_PAD_CTRL(MX6PAD(ENET_TX_EN__GPIO_1_28), WEAK_IRQ), /* Micrel Phy - Interrupt */ - /* * I2C1, used by * SGTL5000 |