Merge tag 'omap-for-v3.9/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel...
Arnd Bergmann [Tue, 19 Feb 2013 19:54:15 +0000 (20:54 +0100)]
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 with c1d1cd597fc7
("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>

19 files changed:
1  2 
MAINTAINERS
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-3630sdp.c
arch/arm/mach-omap2/board-am3517crane.c
arch/arm/mach-omap2/board-am3517evm.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-cm-t3517.c
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-omap3stalker.c
arch/arm/mach-omap2/board-omap3touchbook.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-zoom.c
arch/arm/mach-omap2/usb-host.c
drivers/irqchip/irq-gic.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  #define       USBHS_UHH_HWMODNAME     "usb_host_hs"
  #define USBHS_TLL_HWMODNAME   "usb_tll_hs"
  
- static struct usbhs_omap_platform_data                usbhs_data;
- static struct usbtll_omap_platform_data               usbtll_data;
- static struct ehci_hcd_omap_platform_data     ehci_data;
- static struct ohci_hcd_omap_platform_data     ohci_data;
 -static struct omap_device_pm_latency omap_uhhtll_latency[] = {
 -        {
 -              .deactivate_func = omap_device_idle_hwmods,
 -              .activate_func   = omap_device_enable_hwmods,
 -              .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
 -        },
 -};
 -
  /* MUX settings for EHCI pins */
  /*
   * setup_ehci_io_mux - initialize IO pad mux for USBHOST
@@@ -522,7 -511,9 +503,7 @@@ void __init usbhs_init(struct usbhs_oma
        }
  
        pdev = omap_device_build(OMAP_USBTLL_DEVICE, bus_id, tll_hwm,
-                                &usbtll_data, sizeof(usbtll_data));
 -                              pdata, sizeof(*pdata),
 -                              omap_uhhtll_latency,
 -                              ARRAY_SIZE(omap_uhhtll_latency), false);
++                              pdata, sizeof(*pdata));
        if (IS_ERR(pdev)) {
                pr_err("Could not build hwmod device %s\n",
                       USBHS_TLL_HWMODNAME);
        }
  
        pdev = omap_device_build(OMAP_USBHS_DEVICE, bus_id, uhh_hwm,
-                               &usbhs_data, sizeof(usbhs_data));
 -                              pdata, sizeof(*pdata),
 -                              omap_uhhtll_latency,
 -                              ARRAY_SIZE(omap_uhhtll_latency), false);
++                              pdata, sizeof(*pdata));
        if (IS_ERR(pdev)) {
                pr_err("Could not build hwmod devices %s\n",
                       USBHS_UHH_HWMODNAME);
Simple merge