Commit Graph

7686 Commits

Author SHA1 Message Date
yangkai
bbbb215745 fix compile error 2012-09-06 17:16:47 +08:00
yangkai
f9dc13b34c Merge commit '9ce928373554c3d1616076a0dd421d0a333755c9' into develop-3.0 2012-09-06 16:19:07 +08:00
xxx
9bb82849cd Revert "correct bugs for 'cpu hclk and pclk is 1:1'"
This reverts commit db009dd476.
2012-09-05 19:24:24 -07:00
xxx
db009dd476 correct bugs for 'cpu hclk and pclk is 1:1' 2012-09-05 19:18:35 -07:00
yangkai
0a48052022 usb clock update 2012-09-05 18:16:52 +08:00
lyz
9ce9283735 usbdev_rk30 fix error 2012-09-05 17:31:55 +08:00
yangkai
33ba6c615a usb clock update 2012-09-05 16:10:20 +08:00
yangkai
e99f46316d usb hcd clock bug fix 2012-09-04 14:59:06 +08:00
yangkai
fc146370e5 Merge commit 'c13d296672e1d180c0268ca8dededa535ca67c31' into develop-3.0 2012-09-04 14:56:57 +08:00
lyz
c13d296672 support rk3066b usb 2012-09-04 14:46:08 +08:00
wlf
eaf65a391f RK2928 USB modified 2012-09-03 18:03:22 +08:00
yangkai
e9e325263c rk3066b usb update 2012-09-03 10:40:26 +08:00
yangkai
c814af278a rk3066b otg drv vbus conflict with pwm2 2012-09-01 17:30:24 +08:00
yangkai
f4cd65e97d config rk3066b usb 2012-09-01 16:57:45 +08:00
yangkai
7249b92728 usb driver restructure 2012-08-30 11:45:58 +08:00
yangkai
8957fb9f9b host inno phy config 2012-08-27 14:31:37 +08:00
hxy
a14e8087e9 RK3066B:update board iomux config and add two pmu (wm8326 & tps65910) support 2012-08-24 16:31:59 +08:00
黄涛
4d93acfd39 rk3066b: rename rk31 to rk3066b 2012-08-22 21:21:56 +08:00
yangkai
056440e3f0 don't disable usb clock 2012-08-22 17:09:10 +08:00
黄涛
0a3b24f10d Merge remote-tracking branch 'origin/develop-3.0-jb' into develop-3.0 2012-08-21 19:55:23 +08:00
黄涛
19b3e31e91 Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0-jb
Conflicts:
	drivers/mmc/core/core.c
	drivers/net/wireless/bcm4319/dhd_sdio.c
	drivers/net/wireless/bcm4319/include/linux_osl.h
	drivers/net/wireless/bcm4319/wl_iw.c
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_cfg80211.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/include/wlioctl.h
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wldev_common.c
	drivers/net/wireless/bcmdhd/wldev_common.h
2012-08-21 15:53:18 +08:00
yangkai
1619efaa4d add wakeup_key at vbus disconnect 2012-08-21 14:15:42 +08:00
黄涛
b2be450f10 Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
Conflicts:
	include/net/cfg80211.h
2012-08-21 14:14:24 +08:00
黄涛
109b0ba094 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
Conflicts:
	Makefile
	drivers/net/tun.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/usb/core/hub.c
	sound/soc/codecs/wm8994.c
2012-08-21 13:11:48 +08:00
wlf
c8d3adfb02 RK2928 USB 2012-08-21 12:41:07 +08:00
黄涛
d7fb2169b6 Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0
Conflicts:
	arch/arm/mach-rk30/include/mach/rk30_camera.h
	arch/arm/plat-rk/include/plat/rk_camera.h
	drivers/gpio/gpio-tps65910.c
	drivers/media/video/rk30_camera_oneframe.c
	drivers/mmc/host/rk29_sdmmc.c
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c
	drivers/regulator/rk30-pwm-regulator.c
	drivers/usb/dwc_otg/dwc_otg_driver.c
	drivers/usb/dwc_otg/dwc_otg_hcd.c
	drivers/usb/dwc_otg/dwc_otg_pcd.c
	sound/soc/codecs/Makefile
	sound/soc/rk29/Kconfig
2012-08-17 21:48:20 +08:00
yangkai
92fcf2abad merge rk2928 usb 2012-08-17 16:20:17 +08:00
Mike Lockwood
16f1d42482 USB: gadget: f_audio_source: Fix compilation error
Change-Id: I1b785c47bda03208d396473a9d1c94631f5624d9
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-08-16 13:15:09 -07:00
Mike Lockwood
54c7c33ce2 USB: gadget: f_audio_source: Fix use after free in audio_unbind
When USB was disconnected, we were freeing our audio_dev struct in audio_unbind
before the audio system had cleaned up, resulting in a hang in audio_pcm_close.
We now statically allocate the audio_dev struct to avoid this problem.

Change-Id: I58ad21eaa20dcf4aa74ee614ef3b6ed2c91d52a1
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-08-16 12:52:33 -07:00
CMY
101aadaefe 3G: Support for more 3g devices 2012-08-16 19:20:03 +08:00
Theodore Ts'o
52d1114f46 usb: feed USB device information to the /dev/random driver
commit b04b3156a2 upstream.

Send the USB device's serial, product, and manufacturer strings to the
/dev/random driver to help seed its pools.

Cc: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: Greg KH <greg@kroah.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-15 12:04:12 -07:00
Colin Ian King
aeaab8a0fe USB: echi-dbgp: increase the controller wait time to come out of halt.
commit f96a4216e8 upstream.

The default 10 microsecond delay for the controller to come out of
halt in dbgp_ehci_startup is too short, so increase it to 1 millisecond.

This is based on emperical testing on various USB debug ports on
modern machines such as a Lenovo X220i and an Ivybridge development
platform that needed to wait ~450-950 microseconds.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-09 08:27:53 -07:00
Kevin Cernekee
f58f16f203 usb: gadget: Fix g_ether interface link status
commit 31bde1ceaa upstream.

A "usb0" interface that has never been connected to a host has an unknown
operstate, and therefore the IFF_RUNNING flag is (incorrectly) asserted
when queried by ifconfig, ifplugd, etc.  This is a result of calling
netif_carrier_off() too early in the probe function; it should be called
after register_netdev().

Similar problems have been fixed in many other drivers, e.g.:

    e826eafa6 (bonding: Call netif_carrier_off after register_netdevice)
    0d672e9f8 (drivers/net: Call netif_carrier_off at the end of the probe)
    6a3c869a6 (cxgb4: fix reported state of interfaces without link)

Fix is to move netif_carrier_off() to the end of the function.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-09 08:27:35 -07:00
Hans de Goede
a0f7a5ac6e usbdevfs: Correct amount of data copied to user in processcompl_compat
commit 2102e06a5f upstream.

iso data buffers may have holes in them if some packets were short, so for
iso urbs we should always copy the entire buffer, just like the regular
processcompl does.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-09 08:27:35 -07:00
Mike Lockwood
2fa1f1c9b5 USB: gadget: f_audio_source: Fix error handling and increase packet size
Fixes watchdog reset on USB disconnect
Larger packet size fixes performance in fullspeed mode

Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-08-02 15:23:27 -07:00
yangkai
6519f4a136 update for rk29 config switch 2012-08-02 11:24:17 +08:00
ywj
3b8800fc34 factory develop for usb 2012-08-01 14:30:08 +08:00
yangkai
cdfde8c375 usb code modify 2012-07-31 17:51:05 +08:00
yangkai
740949e306 pcd disconnect with phy suspend 2012-07-31 16:58:23 +08:00
wlf
de3f7c318e RK2928 usb pcd modified 2012-07-31 10:40:48 +08:00
wlf
07dd9223d9 RK2928 usb hcd modified 2012-07-30 11:28:35 +08:00
黄涛
a6ea2fea1e Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb 2012-07-24 12:02:49 +08:00
yangkai
df6862b91e usb transfer speed up 2012-07-23 18:07:50 +08:00
yangkai
1110b79123 fix pcd connect and disconnect bug 2012-07-23 17:39:01 +08:00
黄涛
4444b98b85 Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb 2012-07-20 10:42:06 +08:00
赵子初
b388cab1a5 phonepad:add usiserial.c for usi modem 2012-07-19 17:21:31 +08:00
黄涛
f30ecbfd21 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
Conflicts:
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/rtl818x/rtl8187/leds.c
2012-07-18 11:12:45 +08:00
黄涛
728ae3fd2c Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb 2012-07-18 10:14:33 +08:00
赵子初
a7ebd62b93 phonepad:fix 3g driver 2012-07-17 16:36:24 +08:00
Sarah Sharp
671e3aaf0c xhci: Avoid dead ports when CONFIG_USB_XHCI_HCD=n
Commit 51c9e6c773 upstream, but modified
to get this to apply on 3.0.

If the user chooses to say "no" to CONFIG_USB_XHCI_HCD on a system
with an Intel Panther Point chipset, the PCI quirks code or the EHCI
driver will switch the ports over to the xHCI host, but the xHCI driver
will never load.  The ports will be powered off and seem "dead" to the
user.

Fix this by only switching the ports over if CONFIG_USB_XHCI_HCD is
either compiled in, or compiled as a module.

This patch should be backported to the 3.0 stable kernel, since it
contains the commit 69e848c209 "Intel
xhci: Support EHCI/xHCI port switching."

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Reported-by: Eric Anholt <eric.anholt@intel.com>
Reported-by: David Bein <d.bein@f5.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-07-16 08:47:50 -07:00