- Jun 28, 2012
-
-
Nobuhiro Iwamatsu authored
sh_clk_mstp32_register is deprecated. This convert to sh_clk_mstp_register. Signed-off-by:
Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by:
Paul Mundt <lethal@linux-sh.org>
-
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbLinus Torvalds authored
Pull USB fixes from Greg Kroah-Hartman: "Here are some small USB gadget bugfixes, and a few new USB device ids added to some drivers for the 3.5-rc5 release. Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>"> * tag 'usb-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: USB: CP210x Add 10 Device IDs USB: option: Add USB ID for Novatel Ovation MC551 usb: phy: Fix Kconfig dependency for Phy drivers usb-storage: revert commit afff07e6 (Add 090c:1000 to unusal-devs) SCSI & usb-storage: add try_rc_10_first flag usb: musb: host: release dma channels if no active io usb: gadget: lpc32xx_udc: fix build error with debugfs enabled usb: otg: twl6030-usb: Fix twl writes USB: option: add id for Cellient MEN-200 usb: dwc3: fix giveback of queued request in ep_dequeue usb: gadget: Complete fsl qe/udc driver conversion
-
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/soundLinus Torvalds authored
Pull sound fixes from Takashi Iwai: "Here you find quite a few changes for HD-audio and a copule of quirk additions for USB-audio. All reasonably small and/or trivial." * tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda - Fix power-map regression for HP dv6 & co ALSA: hda - Initialize caches at codec reconfiguration ALSA: hda - Fix memory leaks at module unload ALSA: hda - Fix memory leaks in Realtek & Conexant codec parsers ALSA: hda - Add Realtek ALC280 codec support ALSA: hda - Remove obsoleted CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS ASoC: wm8994: remove duplicate code ALSA: usb-audio: add BOSS GT-100 support ALSA: HDA: Add inverted internal mic quirk for Lenovo S205 ALSA: hda - Fix ALC272X codec detection ALSA: snd_usb_audio: ignore ctrl errors on QuickCam Pro for Notebooks ALSA: snd_usb_audio: ignore ctrl errors on QuickCam E3500
-
git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommuLinus Torvalds authored
Pull a m68knommu fix from Greg Ungerer: "It contains a single fix for breakage using the Freescale FEC eth driver on ColdFire CPUs." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: define a local devm_clk_get() function
-
git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmcLinus Torvalds authored
Pull MMC fixes from Chris Ball: - omap_hsmmc: Using AUTO_CMD12 (enabled by default in 3.5-rc1) has been found to cause data corruption on the BeagleBoard, but no other OMAP boards so far. Revert the patch until there's a root cause explanation that makes sense, at which point we might decide to use a blacklist or whitelist. - mmc_block: Fix incorrect data timeouts for the case of multiblock (ACMD22) writes for block-addressed cards. * tag 'mmc-fixes-for-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: Revert "mmc: omap_hsmmc: Enable Auto CMD12" mmc: block: fix the data timeout issue with ACMD22
-
git://git.linaro.org/people/mturquette/linuxLinus Torvalds authored
Pull clk common framework fixes from Mike Turquette: "This contains three NULL pointer fixes and two device regression fixups. Two NULL pointer dereferences were in the common clk core due to lack of sanity checking and the third NPD was in the mxs-specific clock code due to incorrect use of __initdata. The device regressions were the result of improper data: a wrong string name for matching DT data broke the SPEAr ethernet controller and another string matching problem in the mxs clock data resulted in a broken MMC controller." * tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux: clk: mxs: fix clock lookup after freeing init memory clk: mxs: fix ref_io clock definition clk: Check parent for NULL in clk_change_rate clk: Allow late cache allocation for clk->parents clk: SPEAr600: Fix ethernet clock name for DT based probing
-
Dave Jones authored
This script lacks an executable bit. Signed-off-by:
Dave Jones <davej@redhat.com> Signed-off-by:
Linus Torvalds <torvalds@linux-foundation.org>
-
- Jun 27, 2012
-
-
Craig Shelley authored
This patch adds 10 device IDs for CP210x based devices from the following manufacturers: Timewave Clipsal Festo Link Instruments Signed-off-by:
Craig Shelley <craig@microtron.org.uk> Cc: stable <stable@vger.kernel.org> Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Forest Bond authored
This device is also known as the Verizon USB551L. Signed-off-by:
Forest Bond <forest.bond@rapidrollout.com> Acked-by:
Dan Williams <dcbw@redhat.com> Cc: stable <stable@vger.kernel.org> Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Alexandre Pereira da Silva authored
USB phy layer driver are only built if usb host is selected, but they are used too by USB_GADGET drivers Signed-off-by:
Alexandre Pereira da Silva <aletes.xgr@gmail.com> Acked-by:
Roland Stigge <stigge@antcom.de> Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Ming Lei authored
This patch reverts the commit dba3c29e. After bisecting, this commit dba3c29e is found to ruin micro-SD card data (writing incorrect file, or fs is corrupt after several times mount) on the beagle-xm revB, and reverting the commit will fix the problem. Also from TRM of OMAP3/OMAP4/DM37x, the below is mentioned about the Auto CMD12 Enable bit. - SDIO does not support this feature. - SD card only. Looks it is not suitable to always enable Auto CMD12 in host controller driver. Considered that the commit is not mature enough, so ask to revert it first. Cc: Balaji T K <balajitk@ti.com> Cc: Venkatraman S <svenkatr@ti.com> Buglink: https://lkml.org/lkml/2012/6/10/225 Reported-by:
Paolo Pisati <p.pisati@gmail.com> Reported-bisected-and-tested-by:
Ming Lei <ming.lei@canonical.com> Signed-off-by:
Ming Lei <ming.lei@canonical.com> Acked-by:
Venkatraman S <svenkatr@ti.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Subhash Jadavani authored
If multi block write operation fails for SD card, during error handling we send the SD_APP_SEND_NUM_WR_BLKS (ACMD22) to know how many blocks were already programmed by card. But mmc_sd_num_wr_blocks() function which sends the ACMD22 calculates the data timeout value from csd.tacc_ns and csd.tacc_clks parameters which will be 0 for block addressed (>2GB cards) SD card. This would result in timeout_ns and timeout_clks being 0 in the mmc_request passed to host driver. This means host controller would program its data timeout timer value with 0 which could result in DATA TIMEOUT errors from controller. To fix this issue, mmc_sd_num_wr_blocks() should instead just call the mmc_set_data_timeout() to calculate the data timeout value. mmc_set_data_timeout() function ensures that non zero timeout value is set even for block addressed SD cards. Signed-off-by:
Subhash Jadavani <subhashj@codeaurora.org> Reviewed-by:
Venkatraman S <svenkatr@ti.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
git://people.freedesktop.org/~airlied/linuxLinus Torvalds authored
Pull drm fixes from Dave Airlie: "Just two changes: one udl endian fix, one nouveau memory corruption on some GPUs." * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/nouveau/fbcon: using nv_two_heads is not a good idea drm/udl: Make sure to get correct endian keys from vendor descriptor
-
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hidLinus Torvalds authored
Pull HID fixes from Jiri Kosina: "The most important one is a purification of Kconfig for CONFIG_HID; the inclusion of HID groups and autoloading didn't leave the Kconfig in a really consistent state. Henrik's patch fixes that. In addition to that, there are two small fixes for logitech and magicmouse drivers." * 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: Fix the generic Kconfig options HID: magicmouse: Correct report range of major / minor axes HID: logitech: don't use stack based dj_report structures
-
- Jun 26, 2012
-
-
Takashi Iwai authored
The recent fix for power-map controls (commit b0791dda ) caused regressions on some other HP laptops. They have fixed pins but these pins are exposed as jack-detectable. Thus the driver tries to control the power-map dynamically per jack detection where it never gets on. This patch adds the check of connection and it assumes the no jack detection is available for fixed pins no matter what pin capability says. BugLink: http://bugs.launchpad.net/bugs/1013183 Reported-by:
Luis Henriques <luis.henriques@canonical.com> Signed-off-by:
Takashi Iwai <tiwai@suse.de>
-
Takashi Iwai authored
Better to clean up the caches for avoiding inconsistent codec state after the reconfiguration. Signed-off-by:
Takashi Iwai <tiwai@suse.de>
-
Takashi Iwai authored
Some caches aren't released properly at module unloading time. Cc: <stable@vger.kernel.org> [v3.4+] Signed-off-by:
Takashi Iwai <tiwai@suse.de>
-
Takashi Iwai authored
When moved to the helper code, forgot to release the verb arrays. Signed-off-by:
Takashi Iwai <tiwai@suse.de>
-
Ben Skeggs authored
nv_two_heads() was never meant to be used outside of pre-nv50 code. The code checks for >= NV_10 for 2 CRTCs, then downgrades a few specific chipsets to 1 CRTC based on (pci_device & 0x0ff0). The breakage example seen is on GTX 560Ti, with a pciid of 0x1200, which gets detected as an NV20 (0x020x) with 1 CRTC by nv_two_heads(), causing memory corruption because there's actually 2 CRTCs.. This switches fbcon to use the CRTC count directly from the mode_config structure, which will also fix the same issue on Kepler boards which have 4 CRTCs. Signed-off-by:
Ben Skeggs <bskeggs@redhat.com> Cc: stable@vger.kernel.org Signed-off-by:
Dave Airlie <airlied@redhat.com>
-
Marc Kleine-Budde authored
The struct clk_lookup are marked as __initdata, resulting in being removed from memory after the kernel finished booting. However this leads to a NULL pointer de-ref if loading a module which uses clk_get. This patch removes the __initdata from the struct clk_lookup. Signed-off-by:
Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Signed-off-by:
Mike Turquette <mturquette@linaro.org>
-
Shawn Guo authored
The definition of clocks ref_io0 and ref_io1 were inverted. It causes a mmc regression on some boards right away. Fix the regression by correcting the ref_io clock definition. Reported-by:
Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Signed-off-by:
Mike Turquette <mturquette@linaro.org>
-
Pawel Moll authored
clk_change_rate() is accessing parent's rate without checking if the parent exists at all. In case of root clocks this will cause NULL pointer dereference. This patch follows what clk_calc_new_rates() does in such situation. Signed-off-by:
Pawel Moll <pawel.moll@arm.com> Signed-off-by:
Mike Turquette <mturquette@linaro.org> Cc: stable@kernel.org
-
Rajendra Nayak authored
Parent clocks for muxes are cached in clk->parents to avoid frequent lookups, however the cache allocation happens only during clock registeration and later clk_set_parent() assumes a cache space available and allocated. This is not entirely true for platforms which do early clock registerations wherein the cache allocation using kzalloc could fail during clock registeration. Allow cache allocation to happen later as part of clk_set_parent() to help such cases and avoid crashes assuming a cache being available. While here also replace existing kmalloc() with kzalloc() in the file. Signed-off-by:
Rajendra Nayak <rnayak@ti.com> Signed-off-by:
Mike Turquette <mturquette@linaro.org> Cc: stable@kernel.org
-
Stefan Roese authored
Signed-off-by:
Stefan Roese <sr@denx.de> Cc: Viresh Kumar <viresh.kumar@st.com> Cc: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by:
Mike Turquette <mturquette@linaro.org>
-
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-mediaLinus Torvalds authored
Pull media fixes from Mauro Carvalho Chehab. Trivial conflict due to new USB HID ID's being added next to each other (Baanto vs Axentia). * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (44 commits) [media] smia: Fix compile failures [media] Fix VIDIOC_DQEVENT docbook entry [media] s5p-fimc: Fix control creation function [media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file [media] s5p-mfc: Fix setting controls [media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT [media] v4l/s5p-mfc: corrected encoder v4l control definitions [media] v4l: mem2mem_testdev: Fix race conditions in driver [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism [media] cxd2820r: Fix an incorrect modulation type bitmask [media] em28xx: Show a warning if the board does not support remote controls [media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD [media] USB: Staging: media: lirc: initialize spinlocks before usage [media] Revert "[media] media: mx2_camera: Fix mbus format handling" [media] bw-qcam: driver and pixfmt documentation fixes [media] cx88: fix firmware load on big-endian systems [media] cx18: support big-endian systems [media] ivtv: fix support for big-endian systems [media] tuner-core: return the frequency range of the correct tuner [media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls() ...
-
David Henningsson authored
This chip looks very similar to ALC269 and ALC27* variants. The bug reporter has verified that sound was working after this patch had been applied. Cc: stable@kernel.org BugLink: https://bugs.launchpad.net/bugs/1017017 Tested-by:
Richard Crossley <richardcrossley@o2.co.uk> Signed-off-by:
David Henningsson <david.henningsson@canonical.com> Signed-off-by:
Takashi Iwai <tiwai@suse.de>
-
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulatorLinus Torvalds authored
Pull regulator fixes from Mark Brown: "A few small, driver specific bug fixes, nothing exciting here but all needed if you happen to be using the affected hardware." * tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: palmas: fix regmap offsets for enable/disable regulator: tps6524x: Fix get_voltage_sel for fixed voltage regulator: tps65023: Fix mask for LDOs output voltage select control
-
git://git.linaro.org/people/mszyprowski/linux-dma-mappingLinus Torvalds authored
Git pull DMA-mapping fix from Marek Szyprowski: "Another minor fixup for ARM dma-mapping redesign and extensions merged in this merge window" * 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: ARM: dma-mapping: fix buffer chunk allocation order
-
Paul Mundt authored
Commit 2603efa3 ("bug.h: Fix up powerpc build regression") corrected the powerpc build case and extended the __ASSEMBLY__ guards, but it also got caught in pre-processor hell accidentally matching the else case of CONFIG_BUG resulting in the BUG disabled case tripping up on -Werror=implicit-function-declaration. It's not possible to __ASSEMBLY__ guard the entire file as architecture code needs to get at the BUGFLAG_WARNING definition in the GENERIC_BUG case, but the rest of the CONFIG_BUG=y/n case needs to be guarded. Rather than littering endless __ASSEMBLY__ checks in each of the if/else cases we just move the BUGFLAG definitions up under their own GENERIC_BUG test and then shove everything else under one big __ASSEMBLY__ guard. Build tested on all of x86 CONFIG_BUG=y, CONFIG_BUG=n, powerpc (due to it's dependence on BUGFLAG definitions in assembly code), and sh (due to not bringing in linux/kernel.h to satisfy the taint flag definitions used by the generic bug code). Hopefully that's the end of the corner cases and I can abstain from ever having to touch this infernal header ever again. Reported-by:
Fengguang Wu <fengguang.wu@intel.com> Tested-by:
Fengguang Wu <wfg@linux.intel.com> Acked-by:
Randy Dunlap <rdunlap@xenotime.net> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by:
Paul Mundt <lethal@linux-sh.org> Signed-off-by:
Linus Torvalds <torvalds@linux-foundation.org>
-
Greg Kroah-Hartman authored
This is needed to sync up with the previous USB changes that were merged in Linus's branch. Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
- Jun 25, 2012
-
-
Henrik Rydberg authored
The generic HID driver is obviously not a special driver, so move it outside of the special drivers menu. Explain the usage and make the default follow the HID setting. This should simplify migration from older kernels. While at it, remove the redundant HID_SUPPORT option and modify the HID and USB_HID entries to better explain the bus structure. Reported-by:
Jan Beulich <jbeulich@suse.com> Signed-off-by:
Henrik Rydberg <rydberg@euromail.se> Signed-off-by:
Jiri Kosina <jkosina@suse.cz>
-
Yufeng Shen authored
In patch "HID: magicmouse: Adjust major / minor axes to scale", touch_major and touch_minor axes are scaled by a factor of four when reported but the max touch_major/minor is not scaled accordingly. This patch scales the max touch_major/minor to be consistent with the reported value. Signed-off-by:
Yufeng Shen <miletus@chromium.org> Acked-by:
Henrik Rydberg <rydberg@euromail.se> Signed-off-by:
Jiri Kosina <jkosina@suse.cz>
-
Takashi Iwai authored
I simply forgot to remove this entry although all Realtek quirks have been dropped. Signed-off-by:
Takashi Iwai <tiwai@suse.de>
-
Jaroslav Kysela authored
It seems that the code duplication was added at a merge operation. Signed-off-by:
Jaroslav Kysela <perex@perex.cz> Signed-off-by:
Takashi Iwai <tiwai@suse.de>
-
Clemens Ladisch authored
Reported-by:
John McFarland <mcfarljm@gmail.com> Tested-by:
John McFarland <mcfarljm@gmail.com> Signed-off-by:
Clemens Ladisch <clemens@ladisch.de> Signed-off-by:
Takashi Iwai <tiwai@suse.de>
-
Marek Szyprowski authored
IOMMU-aware dma_alloc_attrs() implementation allocates buffers in power-of-two chunks to improve performance and take advantage of large page mappings provided by some IOMMU hardware. However current code, due to a subtle bug, allocated those chunks in the smallest-to-largest order, what completely killed all the advantages of using larger than page chunks. If a 4KiB chunk has been mapped as a first chunk, the consecutive chunks are not aligned correctly to the power-of-two which match their size and IOMMU drivers were not able to use internal mappings of size other than the 4KiB (largest common denominator of alignment and chunk size). This patch fixes this issue by changing to the correct largest-to-smallest chunk size allocation sequence. Signed-off-by:
Marek Szyprowski <m.szyprowski@samsung.com>
-
Dave Airlie authored
This is a port of commit b49f184b Author: Ben Collins <bcollins@ubuntu.com> from udlfb to udl kms driver. The driver was not using le16_to_cpu when reading keys from the vendor descriptor, causing incorrect parsing. Mainly, sku_pixel_limit was not being parsed on big-endian systems. This would result in a blank screen on big-endian CPUs where the DL chips's max mode was smaller than the monitor's native mode. Signed-off-by:
Dave Airlie <airlied@redhat.com>
-
Greg Ungerer authored
Commit f4d40de3 ("net fec: do not depend on grouped clocks") breaks compilation of the FEC driver for non iMX platforms in linux-3.5-rc1. For example when compiling for ColdFire I get: LD vmlinux drivers/built-in.o: In function `fec_probe': fec.c:(.devinit.text+0x1e0): undefined reference to `devm_clk_get' Define a simple devm_clk_get() function for the m68knommu architecture. Signed-off-by:
Greg Ungerer <gerg@uclinux.org>
-
Linus Torvalds authored
-
Anatol Pomozov authored
Coult -> Could Signed-off-by:
Linus Torvalds <torvalds@linux-foundation.org>
-