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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Thomas Petazzoni 2012-12-21 15:49:11 +01:00 коммит произвёл Arnd Bergmann
Родитель ec05fcf679
Коммит a49da46c52
2 изменённых файлов: 7 добавлений и 6 удалений

Просмотреть файл

@ -74,6 +74,13 @@
status = "okay"; status = "okay";
nr-ports = <1>; nr-ports = <1>;
}; };
mvsdio@90000 {
pinctrl-0 = <&pmx_sdio>;
pinctrl-names = "default";
status = "okay";
/* No CD or WP GPIOs */
};
}; };
gpio-leds { gpio-leds {

Просмотреть файл

@ -15,7 +15,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/mv643xx_eth.h> #include <linux/mv643xx_eth.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/platform_data/mmc-mvsdio.h>
#include "common.h" #include "common.h"
static struct mv643xx_eth_platform_data dreamplug_ge00_data = { 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), .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) void __init dreamplug_init(void)
{ {
/* /*
@ -37,5 +32,4 @@ void __init dreamplug_init(void)
*/ */
kirkwood_ge00_init(&dreamplug_ge00_data); kirkwood_ge00_init(&dreamplug_ge00_data);
kirkwood_ge01_init(&dreamplug_ge01_data); kirkwood_ge01_init(&dreamplug_ge01_data);
kirkwood_sdio_init(&dreamplug_mvsdio_data);
} }