Commit 3ec0d474 authored by Nicolas Pitre's avatar Nicolas Pitre

[ARM] Kirkwood: SheevaPlug USB Power Enable setup

Ideally, the default should be set to 0 and let the EHCI driver turn
it on as needed.  This makes USB usable in the mean time.
Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
parent 4640fa60
...@@ -14,12 +14,14 @@ ...@@ -14,12 +14,14 @@
#include <linux/mtd/nand.h> #include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/mv643xx_eth.h> #include <linux/mv643xx_eth.h>
#include <linux/gpio.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/kirkwood.h> #include <mach/kirkwood.h>
#include <plat/mvsdio.h> #include <plat/mvsdio.h>
#include <plat/orion_nand.h> #include <plat/orion_nand.h>
#include "common.h" #include "common.h"
#include "mpp.h"
static struct mtd_partition sheevaplug_nand_parts[] = { static struct mtd_partition sheevaplug_nand_parts[] = {
{ {
...@@ -71,15 +73,26 @@ static struct mvsdio_platform_data sheevaplug_mvsdio_data = { ...@@ -71,15 +73,26 @@ static struct mvsdio_platform_data sheevaplug_mvsdio_data = {
// unfortunately the CD signal has not been connected */ // unfortunately the CD signal has not been connected */
}; };
static unsigned int sheevaplug_mpp_config[] __initdata = {
MPP29_GPIO, /* USB Power Enable */
0
};
static void __init sheevaplug_init(void) static void __init sheevaplug_init(void)
{ {
/* /*
* Basic setup. Needs to be called early. * Basic setup. Needs to be called early.
*/ */
kirkwood_init(); kirkwood_init();
kirkwood_mpp_conf(sheevaplug_mpp_config);
kirkwood_uart0_init(); kirkwood_uart0_init();
if (gpio_request(29, "USB Power Enable") != 0 ||
gpio_direction_output(29, 1) != 0)
printk(KERN_ERR "can't set up GPIO 29 (USB Power Enable)\n");
kirkwood_ehci_init(); kirkwood_ehci_init();
kirkwood_ge00_init(&sheevaplug_ge00_data); kirkwood_ge00_init(&sheevaplug_ge00_data);
kirkwood_sdio_init(&sheevaplug_mvsdio_data); kirkwood_sdio_init(&sheevaplug_mvsdio_data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment