renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 02:34:01 +08:00
Code

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

Browse Source 
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: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: Soeren Moch <smoch@web.de>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Sebastian Hesselbarth 2013-03-23 13:58:09 +01:00 committed by Jason Cooper
parent 8c75e7b3d2
commit c52b95c2f0
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
View File

@ -69,6 +69,10 @@
status = "okay"; status = "okay";
nr-ports = <1>; nr-ports = <1>;
}; };
mvsdio@90000 {
status = "okay";
};
}; };
gpio-leds { gpio-leds {

6
arch/arm/mach-kirkwood/board-guruplug.c
View File

@ -13,7 +13,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 guruplug_ge00_data = { 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), .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) void __init guruplug_dt_init(void)
{ {
/* /*
@ -35,5 +30,4 @@ void __init guruplug_dt_init(void)
*/ */
kirkwood_ge00_init(&guruplug_ge00_data); kirkwood_ge00_init(&guruplug_ge00_data);
kirkwood_ge01_init(&guruplug_ge01_data); kirkwood_ge01_init(&guruplug_ge01_data);
kirkwood_sdio_init(&guruplug_mvsdio_data);
} }