Message ID | 20161103223009.4794-2-joel@jms.id.au |
---|---|
State | Accepted, archived |
Headers | show |
On Fri, 2016-11-04 at 09:00 +1030, Joel Stanley wrote: > The ftgmac100 driver now knows to configure the new MDIO interface. We > can remove it from the early init process. > > Signed-off-by: Joel Stanley <joel@jms.id.au> Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > --- > arch/arm/mach-aspeed/aspeed.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/arch/arm/mach-aspeed/aspeed.c b/arch/arm/mach-aspeed/aspeed.c > index 57c32ff0fa83..202bf3d9d467 100644 > --- a/arch/arm/mach-aspeed/aspeed.c > +++ b/arch/arm/mach-aspeed/aspeed.c > @@ -146,13 +146,6 @@ static void __init do_garrison_setup(void) > > static void __init do_ast2500_common_setup(void) > { > - unsigned long reg; > - > - /* Set old MDIO interface */ > - reg = readl(AST_IO(AST_BASE_MAC0 | 0x40)); > - reg &= ~0x80000000; > - writel(reg, AST_IO(AST_BASE_MAC0 | 0x40)); > - > /* Set strap[13:12] to 01, Enable SPI master */ > /* Set bits in writes to SCU7C are cleared from SCU70 */ > writel(BIT(13), AST_IO(AST_BASE_SCU | 0x7C));
diff --git a/arch/arm/mach-aspeed/aspeed.c b/arch/arm/mach-aspeed/aspeed.c index 57c32ff0fa83..202bf3d9d467 100644 --- a/arch/arm/mach-aspeed/aspeed.c +++ b/arch/arm/mach-aspeed/aspeed.c @@ -146,13 +146,6 @@ static void __init do_garrison_setup(void) static void __init do_ast2500_common_setup(void) { - unsigned long reg; - - /* Set old MDIO interface */ - reg = readl(AST_IO(AST_BASE_MAC0 | 0x40)); - reg &= ~0x80000000; - writel(reg, AST_IO(AST_BASE_MAC0 | 0x40)); - /* Set strap[13:12] to 01, Enable SPI master */ /* Set bits in writes to SCU7C are cleared from SCU70 */ writel(BIT(13), AST_IO(AST_BASE_SCU | 0x7C));
The ftgmac100 driver now knows to configure the new MDIO interface. We can remove it from the early init process. Signed-off-by: Joel Stanley <joel@jms.id.au> --- arch/arm/mach-aspeed/aspeed.c | 7 ------- 1 file changed, 7 deletions(-)