diff options
Diffstat (limited to 'arch/arm/boards/ccxmx51')
| -rw-r--r-- | arch/arm/boards/ccxmx51/ccxmx51.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/arch/arm/boards/ccxmx51/ccxmx51.c b/arch/arm/boards/ccxmx51/ccxmx51.c index a9bf16a3d6..b1c579b14a 100644 --- a/arch/arm/boards/ccxmx51/ccxmx51.c +++ b/arch/arm/boards/ccxmx51/ccxmx51.c @@ -80,12 +80,10 @@ struct imx_nand_platform_data nand_info = { .flash_bbt = 1, }; -#ifdef CONFIG_DRIVER_NET_FEC_IMX static struct fec_platform_data fec_info = { .xcv_type = MII100, .phy_addr = 7, }; -#endif static iomux_v3_cfg_t ccxmx51_pads[] = { /* UART1 */ @@ -366,8 +364,10 @@ static int ccxmx51_power_init(void) /* GP02 - LAN9221 Power */ /* GP03 - FEC Reset */ /* GP04 - Wireless Power */ - if (IS_ENABLED(CONFIG_DRIVER_NET_SMC911X) && ccxmx51_id->eth1) + if (IS_ENABLED(CONFIG_DRIVER_NET_SMC911X) && ccxmx51_id->eth1) { val |= (1 << 8); + mdelay(50); + } if (IS_ENABLED(CONFIG_DRIVER_NET_FEC_IMX) && ccxmx51_id->eth0) val |= (1 << 10); if (ccxmx51_id->wless) @@ -392,7 +392,7 @@ static int ccxmx51_devices_init(void) printf("Module Variant: %s (0x%02x)\n", ccxmx51_id->id_string, hwid[0]); if (hwid[0]) { - printf("Module HW Rev : %02x\n", hwid[1]); + printf("Module HW Rev : %02x\n", hwid[1] + 1); switch (hwid[2] & 0xc0) { case 0x00: manloc = 'B'; @@ -431,15 +431,12 @@ static int ccxmx51_devices_init(void) devfs_add_partition("nand0", 0x80000, 0x40000, DEVFS_PARTITION_FIXED, "env_raw"); dev_add_bb_dev("env_raw", "env0"); -#ifdef CONFIG_DRIVER_NET_FEC_IMX - if (ccxmx51_id->eth0 && !pwr) { + if (IS_ENABLED(CONFIG_DRIVER_NET_FEC_IMX) && ccxmx51_id->eth0 && !pwr) { eth_register_ethaddr(0, hwid); imx51_add_fec(&fec_info); } -#endif -#ifdef CONFIG_DRIVER_NET_SMC911X - if (ccxmx51_id->eth1 && !pwr) { + if (IS_ENABLED(CONFIG_DRIVER_NET_SMC911X) && ccxmx51_id->eth1 && !pwr) { /* Configure the WEIM CS5 timming, bus width, etc */ /* 16 bit on DATA[31..16], not multiplexed, async */ writel(0x00420081, MX51_WEIM_BASE_ADDR + WEIM_CSxGCR1(5)); @@ -455,7 +452,6 @@ static int ccxmx51_devices_init(void) /* LAN9221 network controller */ add_generic_device("smc911x", 1, NULL, MX51_CS5_BASE_ADDR, SZ_4K, IORESOURCE_MEM, NULL); } -#endif ccxmx51_otghost_init(); |