mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 13:11:45 +00:00
6e7f7cfce2
that were dropped from linux next because of the merge conflicts as requested by me and Olof. The reason was that at this point we really should be able to do the arch/arm related changes separately from driver changes to avoid dependencies between branches. These patches were initially part of the USB related MFD patches. Based on our comments, Roger Quadros quickly reworked these patches into a shared branch between ARM SoC tree and the MFD tree, then separate patches for the OMAP platform data and MFD driver. Note that this branch will conflict withc1d1cd597f("ARM: OMAP2+: omap_device: remove obsolete pm_lats and early_device code"). Please see http://lkml.org/lkml/2013/2/11/16 for the merge resolution. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRHR36AAoJEBvUPslcq6Vz6hEQAIIzgO4Rwf55/nMfRyMWqNEF bM5h8KmMmix0M+MIrCigqciXzEmOY0y95ssQJcdxUoDl3kCpkHfcrxDTQmf6ehGD cMxYkeYVB9JYDuYr3HUvqv7MvDQIge11Sh1Yfj1YG7UYHNDh5OP+4DBtSGByIhHf clQ9I3c74EBxqEzyUWlE7BOYH6+WEQ2yh4RzzDnSgiQcyRn25jWd0RpXoroE2XQb ZsW1wZtpFqsMfHsPrIdHm5KLsgn9tSvWZ+NEUlXVqnNumdl3zaxX65fOGNWGjAax A8JRpntvwcGGl6XV54mCVV/yuStuA7kdDn9ABnghUFy8ZzgRA2hvJFe0Kc5lUgO1 RRKQ4+fsFyPYDyvMmo4tYsNOXxW+DryHSxvhUICHqjKvXyWEUSTHLJ3vHIvq2zjZ cYV+opeZkF6ddwUhPhIVYUmFDfZeCriqOUlVnQYLxqAzRSTEk5buNW58WtX4ZNA1 f6k1xlepsLCvuMAr8IGZyWnM6SH3k+/f0Hs9Pl8mijV/nNSaF8JW4k9NVPnFwT9Q PcwVhT23mLkKLr5ab03EEzCs/2a3VTkmUbQm70tC2FTtMQTwmHCpg+WQMf+aug6e 8++A6V+GqZ6ggW5rV95jJsJ39hBAAK0lCld+fNZ5MjQgMwlAe+mdl6FrQWib1TFa obIzQnfifyPjomrRAdu5 =svW/ -----END PGP SIGNATURE----- Merge tag 'omap-for-v3.9/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc These changes contain the OMAP USB related platform data changes that were dropped from linux next because of the merge conflicts as requested by me and Olof. The reason was that at this point we really should be able to do the arch/arm related changes separately from driver changes to avoid dependencies between branches. These patches were initially part of the USB related MFD patches. Based on our comments, Roger Quadros quickly reworked these patches into a shared branch between ARM SoC tree and the MFD tree, then separate patches for the OMAP platform data and MFD driver. Note that this branch will conflict withc1d1cd597f("ARM: OMAP2+: omap_device: remove obsolete pm_lats and early_device code"). Please see http://lkml.org/lkml/2013/2/11/16 for the merge resolution. [arnd - resolved the merge conflict] Signed-off-by: Arnd Bergmann <arnd@arndb.de>
98 lines
2.6 KiB
C
98 lines
2.6 KiB
C
/*
|
|
* Support for AM3517/05 Craneboard
|
|
* http://www.mistralsolutions.com/products/craneboard.php
|
|
*
|
|
* Copyright (C) 2010 Mistral Solutions Pvt Ltd. <www.mistralsolutions.com>
|
|
* Author: R.Srinath <srinath@mistralsolutions.com>
|
|
*
|
|
* Based on mach-omap2/board-am3517evm.c
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation version 2.
|
|
*
|
|
* This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
|
|
* whether express or implied; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/gpio.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include "common.h"
|
|
|
|
#include "am35xx-emac.h"
|
|
#include "mux.h"
|
|
#include "control.h"
|
|
|
|
#define GPIO_USB_POWER 35
|
|
#define GPIO_USB_NRESET 38
|
|
|
|
#ifdef CONFIG_OMAP_MUX
|
|
static struct omap_board_mux board_mux[] __initdata = {
|
|
{ .reg_offset = OMAP_MUX_TERMINATOR },
|
|
};
|
|
#endif
|
|
|
|
static struct usbhs_omap_platform_data usbhs_bdata __initdata = {
|
|
.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
|
|
.port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED,
|
|
.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
|
|
|
|
.phy_reset = true,
|
|
.reset_gpio_port[0] = GPIO_USB_NRESET,
|
|
.reset_gpio_port[1] = -EINVAL,
|
|
.reset_gpio_port[2] = -EINVAL
|
|
};
|
|
|
|
static void __init am3517_crane_init(void)
|
|
{
|
|
int ret;
|
|
|
|
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
|
|
omap_serial_init();
|
|
omap_sdrc_init(NULL, NULL);
|
|
|
|
/* Configure GPIO for EHCI port */
|
|
if (omap_mux_init_gpio(GPIO_USB_NRESET, OMAP_PIN_OUTPUT)) {
|
|
pr_err("Can not configure mux for GPIO_USB_NRESET %d\n",
|
|
GPIO_USB_NRESET);
|
|
return;
|
|
}
|
|
|
|
if (omap_mux_init_gpio(GPIO_USB_POWER, OMAP_PIN_OUTPUT)) {
|
|
pr_err("Can not configure mux for GPIO_USB_POWER %d\n",
|
|
GPIO_USB_POWER);
|
|
return;
|
|
}
|
|
|
|
ret = gpio_request_one(GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
|
|
"usb_ehci_enable");
|
|
if (ret < 0) {
|
|
pr_err("Can not request GPIO %d\n", GPIO_USB_POWER);
|
|
return;
|
|
}
|
|
|
|
usbhs_init(&usbhs_bdata);
|
|
am35xx_emac_init(AM35XX_DEFAULT_MDIO_FREQUENCY, 1);
|
|
}
|
|
|
|
MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD")
|
|
.atag_offset = 0x100,
|
|
.reserve = omap_reserve,
|
|
.map_io = omap3_map_io,
|
|
.init_early = am35xx_init_early,
|
|
.init_irq = omap3_init_irq,
|
|
.handle_irq = omap3_intc_handle_irq,
|
|
.init_machine = am3517_crane_init,
|
|
.init_late = am35xx_init_late,
|
|
.init_time = omap3_sync32k_timer_init,
|
|
.restart = omap3xxx_restart,
|
|
MACHINE_END
|