summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-02-09USB: ftdi_sio: Add more identifiersAlan Cox
commit 2353f806c97020d4c7709f15eebb49b591f7306d upstream. 0x04d8, 0x000a: Hornby Elite Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I0cdcd93865fe4ce86bb5fa5e18c585a64b0edb78 Reviewed-on: http://git-master/r/79670 Reviewed-by: Automatic_Commit_Validation_User
2012-02-09USB: serial: ftdi additional IDsPeter Naulls
commit fc216ec363f4d174932df90bbf35c77d0540e561 upstream. I tested this against 2.6.39 in the Ubuntu kernel, however I see the IDs are not in latest 3.2 git. This adds IDs for the FTDI controller in the Rainforest Automation Zigbee dongle. Signed-off-by: Peter Naulls <peter@chocky.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I27ff506978bf3387a2571e5146b3c181eed95bf0 Reviewed-on: http://git-master/r/79669 Reviewed-by: Automatic_Commit_Validation_User
2012-02-09USB: ftdi_sio: add PID for TI XDS100v2 / BeagleBone A3Peter Korsgaard
commit 55f13aeae0346f0c89bfface91ad9a97653dc433 upstream. Port A for JTAG, port B for serial. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I4ce3e7aa2d117dde3840f3da1adb21caee413e03 Reviewed-on: http://git-master/r/79668 Reviewed-by: Automatic_Commit_Validation_User
2012-02-09USB: ftdi_sio: fix initial baud rateJohan Hovold
commit 108e02b12921078a59dcacd048079ece48a4a983 upstream. Fix regression introduced by commit b1ffb4c851f1 ("USB: Fix Corruption issue in USB ftdi driver ftdi_sio.c") which caused the termios settings to no longer be initialised at open. Consequently it was no longer possible to set the port to the default speed of 9600 baud without first changing to another baud rate and back again. Reported-by: Roland Ramthun <mail@roland-ramthun.de> Signed-off-by: Johan Hovold <jhovold@gmail.com> Tested-by: Roland Ramthun <mail@roland-ramthun.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: Ic092fe37a53c546aceb7e1b3cd8bd44cd8b8369b Reviewed-on: http://git-master/r/79667 Reviewed-by: Automatic_Commit_Validation_User
2012-02-09USB: ftdi_sio: fix TIOCSSERIAL baud_base handlingJohan Hovold
commit eb833a9e0972f60beb4ab8104ad7ef6bf30f02fc upstream. Return EINVAL if new baud_base does not match the current one. The baud_base is device specific and can not be changed. This restores the old (pre-2005) behaviour which was changed due to a misunderstanding regarding this fact (see https://lkml.org/lkml/2005/1/20/84). Reported-by: Torbjörn Lofterud <torbjorn@pi.nxs.se> Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I672bd484e4c55708f0e97c83037c5acbc7b9e7c7 Reviewed-on: http://git-master/r/79666 Reviewed-by: Automatic_Commit_Validation_User
2012-02-09USB: option: Add LG docomo L-02CKentaro Matsuyama
commit e423d7401fd0717cb56a6cf51dd8341cc3e800d2 upstream. Add vendor and product ID for USB 3G/LTE modem of docomo L-02C Signed-off-by: Kentaro Matsuyama <kentaro.matsuyama@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I265980e25c6db426f3b88339d68b09e02dc86226 Reviewed-on: http://git-master/r/79665 Reviewed-by: Automatic_Commit_Validation_User
2012-02-09ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guardsWill Deacon
commit 612539e81f655f6ac73c7af1da8701c1ee618aee upstream. On v7, we use the same cache maintenance instructions for data lines as for unified lines. This was not the case for v6, where HARVARD_CACHE was defined to indicate the L1 cache topology. This patch removes the erroneous compile-time check for HARVARD_CACHE in proc-v7.S, ensuring that we perform I-side invalidation at boot. Reported-and-Acked-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Catalin Marinas <Catalin.Marinas@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I9a44ed525f4f702f9fac2965828608d9f1865633 Reviewed-on: http://git-master/r/79664 Reviewed-by: Automatic_Commit_Validation_User
2012-02-09drm/i915/sdvo: always set positive sync polarityPaulo Zanoni
commit ba68e086223a5f149f37bf8692c8cdbf1b0ba3ef upstream. This is a revert of 81a14b46846fea0741902e8d8dfcc6c6c78154c8. We already set the mode polarity using the SDVO commands with struct intel_sdvo_dtd. We have at least 3 bugs that get fixed with this patch. The documentation, despite not clear, can also be interpreted in a way that suggests this patch is needed. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=15766 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42174 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43333 Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: If7b6ecb7fe43fa8611a8ea7f4260f9d3d378284c Reviewed-on: http://git-master/r/79663 Reviewed-by: Automatic_Commit_Validation_User
2012-02-09commit b3a81520bd37a28f77cb0f7002086fb14061824d upstream.Takashi Iwai
The very same problem is seen on Haier W18 laptop with ALC861 as seen on ASUS A6Rp, which was fixed by the commit 3b25eb69. Now we just need to add a new SSID entry pointing to the same fixup. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=42656 Change-Id: I3aa7e2b665fd04d3ffccee77d91798dd082a84e1 Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/79662 Reviewed-by: Automatic_Commit_Validation_User
2012-02-09commit 3b25eb690e8c7424eecffe1458c02b87b32aa001 upstream.Takashi Iwai
The refactoring of Realtek codec driver in 3.2 kernel caused a regression for ASUS A6Rp laptop; it doesn't give any output. The reason was that this machine has a secret master mute (or EAPD) control via NID 0x0f VREF. Setting VREF50 on this node makes the sound working again. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=42588 Change-Id: I62fd76bc3d3bc6321da52341531d32dbd1292edd Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/79661 Reviewed-by: Automatic_Commit_Validation_User
2012-02-09tegra: watchdog: add enable/disable ioctlXin Xie
Signed-off-by: Xin Xie <xxie@nvidia.com> Reviewed-on: http://git-master/r/70702 (cherry picked from commit 50992cf718c37882d90e2b781fbe3f01b4997df8) Reviewed-on: http://git-master/r/77928 (cherry picked from commit a51315ad482758e53a75096be0415ca9b49b9483) Change-Id: I22389cfc7010937dc60c5b1aa4b59c4992f9906b Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/80003 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09cpufreq: properly clamp QoS min/maxDonghan Ryu
typically PM QoS clients request the maximum cpu frequency by setting cpu_freq_min to INT_MAX. Therefore, we need to clamp INT_MAX to whatever the maximum frequency allowed by the policy to make the requested cpu_freq_min is same as the maximum allowed cpu frequency. Inverse logic applies to the cpu_freq_max as well. Bug 932477 Signed-off-by: Donghan Ryu <dryu@nvidia.com> Reviewed-on: http://git-master/r/78401 (cherry picked from commit 9688430a621515f3afe3e0ab358ea7ad5aab6d91) Change-Id: Ie5edcd4a873ed5cce45ec0f9b981f28db6091ff1 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/80002 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09ARM: tegra: pinmux: Correct the offset of padcfg reg.Harry Hong
Changed the offset of each controls in pad control register based on tegra_soc_drive_pingroups array instead of fixed offset when printing debug info of pinmux drive settings. bug 929985 Signed-off-by: Harry Hong <hhong@nvidia.com> Reviewed-on: http://git-master/r/77978 (cherry picked from commit 4a106e10b664837bf8652a7afe49788f5bb07582) Change-Id: I387b095d09582efdcdc4c374e5fc984a0f3ac2b8 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/80001 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09ARM: tegra: dvfs: Expand Tegra3 cpu dvfs tablesAlex Frid
Expand Tegra3 cpu dvfs tables to add characterization results for 800mV VDD_CPU. Bug 817679 Bug 841336 Signed-off-by: Alex Frid <afrid@nvidia.com> Reviewed-on: http://git-master/r/77936 (cherry picked from commit f5b488019895c83e05ded8a8912cf3eb4eea5686) Change-Id: Id7e5a46c96c67ca80f552b742cf3cf341bb8e1f0 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/80000 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09tegra: watchdog: improve Kconfig descriptionXin Xie
Signed-off-by: Xin Xie <xxie@nvidia.com> Reviewed-on: http://git-master/r/70625 (cherry picked from commit 90add398c43bb111903015bb6a3cd57a8d62262f) Reviewed-on: http://git-master/r/77926 (cherry picked from commit 4a781c10f2b302f3b467b69060028f9c3b2f9774) Change-Id: Ia2b4935896a44d1717e20693e26a244c6f556c98 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79999 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09security: trusted foundations: fix coarse_page_table_array initChris Johnson
On the first allocation of a coarse page array, explicitly set the ref_count to 1, rather than incrementing (as the allocator used may not guarantee a zero initted struct). Bug 928289 Signed-off-by: Chris Johnson <cwj@nvidia.com> Reviewed-on: http://git-master/r/77514 (cherry picked from commit 7329d105883f8b5db87a45085cf6c47c234c4126) Change-Id: Ic33eecfaf0620340dd430dfa43793fbf0bd8ad8f Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79998 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09video: tegra: dc: set mode on probeJon Mayo
Set all parameters of the video mode on probe so that FBIOGET_VSCREENINFO can query the current mode. Bug 931383 Signed-off-by: Jon Mayo <jmayo@nvidia.com> Reviewed-on: http://git-master/r/77433 (cherry picked from commit cb97eadc17a204fc8051fe5b9321a27905f890bb) Change-Id: Ibd7fc05b1203044cc616c1ee628873385643c909 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79997 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Jon Mayo <jmayo@nvidia.com>
2012-02-09arm: tegra: Reduce coresite clock frequencyScottPeterson
Source coresite clock from clk_m and reduce its frequency to 1Mhz to reduce the power consumption on csite module. BUG 922351 Signed-off-by: ScottPeterson <speterson@nvidia.com> Reviewed-on: http://git-master/r/76287 (cherry picked from commit 80c11f4c789efea49b30b8731711aa4c20d7630c) Change-Id: If8a75924229c8d6aae4fd449eff6ae2e194a6e45 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79995 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Scott Peterson <speterson@nvidia.com>
2012-02-09arm: tegra: la: change default LA for 2DJon Mayo
Decrease the priority for 2D operations so they do not compete with display. Signed-off-by: Jon Mayo <jmayo@nvidia.com> Reviewed-on: http://git-master/r/76683 (cherry picked from commit 2094d7c0b435b8a22c81a4bc5d54d4a697518f3a) Change-Id: Id559a585a4826a370850c893fda21f47ab339019 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79994 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Jon Mayo <jmayo@nvidia.com>
2012-02-09tegra: i2c: do not flush fifo if msg length is 0Alexandre Courbot
Bug 915417 Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Reviewed-on: http://git-master/r/74134 (cherry picked from commit 37018b3493d2d3006e38eb7a2f81cf47b111e5ea) Change-Id: I1f8bda8be92f3861fabc51c362e677497e1cb44f Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79993 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09arch: arm: configs: Updated MODS LDK defconfigDinesh Israni
* Removed support for extra PMUs * Enabled HDA Support for Azalia * Disabled Wireless and some other netowrking support that is not required * Disabled support for various filesystems that are not required Reviewed-on: http://git-master/r/77680 (cherry picked from commit f1eb48e4be01e6148f01534f87348ff656e1b986) Change-Id: I5a7a97b52e8969ef95985c931334f6dba437f832 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79992 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09arm: tegra: kai: Panel fixes for A01 board.Rakesh Iyer
Modify panel GPIO for A01 board. Signed-off-by: Rakesh Iyer <riyer@nvidia.com> Reviewed-on: http://git-master/r/77610 (cherry picked from commit 4b45da8a3f35b81772d328d860bff20fe8a46927) Change-Id: I13c1bc000eb9642d0d44d787f6c4db08be5c42a7 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79991 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09ARM: tegra: iovmm: Use all capital letters for MACROHiroshi DOYU
Use all capital letters for MACRO Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com> Reviewed-on: http://git-master/r/66371 (cherry picked from commit 48100a354bf4ec447c1b0eefa968322894907bca) Change-Id: I3429b68bcc9228a4b74b50c95156f8df1c1c19a0 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79990 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09ARM: tegra: gart: Introduce GART_PAGE_SIZE macroHiroshi DOYU
A bit nicer for readibility. Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com> Reviewed-on: http://git-master/r/66362 (cherry picked from commit b8f0aad888dd6b72462a207520d3585951c065f9) Change-Id: I4e4fa5b32a06c8ffee6a9ad002ae0c93b1bf7e80 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79989 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09ARM: tegra: gart: Fix wrong initialization orderHiroshi DOYU
GART H/W should be enabled after a page table is initialized. Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com> Reviewed-on: http://git-master/r/66361 (cherry picked from commit 223c0ba1413aeb88742b8f9849a9967e4680f126) Change-Id: Iafc26560716273e3871a4555081f22b8bb51bc67 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79988 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09ARM: tegra: gart: Replace memory barrier with register read-backHiroshi DOYU
Any interaction between any block on PPSB and a block on APB or AHB must have these read-back to ensure the APB/AHB bus transaction is complete before initiating activity on the PPSB block. wmb() won't ensure the above transaction but only register read-back does. So now there's not much benefit ioremap_wc() + wmb() only for GART registers because the number of that access isn't so huge. Replaced memory barrier with register read-back, and also introduced gart_set_pte() for simplification of those register access. Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com> Reviewed-on: http://git-master/r/66358 (cherry picked from commit 4c68b93498ee4912e5f98ddb25d4511107d4d35a) Change-Id: I9e847624f7321bb36c1209340ff6e12b66f7e792 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79987 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09arm: tegra: pinmux changes for smb349 driverSyed Rafiuddin
This patch configures pinmux changes for smb349 charger driver which enables smb349 to respond to read/while while booted with battery. Signed-off-by: Syed Rafiuddin <srafiuddin@nvidia.com> Reviewed-on: http://git-master/r/78466 (cherry picked from commit 7330839fa790915202614ba45bead65bb7057993) Change-Id: Id0585ef9ae46706e8dcca900c7f319fb1488fa59 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79986 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09arm: tegra: kai: board specific changes for smb349Rakesh Iyer
Board specific changes for smb349 charger driver Signed-off-by: Syed Rafiuddin <srafiuddin@nvidia.com> Reviewed-on: http://git-master/r/78293 (cherry picked from commit 55e4ee17e13614996fc67a8bac8c019523df6294) Change-Id: Iaf34c3ee2d474d6a32509b71fb0df72c633df1e4 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79985 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09arm: config: tegra: enable smb349 driverSyed Rafiuddin
defconfig change to enable smb349 charger driver Signed-off-by: Syed Rafiuddin <srafiuddin@nvidia.com> Reviewed-on: http://git-master/r/78291 (cherry picked from commit add6b9791b0dca26f7034d12b7e72d8cdd3161ce) Change-Id: Id3ec77fbd3d7979f13ce269b9e269ead5515747a Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79984 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09arm: config: tegra: enable max17048 driverSyed Rafiuddin
defconfig change to enable max17048 driver Signed-off-by: Syed Rafiuddin <srafiuddin@nvidia.com> Reviewed-on: http://git-master/r/78288 (cherry picked from commit d3224bc1d960c38472cafbd1cd48d4d24236ca5c) Change-Id: I395bd3af953edd7f0e73161528e10afec0171b78 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79983 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09ARM: tegra: p1852: Add board support files for p1852Amlan Kundu
bug 871603 P1852 is a T30 based Automotive platform. Signed-off-by: Amlan Kundu <akundu@nvidia.com> Signed-off-by: Manoj Chourasia <mchourasia@nvidia.com> Reviewed-on: http://git-master/r/72253 (cherry picked from commit 98d50016e70a22ae7e8e109cfb6633a8fe75f905) Change-Id: Iede9881fc1168bb6802694e233554d84adfb8f44 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79981 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09power: smb349: smb349 charger driverSyed Rafiuddin
Smb349 battery charger driver for kai platform. Signed-off-by: Syed Rafiuddin <srafiuddin@nvidia.com> Reviewed-on: http://git-master/r/78211 (cherry picked from commit f059c9db2735a6e0088dd9cd61a623b13b5d717e) Change-Id: Ifa401713928d29bb4235353e50b66e632c7625ba Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79980 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09arm: tegra: cardhu/enterprise: Remove pinmux conflictsLaxman Dewangan
Remove the pinmux conflicts by moving the unused pins in reserved options. bug 920706 Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-on: http://git-master/r/78172 (cherry picked from commit fb30d2d39e39f2effb7ea39ea6d9ff16d55de99c) Change-Id: Ieea78535a58707dec9dc9dbe74c6ec25a40d2b26 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/79978 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-09rtc: tps6591x: Fixing month register program errorVenu Byravarasu
The month field of tm structure managed by kernel, expects a value between 0 to 11. However, TPS6591x RTC month register expects the month range to be between 1 to 12. Hence fixing it. Signed-off-by: Venu Byravarasu <vbyravarasu@nvidia.com> Change-Id: I054de10dcd58497167c8460fe935325cee3c582f Reviewed-on: http://git-master/r/79930 Tested-by: Venu Byravarasu <vbyravarasu@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
2012-02-09rtc: tps80031: Fixing month register program errorVenu Byravarasu
The month field of tm structure managed by kernel, expects a value between 0 to 11. However, TPS80031 RTC month register expects the month range to be between 1 to 12. Hence fixing it. bug 931452 Change-Id: Ie208c50b316e452e50eb2b607bafe83cb227eaea Signed-off-by: Venu Byravarasu <vbyravarasu@nvidia.com> Reviewed-on: http://git-master/r/79928 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2012-02-08USB: cdc-wdm: better allocate a buffer that is at least as big as we tell ↵Bjørn Mork
the USB core commit 655e247daf52b202a6c2d0f8a06dd2051e756ce4 upstream. As it turns out, there was a mismatch between the allocated inbuf size (desc->bMaxPacketSize0, typically something like 64) and the length we specified in the URB (desc->wMaxCommand, typically something like 2048) Signed-off-by: Bjørn Mork <bjorn@mork.no> Cc: Oliver Neukum <oliver@neukum.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I00872baa6896dfdd076fdcfc57956f1420973a7f Reviewed-on: http://git-master/r/79687 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
2012-02-08USB: cp210x: allow more baud rates above 1MbaudJohan Hovold
commit d1620ca9e7bb0030068c3b45b653defde8839dac upstream. Allow more baud rates to be set in [1M,2M] baud. Signed-off-by: Johan Hovold <jhovold@gmail.com> Cc: Preston Fick <preston.fick@silabs.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: Idbfba5dd348d4d108394918e2349a55ca7a541aa Reviewed-on: http://git-master/r/79705 Reviewed-by: Automatic_Commit_Validation_User
2012-02-08USB: cp210x: initialise baud rate at openJohan Hovold
commit cdc32fd6f7b2b2580d7f1b74563f888e4dd9eb8a upstream. The newer cp2104 devices require the baud rate to be initialised after power on. Make sure it is set when port is opened. Signed-off-by: Johan Hovold <jhovold@gmail.com> Cc: Preston Fick <preston.fick@silabs.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I165e4c3692ed7f177815a729128b4bc325ac6908 Reviewed-on: http://git-master/r/79704 Reviewed-by: Automatic_Commit_Validation_User
2012-02-08USB: cp210x: clean up, refactor and document speed handlingJohan Hovold
commit e5990874e511d5bbca23b3396419480cb2ca0ee7 upstream. Clean up and refactor speed handling. Document baud rate handling for CP210{1,2,4,5,10}. Signed-off-by: Johan Hovold <jhovold@gmail.com> Cc: Preston Fick <preston.fick@silabs.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: Icf3d3a2ae7116d8c9fe93b356304950cc97cb15e Reviewed-on: http://git-master/r/79703 Reviewed-by: Automatic_Commit_Validation_User
2012-02-08USB: cp210x: fix up set_termios variablesJohan Hovold
commit 34b76fcaee574017862ea3fa0efdcd77a9d0e57d upstream. [Based on a patch from Johan, mangled by gregkh to keep things in line] Fix up the variable usage in the set_termios call. Signed-off-by: Johan Hovold <jhovold@gmail.com> Cc: Preston Fick <preston.fick@silabs.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I42e7a0665e4c8bd4bcadad75141a307aaec11868 Reviewed-on: http://git-master/r/79702 Reviewed-by: Automatic_Commit_Validation_User
2012-02-08USB: cp210x: do not map baud rates to B0Johan Hovold
commit be125d9c8d59560e7cc2d6e2b65c8fd233498ab7 upstream. We do not implement B0 hangup yet so map low baudrates to 300bps. Signed-off-by: Johan Hovold <jhovold@gmail.com> Cc: Preston Fick <preston.fick@silabs.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I207291b93446265c4469ce1475040ee12927ae10 Reviewed-on: http://git-master/r/79701 Reviewed-by: Automatic_Commit_Validation_User
2012-02-08USB: cp210x: fix CP2104 baudrate usagePreston Fick
commit 7f482fc88ac47662228d6b1f05759797c8936a30 upstream. This fix changes the way baudrates are set on the CP210x devices from Silicon Labs. The CP2101/2/3 will respond to both a GET/SET_BAUDDIV command, and GET/SET_BAUDRATE command, while CP2104 and higher devices only respond to GET/SET_BAUDRATE. The current cp210x.ko driver in kernel version 3.2.0 only implements the GET/SET_BAUDDIV command. This patch implements the two new codes for the GET/SET_BAUDRATE commands. Then there is a change in the way that the baudrate is assigned or retrieved. This is done according to the CP210x USB specification in AN571. This document can be found here: http://www.silabs.com/pages/DownloadDoc.aspx?FILEURL=Support%20Documents/TechnicalDocs/AN571.pdf&src=DocumentationWebPart Sections 5.3/5.4 describe the USB packets for the old baudrate method. Sections 5.5/5.6 describe the USB packets for the new method. This patch also implements the new request scheme, and eliminates the unnecessary baudrate calculations since it uses the "actual baudrate" method. This patch solves the problem reported for the CP2104 in bug 42586, and also keeps support for all other devices (CP2101/2/3). This patchfile is also attached to the bug report on bugzilla.kernel.org. This patch has been developed and test on the 3.2.0 mainline kernel version under Ubuntu 10.11. Signed-off-by: Preston Fick <preston.fick@silabs.com> [duplicate patch also sent by Johan - gregkh] Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: Ie20fdc77d083b191714c4954ce11c0b71ba05867 Reviewed-on: http://git-master/r/79700
2012-02-08USB: cp210x: call generic open last in openJohan Hovold
commit 55b2afbb92ad92e9f6b0aa4354eb1c94589280c3 upstream. Make sure port is fully initialised before calling generic open. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I7355877d73350ffbfff6fc2f00bdf6e71690144b Reviewed-on: http://git-master/r/79699 Reviewed-by: Automatic_Commit_Validation_User
2012-02-08USB: serial: CP210x: Added USB-ID for the Link Instruments MSO-19Renato Caldas
commit 791b7d7cf69de11275e4dccec2f538eec02cbff6 upstream. This device is a Oscilloscope/Logic Analizer/Pattern Generator/TDR, using a Silabs CP2103 USB to UART Bridge. Signed-off-by: Renato Caldas <rmsc@fe.up.pt> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I3dc76e4f696459ed8c61e641a05a32afc39eb145 Reviewed-on: http://git-master/r/79698 Reviewed-by: Automatic_Commit_Validation_User
2012-02-08tcp: md5: using remote adress for md5 lookup in rst packetshawnlu
[ Upstream commit 8a622e71f58ec9f092fc99eacae0e6cf14f6e742 ] md5 key is added in socket through remote address. remote address should be used in finding md5 key when sending out reset packet. Signed-off-by: shawnlu <shawn.lu@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: Ib092cc760c830540564414aa1d400e5eb78208f6 Reviewed-on: http://git-master/r/79697 Reviewed-by: Automatic_Commit_Validation_User
2012-02-08tcp: fix tcp_trim_head() to adjust segment count with skb MSSNeal Cardwell
[ Upstream commit 5b35e1e6e9ca651e6b291c96d1106043c9af314a ] This commit fixes tcp_trim_head() to recalculate the number of segments in the skb with the skb's existing MSS, so trimming the head causes the skb segment count to be monotonically non-increasing - it should stay the same or go down, but not increase. Previously tcp_trim_head() used the current MSS of the connection. But if there was a decrease in MSS between original transmission and ACK (e.g. due to PMTUD), this could cause tcp_trim_head() to counter-intuitively increase the segment count when trimming bytes off the head of an skb. This violated assumptions in tcp_tso_acked() that tcp_trim_head() only decreases the packet count, so that packets_acked in tcp_tso_acked() could underflow, leading tcp_clean_rtx_queue() to pass u32 pkts_acked values as large as 0xffffffff to ca_ops->pkts_acked(). As an aside, if tcp_trim_head() had really wanted the skb to reflect the current MSS, it should have called tcp_set_skb_tso_segs() unconditionally, since a decrease in MSS would mean that a single-packet skb should now be sliced into multiple segments. Signed-off-by: Neal Cardwell <ncardwell@google.com> Acked-by: Nandita Dukkipati <nanditad@google.com> Acked-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I8e7359bbd561e78d0d9be4c3f871b22114504c8b Reviewed-on: http://git-master/r/79696 Reviewed-by: Automatic_Commit_Validation_User
2012-02-08rds: Make rds_sock_lock BH rather than IRQ safe.David S. Miller
[ Upstream commit efc3dbc37412c027e363736b4f4c74ee5e8ecffc ] rds_sock_info() triggers locking warnings because we try to perform a local_bh_enable() (via sock_i_ino()) while hardware interrupts are disabled (via taking rds_sock_lock). There is no reason for rds_sock_lock to be a hardware IRQ disabling lock, none of these access paths run in hardware interrupt context. Therefore making it a BH disabling lock is safe and sufficient to fix this bug. Reported-by: Kumar Sanghvi <kumaras@chelsio.com> Reported-by: Josh Boyer <jwboyer@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: Ie8ac0fd3307c1d827994aa113764bc3ad96ab1a3 Reviewed-on: http://git-master/r/79695 Reviewed-by: Automatic_Commit_Validation_User
2012-02-08net: bpf_jit: fix divide by 0 generationEric Dumazet
[ Upstream commit d00a9dd21bdf7908b70866794c8313ee8a5abd5c ] Several problems fixed in this patch : 1) Target of the conditional jump in case a divide by 0 is performed by a bpf is wrong. 2) Must 'generate' the full function prologue/epilogue at pass=0, or else we can stop too early in pass=1 if the proglen doesnt change. (if the increase of prologue/epilogue equals decrease of all instructions length because some jumps are converted to near jumps) 3) Change the wrong length detection at the end of code generation to issue a more explicit message, no need for a full stack trace. Reported-by: Phil Oester <kernel@linuxace.com> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I3917ba6b47928c99978532286ee99730f558c86c Reviewed-on: http://git-master/r/79694 Reviewed-by: Automatic_Commit_Validation_User
2012-02-08l2tp: l2tp_ip - fix possible oops on packet receiveJames Chapman
[ Upstream commit 68315801dbf3ab2001679fd2074c9dc5dcf87dfa ] When a packet is received on an L2TP IP socket (L2TPv3 IP link encapsulation), the l2tpip socket's backlog_rcv function calls xfrm4_policy_check(). This is not necessary, since it was called before the skb was added to the backlog. With CONFIG_NET_NS enabled, xfrm4_policy_check() will oops if skb->dev is null, so this trivial patch removes the call. This bug has always been present, but only when CONFIG_NET_NS is enabled does it cause problems. Most users are probably using UDP encapsulation for L2TP, hence the problem has only recently surfaced. EIP: 0060:[<c12bb62b>] EFLAGS: 00210246 CPU: 0 EIP is at l2tp_ip_recvmsg+0xd4/0x2a7 EAX: 00000001 EBX: d77b5180 ECX: 00000000 EDX: 00200246 ESI: 00000000 EDI: d63cbd30 EBP: d63cbd18 ESP: d63cbcf4 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 Call Trace: [<c1218568>] sock_common_recvmsg+0x31/0x46 [<c1215c92>] __sock_recvmsg_nosec+0x45/0x4d [<c12163a1>] __sock_recvmsg+0x31/0x3b [<c1216828>] sock_recvmsg+0x96/0xab [<c10b2693>] ? might_fault+0x47/0x81 [<c10b2693>] ? might_fault+0x47/0x81 [<c1167fd0>] ? _copy_from_user+0x31/0x115 [<c121e8c8>] ? copy_from_user+0x8/0xa [<c121ebd6>] ? verify_iovec+0x3e/0x78 [<c1216604>] __sys_recvmsg+0x10a/0x1aa [<c1216792>] ? sock_recvmsg+0x0/0xab [<c105a99b>] ? __lock_acquire+0xbdf/0xbee [<c12d5a99>] ? do_page_fault+0x193/0x375 [<c10d1200>] ? fcheck_files+0x9b/0xca [<c10d1259>] ? fget_light+0x2a/0x9c [<c1216bbb>] sys_recvmsg+0x2b/0x43 [<c1218145>] sys_socketcall+0x16d/0x1a5 [<c11679f0>] ? trace_hardirqs_on_thunk+0xc/0x10 [<c100305f>] sysenter_do_call+0x12/0x38 Code: c6 05 8c ea a8 c1 01 e8 0c d4 d9 ff 85 f6 74 07 3e ff 86 80 00 00 00 b9 17 b6 2b c1 ba 01 00 00 00 b8 78 ed 48 c1 e8 23 f6 d9 ff <ff> 76 0c 68 28 e3 30 c1 68 2d 44 41 c1 e8 89 57 01 00 83 c4 0c Signed-off-by: James Chapman <jchapman@katalix.com> Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I343ca4e0871cd48dfc62ef7d1b45e0be3109688a Reviewed-on: http://git-master/r/79693
2012-02-08bonding: fix enslaving in alb mode when link downJiri Bohac
[ Upstream commit b924551bed09f61b64f21bffe241afc5526b091a ] bond_alb_init_slave() is called from bond_enslave() and sets the slave's MAC address. This is done differently for TLB and ALB modes. bond->alb_info.rlb_enabled is used to discriminate between the two modes but this flag may be uninitialized if the slave is being enslaved prior to calling bond_open() -> bond_alb_initialize() on the master. It turns out all the callers of alb_set_slave_mac_addr() pass bond->alb_info.rlb_enabled as the hw parameter. This patch cleans up the unnecessary parameter of alb_set_slave_mac_addr() and makes the function decide based on the bonding mode instead, which fixes the above problem. Reported-by: Narendra K <Narendra_K@Dell.com> Signed-off-by: Jiri Bohac <jbohac@suse.cz> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I83909e006b8e2dcbe35c35c80f2e236e7e4743bf Reviewed-on: http://git-master/r/79692 Reviewed-by: Automatic_Commit_Validation_User
generated by cgit v1.2.3 (git 2.0.4) at 2024-09-17 06:05:46 +0000