History

Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (260 commits) usb: renesas_usbhs: fixup inconsistent return from usbhs_pkt_push() usb/isp1760: Allow to optionally trigger low-level chip reset via GPIOLIB. USB: gadget: midi: memory leak in f_midi_bind_config() USB: gadget: midi: fix range check in f_midi_out_open() QE/FHCI: fixed the CONTROL bug usb: renesas_usbhs: tidyup for smatch warnings USB: Fix USB Kconfig dependency problem on 85xx/QoirQ platforms EHCI: workaround for MosChip controller bug usb: gadget: file_storage: fix race on unloading USB: ftdi_sio.c: Use ftdi async_icount structure for TIOCMIWAIT, as in other drivers USB: ftdi_sio.c:Fill MSR fields of the ftdi async_icount structure USB: ftdi_sio.c: Fill LSR fields of the ftdi async_icount structure USB: ftdi_sio.c:Fill TX field of the ftdi async_icount structure USB: ftdi_sio.c: Fill the RX field of the ftdi async_icount structure USB: ftdi_sio.c: Basic icount infrastructure for ftdi_sio usb/isp1760: Let OF bindings depend on general CONFIG_OF instead of PPC_OF . USB: ftdi_sio: Support TI/Luminary Micro Stellaris BD-ICDI Board USB: Fix runtime wakeup on OHCI xHCI/USB: Make xHCI driver have a BOS descriptor. usb: gadget: add new usb gadget for ACM and mass storage ...

Linus Torvalds committed 15 years ago

Commit 1be025d2 parents 2d03423 a2c76b8247 files · +15136 −4175Browse files

Showing the changes to include/linux/platform_data (2 of 247 files). Show all

Unified · Split

2 files
  1. include/linux/platform_data/dwc3-omap.h +47 −0
  2. include/linux/platform_data/mv_usb.h +50 −0
include/linux/platform_data/dwc3-omap.h+47−0
@@ -0,0 +1,47 @@
1+/**
2+ * dwc3-omap.h - OMAP Specific Glue layer, header.
3+ *
4+ * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com
5+ * All rights reserved.
6+ *
7+ * Author: Felipe Balbi <balbi@ti.com>
8+ *
9+ * Redistribution and use in source and binary forms, with or without
10+ * modification, are permitted provided that the following conditions
11+ * are met:
12+ * 1. Redistributions of source code must retain the above copyright
13+ * notice, this list of conditions, and the following disclaimer,
14+ * without modification.
15+ * 2. Redistributions in binary form must reproduce the above copyright
16+ * notice, this list of conditions and the following disclaimer in the
17+ * documentation and/or other materials provided with the distribution.
18+ * 3. The names of the above-listed copyright holders may not be used
19+ * to endorse or promote products derived from this software without
20+ * specific prior written permission.
21+ *
22+ * ALTERNATIVELY, this software may be distributed under the terms of the
23+ * GNU General Public License ("GPL") version 2, as published by the Free
24+ * Software Foundation.
25+ *
26+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
27+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
28+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
29+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
30+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
31+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
32+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
33+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
34+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
35+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
36+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37+ */
38+
39+enum dwc3_omap_utmi_mode {
40+ DWC3_OMAP_UTMI_MODE_UNKNOWN = 0,
41+ DWC3_OMAP_UTMI_MODE_HW,
42+ DWC3_OMAP_UTMI_MODE_SW,
43+};
44+
45+struct dwc3_omap_data {
46+ enum dwc3_omap_utmi_mode utmi_mode;
47+};
include/linux/platform_data/mv_usb.h+50−0
@@ -0,0 +1,50 @@
1+/*
2+ * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
3+ *
4+ * This program is free software; you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License as published by the
6+ * Free Software Foundation; either version 2 of the License, or (at your
7+ * option) any later version.
8+ */
9+
10+#ifndef __MV_PLATFORM_USB_H
11+#define __MV_PLATFORM_USB_H
12+
13+enum pxa_ehci_type {
14+ EHCI_UNDEFINED = 0,
15+ PXA_U2OEHCI, /* pxa 168, 9xx */
16+ PXA_SPH, /* pxa 168, 9xx SPH */
17+ MMP3_HSIC, /* mmp3 hsic */
18+ MMP3_FSIC, /* mmp3 fsic */
19+};
20+
21+enum {
22+ MV_USB_MODE_OTG,
23+ MV_USB_MODE_HOST,
24+};
25+
26+enum {
27+ VBUS_LOW = 0,
28+ VBUS_HIGH = 1 << 0,
29+};
30+
31+struct mv_usb_addon_irq {
32+ unsigned int irq;
33+ int (*poll)(void);
34+};
35+
36+struct mv_usb_platform_data {
37+ unsigned int clknum;
38+ char **clkname;
39+ struct mv_usb_addon_irq *id; /* Only valid for OTG. ID pin change*/
40+ struct mv_usb_addon_irq *vbus; /* valid for OTG/UDC. VBUS change*/
41+
42+ /* only valid for HCD. OTG or Host only*/
43+ unsigned int mode;
44+
45+ int (*phy_init)(unsigned int regbase);
46+ void (*phy_deinit)(unsigned int regbase);
47+ int (*set_vbus)(unsigned int vbus);
48+};
49+
50+#endif