Commit 94ff447c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'gadget-for-v3.6' of...

Merge tag 'gadget-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

usb: gadget: patches for v3.6 merge window

This is quite a big pull request and contains patches
all over the place.

omap_udc is now a bit cleaner after removing omap2 support,
fixing some checkpatch.pl warnings and errors, switching over
to generic map/unmap routines and preventing a NULL pointer
de-reference.

s3c-hsotg has been switched over to devm_* API, got some
locking fixes and improvements and it also got an implementation
for the pullup() method.

the mass storage gadgets changed default value of the removable
parameter, dropped some unused options and made "file" and "ro"
module_parameters read-only in some cases.

ffs function got support for HID descriptor.

Some UDCs have been converted to clk_prepare_enable() and
clk_disable_unprepare().

Marvell now got support for its USB3 controller in mainline
after introducing its mv_u3d_core.c driver.
parents 979eef33 65c84ea1
* Overview
Mass Storage Gadget (or MSG) acts as a USB Mass Storage device,
appearing to the host as a disk or a CD-ROM drive. It supports
multiple logical units (LUNs). Backing storage for each LUN is
provided by a regular file or a block device, access can be limited
to read-only, and gadget can indicate that it is removable and/or
CD-ROM (the latter implies read-only access).
Its requirements are modest; only a bulk-in and a bulk-out endpoint
are needed. The memory requirement amounts to two 16K buffers.
Support is included for full-speed, high-speed and SuperSpeed
operation.
Note that the driver is slightly non-portable in that it assumes
a single memory/DMA buffer will be useable for bulk-in and bulk-out
endpoints. With most device controllers this is not an issue, but
there may be some with hardware restrictions that prevent a buffer
from being used by more than one endpoint.
This document describes how to use the gadget from user space, its
relation to mass storage function (or MSF) and different gadgets
using it, and how it differs from File Storage Gadget (or FSG). It
will talk only briefly about how to use MSF within composite
gadgets.
* Module parameters
The mass storage gadget accepts the following mass storage specific
module parameters:
- file=filename[,filename...]
This parameter lists paths to files or block devices used for
backing storage for each logical unit. There may be at most
FSG_MAX_LUNS (8) LUNs set. If more files are specified, they will
be silently ignored. See also “luns” parameter.
*BEWARE* that if a file is used as a backing storage, it may not
be modified by any other process. This is because the host
assumes the data does not change without its knowledge. It may be
read, but (if the logical unit is writable) due to buffering on
the host side, the contents are not well defined.
The size of the logical unit will be rounded down to a full
logical block. The logical block size is 2048 bytes for LUNs
simulating CD-ROM, block size of the device if the backing file is
a block device, or 512 bytes otherwise.
- removable=b[,b...]
This parameter specifies whether each logical unit should be
removable. “b” here is either “y”, “Y” or “1” for true or “n”,
“N” or “0” for false.
If this option is set for a logical unit, gadget will accept an
“eject” SCSI request (Start/Stop Unit). When it is sent, the
backing file will be closed to simulate ejection and the logical
unit will not be mountable by the host until a new backing file is
specified by userspace on the device (see “sysfs entries”
section).
If a logical unit is not removable (the default), a backing file
must be specified for it with the “file” parameter as the module
is loaded. The same applies if the module is built in, no
exceptions.
The default value of the flag is false, *HOWEVER* it used to be
true. This has been changed to better match File Storage Gadget
and because it seems like a saner default after all. Thus to
maintain compatibility with older kernels, it's best to specify
the default values. Also, if one relied on old default, explicit
“n” needs to be specified now.
Note that “removable” means the logical unit's media can be
ejected or removed (as is true for a CD-ROM drive or a card
reader). It does *not* mean that the entire gadget can be
unplugged from the host; the proper term for that is
“hot-unpluggable”.
- cdrom=b[,b...]
This parameter specifies whether each logical unit should simulate
CD-ROM. The default is false.
- ro=b[,b...]
This parameter specifies whether each logical unit should be
reported as read only. This will prevent host from modifying the
backing files.
Note that if this flag for given logical unit is false but the
backing file could not be opened in read/write mode, the gadget
will fall back to read only mode anyway.
The default value for non-CD-ROM logical units is false; for
logical units simulating CD-ROM it is forced to true.
- nofua=b[,b...]
This parameter specifies whether FUA flag should be ignored in SCSI
Write10 and Write12 commands sent to given logical units.
MS Windows mounts removable storage in “Removal optimised mode” by
default. All the writes to the media are synchronous, which is
achieved by setting the FUA (Force Unit Access) bit in SCSI
Write(10,12) commands. This forces each write to wait until the
data has actually been written out and prevents I/O requests
aggregation in block layer dramatically decreasing performance.
Note that this may mean that if the device is powered from USB and
the user unplugs the device without unmounting it first (which at
least some Windows users do), the data may be lost.
The default value is false.
- luns=N
This parameter specifies number of logical units the gadget will
have. It is limited by FSG_MAX_LUNS (8) and higher value will be
capped.
If this parameter is provided, and the number of files specified
in “file” argument is greater then the value of “luns”, all excess
files will be ignored.
If this parameter is not present, the number of logical units will
be deduced from the number of files specified in the “file”
parameter. If the file parameter is missing as well, one is
assumed.
- stall=b
Specifies whether the gadget is allowed to halt bulk endpoints.
The default is determined according to the type of USB device
controller, but usually true.
In addition to the above, the gadget also accepts the following
parameters defined by the composite framework (they are common to
all composite gadgets so just a quick listing):
- idVendor -- USB Vendor ID (16 bit integer)
- idProduct -- USB Product ID (16 bit integer)
- bcdDevice -- USB Device version (BCD) (16 bit integer)
- iManufacturer -- USB Manufacturer string (string)
- iProduct -- USB Product string (string)
- iSerialNumber -- SerialNumber string (sting)
* sysfs entries
For each logical unit, the gadget creates a directory in the sysfs
hierarchy. Inside of it the following three files are created:
- file
When read it returns the path to the backing file for the given
logical unit. If there is no backing file (possible only if the
logical unit is removable), the content is empty.
When written into, it changes the backing file for given logical
unit. This change can be performed even if given logical unit is
not specified as removable (but that may look strange to the
host). It may fail, however, if host disallowed medium removal
with the Prevent-Allow Medium Removal SCSI command.
- ro
Reflects the state of ro flag for the given logical unit. It can
be read any time, and written to when there is no backing file
open for given logical unit.
- nofua
Reflects the state of nofua flag for given logical unit. It can
be read and written.
Other then those, as usual, the values of module parameters can be
read from /sys/module/g_mass_storage/parameters/* files.
* Other gadgets using mass storage function
The Mass Storage Gadget uses the Mass Storage Function to handle
mass storage protocol. As a composite function, MSF may be used by
other gadgets as well (eg. g_multi and acm_ms).
All of the information in previous sections are valid for other
gadgets using MSF, except that support for mass storage related
module parameters may be missing, or the parameters may have
a prefix. To figure out whether any of this is true one needs to
consult the gadget's documentation or its source code.
For examples of how to include mass storage function in gadgets, one
may take a look at mass_storage.c, acm_ms.c and multi.c (sorted by
complexity).
* Relation to file storage gadget
The Mass Storage Function and thus the Mass Storage Gadget has been
based on the File Storage Gadget. The difference between the two is
that MSG is a composite gadget (ie. uses the composite framework)
while file storage gadget is a traditional gadget. From userspace
point of view this distinction does not really matter, but from
kernel hacker's point of view, this means that (i) MSG does not
duplicate code needed for handling basic USB protocol commands and
(ii) MSF can be used in any other composite gadget.
Because of that, File Storage Gadget has been deprecated and
scheduled to be removed in Linux 3.8. All users need to transition
to the Mass Storage Gadget by that time. The two gadgets behave
mostly the same from the outside except:
1. In FSG the “removable” and “cdrom” module parameters set the flag
for all logical units whereas in MSG they accept a list of y/n
values for each logical unit. If one uses only a single logical
unit this does not matter, but if there are more, the y/n value
needs to be repeated for each logical unit.
2. FSG's “serial”, “vendor”, “product” and “release” module
parameters are handled in MSG by the composite layer's parameters
named respectively: “iSerialnumber”, “idVendor”, “idProduct” and
“bcdDevice”.
3. MSG does not support FSG's test mode, thus “transport”,
“protocol” and “buflen” FSG's module parameters are not
supported. MSG always uses SCSI protocol with bulk only
transport mode and 16 KiB buffers.
...@@ -414,7 +414,7 @@ static int dwc3_gadget_set_ep_config(struct dwc3 *dwc, struct dwc3_ep *dep, ...@@ -414,7 +414,7 @@ static int dwc3_gadget_set_ep_config(struct dwc3 *dwc, struct dwc3_ep *dep,
params.param0 = DWC3_DEPCFG_EP_TYPE(usb_endpoint_type(desc)) params.param0 = DWC3_DEPCFG_EP_TYPE(usb_endpoint_type(desc))
| DWC3_DEPCFG_MAX_PACKET_SIZE(usb_endpoint_maxp(desc)) | DWC3_DEPCFG_MAX_PACKET_SIZE(usb_endpoint_maxp(desc))
| DWC3_DEPCFG_BURST_SIZE(dep->endpoint.maxburst); | DWC3_DEPCFG_BURST_SIZE(dep->endpoint.maxburst - 1);
params.param1 = DWC3_DEPCFG_XFER_COMPLETE_EN params.param1 = DWC3_DEPCFG_XFER_COMPLETE_EN
| DWC3_DEPCFG_XFER_NOT_READY_EN; | DWC3_DEPCFG_XFER_NOT_READY_EN;
......
...@@ -321,6 +321,15 @@ config USB_MV_UDC ...@@ -321,6 +321,15 @@ config USB_MV_UDC
USB2.0 OTG controller, which can be configured as high speed or USB2.0 OTG controller, which can be configured as high speed or
full speed USB peripheral. full speed USB peripheral.
config USB_MV_U3D
tristate "MARVELL PXA2128 USB 3.0 controller"
depends on CPU_MMP3
select USB_GADGET_DUALSPEED
select USB_GADGET_SUPERSPEED
help
MARVELL PXA2128 Processor series include a super speed USB3.0 device
controller, which support super speed USB peripheral.
# #
# Controllers available in both integrated and discrete versions # Controllers available in both integrated and discrete versions
# #
......
...@@ -29,6 +29,7 @@ obj-$(CONFIG_USB_EG20T) += pch_udc.o ...@@ -29,6 +29,7 @@ obj-$(CONFIG_USB_EG20T) += pch_udc.o
obj-$(CONFIG_USB_MV_UDC) += mv_udc.o obj-$(CONFIG_USB_MV_UDC) += mv_udc.o
mv_udc-y := mv_udc_core.o mv_udc-y := mv_udc_core.o
obj-$(CONFIG_USB_FUSB300) += fusb300_udc.o obj-$(CONFIG_USB_FUSB300) += fusb300_udc.o
obj-$(CONFIG_USB_MV_U3D) += mv_u3d_core.o
# #
# USB gadget drivers # USB gadget drivers
......
...@@ -235,6 +235,7 @@ static int __exit acm_ms_unbind(struct usb_composite_dev *cdev) ...@@ -235,6 +235,7 @@ static int __exit acm_ms_unbind(struct usb_composite_dev *cdev)
static struct usb_composite_driver acm_ms_driver = { static struct usb_composite_driver acm_ms_driver = {
.name = "g_acm_ms", .name = "g_acm_ms",
.dev = &device_desc, .dev = &device_desc,
.max_speed = USB_SPEED_SUPER,
.strings = dev_strings, .strings = dev_strings,
.unbind = __exit_p(acm_ms_unbind), .unbind = __exit_p(acm_ms_unbind),
}; };
......
...@@ -1634,6 +1634,7 @@ static int at91_start(struct usb_gadget *gadget, ...@@ -1634,6 +1634,7 @@ static int at91_start(struct usb_gadget *gadget,
udc = container_of(gadget, struct at91_udc, gadget); udc = container_of(gadget, struct at91_udc, gadget);
udc->driver = driver; udc->driver = driver;
udc->gadget.dev.driver = &driver->driver; udc->gadget.dev.driver = &driver->driver;
udc->gadget.dev.of_node = udc->pdev->dev.of_node;
dev_set_drvdata(&udc->gadget.dev, &driver->driver); dev_set_drvdata(&udc->gadget.dev, &driver->driver);
udc->enabled = 1; udc->enabled = 1;
udc->selfpowered = 1; udc->selfpowered = 1;
......
...@@ -117,6 +117,7 @@ int config_ep_by_speed(struct usb_gadget *g, ...@@ -117,6 +117,7 @@ int config_ep_by_speed(struct usb_gadget *g,
struct usb_function *f, struct usb_function *f,
struct usb_ep *_ep) struct usb_ep *_ep)
{ {
struct usb_composite_dev *cdev = get_gadget_data(g);
struct usb_endpoint_descriptor *chosen_desc = NULL; struct usb_endpoint_descriptor *chosen_desc = NULL;
struct usb_descriptor_header **speed_desc = NULL; struct usb_descriptor_header **speed_desc = NULL;
...@@ -180,10 +181,12 @@ int config_ep_by_speed(struct usb_gadget *g, ...@@ -180,10 +181,12 @@ int config_ep_by_speed(struct usb_gadget *g,
_ep->mult = comp_desc->bmAttributes & 0x3; _ep->mult = comp_desc->bmAttributes & 0x3;
case USB_ENDPOINT_XFER_BULK: case USB_ENDPOINT_XFER_BULK:
case USB_ENDPOINT_XFER_INT: case USB_ENDPOINT_XFER_INT:
_ep->maxburst = comp_desc->bMaxBurst; _ep->maxburst = comp_desc->bMaxBurst + 1;
break; break;
default: default:
/* Do nothing for control endpoints */ if (comp_desc->bMaxBurst != 0)
ERROR(cdev, "ep0 bMaxBurst must be 0\n");
_ep->maxburst = 1;
break; break;
} }
} }
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/hid.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <linux/usb/composite.h> #include <linux/usb/composite.h>
...@@ -1671,6 +1672,12 @@ static int __must_check ffs_do_desc(char *data, unsigned len, ...@@ -1671,6 +1672,12 @@ static int __must_check ffs_do_desc(char *data, unsigned len,
} }
break; break;
case HID_DT_HID:
pr_vdebug("hid descriptor\n");
if (length != sizeof(struct hid_descriptor))
goto inv_length;
break;
case USB_DT_OTG: case USB_DT_OTG:
if (length != sizeof(struct usb_otg_descriptor)) if (length != sizeof(struct usb_otg_descriptor))
goto inv_length; goto inv_length;
......
This diff is collapsed.
...@@ -44,12 +44,12 @@ ...@@ -44,12 +44,12 @@
* function for a USB device, it also illustrates a technique of * function for a USB device, it also illustrates a technique of
* double-buffering for increased throughput. * double-buffering for increased throughput.
* *
* Function supports multiple logical units (LUNs). Backing storage * For more information about MSF and in particular its module
* for each LUN is provided by a regular file or a block device. * parameters and sysfs interface read the
* Access for each LUN can be limited to read-only. Moreover, the * <Documentation/usb/mass-storage.txt> file.
* function can indicate that LUN is removable and/or CD-ROM. (The */
* later implies read-only access.)
* /*
* MSF is configured by specifying a fsg_config structure. It has the * MSF is configured by specifying a fsg_config structure. It has the
* following fields: * following fields:
* *
...@@ -75,25 +75,6 @@ ...@@ -75,25 +75,6 @@
* ->nofua Flag specifying that FUA flag in SCSI WRITE(10,12) * ->nofua Flag specifying that FUA flag in SCSI WRITE(10,12)
* commands for this LUN shall be ignored. * commands for this LUN shall be ignored.
* *
* lun_name_format A printf-like format for names of the LUN
* devices. This determines how the
* directory in sysfs will be named.
* Unless you are using several MSFs in
* a single gadget (as opposed to single
* MSF in many configurations) you may
* leave it as NULL (in which case
* "lun%d" will be used). In the format
* you can use "%d" to index LUNs for
* MSF's with more than one LUN. (Beware
* that there is only one integer given
* as an argument for the format and
* specifying invalid format may cause
* unspecified behaviour.)
* thread_name Name of the kernel thread process used by the
* MSF. You can safely set it to NULL
* (in which case default "file-storage"
* will be used).
*
* vendor_name * vendor_name
* product_name * product_name
* release Information used as a reply to INQUIRY * release Information used as a reply to INQUIRY
...@@ -114,62 +95,6 @@ ...@@ -114,62 +95,6 @@
* data track and no audio tracks; hence there need be only one * data track and no audio tracks; hence there need be only one
* backing file per LUN. * backing file per LUN.
* *
*
* MSF includes support for module parameters. If gadget using it
* decides to use it, the following module parameters will be
* available:
*
* file=filename[,filename...]
* Names of the files or block devices used for
* backing storage.
* ro=b[,b...] Default false, boolean for read-only access.
* removable=b[,b...]
* Default true, boolean for removable media.
* cdrom=b[,b...] Default false, boolean for whether to emulate
* a CD-ROM drive.
* nofua=b[,b...] Default false, booleans for ignore FUA flag
* in SCSI WRITE(10,12) commands
* luns=N Default N = number of filenames, number of
* LUNs to support.
* stall Default determined according to the type of
* USB device controller (usually true),
* boolean to permit the driver to halt
* bulk endpoints.
*
* The module parameters may be prefixed with some string. You need
* to consult gadget's documentation or source to verify whether it is
* using those module parameters and if it does what are the prefixes
* (look for FSG_MODULE_PARAMETERS() macro usage, what's inside it is
* the prefix).
*
*
* Requirements are modest; only a bulk-in and a bulk-out endpoint are
* needed. The memory requirement amounts to two 16K buffers, size
* configurable by a parameter. Support is included for both
* full-speed and high-speed operation.
*
* Note that the driver is slightly non-portable in that it assumes a
* single memory/DMA buffer will be useable for bulk-in, bulk-out, and
* interrupt-in endpoints. With most device controllers this isn't an
* issue, but there may be some with hardware restrictions that prevent
* a buffer from being used by more than one endpoint.
*
*
* The pathnames of the backing files and the ro settings are
* available in the attribute files "file" and "ro" in the lun<n> (or
* to be more precise in a directory which name comes from
* "lun_name_format" option!) subdirectory of the gadget's sysfs
* directory. If the "removable" option is set, writing to these
* files will simulate ejecting/loading the medium (writing an empty
* line means eject) and adjusting a write-enable tab. Changes to the
* ro setting are not allowed when the medium is loaded or if CD-ROM
* emulation is being used.
*
* When a LUN receive an "eject" SCSI request (Start/Stop Unit),
* if the LUN is removable, the backing file is released to simulate
* ejection.
*
*
* This function is heavily based on "File-backed Storage Gadget" by * This function is heavily based on "File-backed Storage Gadget" by
* Alan Stern which in turn is heavily based on "Gadget Zero" by David * Alan Stern which in turn is heavily based on "Gadget Zero" by David
* Brownell. The driver's SCSI command interface was based on the * Brownell. The driver's SCSI command interface was based on the
...@@ -211,7 +136,7 @@ ...@@ -211,7 +136,7 @@
* In normal operation the main thread is started during the gadget's * In normal operation the main thread is started during the gadget's
* fsg_bind() callback and stopped during fsg_unbind(). But it can * fsg_bind() callback and stopped during fsg_unbind(). But it can
* also exit when it receives a signal, and there's no point leaving * also exit when it receives a signal, and there's no point leaving
* the gadget running when the thread is dead. At of this moment, MSF * the gadget running when the thread is dead. As of this moment, MSF
* provides no way to deregister the gadget when thread dies -- maybe * provides no way to deregister the gadget when thread dies -- maybe
* a callback functions is needed. * a callback functions is needed.
* *
...@@ -417,9 +342,6 @@ struct fsg_config { ...@@ -417,9 +342,6 @@ struct fsg_config {
char nofua; char nofua;
} luns[FSG_MAX_LUNS]; } luns[FSG_MAX_LUNS];
const char *lun_name_format;
const char *thread_name;
/* Callback functions. */ /* Callback functions. */
const struct fsg_operations *ops; const struct fsg_operations *ops;
/* Gadget's private data. */ /* Gadget's private data. */
...@@ -2687,11 +2609,15 @@ static int fsg_main_thread(void *common_) ...@@ -2687,11 +2609,15 @@ static int fsg_main_thread(void *common_)
/*************************** DEVICE ATTRIBUTES ***************************/ /*************************** DEVICE ATTRIBUTES ***************************/
/* Write permission is checked per LUN in store_*() functions. */
static DEVICE_ATTR(ro, 0644, fsg_show_ro, fsg_store_ro); static DEVICE_ATTR(ro, 0644, fsg_show_ro, fsg_store_ro);
static DEVICE_ATTR(nofua, 0644, fsg_show_nofua, fsg_store_nofua); static DEVICE_ATTR(nofua, 0644, fsg_show_nofua, fsg_store_nofua);
static DEVICE_ATTR(file, 0644, fsg_show_file, fsg_store_file); static DEVICE_ATTR(file, 0644, fsg_show_file, fsg_store_file);
static struct device_attribute dev_attr_ro_cdrom =
__ATTR(ro, 0444, fsg_show_ro, NULL);
static struct device_attribute dev_attr_file_nonremovable =
__ATTR(file, 0444, fsg_show_file, NULL);
/****************************** FSG COMMON ******************************/ /****************************** FSG COMMON ******************************/
...@@ -2792,11 +2718,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common, ...@@ -2792,11 +2718,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
curlun->dev.parent = &gadget->dev; curlun->dev.parent = &gadget->dev;
/* curlun->dev.driver = &fsg_driver.driver; XXX */ /* curlun->dev.driver = &fsg_driver.driver; XXX */
dev_set_drvdata(&curlun->dev, &common->filesem); dev_set_drvdata(&curlun->dev, &common->filesem);
dev_set_name(&curlun->dev, dev_set_name(&curlun->dev, "lun%d", i);
cfg->lun_name_format
? cfg->lun_name_format
: "lun%d",
i);
rc = device_register(&curlun->dev); rc = device_register(&curlun->dev);
if (rc) { if (rc) {
...@@ -2806,10 +2728,16 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common, ...@@ -2806,10 +2728,16 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
goto error_release; goto error_release;
} }
rc = device_create_file(&curlun->dev, &dev_attr_ro); rc = device_create_file(&curlun->dev,
curlun->cdrom
? &dev_attr_ro_cdrom
: &dev_attr_ro);
if (rc) if (rc)
goto error_luns; goto error_luns;
rc = device_create_file(&curlun->dev, &dev_attr_file); rc = device_create_file(&curlun->dev,
curlun->removable
? &dev_attr_file
: &dev_attr_file_nonremovable);
if (rc) if (rc)
goto error_luns; goto error_luns;
rc = device_create_file(&curlun->dev, &dev_attr_nofua); rc = device_create_file(&curlun->dev, &dev_attr_nofua);
...@@ -2878,8 +2806,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common, ...@@ -2878,8 +2806,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
/* Tell the thread to start working */ /* Tell the thread to start working */
common->thread_task = common->thread_task =
kthread_create(fsg_main_thread, common, kthread_create(fsg_main_thread, common, "file-storage");
cfg->thread_name ?: "file-storage");
if (IS_ERR(common->thread_task)) { if (IS_ERR(common->thread_task)) {
rc = PTR_ERR(common->thread_task); rc = PTR_ERR(common->thread_task);
goto error_release; goto error_release;
...@@ -2945,8 +2872,14 @@ static void fsg_common_release(struct kref *ref) ...@@ -2945,8 +2872,14 @@ static void fsg_common_release(struct kref *ref)
/* In error recovery common->nluns may be zero. */ /* In error recovery common->nluns may be zero. */
for (; i; --i, ++lun) { for (; i; --i, ++lun) {
device_remove_file(&lun->dev, &dev_attr_nofua); device_remove_file(&lun->dev, &dev_attr_nofua);
device_remove_file(&lun->dev, &dev_attr_ro); device_remove_file(&lun->dev,
device_remove_file(&lun->dev, &dev_attr_file); lun->cdrom
? &dev_attr_ro_cdrom
: &dev_attr_ro);
device_remove_file(&lun->dev,
lun->removable
? &dev_attr_file
: &dev_attr_file_nonremovable);
fsg_lun_close(lun); fsg_lun_close(lun);
device_unregister(&lun->dev); device_unregister(&lun->dev);
} }
...@@ -3167,8 +3100,7 @@ fsg_config_from_params(struct fsg_config *cfg, ...@@ -3167,8 +3100,7 @@ fsg_config_from_params(struct fsg_config *cfg,
for (i = 0, lun = cfg->luns; i < cfg->nluns; ++i, ++lun) { for (i = 0, lun = cfg->luns; i < cfg->nluns; ++i, ++lun) {
lun->ro = !!params->ro[i]; lun->ro = !!params->ro[i];
lun->cdrom = !!params->cdrom[i]; lun->cdrom = !!params->cdrom[i];
lun->removable = /* Removable by default */ lun->removable = !!params->removable[i];
params->removable_count <= i || params->removable[i];
lun->filename = lun->filename =
params->file_count > i && params->file[i][0] params->file_count > i && params->file[i][0]
? params->file[i] ? params->file[i]
...@@ -3176,8 +3108,6 @@ fsg_config_from_params(struct fsg_config *cfg, ...@@ -3176,8 +3108,6 @@ fsg_config_from_params(struct fsg_config *cfg,
} }
/* Let MSF use defaults */ /* Let MSF use defaults */
cfg->lun_name_format = 0;
cfg->thread_name = 0;
cfg->vendor_name = 0; cfg->vendor_name = 0;
cfg->product_name = 0; cfg->product_name = 0;
cfg->release = 0xffff; cfg->release = 0xffff;
...@@ -3203,4 +3133,3 @@ fsg_common_from_params(struct fsg_common *common, ...@@ -3203,4 +3133,3 @@ fsg_common_from_params(struct fsg_common *common,
fsg_config_from_params(&cfg, params); fsg_config_from_params(&cfg, params);
return fsg_common_init(common, cdev, &cfg); return fsg_common_init(common, cdev, &cfg);
} }
This diff is collapsed.
...@@ -17,9 +17,11 @@ ...@@ -17,9 +17,11 @@
#include <linux/usb/video.h> #include <linux/usb/video.h>
extern int uvc_bind_config(struct usb_configuration *c, extern int uvc_bind_config(struct usb_configuration *c,
const struct uvc_descriptor_header * const *control, const struct uvc_descriptor_header * const *fs_control,
const struct uvc_descriptor_header * const *fs_streaming, const struct uvc_descriptor_header * const *hs_control,
const struct uvc_descriptor_header * const *hs_streaming); const struct uvc_descriptor_header * const *fs_streaming,
const struct uvc_descriptor_header * const *hs_streaming,
const struct uvc_descriptor_header * const *ss_streaming);
#endif /* _F_UVC_H_ */ #endif /* _F_UVC_H_ */
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
#include <mach/hardware.h> #include <mach/hardware.h>
static struct clk *mxc_ahb_clk; static struct clk *mxc_ahb_clk;
static struct clk *mxc_usb_clk; static struct clk *mxc_per_clk;
static struct clk *mxc_ipg_clk;
/* workaround ENGcm09152 for i.MX35 */ /* workaround ENGcm09152 for i.MX35 */
#define USBPHYCTRL_OTGBASE_OFFSET 0x608 #define USBPHYCTRL_OTGBASE_OFFSET 0x608
...@@ -35,28 +36,31 @@ int fsl_udc_clk_init(struct platform_device *pdev) ...@@ -35,28 +36,31 @@ int fsl_udc_clk_init(struct platform_device *pdev)
pdata = pdev->dev.platform_data; pdata = pdev->dev.platform_data;
if (!cpu_is_mx35() && !cpu_is_mx25()) { mxc_ipg_clk = devm_clk_get(&pdev->dev, "ipg");
mxc_ahb_clk = clk_get(&pdev->dev, "usb_ahb"); if (IS_ERR(mxc_ipg_clk)) {
if (IS_ERR(mxc_ahb_clk)) dev_err(&pdev->dev, "clk_get(\"ipg\") failed\n");
return PTR_ERR(mxc_ahb_clk); return PTR_ERR(mxc_ipg_clk);
}
ret = clk_enable(mxc_ahb_clk); mxc_ahb_clk = devm_clk_get(&pdev->dev, "ahb");
if (ret < 0) { if (IS_ERR(mxc_ahb_clk)) {
dev_err(&pdev->dev, "clk_enable(\"usb_ahb\") failed\n"); dev_err(&pdev->dev, "clk_get(\"ahb\") failed\n");
goto eenahb; return PTR_ERR(mxc_ahb_clk);
}
} }
/* make sure USB_CLK is running at 60 MHz +/- 1000 Hz */ mxc_per_clk = devm_clk_get(&pdev->dev, "per");
mxc_usb_clk = clk_get(&pdev->dev, "usb"); if (IS_ERR(mxc_per_clk)) {
if (IS_ERR(mxc_usb_clk)) { dev_err(&pdev->dev, "clk_get(\"per\") failed\n");
dev_err(&pdev->dev, "clk_get(\"usb\") failed\n"); return PTR_ERR(mxc_per_clk);
ret = PTR_ERR(mxc_usb_clk);
goto egusb;
} }
clk_prepare_enable(mxc_ipg_clk);
clk_prepare_enable(mxc_ahb_clk);
clk_prepare_enable(mxc_per_clk);
/* make sure USB_CLK is running at 60 MHz +/- 1000 Hz */
if (!cpu_is_mx51()) { if (!cpu_is_mx51()) {
freq = clk_get_rate(mxc_usb_clk); freq = clk_get_rate(mxc_per_clk);
if (pdata->phy_mode != FSL_USB2_PHY_ULPI && if (pdata->phy_mode != FSL_USB2_PHY_ULPI &&
(freq < 59999000 || freq > 60001000)) { (freq < 59999000 || freq > 60001000)) {
dev_err(&pdev->dev, "USB_CLK=%lu, should be 60MHz\n", freq); dev_err(&pdev->dev, "USB_CLK=%lu, should be 60MHz\n", freq);
...@@ -65,24 +69,13 @@ int fsl_udc_clk_init(struct platform_device *pdev) ...@@ -65,24 +69,13 @@ int fsl_udc_clk_init(struct platform_device *pdev)
} }
} }
ret = clk_enable(mxc_usb_clk);
if (ret < 0) {
dev_err(&pdev->dev, "clk_enable(\"usb_clk\") failed\n");
goto eenusb;
}
return 0; return 0;
eenusb:
eclkrate: eclkrate:
clk_put(mxc_usb_clk); clk_disable_unprepare(mxc_ipg_clk);
mxc_usb_clk = NULL; clk_disable_unprepare(mxc_ahb_clk);
egusb: clk_disable_unprepare(mxc_per_clk);
if (!cpu_is_mx35()) mxc_per_clk = NULL;
clk_disable(mxc_ahb_clk);
eenahb:
if (!cpu_is_mx35())
clk_put(mxc_ahb_clk);
return ret; return ret;
} }
...@@ -104,20 +97,15 @@ void fsl_udc_clk_finalize(struct platform_device *pdev) ...@@ -104,20 +97,15 @@ void fsl_udc_clk_finalize(struct platform_device *pdev)
/* ULPI transceivers don't need usbpll */ /* ULPI transceivers don't need usbpll */
if (pdata->phy_mode == FSL_USB2_PHY_ULPI) { if (pdata->phy_mode == FSL_USB2_PHY_ULPI) {
clk_disable(mxc_usb_clk); clk_disable_unprepare(mxc_per_clk);
clk_put(mxc_usb_clk); mxc_per_clk = NULL;
mxc_usb_clk = NULL;
} }
} }
void fsl_udc_clk_release(void) void fsl_udc_clk_release(void)
{ {
if (mxc_usb_clk) { if (mxc_per_clk)
clk_disable(mxc_usb_clk); clk_disable_unprepare(mxc_per_clk);
clk_put(mxc_usb_clk); clk_disable_unprepare(mxc_ahb_clk);
} clk_disable_unprepare(mxc_ipg_clk);
if (!cpu_is_mx35()) {
clk_disable(mxc_ahb_clk);
clk_put(mxc_ahb_clk);
}
} }
...@@ -2560,6 +2560,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev) ...@@ -2560,6 +2560,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
dev_set_name(&udc_controller->gadget.dev, "gadget"); dev_set_name(&udc_controller->gadget.dev, "gadget");
udc_controller->gadget.dev.release = fsl_udc_release; udc_controller->gadget.dev.release = fsl_udc_release;
udc_controller->gadget.dev.parent = &pdev->dev; udc_controller->gadget.dev.parent = &pdev->dev;
udc_controller->gadget.dev.of_node = pdev->dev.of_node;
ret = device_register(&udc_controller->gadget.dev); ret = device_register(&udc_controller->gadget.dev);
if (ret < 0) if (ret < 0)
goto err_free_irq; goto err_free_irq;
......
...@@ -1432,7 +1432,7 @@ static int __init imx_udc_probe(struct platform_device *pdev) ...@@ -1432,7 +1432,7 @@ static int __init imx_udc_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "can't get USB clock\n"); dev_err(&pdev->dev, "can't get USB clock\n");
goto fail2; goto fail2;
} }
clk_enable(clk); clk_prepare_enable(clk);
if (clk_get_rate(clk) != 48000000) { if (clk_get_rate(clk) != 48000000) {
D_INI(&pdev->dev, D_INI(&pdev->dev,
...@@ -1496,7 +1496,7 @@ static int __init imx_udc_probe(struct platform_device *pdev) ...@@ -1496,7 +1496,7 @@ static int __init imx_udc_probe(struct platform_device *pdev)
free_irq(imx_usb->usbd_int[i], imx_usb); free_irq(imx_usb->usbd_int[i], imx_usb);
fail3: fail3:
clk_put(clk); clk_put(clk);
clk_disable(clk); clk_disable_unprepare(clk);
fail2: fail2:
iounmap(base); iounmap(base);
fail1: fail1:
...@@ -1521,7 +1521,7 @@ static int __exit imx_udc_remove(struct platform_device *pdev) ...@@ -1521,7 +1521,7 @@ static int __exit imx_udc_remove(struct platform_device *pdev)
free_irq(imx_usb->usbd_int[i], imx_usb); free_irq(imx_usb->usbd_int[i], imx_usb);
clk_put(imx_usb->clk); clk_put(imx_usb->clk);
clk_disable(imx_usb->clk); clk_disable_unprepare(imx_usb->clk);
iounmap(imx_usb->base); iounmap(imx_usb->base);
release_mem_region(imx_usb->res->start, resource_size(imx_usb->res)); release_mem_region(imx_usb->res->start, resource_size(imx_usb->res));
......
...@@ -165,6 +165,7 @@ struct lpc32xx_udc { ...@@ -165,6 +165,7 @@ struct lpc32xx_udc {
int udp_irq[4]; int udp_irq[4];
struct clk *usb_pll_clk; struct clk *usb_pll_clk;
struct clk *usb_slv_clk; struct clk *usb_slv_clk;
struct clk *usb_otg_clk;
/* DMA support */ /* DMA support */
u32 *udca_v_base; u32 *udca_v_base;
...@@ -227,33 +228,15 @@ static inline struct lpc32xx_udc *to_udc(struct usb_gadget *g) ...@@ -227,33 +228,15 @@ static inline struct lpc32xx_udc *to_udc(struct usb_gadget *g)
#define UDCA_BUFF_SIZE (128) #define UDCA_BUFF_SIZE (128)
/* TODO: When the clock framework is introduced in LPC32xx, IO_ADDRESS will /* TODO: When the clock framework is introduced in LPC32xx, IO_ADDRESS will
* be replaced with an inremap()ed pointer, see USB_OTG_CLK_CTRL() * be replaced with an inremap()ed pointer
* */ * */
#define USB_CTRL IO_ADDRESS(LPC32XX_CLK_PM_BASE + 0x64) #define USB_CTRL IO_ADDRESS(LPC32XX_CLK_PM_BASE + 0x64)
#define USB_CLOCK_MASK (AHB_M_CLOCK_ON | OTG_CLOCK_ON | \
DEV_CLOCK_ON | I2C_CLOCK_ON)
/* USB_CTRL bit defines */ /* USB_CTRL bit defines */
#define USB_SLAVE_HCLK_EN (1 << 24) #define USB_SLAVE_HCLK_EN (1 << 24)
#define USB_HOST_NEED_CLK_EN (1 << 21) #define USB_HOST_NEED_CLK_EN (1 << 21)
#define USB_DEV_NEED_CLK_EN (1 << 22) #define USB_DEV_NEED_CLK_EN (1 << 22)
#define USB_OTG_CLK_CTRL(udc) ((udc)->udp_baseaddr + 0xFF4)
#define USB_OTG_CLK_STAT(udc) ((udc)->udp_baseaddr + 0xFF8)
/* USB_OTG_CLK_CTRL bit defines */
#define AHB_M_CLOCK_ON (1 << 4)
#define OTG_CLOCK_ON (1 << 3)
#define I2C_CLOCK_ON (1 << 2)
#define DEV_CLOCK_ON (1 << 1)
#define HOST_CLOCK_ON (1 << 0)
#define USB_OTG_STAT_CONTROL(udc) (udc->udp_baseaddr + 0x110)
/* USB_OTG_STAT_CONTROL bit defines */
#define TRANSPARENT_I2C_EN (1 << 7)
#define HOST_EN (1 << 0)
/********************************************************************** /**********************************************************************
* USB device controller register offsets * USB device controller register offsets
**********************************************************************/ **********************************************************************/
...@@ -677,7 +660,7 @@ static void isp1301_udc_configure(struct lpc32xx_udc *udc) ...@@ -677,7 +660,7 @@ static void isp1301_udc_configure(struct lpc32xx_udc *udc)
ISP1301_I2C_INTERRUPT_RISING, INT_VBUS_VLD); ISP1301_I2C_INTERRUPT_RISING, INT_VBUS_VLD);
/* Enable usb_need_clk clock after transceiver is initialized */ /* Enable usb_need_clk clock after transceiver is initialized */
writel((readl(USB_CTRL) | (1 << 22)), USB_CTRL); writel((readl(USB_CTRL) | USB_DEV_NEED_CLK_EN), USB_CTRL);
dev_info(udc->dev, "ISP1301 Vendor ID : 0x%04x\n", dev_info(udc->dev, "ISP1301 Vendor ID : 0x%04x\n",
i2c_smbus_read_word_data(udc->isp1301_i2c_client, 0x00)); i2c_smbus_read_word_data(udc->isp1301_i2c_client, 0x00));
...@@ -1010,11 +993,8 @@ static void udc_dd_free(struct lpc32xx_udc *udc, struct lpc32xx_usbd_dd_gad *dd) ...@@ -1010,11 +993,8 @@ static void udc_dd_free(struct lpc32xx_udc *udc, struct lpc32xx_usbd_dd_gad *dd)
/* Enables or disables most of the USB system clocks when low power mode is /* Enables or disables most of the USB system clocks when low power mode is
* needed. Clocks are typically started on a connection event, and disabled * needed. Clocks are typically started on a connection event, and disabled
* when a cable is disconnected */ * when a cable is disconnected */
#define OTGOFF_CLK_MASK (AHB_M_CLOCK_ON | I2C_CLOCK_ON)
static void udc_clk_set(struct lpc32xx_udc *udc, int enable) static void udc_clk_set(struct lpc32xx_udc *udc, int enable)
{ {
int to = 1000;
if (enable != 0) { if (enable != 0) {
if (udc->clocked) if (udc->clocked)
return; return;
...@@ -1028,14 +1008,7 @@ static void udc_clk_set(struct lpc32xx_udc *udc, int enable) ...@@ -1028,14 +1008,7 @@ static void udc_clk_set(struct lpc32xx_udc *udc, int enable)
writel(readl(USB_CTRL) | USB_DEV_NEED_CLK_EN, writel(readl(USB_CTRL) | USB_DEV_NEED_CLK_EN,
USB_CTRL); USB_CTRL);
/* Set to enable all needed USB OTG clocks */ clk_enable(udc->usb_otg_clk);
writel(USB_CLOCK_MASK, USB_OTG_CLK_CTRL(udc));
while (((readl(USB_OTG_CLK_STAT(udc)) & USB_CLOCK_MASK) !=
USB_CLOCK_MASK) && (to > 0))
to--;
if (!to)
dev_dbg(udc->dev, "Cannot enable USB OTG clocking\n");
} else { } else {
if (!udc->clocked) if (!udc->clocked)
return; return;
...@@ -1047,19 +1020,11 @@ static void udc_clk_set(struct lpc32xx_udc *udc, int enable) ...@@ -1047,19 +1020,11 @@ static void udc_clk_set(struct lpc32xx_udc *udc, int enable)
/* 48MHz PLL dpwn */ /* 48MHz PLL dpwn */
clk_disable(udc->usb_pll_clk); clk_disable(udc->usb_pll_clk);
/* Enable the USB device clock */ /* Disable the USB device clock */
writel(readl(USB_CTRL) & ~USB_DEV_NEED_CLK_EN, writel(readl(USB_CTRL) & ~USB_DEV_NEED_CLK_EN,
USB_CTRL); USB_CTRL);
/* Set to enable all needed USB OTG clocks */ clk_disable(udc->usb_otg_clk);
writel(OTGOFF_CLK_MASK, USB_OTG_CLK_CTRL(udc));
while (((readl(USB_OTG_CLK_STAT(udc)) &
OTGOFF_CLK_MASK) !=
OTGOFF_CLK_MASK) && (to > 0))
to--;
if (!to)
dev_dbg(udc->dev, "Cannot disable USB OTG clocking\n");
} }
} }
...@@ -3041,6 +3006,7 @@ static int lpc32xx_start(struct usb_gadget_driver *driver, ...@@ -3041,6 +3006,7 @@ static int lpc32xx_start(struct usb_gadget_driver *driver,
udc->driver = driver; udc->driver = driver;
udc->gadget.dev.driver = &driver->driver; udc->gadget.dev.driver = &driver->driver;
udc->gadget.dev.of_node = udc->dev->of_node;
udc->enabled = 1; udc->enabled = 1;
udc->selfpowered = 1; udc->selfpowered = 1;
udc->vbus = 0; udc->vbus = 0;
...@@ -3239,6 +3205,12 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev) ...@@ -3239,6 +3205,12 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev)
retval = PTR_ERR(udc->usb_slv_clk); retval = PTR_ERR(udc->usb_slv_clk);
goto usb_clk_get_fail; goto usb_clk_get_fail;
} }
udc->usb_otg_clk = clk_get(&pdev->dev, "ck_usb_otg");
if (IS_ERR(udc->usb_otg_clk)) {
dev_err(udc->dev, "failed to acquire USB otg clock\n");
retval = PTR_ERR(udc->usb_slv_clk);
goto usb_otg_clk_get_fail;
}
/* Setup PLL clock to 48MHz */ /* Setup PLL clock to 48MHz */
retval = clk_enable(udc->usb_pll_clk); retval = clk_enable(udc->usb_pll_clk);
...@@ -3262,15 +3234,12 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev) ...@@ -3262,15 +3234,12 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev)
goto usb_clk_enable_fail; goto usb_clk_enable_fail;
} }
/* Set to enable all needed USB OTG clocks */ /* Enable USB OTG clock */
writel(USB_CLOCK_MASK, USB_OTG_CLK_CTRL(udc)); retval = clk_enable(udc->usb_otg_clk);
if (retval < 0) {
i = 1000; dev_err(udc->dev, "failed to start USB otg clock\n");
while (((readl(USB_OTG_CLK_STAT(udc)) & USB_CLOCK_MASK) != goto usb_otg_clk_enable_fail;
USB_CLOCK_MASK) && (i > 0)) }
i--;
if (!i)
dev_dbg(udc->dev, "USB OTG clocks not correctly enabled\n");
/* Setup deferred workqueue data */ /* Setup deferred workqueue data */
udc->poweron = udc->pullup = 0; udc->poweron = udc->pullup = 0;
...@@ -3390,12 +3359,16 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev) ...@@ -3390,12 +3359,16 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev)
dma_free_coherent(&pdev->dev, UDCA_BUFF_SIZE, dma_free_coherent(&pdev->dev, UDCA_BUFF_SIZE,
udc->udca_v_base, udc->udca_p_base); udc->udca_v_base, udc->udca_p_base);
i2c_fail: i2c_fail:
clk_disable(udc->usb_otg_clk);
usb_otg_clk_enable_fail:
clk_disable(udc->usb_slv_clk); clk_disable(udc->usb_slv_clk);
usb_clk_enable_fail: usb_clk_enable_fail:
pll_set_fail: pll_set_fail:
clk_disable(udc->usb_pll_clk); clk_disable(udc->usb_pll_clk);
pll_enable_fail: pll_enable_fail:
clk_put(udc->usb_slv_clk); clk_put(udc->usb_slv_clk);
usb_otg_clk_get_fail:
clk_put(udc->usb_otg_clk);
usb_clk_get_fail: usb_clk_get_fail:
clk_put(udc->usb_pll_clk); clk_put(udc->usb_pll_clk);
pll_get_fail: pll_get_fail:
...@@ -3433,6 +3406,8 @@ static int __devexit lpc32xx_udc_remove(struct platform_device *pdev) ...@@ -3433,6 +3406,8 @@ static int __devexit lpc32xx_udc_remove(struct platform_device *pdev)
device_unregister(&udc->gadget.dev); device_unregister(&udc->gadget.dev);
clk_disable(udc->usb_otg_clk);
clk_put(udc->usb_otg_clk);
clk_disable(udc->usb_slv_clk); clk_disable(udc->usb_slv_clk);
clk_put(udc->usb_slv_clk); clk_put(udc->usb_slv_clk);
clk_disable(udc->usb_pll_clk); clk_disable(udc->usb_pll_clk);
...@@ -3446,7 +3421,6 @@ static int __devexit lpc32xx_udc_remove(struct platform_device *pdev) ...@@ -3446,7 +3421,6 @@ static int __devexit lpc32xx_udc_remove(struct platform_device *pdev)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int lpc32xx_udc_suspend(struct platform_device *pdev, pm_message_t mesg) static int lpc32xx_udc_suspend(struct platform_device *pdev, pm_message_t mesg)
{ {
int to = 1000;
struct lpc32xx_udc *udc = platform_get_drvdata(pdev); struct lpc32xx_udc *udc = platform_get_drvdata(pdev);
if (udc->clocked) { if (udc->clocked) {
...@@ -3461,15 +3435,6 @@ static int lpc32xx_udc_suspend(struct platform_device *pdev, pm_message_t mesg) ...@@ -3461,15 +3435,6 @@ static int lpc32xx_udc_suspend(struct platform_device *pdev, pm_message_t mesg)
on resume */ on resume */
udc->clocked = 1; udc->clocked = 1;
/* Kill OTG and I2C clocks */
writel(0, USB_OTG_CLK_CTRL(udc));
while (((readl(USB_OTG_CLK_STAT(udc)) & OTGOFF_CLK_MASK) !=
OTGOFF_CLK_MASK) && (to > 0))
to--;
if (!to)
dev_dbg(udc->dev,
"USB OTG clocks not correctly enabled\n");
/* Kill global USB clock */ /* Kill global USB clock */
clk_disable(udc->usb_slv_clk); clk_disable(udc->usb_slv_clk);
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -2208,7 +2208,7 @@ static void pch_udc_complete_receiver(struct pch_udc_ep *ep) ...@@ -2208,7 +2208,7 @@ static void pch_udc_complete_receiver(struct pch_udc_ep *ep)
return; return;
} }
if ((td->status & PCH_UDC_BUFF_STS) == PCH_UDC_BS_DMA_DONE) if ((td->status & PCH_UDC_BUFF_STS) == PCH_UDC_BS_DMA_DONE)
if (td->status | PCH_UDC_DMA_LAST) { if (td->status & PCH_UDC_DMA_LAST) {
count = td->status & PCH_UDC_RXTX_BYTES; count = td->status & PCH_UDC_RXTX_BYTES;
break; break;
} }
......
This diff is collapsed.
This diff is collapsed.
...@@ -798,12 +798,6 @@ int gether_setup_name(struct usb_gadget *g, u8 ethaddr[ETH_ALEN], ...@@ -798,12 +798,6 @@ int gether_setup_name(struct usb_gadget *g, u8 ethaddr[ETH_ALEN],
SET_ETHTOOL_OPS(net, &ops); SET_ETHTOOL_OPS(net, &ops);
/* two kinds of host-initiated state changes:
* - iff DATA transfer is active, carrier is "on"
* - tx queueing enabled if open *and* carrier is "on"
*/
netif_carrier_off(net);
dev->gadget = g; dev->gadget = g;
SET_NETDEV_DEV(net, &g->dev); SET_NETDEV_DEV(net, &g->dev);
SET_NETDEV_DEVTYPE(net, &gadget_type); SET_NETDEV_DEVTYPE(net, &gadget_type);
...@@ -817,6 +811,12 @@ int gether_setup_name(struct usb_gadget *g, u8 ethaddr[ETH_ALEN], ...@@ -817,6 +811,12 @@ int gether_setup_name(struct usb_gadget *g, u8 ethaddr[ETH_ALEN],
INFO(dev, "HOST MAC %pM\n", dev->host_mac); INFO(dev, "HOST MAC %pM\n", dev->host_mac);
the_dev = dev; the_dev = dev;
/* two kinds of host-initiated state changes:
* - iff DATA transfer is active, carrier is "on"
* - tx queueing enabled if open *and* carrier is "on"
*/
netif_carrier_off(net);
} }
return status; return status;
......
...@@ -153,9 +153,11 @@ struct uvc_device ...@@ -153,9 +153,11 @@ struct uvc_device
/* Descriptors */ /* Descriptors */
struct { struct {
const struct uvc_descriptor_header * const *control; const struct uvc_descriptor_header * const *fs_control;
const struct uvc_descriptor_header * const *ss_control;
const struct uvc_descriptor_header * const *fs_streaming; const struct uvc_descriptor_header * const *fs_streaming;
const struct uvc_descriptor_header * const *hs_streaming; const struct uvc_descriptor_header * const *hs_streaming;
const struct uvc_descriptor_header * const *ss_streaming;
} desc; } desc;
unsigned int control_intf; unsigned int control_intf;
......
This diff is collapsed.
...@@ -1811,7 +1811,7 @@ static int imx21_remove(struct platform_device *pdev) ...@@ -1811,7 +1811,7 @@ static int imx21_remove(struct platform_device *pdev)
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
if (res != NULL) { if (res != NULL) {
clk_disable(imx21->clk); clk_disable_unprepare(imx21->clk);
clk_put(imx21->clk); clk_put(imx21->clk);
iounmap(imx21->regs); iounmap(imx21->regs);
release_mem_region(res->start, resource_size(res)); release_mem_region(res->start, resource_size(res));
...@@ -1884,7 +1884,7 @@ static int imx21_probe(struct platform_device *pdev) ...@@ -1884,7 +1884,7 @@ static int imx21_probe(struct platform_device *pdev)
ret = clk_set_rate(imx21->clk, clk_round_rate(imx21->clk, 48000000)); ret = clk_set_rate(imx21->clk, clk_round_rate(imx21->clk, 48000000));
if (ret) if (ret)
goto failed_clock_set; goto failed_clock_set;
ret = clk_enable(imx21->clk); ret = clk_prepare_enable(imx21->clk);
if (ret) if (ret)
goto failed_clock_enable; goto failed_clock_enable;
...@@ -1900,7 +1900,7 @@ static int imx21_probe(struct platform_device *pdev) ...@@ -1900,7 +1900,7 @@ static int imx21_probe(struct platform_device *pdev)
return 0; return 0;
failed_add_hcd: failed_add_hcd:
clk_disable(imx21->clk); clk_disable_unprepare(imx21->clk);
failed_clock_enable: failed_clock_enable:
failed_clock_set: failed_clock_set:
clk_put(imx21->clk); clk_put(imx21->clk);
......
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