Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c52b95c2 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by Jason Cooper
Browse files

ARM: kirkwood: make use of DT mvsdio on guruplug board 



Device tree based guruplug boards still use mvsdio platform_data and
kirkwood_sdio_init to enable sdio. DT support for sdio is already there,
so make use of it.

This also fixes mvsdio accidentially breaking nand by configuring mpp0
to gpio, while used also by nand (nand_io2 on mpp0).

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: default avatarSoeren Moch <smoch@web.de>
Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 8c75e7b3

arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts

+4 −0
Original line number Diff line number Diff line
@@ -69,6 +69,10 @@ 
			status = "okay";

			nr-ports = <1>;

		};



		mvsdio@90000 {

			status = "okay";

		};

	};



	gpio-leds {

arch/arm/mach-kirkwood/board-guruplug.c

+0 −6
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/init.h>

#include <linux/mv643xx_eth.h>

#include <linux/gpio.h>

#include <linux/platform_data/mmc-mvsdio.h>

#include "common.h"



static struct mv643xx_eth_platform_data guruplug_ge00_data = {
@@ -24,10 +23,6 @@ static struct mv643xx_eth_platform_data guruplug_ge01_data = { 
	.phy_addr	= MV643XX_ETH_PHY_ADDR(1),

};



static struct mvsdio_platform_data guruplug_mvsdio_data = {

	/* unfortunately the CD signal has not been connected */

};



void __init guruplug_dt_init(void)

{

	/*
@@ -35,5 +30,4 @@ void __init guruplug_dt_init(void) 
	 */

	kirkwood_ge00_init(&guruplug_ge00_data);

	kirkwood_ge01_init(&guruplug_ge01_data);

	kirkwood_sdio_init(&guruplug_mvsdio_data);

}