net: fec_mxc: Add support for mx6 solo-lite
Subsystems (2)
PATCH 1/2 net: fec_mxc: Add support for mx6 solo-lite
From: Fabio Estevam <[email protected]>
Similarly as mx25 and mx53, mx6solo-lite needs to setup the MII gasket for RMII mode.
Add support for mx6solo-lite.
---
Based on FSL BSP, which uses U-boot 2013.04.
drivers/net/fec_mxc.c | 2 +- drivers/net/fec_mxc.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/fec_mxc.c +1 -1
@@ -453,7 +453,7 @@ static int fec_open(struct eth_device *edev)*/ writel (readl (&fec->eth->ecntrl) |FEC_ECNTRL_ETHER_EN , &fec->eth->ecntrl); -#if defined(CONFIG_MX25 ) || defined(CONFIG_MX53 ) +#if defined(CONFIG_MX25 ) || defined(CONFIG_MX53 ) || defined(CONFIG_MX6SL )udelay (100 );/* * setup the MII gasket for RMII mode
drivers/net/fec_mxc.h +2 -2
@@ -135,7 +135,7 @@ struct ethernet_regs {uint32_t res14[7 ];/* MBAR_ETH + 0x2E4-2FC */ -#if defined(CONFIG_MX25 ) || defined(CONFIG_MX53 ) +#if defined(CONFIG_MX25 ) || defined(CONFIG_MX53 ) || defined(CONFIG_MX6SL )uint16_t miigsk_cfgr;/* MBAR_ETH + 0x300 */ uint16_t res15[3 ];/* MBAR_ETH + 0x302-306 */ uint16_t miigsk_enr;/* MBAR_ETH + 0x308 */
@@ -202,7 +202,7 @@ struct ethernet_regs {#define FEC_X_DES_ACTIVE_TDAR 0x01000000#define FEC_R_DES_ACTIVE_RDAR 0x01000000 -#if defined(CONFIG_MX25 ) || defined(CONFIG_MX53 ) +#if defined(CONFIG_MX25 ) || defined(CONFIG_MX53 ) || defined(CONFIG_MX6SL )/* defines for MIIGSK */ /* RMII frequency control: 0=50MHz, 1=5MHz */ #define MIIGSK_CFGR_FRCONT (1 << 6)
Signature · 1 line
1.8.1.2
PATCH 2/2 mx6slevk: Add Ethernet support
From: Fabio Estevam <[email protected]>
mx6slevk has a SMSC8720 connected in RMII mode.
Add support for it.
---
Based on FSL BSP, which uses U-boot 2013.04.
arch/arm/cpu/armv7/mx6/clock.c | 30 +++++++++++++ arch/arm/include/asm/arch-mx6/clock.h | 1 + arch/arm/include/asm/arch-mx6/iomux.h | 5 +++ arch/arm/include/asm/arch-mx6/mx6sl_pins.h | 12 ++++++ board/freescale/mx6slevk/mx6slevk.c | 68 ++++++++++++++++++++++++++++++ include/configs/mx6slevk.h | 14 ++++++ 6 files changed, 130 insertions(+)
arch/arm/cpu/armv7/mx6/clock.c +30 -0
@@ -282,6 +282,36 @@ static u32 get_mmdc_ch0_clk(void)return freq / (podf +1 ); } + +int enable_fec_anatop_clock (void ) +{ +u32 reg =0 ; +s32 timeout =100000 ; + +struct anatop_regs __iomem *anatop = + (struct anatop_regs __iomem *)ANATOP_BASE_ADDR ; + + reg =readl (&anatop->pll_enet); +if ((reg &BM_ANADIG_PLL_ENET_POWERDOWN ) || + (!(reg &BM_ANADIG_PLL_ENET_LOCK ))) { + reg &= ~BM_ANADIG_PLL_ENET_POWERDOWN ; +writel (reg,ANATOP_BASE_ADDR +0xe0 ); +while (timeout--) { +if (readl (&anatop->pll_enet) &BM_ANADIG_PLL_ENET_LOCK ) +break ; + } +if (timeout <0 ) +return -ETIMEDOUT ; + } + +/* Enable FEC clock */ + reg |=BM_ANADIG_PLL_ENET_ENABLE ; + reg &= ~BM_ANADIG_PLL_ENET_BYPASS ; +writel (reg, &anatop->pll_enet); + +return 0 ; +} +#else static u32 get_mmdc_ch0_clk (void ) {
arch/arm/include/asm/arch-mx6/clock.h +1 -0
@@ -50,4 +50,5 @@ void enable_usboh3_clk(unsigned char enable);int enable_sata_clock (void );int enable_i2c_clk (unsigned char enable,unsigned i2c_num);void enable_ipu_clock (void ); +int enable_fec_anatop_clock (void );#endif /* __ASM_ARCH_CLOCK_H */
arch/arm/include/asm/arch-mx6/iomux.h +5 -0
@@ -27,6 +27,11 @@#define IOMUXC_GPR13_SATA_PHY_2_MASK (0x1f<<2)#define IOMUXC_GPR13_SATA_PHY_1_MASK (3<<0) +#define IOMUX_GPR1_FEC_CLOCK_MUX1_SEL_MASK (0x3 << 17) +#define IOMUX_GPR1_FEC_CLOCK_MUX2_SEL_MASK (0x1 << 14) +#define IOMUX_GPR1_FEC_MASK (IOMUX_GPR1_FEC_CLOCK_MUX1_SEL_MASK \ + | IOMUX_GPR1_FEC_CLOCK_MUX2_SEL_MASK) +#define IOMUXC_GPR13_SATA_PHY_8_RXEQ_0P5DB (0<<24)#define IOMUXC_GPR13_SATA_PHY_8_RXEQ_1P0DB (1<<24)#define IOMUXC_GPR13_SATA_PHY_8_RXEQ_1P5DB (2<<24)
arch/arm/include/asm/arch-mx6/mx6sl_pins.h +12 -0
@@ -18,5 +18,17 @@ enum {MX6_PAD_SD2_DAT3__USDHC2_DAT3 =IOMUX_PAD (0x0570 ,0x0268 ,0 ,0x0000 ,0 ,0 ),MX6_PAD_UART1_RXD__UART1_RXD =IOMUX_PAD (0x05A0 ,0x0298 ,0 ,0x07FC ,0 ,0 ),MX6_PAD_UART1_TXD__UART1_TXD =IOMUX_PAD (0x05A4 ,0x029C ,0 ,0x0000 ,0 ,0 ), + +MX6_PAD_FEC_MDC__FEC_MDC =IOMUX_PAD (0x41c ,0x12c ,0 ,0x000 ,0 ,0 ), +MX6_PAD_FEC_MDIO__FEC_MDIO =IOMUX_PAD (0x420 ,0x130 ,0 ,0x6f4 ,1 ,0 ), +MX6_PAD_FEC_CRS_DV__FEC_RX_DV =IOMUX_PAD (0x418 ,0x128 ,0 ,0x704 ,1 ,0 ), +MX6_PAD_FEC_RXD0__FEC_RX_DATA0 =IOMUX_PAD (0x42c ,0x13c ,0 ,0x6f8 ,0 ,0 ), +MX6_PAD_FEC_RXD1__FEC_RX_DATA1 =IOMUX_PAD (0x430 ,0x140 ,0 ,0x6fc ,1 ,0 ), +MX6_PAD_FEC_TX_EN__FEC_TX_EN =IOMUX_PAD (0x438 ,0x148 ,0 ,0x000 ,0 ,0 ), +MX6_PAD_FEC_TXD0__FEC_TX_DATA0 =IOMUX_PAD (0x43c ,0x14c ,0 ,0x000 ,0 ,0 ), +MX6_PAD_FEC_TXD1__FEC_TX_DATA1 =IOMUX_PAD (0x440 ,0x150 ,0 ,0x000 ,0 ,0 ), +MX6_PAD_FEC_REF_CLK__FEC_REF_OUT =IOMUX_PAD (0x424 ,0x134 ,0x10 ,0x000 ,0 ,0 ), +MX6_PAD_FEC_RX_ER__GPIO_4_19 =IOMUX_PAD (0x0428 ,0x0138 ,5 ,0x0000 ,0 ,0 ), + MX6_PAD_FEC_TX_CLK__GPIO_4_21 = IOMUX_PAD(0x0434, 0x0144, 5, 0x0000, 0, 0), };#endif /* __ASM_ARCH_MX6_MX6SL_PINS_H__ */
board/freescale/mx6slevk/mx6slevk.c +68 -0
103 lines not on this page · raw message
include/configs/mx6slevk.h +14 -0
@@ -44,6 +44,20 @@#define CONFIG_CMD_FAT #define CONFIG_DOS_PARTITION +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_MII +#define CONFIG_CMD_NET +#define CONFIG_FEC_MXC +#define CONFIG_MII +#define IMX_FEC_BASE ENET_BASE_ADDR +#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_ETHPRIME "FEC" +#define CONFIG_FEC_MXC_PHYADDR 0 + +#define CONFIG_PHYLIB +#define CONFIG_PHY_SMSC +/* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1
Signature · 1 line
1.8.1.2
PATCH 1/2 net: fec_mxc: Add support for mx6 solo-lite
In reply to Fabio EstevamQuoted 9 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Similarly as mx25 and mx53, mx6solo-lite needs to setup the MII gasket for RMII mode.
Add support for mx6solo-lite.
Signed-off-by Fabio Estevam <[email protected]>---
Seems safe enough to go into 2013.10, doesn't it? :-)
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
PATCH 1/2 net: fec_mxc: Add support for mx6 solo-lite
Quoted 6 lines · Otavio Salvador
Quoted 5 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Similarly as mx25 and mx53, mx6solo-lite needs to setup the MII gasket for RMII mode.
Quoted 7 lines
Quoted 4 lines
Add support for mx6solo-lite.
Signed-off-by Fabio Estevam <[email protected]>---
Seems safe enough to go into 2013.10, doesn't it? :-)
Agree - I will merge it and push it.
Regards,
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 1/2 net: fec_mxc: Add support for mx6 solo-lite
In reply to Fabio EstevamQuoted 9 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Similarly as mx25 and mx53, mx6solo-lite needs to setup the MII gasket for RMII mode.
Add support for mx6solo-lite.
Signed-off-by Fabio Estevam <[email protected]>---
Applied to u-boot-imx, thanks!
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================