summaryrefslogtreecommitdiff
path: root/drivers/usb
AgeCommit message (Collapse)Author
2019-02-06tegra-xusb: fix module compilationDominik Sliwa
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
2018-11-29xhci-tegra: fix compiler warningsRolf Eike Beer
Signed-off-by: Rolf Eike Beer <eb@emlix.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-11-29Merge tag 'tegra-l4t-r21.6' into toradex_tk1_l4t_r21.6Marcel Ziswiler
Merge NVIDIA's latest Linux for Tegra aka L4T R21.6 Linux kernel changes from git://nv-tegra.nvidia.com/linux-3.10.git commit: b271e8fa67a6d9c4600274a25636cfe00fdd1b68 Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com>
2017-09-20tegra_udc.c: fix compilation with gcc 7Max Krummenacher
With gcc 7 the following compile time error occurs: | .../drivers/usb/gadget/tegra_udc.c:2565:17: error: 'out' directive writing 3 bytes into a region of size between 2 and 11 [-Werror=format-overflow=] | sprintf(name, "ep%dout", i); | ^~~~~~~~~ | .../drivers/usb/gadget/tegra_udc.c:2565:3: note: 'sprintf' output between 7 and 16 bytes into a destination of size 14 | sprintf(name, "ep%dout", i); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ The last end point will never be greater than 32 but the compiler can not find this out from the code. Work around this by passing a format specifier to interpreat i as a signed char. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2016-08-18usb: gadget: tegra: Fix short packet issuePeter Chiang
Fix Tranaction Error due to short packet with ISO mult-transaction. Set new value in Override Mult field to support short packet Bug 1745903 Change-Id: I7409ba8943c2490afe714a0da9f7c05a63c949b4 Signed-off-by: Peter Chiang <pchiang@nvidia.com> Reviewed-on: http://git-master/r/1175184 GVS: Gerrit_Virtual_Submit Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
2015-10-14usb: gadget: composite: Fix cdev null after rmmodPeter Chiang
Avoid to disconnect gadget again after unbinding bug 200141741 Change-Id: I6fadcb4c5b5262d861a865f24ba2d8666e126923 Signed-off-by: Peter Chiang <pchiang@nvidia.com> Reviewed-on: http://git-master/r/805175 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bibek Basu <bbasu@nvidia.com> Reviewed-by: Hui Fu <hfu@nvidia.com> Reviewed-by: Ashutosh Jha <ajha@nvidia.com>
2015-06-04xhci: tegra: run firmware log thread only if needJC Kuo
Driver doesn't need to run a kernel thread to collect firmware log if release build firmware is loaded. Only debug build firmware is capable of generating logs. This commit checks firmware CFGTBL to know whether a firmware generates logs or not. bug 1487603 Change-Id: I8b147710dae58332d68625fedd3173e2d2f6074b Signed-off-by: JC Kuo <jckuo@nvidia.com> Reviewed-on: http://git-master/r/663769 (cherry picked from commit bc339c3a63ea18fbbe568c99e33d06d637ad1f71) Reviewed-on: http://git-master/r/744725 GVS: Gerrit_Virtual_Submit Tested-by: Mark Kuo <mkuo@nvidia.com> Reviewed-by: WK Tsai <wtsai@nvidia.com> Reviewed-by: Bibek Basu <bbasu@nvidia.com> Reviewed-by: Matthew Pedro <mapedro@nvidia.com> Reviewed-by: Ashutosh Jha <ajha@nvidia.com>
2015-05-26xhci: tegra: load fw from filesystem earlierBibek Basu
Loading firmware from filesystem takes much time. Enabing vbus regualtor before loading firmware will cause the time gap between vbus ON and host controller ready too large. So, we move the time of firmware loading earlier. Bug 200067006 Change-Id: I63ecbd9e65f3bb56db564f72cc417fc4f76adbc3 Signed-off-by: Henry Lin <henryl@nvidia.com> Signed-off-by: Bibek Basu <bbasu@nvidia.com> Reviewed-on: http://git-master/r/736193 (cherry picked from commit 6875a1752b3ed4e121efcc3fddca0810ffd22546) Reviewed-on: http://git-master/r/746074 GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2015-05-19usb: xhci: tegra: fix compilation with lockdep enabledAlban Bedel
The sysfs_attr_init() macro expects a pointer to a struct attribute as argument and not a pointer to a struct device_attribute. This was bulding with lockdep disabled because in this case the sysfs_attr_init() macro does nothing. Bug 1618089 Change-Id: I6225c5c26beccae3848d8d5360a0efabcba60ce5 Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de> Signed-off-by: Bibek Basu <bbasu@nvidia.com> Reviewed-on: http://git-master/r/741614 GVS: Gerrit_Virtual_Submit Reviewed-by: Matthew Pedro <mapedro@nvidia.com> Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2015-05-14usb: phy: tegra: set UTMIP_PCOUNT_UPDN_DIV to zeroRakesh Babu Bodla
Set UTMIP_PCOUNT_UPDN_DIV to zero to address hosts having jitter issues. Bug 200085253 Bug 200100469 Change-Id: I3f0202b74dbbbd697d52c386626112714f26834f Signed-off-by: Rakesh Babu Bodla <rbodla@nvidia.com> Reviewed-on: http://git-master/r/736178 (cherry picked from commit 6d1f2be772751ebb0fb07dce2fc6992467c19eab) Reviewed-on: http://git-master/r/740972 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Bibek Basu <bbasu@nvidia.com> Tested-by: Bibek Basu <bbasu@nvidia.com> Reviewed-by: Matthew Pedro <mapedro@nvidia.com> Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2015-04-06xhci: Silence "xHCI xhci_drop_endpoint called with disabled ep ..." messagesHans de Goede
When re-applying the configuration after a successful usb device reset, xhci_discover_or_reset_device has already dropped the endpoints, and free-ed the rings. The endpoints already being dropped is expected, and should not lead to warnings. Use the fact that the rings are also free-ed in this scenario to detect this, and suppress the "xHCI xhci_drop_endpoint called with disabled ep ..." message in this case. Bug 200040915 Signed-off-by: Hans de Goede <hdegoede@redhat.com> -- Changes in v2: Move the ring check to only guard the xhci_warn, so as to avoid side-effects in case we have a scenario where the rings are free-ed, but the endpoint is not yet dropped. Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Change-Id: I94392cf985208f96c7102e5115268c3460338a46 Signed-off-by: Petlozu Pravareshwar <petlozup@nvidia.com> Reviewed-on: http://git-master/r/721398 Reviewed-by: Krishna Yarlagadda <kyarlagadda@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2015-04-06usb: xhci: tegra: fix wake from LP1Joy Wang
We have VDD_CORE on when LP1. xusb use padctl interrupt to wake from LP1. Keep interrupt enabled when system suspend. Bug 1583860 Bug 200081242 Change-Id: I276594d69a051ea84034c32015589a6574ded7f1 Signed-off-by: Joy Wang <joyw@nvidia.com> Reviewed-on: http://git-master/r/658281 (cherry picked from commit 0031edc18b385eb5dc67eb419f2c50aa5f0a15a2) Signed-off-by: Petlozu Pravareshwar <petlozup@nvidia.com> Reviewed-on: http://git-master/r/726127 Reviewed-by: Ajay Gupta <ajayg@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Krishna Yarlagadda <kyarlagadda@nvidia.com> Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2014-09-16usb: xhci: tegra: remove PCIe dependencyHaribabu Narayanan
PCIe powergating dependency is now handled internally in the powergating module for t12x/t13x. This patch removes PCIe related powergating calls from XHCI driver for tegra. Bug 1451279 Bug 1524744 Bug 200027067 Change-Id: I0752cd745f218266e1636cc7c40a6c29dee3b3d4 Reviewed-on: http://git-master/r/424036 (cherry picked from commit 91e2bd6728ca1969615081c70be6b2f21acd43d5) Signed-off-by: Vidya Sagar <vidyas@nvidia.com> Reviewed-on: http://git-master/r/498662 Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
2014-09-16usb: xhci: tegra: remove conditional powergatingHaribabu Narayanan
The powergate module now maintains reference count for PCIE. Remove conditional checks in XHCI driver before invoking powergating APIs. Bug 1451279 Bug 1455032 Bug 200027067 Change-Id: I186270dc86fba78a8c321ba5923382e642b14b60 Reviewed-on: http://git-master/r/418061 (cherry picked from commit b0f746945fccf025e2ab1764c0cc35eb1bc780b3) Signed-off-by: Vidya Sagar <vidyas@nvidia.com> Reviewed-on: http://git-master/r/498660 Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
2014-08-13usb: phy: tegra: increase the timeout for phy clkPreetham Chandru R
Increase the timeout for phy clk to stabilize Bug 1485579 Signed-off-by: Preetham Chandru R <pchandru@nvidia.com> Change-Id: Ic73436dd5b74f327707b0c36ef0323d6decd9c67 Reviewed-on: http://git-master/r/408597 (cherry picked from commit 921b5ba58fc4e9427824d16bd3648055ca11b37c) Reviewed-on: http://git-master/r/455528 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty <vmoganty@nvidia.com> Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
2014-08-12usb: gadget: mtp : Handle ioctl MTP_SEND_EVENT_32Rohith Seelaboyina
MTP_SEND_EVENT_32 is defined for 64bit kernel. This changes properly fixes handling of 32-64 bit ioctl call for mtp_send_event. Bug 200016543 Change-Id: Ife559ecb31d10fdfe17d34c8a132cbaf04b09082 Signed-off-by: Rohith Seelaboyina <rseelaboyina@nvidia.com> Reviewed-on: http://git-master/r/450869 (cherry picked from commit baf0ecf975bafbe3031b81e3c1899e011c8e0a21) Reviewed-on: http://git-master/r/454868 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2014-07-10usb: gadget: tegra: handle the case when host rebootsRakesh Bodla
Some hosts during booting first supply vbus and then send setup packets after x seconds. In this case we detect as non-standard. Handle this case by setting to SDP. Also adding condition to avoid unnecessary icon notifications. Bug 200017121 Change-Id: I1f0d9a2e2725a0cd3a4324f5208764ee2e4978cf Signed-off-by: Rakesh Bodla <rbodla@nvidia.com> Reviewed-on: http://git-master/r/433179 (cherry picked from commit 1073c32cebc1314e4d3be7967d707a743ded05ea) Reviewed-on: http://git-master/r/436033 Reviewed-by: Venkat Moganty <vmoganty@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
2014-07-10usb: phy: tegra: QC2 speed up charger recogniionPhilip Rakity
The QC2 Wall Charger needs to be reset only when we boot or reboot the system. This is because the wall charger will have already defaulted to a DCP. Since the internal logic in the Wall Charger will not see D+/D- programmed during the time available. If we just plug in the charger then it will be recognised in time so no reset is necessary. Removes 1.5s of delay. bug 1424733 Reviewed-on: http://git-master/r/433790 (cherry picked from commit b1a51cad99e8ec7e309aa33a786bdc41bc61f6db) Change-Id: I2b6f698e75f29163e9de4dac3f1b2ef1fb0ec6cc Signed-off-by: Philip Rakity <prakity@nvidia.com> Reviewed-on: http://git-master/r/435646 GVS: Gerrit_Virtual_Submit Reviewed-by: Rakesh Babu Bodla <rbodla@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
2014-07-07USB: phy: tegra: replace mdelay with usleep_rangeSuresh Mangipudi
Avoid busy waiting by using usleep_range(). Change-Id: If11f137d5bc1a67e37e232996cac559b7b154545 Signed-off-by: Suresh Mangipudi <smangipudi@nvidia.com> Reviewed-on: http://git-master/r/432645 (cherry picked from commit 067e4086801c0805846969b8473999afe7b7dd03) Reviewed-on: http://git-master/r/434624 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty <vmoganty@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
2014-06-23USB: gadget: f_audio_source: change packet size to 256Ravindra Lokhande
Bug 1327528 Change-Id: Idc243389486ab9121826787ae85475458fa18506 Signed-off-by: Ravindra Lokhande <rlokhande@nvidia.com> Reviewed-on: http://git-master/r/351034 (cherry picked from commit 038389830a31bb00dc4851922e08caa617af8a80) Reviewed-on: http://git-master/r/426590 GVS: Gerrit_Virtual_Submit Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
2014-06-23tn8: modem: reduce timeout wakelock to 1sRobert Shih
1. The kernel resume (from LP0 to the time when app tasks start unfreezing) is shorter than 200ms. When app tasks start running, the RIL/framework/app will hold their wake lock to block suspending. Furthermore, tegra_usb_modem_post_remote_wakeup() in tegra_usb_modem_power.c will hold another timeout (1 second) wake lock, which should start later than the wake lock "tegra-ehci.1". So, 1s timeout for wake lock "tegra-ehci.1" in kernel should be enough. 2. Per our experience, many system resume/suspend (with screen off) caused by remote wake-up is able to finish in 1.5 seconds, or even shorter. So, 3 seconds timeout could cause more unnecessary power consumption. bug 1519797 Change-Id: If7b20ea490007e1df0639b4ece8f32fdb3fa757e Signed-off-by: Robert Shih <rshih@nvidia.com> Reviewed-on: http://git-master/r/419279 (cherry picked from commit 3ee5cc88a7db04b2087937e8ddb27f69ab934544) Reviewed-on: http://git-master/r/423626 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Martin Chi <mchi@nvidia.com> Tested-by: Martin Chi <mchi@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2014-06-23usb: free up composite gadget string ids on unbindRakesh Bodla
There are only 254 USB composite gadget string_ids available. When switching gadget mode such as mtp and acm repeatedly, they will be exhausted. This bug has been brought up since android composite driver introduced a way to switch gadget modes while the composite driver is still holding its bind. Fix this by reset next_string_id and clean up gstrings when android gadgets are disabled. Also by removing the condition comparing gadgets' string id to 0 because gadget string id has to be re-assigned whenever the string count is reset. The codes removed the condition check will work as the same as before they have changed if the gadgets are used by other composite drivers other than android since all of them call bind only once and never unbind it hence no side effects considered. Ported from https://android-review.googlesource.com/#/c/95366/ Bug 200001941 Change-Id: I1e2fbe0f59fe05b89052db62e0b61b074d8f032b Signed-off-by: Rakesh Bodla <rbodla@nvidia.com> Reviewed-on: http://git-master/r/425165 (cherry picked from commit fc71534a90787bd763b7bd0f7c698b76b66ad251) Reviewed-on: http://git-master/r/419340 Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2014-06-18usb: gadget: tegra: reset extcon state in cable disconnectRakesh Bodla
For QC2.0 charger we set two cable types. Resetting the extcon state during cable disconnect so that all the cables types are cleared. Bug 200011709 Change-Id: I3e5bf896869045f5eefb68723411abbc864ae76d Signed-off-by: Rakesh Bodla <rbodla@nvidia.com> Reviewed-on: http://git-master/r/422715 (cherry picked from commit b546521e81a106c1aea35d3198fc135b67e64913) Reviewed-on: http://git-master/r/423473 GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2014-06-10Merge commit 'refs/changes/82/419382/1' of ssh://git-master:12001/linux-3.10 ↵Mandar padmawar
into promotion_build Change-Id: I9418a05ad5c56b2e902249218bac2fa594d99f56
2014-06-09usb: hsic: add delay during hsic phy resumeMartin Chi
25ms delay is added to make sure the resume signalling to be driven during remote wake-up on the USB lines for a minimum period of 25ms 10ms delay is added to stabilize the HSIC bus bug 1451863 bug 1438066 Change-Id: If514bb0b31df54f1b219f2ebfc6a3ca5ea62e6a4 Signed-off-by: Martin Chi <mchi@nvidia.com> Reviewed-on: http://git-master/r/400932 (cherry picked from commit 0b28b90602d8cbcea8f3b3354524d443ab3d1872) Reviewed-on: http://git-master/r/420335 Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> GVS: Gerrit_Virtual_Submit
2014-06-09usb: phy: tegra: HSIC: Clear PD_TX during resumeBH Hsieh
During HSIC resume the PD_TX circuit is to be turned on before clearing MASTER_ENABLE of PMC. Bug 1496758 Change-Id: I1127dfc0fc0e3b8dfb63bafa2291483186e06093 Signed-off-by: BH Hsieh <bhsieh@nvidia.com> Reviewed-on: http://git-master/r/395683 (cherry picked from commit I1127dfc0fc0e3b8dfb63bafa2291483186e06093) Reviewed-on: http://git-master/r/420336 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Martin Chi <mchi@nvidia.com> Tested-by: Martin Chi <mchi@nvidia.com> Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
2014-06-06usb: otg: tegra: Add extcon device for y-cableRakesh Bodla
Add extcon device to notify presence of Y cable connection. Bug 200004368 Bug 1456628 Change-Id: I6b169167c37e34b072970e38c275aa22ad63b35c Signed-off-by: Rakesh Bodla <rbodla@nvidia.com> Reviewed-on: http://git-master/r/400098 (cherry picked from commit 2e8ba18d74dc3091390c9ee3f8c1f4c196935412) Reviewed-on: http://git-master/r/418863 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2014-06-05usb:hsic: disable PMC master control in usb resumeMartin Chi
disable pmc remote wake-up detection in usb resume to prevent the pmc remote wake-up during usb auto-resume, otherwise, the concurrent resume may cause hsic bus entering unexpected state and cause 'XactErr' errs. bug 1476774 Change-Id: I0f1165a1d9316a229c756e75cb905ba6fff88cda Signed-off-by: Martin Chi <mchi@nvidia.com> Reviewed-on: http://git-master/r/400933 (cherry picked from commit 19acbead48a7ff4e322ec249d9c37295ca347775) Reviewed-on: http://git-master/r/419226 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
2014-06-05usb: ehci: Tegra: add echi wake lockMartin Chi
For now, only apply it in tegra_ehci_irq when it's triggered by remote wake-up irq, since, without wake lock hold here, device may continue the suspend if remote wake-up comes in suspending. bug 1402295 Change-Id: I49223c0fb80fd793e8886688a96e66101405fdd6 Signed-off-by: Martin Chi <mchi@nvidia.com> Reviewed-on: http://git-master/r/359426 Reviewed-on: http://git-master/r/385478 (cherry picked from commit a06d6d9eb47428e8a7be09c988fe83cff260acd0) Reviewed-on: http://git-master/r/419225 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
2014-06-05Merge branch 'linux-3.10.40' into rel-21Ishan Mittal
Bug 200004122 Conflicts: drivers/cpufreq/cpufreq.c drivers/regulator/core.c sound/soc/codecs/max98090.c Change-Id: I9418a05ad5c56b2e902249218bac2fa594d99f56 Signed-off-by: Ishan Mittal <imittal@nvidia.com>
2014-06-04usb: gadget: tegra: fix usb cable extcon updateRakesh Bodla
USB cable status now properly updated to extcon framework, with which charging icon will be updated properly. Bug 1458999 Bug 200002489 Bug 1503711 Change-Id: If509e05e1b0ffd6e1fb34e58b9c01b7345751653 Signed-off-by: Rakesh Bodla <rbodla@nvidia.com> Reviewed-on: http://git-master/r/412019 (cherry picked from commit 7c1a5e47f5ab792d9d722db32b5c60fc2957c8d9) Reviewed-on: http://git-master/r/417469 Reviewed-by: Mrutyunjay Sawant <msawant@nvidia.com> Tested-by: Mrutyunjay Sawant <msawant@nvidia.com>
2014-06-03usb: gadget: android: Maxim 14675 driver supportPhilip Rakity
add USB string to signal 12V max - 5V min charging bug 1321188 bug 1456402 (cherry picked from commit 43c6f013e6a7cc09c83d66956715386d2ff659e7) Change-Id: Ia13575a9da8f206b0b578c86854b9284b3a7f777 Reviewed-on: http://git-master/r/400492 Signed-off-by: Philip Rakity <prakity@nvidia.com> Reviewed-on: http://git-master/r/417037 GVS: Gerrit_Virtual_Submit Reviewed-by: Rakesh Babu Bodla <rbodla@nvidia.com> Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2014-06-03usb: gadget: tegra: Maxim 14675 driver supportPhilip Rakity
Support Maxim 14765 detection bug 1321188 bug 1456402 (cherry picked from commit a3bdc86bf2a5192d55a26375a9480f415ab9c7dd) Change-Id: I8802b4f35493c99f770f68bef797177268eb6300 Reviewed-on: http://git-master/r/400491 Signed-off-by: Philip Rakity <prakity@nvidia.com> Reviewed-on: http://git-master/r/417036 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Rakesh Babu Bodla <rbodla@nvidia.com> Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2014-06-03phy usb: add Maxim Fast Charger informationPhilip Rakity
Maxim 14675 charger support at the PHY layer Bug 1321188 Bug 1456402 (cherry picked from commit 2ab5c72ab40adfdc34d5334a4c2c4648ccdac42e) Change-Id: I31d672e82f9f3a4ccf5a8db75df8f7e12f30a63b Reviewed-on: http://git-master/r/400490 Signed-off-by: Philip Rakity <prakity@nvidia.com> Reviewed-on: http://git-master/r/417035 Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com> Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>
2014-05-29Merge commit 'refs/changes/16/411516/5' of ssh://git-master:12001/linux-3.10 ↵Mandar padmawar
into promotion_build
2014-05-29Merge branch 'android-3.10' into rel-21Ishan Mittal
Bug 200004122 Bug 1511804 This merge takes AOSP commits from android-3.10 branch Change-Id: I07ec2468114db0366d63777142c9572bbfadbc45 Signed-off-by: Ishan Mittal <imittal@nvidia.com>
2014-05-20usb: phy: tegra: Add usb_phy_reset for HSICBH Hsieh
usb_phy_reset was missing from uhsic_phy_ops hence USB_TXFILLTUNING kept incorrect value after ehci_reset then resulted in DataBufferErr on out endpoint Bug 200002033 Change-Id: Id8ac624174b5bdca740925092fff7c26481ef46e Signed-off-by: BH Hsieh <bhsieh@nvidia.com> Reviewed-on: http://git-master/r/406720 (cherry picked from commit f2884247f7557593c8b7fd4fa6a7fa5297c69b58) Reviewed-on: http://git-master/r/409973 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2014-05-19usb: gadget: tegra: Reset charger connect_typeRohith Seelaboyina
To update the charging icon quickly, initially connect_type is set to NON_STD and then QC2/DCP eventually. Because of this extcon is getting notified twice and to prevent this we need to reset the connect_type to none. Bug 200002489 Change-Id: I083e446288c7e3b540f3c721684b2b6d8353de1f Signed-off-by: Rohith Seelaboyina <rseelaboyina@nvidia.com> Reviewed-on: http://git-master/r/406438 (cherry picked from commit 52ef1336fdf8e5aa3c7c4062c960fd1d1e766038) Reviewed-on: http://git-master/r/409577 Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com> Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>
2014-05-19usb: gadget: tegra: Update extcon state properlyRohith Seelaboyina
If USB cable is disconnected when the device is in LP0, after resuming current limit is set to 0 and accordingly extcon state must be updated with which charger icon also gets updated. Bug 1502977 Change-Id: I171df607d3190191cf821a5b03f93d52cfa25e93 Signed-off-by: Rohith Seelaboyina <rseelaboyina@nvidia.com> Reviewed-on: http://git-master/r/406423 (cherry picked from commit 370c32eae5d11419bb48f6ce2f6d8a37a7d7b8b6) Reviewed-on: http://git-master/r/409576 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2014-05-14usb: gadget: add compat_ioctl handlerRakesh Bodla
Add compat_ioctl for accessory and fs to work on 64 bit platforms. Bug 1505458 Change-Id: Ic5fa65451fa6428d50de2307136a59b13bd691cb Signed-off-by: Rakesh Bodla <rbodla@nvidia.com> Reviewed-on: http://git-master/r/408014 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2014-05-12usb: gadget: tegra:cancel non-standard charger workRakesh Bodla
When there is series of gadget_connect and gadget_disconnect calls, non standard charger detection work is getting sheduled. This is being executed due to there is no time window observed to see setup packet.Fixing this by canceling the work appropriately. Bug 1477692 Change-Id: I3460675c0ccbd251e3c3be217792d5a2fd44f85d Signed-off-by: Rakesh Bodla <rbodla@nvidia.com> Reviewed-on: http://git-master/r/406351 GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2014-05-06usb: musb: avoid NULL pointer dereferenceFelipe Balbi
commit eee3f15d5f1f4f0c283dd4db67dc1b874a2852d1 upstream. instead of relying on the otg pointer, which can be NULL in certain cases, we can use the gadget and host pointers we already hold inside struct musb. Tested-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-06USB: pl2303: add ids for Hewlett-Packard HP POS pole displaysAaron Sanders
commit b16c02fbfb963fa2941b7517ebf1f8a21946775e upstream. Add device ids to pl2303 for the Hewlett-Packard HP POS pole displays: LD960: 03f0:0B39 LCM220: 03f0:3139 LCM960: 03f0:3239 [ Johan: fix indentation and sort PIDs numerically ] Signed-off-by: Aaron Sanders <aaron.sanders@hp.com> Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-06USB: unbind all interfaces before rebinding anyAlan Stern
commit 6aec044cc2f5670cf3b143c151c8be846499bd15 upstream. When a driver doesn't have pre_reset, post_reset, or reset_resume methods, the USB core unbinds that driver when its device undergoes a reset or a reset-resume, and then rebinds it afterward. The existing straightforward implementation can lead to problems, because each interface gets unbound and rebound before the next interface is handled. If a driver claims additional interfaces, the claim may fail because the old binding instance may still own the additional interface when the new instance tries to claim it. This patch fixes the problem by first unbinding all the interfaces that are marked (i.e., their needs_binding flag is set) and then rebinding all of them. The patch also makes the helper functions in driver.c a little more uniform and adjusts some out-of-date comments. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Reported-and-tested-by: "Poulain, Loic" <loic.poulain@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-06usb: phy: Add ulpi IDs for SMSC USB3320 and TI TUSB1210Michal Simek
commit ead5178bf442dbae4008ee54bf4f66a1f6a317c9 upstream. Add new ulpi IDs which are available on Xilinx Zynq boards. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-06usb: dwc3: fix wrong bit mask in dwc3_event_devtHuang Rui
commit 06f9b6e59661cee510b04513b13ea7927727d758 upstream. Around DWC USB3 2.30a release another bit has been added to the Device-Specific Event (DEVT) Event Information (EvtInfo) bitfield. Because of that, what used to be 8 bits long, has become 9 bits long. Per dwc3 2.30a+ spec in the Device-Specific Event (DEVT), the field of Event Information Bits(EvtInfo) uses [24:16] bits, and it has 9 bits not 8 bits. And the following reserved field uses [31:25] bits not [31:24] bits, and it has 7 bits. So in dwc3_event_devt, the bit mask should be: event_info [24:16] 9 bits reserved31_25 [31:25] 7 bits This patch makes sure that newer core releases will work fine with Linux and that we will decode the event information properly on new core releases. [ balbi@ti.com : improve commit log a bit ] Signed-off-by: Huang Rui <ray.huang@amd.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-06usb/xhci: fix compilation warning when !CONFIG_PCI && !CONFIG_PMDavid Cohen
commit 01bb59ebffdec314da8da66266edf29529372f9b upstream. When CONFIG_PCI and CONFIG_PM are not selected, xhci.c gets this warning: drivers/usb/host/xhci.c:409:13: warning: ‘xhci_msix_sync_irqs’ defined but not used [-Wunused-function] Instead of creating nested #ifdefs, this patch fixes it by defining the xHCI PCI stubs as inline. This warning has been in since 3.2 kernel and was caused by commit 421aa841a134f6a743111cf44d0c6d3b45e3cf8c "usb/xhci: hide MSI code behind PCI bars", but wasn't noticed until 3.13 when a configuration with these options was tried Signed-off-by: David Cohen <david.a.cohen@linux.intel.com> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-06xhci: extend quirk for Renesas cardsIgor Gnatenko
commit 6db249ebefc6bf5c39f35dfaacc046d8ad3ffd70 upstream. After suspend another Renesas PCI-X USB 3.0 card doesn't work. [root@fedora-20 ~]# lspci -vmnnd 1912: Device: 03:00.0 Class: USB controller [0c03] Vendor: Renesas Technology Corp. [1912] Device: uPD720202 USB 3.0 Host Controller [0015] SVendor: Renesas Technology Corp. [1912] SDevice: uPD720202 USB 3.0 Host Controller [0015] Rev: 02 ProgIf: 30 This patch should be applied to stable kernel 3.14 that contain the commit 1aa9578c1a9450fb21501c4f549f5b1edb557e6d "xhci: Fix resume issues on Renesas chips in Samsung laptops" Reported-and-tested-by: Anatoly Kharchenko <rfr-bugs@yandex.ru> Reference: http://redmine.russianfedora.pro/issues/1315 Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-06xhci: Prevent runtime pm from autosuspending during initializationMathias Nyman
commit bcffae7708eb8352f44dc510b326541fe43a02a4 upstream. xHCI driver has its own pci probe function that will call usb_hcd_pci_probe to register its usb-2 bus, and then continue to manually register the usb-3 bus. usb_hcd_pci_probe does a pm_runtime_put_noidle at the end and might thus trigger a runtime suspend before the usb-3 bus is ready. Prevent the runtime suspend by increasing the usage count in the beginning of xhci_pci_probe, and decrease it once the usb-3 bus is ready. xhci-platform driver is not using usb_hcd_pci_probe to set up busses and should not need to have it's usage count increased during probe. Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Acked-by: Dan Williams <dan.j.williams@intel.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-06usb: gadget: zero: Fix SuperSpeed enumeration for alternate setting 1Roger Quadros
commit 9c1b70361e0b38e4acb8e62b54da66538cb77ff2 upstream. It was impossible to enumerate on a SuperSpeed (XHCI) host with alternate setting = 1 due to the wrongly set 'bMaxBurst' field in the SuperSpeed Endpoint Companion descriptor. Testcase: <host> modprobe -r usbtest; modprobe usbtest alt=1 <device> modprobe g_zero plug device to SuperSpeed port on the host. Without this patch the host always complains like so "usb 12-2: Not enough bandwidth for new device state. usb 12-2: Not enough bandwidth for altsetting 1" Bug was introduced by commit cf9a08ae in v3.9 Fixes: cf9a08ae5aec (usb: gadget: convert source sink and loopback to new function interface) Reviewed-by: Felipe Balbi <balbi@ti.com> Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>