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_sabreauto.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_sabreauto.c')
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabreauto.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c index 45f4af592ab9..853ecf563222 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabreauto.c +++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.c @@ -115,13 +115,6 @@ #define SABREAUTO_MAX7310_2_BASE_ADDR IMX_GPIO_NR(8, 8) #define SABREAUTO_MAX7310_3_BASE_ADDR IMX_GPIO_NR(8, 16) -#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 - #define SABREAUTO_IO_EXP_GPIO1(x) (SABREAUTO_MAX7310_1_BASE_ADDR + (x)) #define SABREAUTO_IO_EXP_GPIO2(x) (SABREAUTO_MAX7310_2_BASE_ADDR + (x)) #define SABREAUTO_IO_EXP_GPIO3(x) (SABREAUTO_MAX7310_3_BASE_ADDR + (x)) @@ -416,9 +409,6 @@ static struct fec_platform_data fec_data __initdata = { .init = mx6q_sabreauto_fec_phy_init, .power_hibernate = mx6q_sabreauto_fec_power_hibernate, .phy = PHY_INTERFACE_MODE_RGMII, -#ifdef CONFIG_MX6_ENET_IRQ_TO_GPIO - .gpio_irq = MX6_ENET_IRQ, -#endif }; static int mx6q_sabreauto_spi_cs[] = { @@ -1733,15 +1723,9 @@ static void __init mx6_board_init(void) imx6q_add_anatop_thermal_imx(1, &mx6q_sabreauto_anatop_thermal_data); - if (!can0_enable) { + if (!can0_enable) 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_sabreauto_pm_data); imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabreauto_sd3_data); |