omap4: pandaboard: machine cleanups
Subsystems (3)
cover omap4: pandaboard: machine cleanups
PandaBoard machine file related cleanups.
David Anders (3):
omap4: pandaboard: remove unused hsmmc definition
omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set
omap4: pandaboard: enable the ehci port on pandaboard
arch/arm/mach-omap2/board-omap4panda.c | 69 +++++++++++++++++++++++++++++--- 1 files changed, 63 insertions(+), 6 deletions(-)
PATCH 1/3 omap4: pandaboard: remove unused hsmmc definition
remove the second hsmmc definition as it is only used on the expansion header of the PandaBoard and can be mux for other functions.
--- arch/arm/mach-omap2/board-omap4panda.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
arch/arm/mach-omap2/board-omap4panda.c +1 -5
@@ -98,10 +98,6 @@ static struct regulator_consumer_supply omap4_panda_vmmc_supply[] = { .supply = "vmmc", .dev_name = "mmci-omap-hs.0", }, - { - .supply = "vmmc", - .dev_name = "mmci-omap-hs.1", - }, };static int omap4_twl6030_hsmmc_late_init (struct device *dev)
@@ -187,7 +183,7 @@ static struct regulator_init_data omap4_panda_vmmc = { | REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, }, - .num_consumer_supplies = 2, + .num_consumer_supplies = 1, .consumer_supplies = omap4_panda_vmmc_supply, };
Signature · 1 line
1.7.0.4
PATCH 2/3 omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set
In reply to David AndersAvoid possible crash if CONFIG_MMC_OMAP_HS is not set.
--- arch/arm/mach-omap2/board-omap4panda.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/board-omap4panda.c +8 -1
@@ -116,7 +116,14 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev)static __init void omap4_twl6030_hsmmc_set_late_init (struct device *dev) { -struct omap_mmc_platform_data *pdata = dev->platform_data; +struct omap_mmc_platform_data *pdata; + +/* dev can be null if CONFIG_MMC_OMAP_HS is not set */ +if (!dev) { +pr_err ("Failed omap4_twl6030_hsmmc_set_late_init\n" ); +return ; + } + pdata = dev->platform_data; pdata->init = omap4_twl6030_hsmmc_late_init; }
Signature · 1 line
1.7.0.4
PATCH 3/3 omap4: pandaboard: enable the ehci port on pandaboard
In reply to David AndersThe OMAP4 PandaBoard has EHCI port1 hooked up to an external SMSC3320 transciever. GPIO 1 is used to power on the transceiver and GPIO 62 for reset on the transceiver.
--- arch/arm/mach-omap2/board-omap4panda.c | 54 ++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-omap4panda.c +54 -0
@@ -41,6 +41,9 @@#include "hsmmc.h" #include "control.h" +#define GPIO_HUB_POWER 1 +#define GPIO_HUB_NRESET 62 +static struct gpio_led gpio_leds[] = { { .name ="pandaboard::status1" ,
@@ -78,6 +81,56 @@ static void __init omap4_panda_init_irq(void)omap_gpio_init (); } +static const struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { + .port_mode[0 ] =EHCI_HCD_OMAP_MODE_PHY , + .port_mode[1 ] =EHCI_HCD_OMAP_MODE_UNKNOWN , + .port_mode[2 ] =EHCI_HCD_OMAP_MODE_UNKNOWN , + .phy_reset = false, + .reset_gpio_port[0 ] = -EINVAL , + .reset_gpio_port[1 ] = -EINVAL , + .reset_gpio_port[2 ] = -EINVAL +}; + +static void __init omap4_ehci_init (void ) +{ +int ret; + + +/* disable the power to the usb hub prior to init */ + ret =gpio_request (GPIO_HUB_POWER ,"hub_power" ); +if (ret) { +pr_err ("Cannot request GPIO %d\n" ,GPIO_HUB_POWER ); + goto error1; + } +gpio_export (GPIO_HUB_POWER ,0 ); +gpio_direction_output (GPIO_HUB_POWER ,0 ); +gpio_set_value (GPIO_HUB_POWER ,0 ); + +/* reset phy+hub */ + ret =gpio_request (GPIO_HUB_NRESET ,"hub_nreset" ); +if (ret) { +pr_err ("Cannot request GPIO %d\n" ,GPIO_HUB_NRESET ); + goto error2; + } +gpio_export (GPIO_HUB_NRESET ,0 ); +gpio_direction_output (GPIO_HUB_NRESET ,0 ); +gpio_set_value (GPIO_HUB_NRESET ,0 ); +gpio_set_value (GPIO_HUB_NRESET ,1 ); + +usb_ehci_init (&ehci_pdata); + +/* enable power to hub */ +gpio_set_value (GPIO_HUB_POWER ,1 ); +return ; + +error2: +gpio_free (GPIO_HUB_POWER ); +error1: +pr_err ("Unable to initialize EHCI power/reset\n" ); +return ; + +} +static struct omap_musb_board_data musb_board_data = { .interface_type =MUSB_INTERFACE_UTMI , .mode =MUSB_PERIPHERAL ,
@@ -314,6 +367,7 @@ static void __init omap4_panda_init(void)omap4_twl6030_hsmmc_init (mmc);/* OMAP4 Panda uses internal transceiver so register nop transceiver */ usb_nop_xceiv_register (); +omap4_ehci_init ();/* FIXME: allow multi-omap to boot until musb is updated for omap4 */ if (!cpu_is_omap44xx ())usb_musb_init (&musb_board_data);
Signature · 1 line
1.7.0.4
Tony Lindgren
maintainercover omap4: pandaboard: machine cleanups
In reply to David AndersQuoted 6 lines · David Anders
PandaBoard machine file related cleanups.
David Anders (3):
omap4: pandaboard: remove unused hsmmc definition
omap4: pandaboard: Fix the init ifCONFIG_MMC_OMAP_HSis not set
omap4: pandaboard: enable the ehci port on pandaboard
Thanks, adding these into omap-for-linus.
Regards,
Tony