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

Commit a49da46c authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Arnd Bergmann
Browse files

arm: kirkwood: dreamplug: use Device Tree to probe SDIO 



Now that the mvsdio driver has a Device Tree binding, and the SDIO
controller is declared in kirkwood.dtsi, migrate the dreamplug board
to use the Device Tree to probe the SDIO controller and to mux this
interface properly.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent ec05fcf6

arch/arm/boot/dts/kirkwood-dreamplug.dts

+7 −0
Original line number Diff line number Diff line
@@ -74,6 +74,13 @@ 
			status = "okay";

			nr-ports = <1>;

		};



		mvsdio@90000 {

			pinctrl-0 = <&pmx_sdio>;

			pinctrl-names = "default";

			status = "okay";

			/* No CD or WP GPIOs */

		};

	};



	gpio-leds {

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

+0 −6
Original line number Diff line number Diff line
@@ -15,7 +15,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 dreamplug_ge00_data = {
@@ -26,10 +25,6 @@ static struct mv643xx_eth_platform_data dreamplug_ge01_data = { 
	.phy_addr	= MV643XX_ETH_PHY_ADDR(1),

};



static struct mvsdio_platform_data dreamplug_mvsdio_data = {

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

};



void __init dreamplug_init(void)

{

	/*
@@ -37,5 +32,4 @@ void __init dreamplug_init(void) 
	 */

	kirkwood_ge00_init(&dreamplug_ge00_data);

	kirkwood_ge01_init(&dreamplug_ge01_data);

	kirkwood_sdio_init(&dreamplug_mvsdio_data);

}