diff options
author | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-07 13:56:21 +0800 |
---|---|---|
committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-07 13:56:21 +0800 |
commit | ea6aa41b21de5095d17d43776c8a8c472fad9cd4 (patch) | |
tree | b7e245793e9306d8f602c87a90c76bd0b2e7be1e /arch/arm/mach-mx6/board-mx6q_sabresd.c | |
parent | 7c8718a8d86182a1ea3ad6d89e2ff0201ca2a4a9 (diff) | |
parent | 23fae65a58952ca3de64e68c13c0d3527bec6f0a (diff) |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into imx_3.0.35_android
Diffstat (limited to 'arch/arm/mach-mx6/board-mx6q_sabresd.c')
-rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabresd.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c index 9971ff55a765..2b8a1bedc17b 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabresd.c +++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c @@ -201,13 +201,6 @@ #define SABRESD_ELAN_RST IMX_GPIO_NR(3, 8) #define SABRESD_ELAN_INT IMX_GPIO_NR(3, 28) -#ifdef CONFIG_MX6_ENET_IRQ_TO_GPIO -#define MX6_ENET_IRQ IMX_GPIO_NR(1, 6) -#define IOMUX_OBSRV_MUX1_OFFSET 0x3c -#define OBSRV_MUX1_MASK 0x3f -#define OBSRV_MUX1_ENET_IRQ 0x9 -#endif - static struct clk *sata_clk; static struct clk *clko; static int mma8451_position; @@ -310,9 +303,6 @@ static int mx6q_sabresd_fec_phy_init(struct phy_device *phydev) static struct fec_platform_data fec_data __initdata = { .init = mx6q_sabresd_fec_phy_init, .phy = PHY_INTERFACE_MODE_RGMII, -#ifdef CONFIG_MX6_ENET_IRQ_TO_GPIO - .gpio_irq = MX6_ENET_IRQ, -#endif }; static int mx6q_sabresd_spi_cs[] = { @@ -1965,12 +1955,6 @@ static void __init mx6_sabresd_board_init(void) imx6q_add_anatop_thermal_imx(1, &mx6q_sabresd_anatop_thermal_data); imx6_init_fec(fec_data); -#ifdef CONFIG_MX6_ENET_IRQ_TO_GPIO - /* Make sure the IOMUX_OBSRV_MUX1 is set to ENET_IRQ. */ - mxc_iomux_set_specialbits_register(IOMUX_OBSRV_MUX1_OFFSET, - OBSRV_MUX1_ENET_IRQ, OBSRV_MUX1_MASK); -#endif - imx6q_add_pm_imx(0, &mx6q_sabresd_pm_data); /* Move sd4 to first because sd4 connect to emmc. |