summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-29Merge branch 'armsoc/for-3.12/soc' of git://github.com/broadcom/bcm11351 ↵Olof Johansson
into next/boards From Christian Daudt, SoC changes for Broadcom. * 'armsoc/for-3.12/soc' of git://github.com/broadcom/bcm11351: (673 commits) ARM: bcm: Make secure API call optional ARM: DT: binding fixup to align with vendor-prefixes.txt (drivers) ARM: mmc: fix NONREMOVABLE test in sdhci-bcm-kona ARM: bcm: Rename board_bcm mmc: sdhci-bcm-kona: make linker-section warning go away ARM: configs: disable DEBUG_LL in bcm_defconfig ARM: bcm281xx: Board specific reboot code ARM bcm281xx: Turn on socket & network support. ARM: bcm281xx: Turn on L2 cache. + Linux 3.11-rc4 Signed-off-by: Olof Johansson <olof@lixom.net>
2013-08-20Merge tag 'tegra-for-3.12-defconfig' of ↵Kevin Hilman
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/boards From: Stephen Warren: ARM: tegra: defconfig update for 3.12 This defconfig change enables: * SYSVIPC (needed for some apps, e.g. fakeroot). * Elantech touchpad (touchpad on AC100). * SCSI_MULTI_LUN (needed for some USB SD card readers). * PCI, MSI, and Tegra's PCIe driver. * USB XHCI; useful for testing PCIe. * tag 'tegra-for-3.12-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: tegra: defconfig updates
2013-08-20ARM: bcm: Make secure API call optionalChristian Daudt
The current bcm_kona_smc_init function throws a BUG_ON if there's no SMC device node defined in the device tree. Since secure API access is optional depending the chip configuration, fix this by allowing the rest of the code to run even if there's no SMC device node defined Signed-off-by: Christian Daudt <csd@broadcom.com> Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
2013-08-20ARM: DT: binding fixup to align with vendor-prefixes.txt (drivers)Christian Daudt
[ this is a follow-up to this discussion: http://archive.arm.linux.org.uk/lurker/message/20130730.230827.a1ceb12a.en.html ] This patchset renames all uses of "bcm," name bindings to "brcm," as they were done prior to knowing that brcm had already been standardized as Broadcom vendor prefix (in Documentation/devicetree/bindings/vendor-prefixes.txt). This will not cause any churn on devices because none of these bindings have made it into production yet. Signed-off-by: Christian Daudt <csd@broadcom.com> Acked-by: Stephen Warren <swarren@nvidia.com>
2013-08-19ARM: mmc: fix NONREMOVABLE test in sdhci-bcm-konaChristian Daudt
sdhci-bcm-kona driver is incorrectly doing "|" to bit-test NONREMOVABLE. Switch to "&" Signed-off-by: Christian Daudt <csd@broadcom.com> Reviewed-by: Markus Mayer <markus.mayer@linaro.org> Reviewed-by: Matt Porter <matt.porter@linaro.org>
2013-08-19ARM: bcm: Rename board_bcmChristian Daudt
In order to support multiple SoC models in the mach-bcm directory, board_bcm.c is being renamed board_bcm281xx.c Reviewed-by: Markus Mayer <markus.mayer@linaro.org> Signed-off-by: Christian Daudt <csd@broadcom.com>
2013-08-19mmc: sdhci-bcm-kona: make linker-section warning go awayMarkus Mayer
This change makes the following build warning go away: [...] LINK vmlinux LD vmlinux.o MODPOST vmlinux.o WARNING: modpost: Found 2 section mismatch(es). To see full details build your kernel with: 'make CONFIG_DEBUG_SECTION_MISMATCH=y' Signed-off-by: Markus Mayer <markus.mayer@linaro.org> Reviewed-by: Christian Daudt <csd@broadcom.com> Reviewed-by: Matt Porter <matt.porter@linaro.org>
2013-08-15Merge tag 'defconfig-3.12' of git://git.infradead.org/linux-mvebu into ↵Olof Johansson
next/boards From Jason Cooper, mvebu defconfig changes for v3.12: - kirkwood: add i2c devices, ext4, r8169 - mvebu: gpio-keys, input event - dove: SI5351, PCI, xHCI * tag 'defconfig-3.12' of git://git.infradead.org/linux-mvebu: ARM: dove: update dove_defconfig with SI5351, PCI, and xHCI ARM: mvebu: add gpio-keys and input event support in defconfig ARM: Kirkwood: update defconfig for used i2c devices, EXT4 FS, r8169 Signed-off-by: Olof Johansson <olof@lixom.net>
2013-08-15Merge tag 'boards-3.12-2' of git://git.infradead.org/linux-mvebu into ↵Olof Johansson
next/boards From Jason Cooper, mvebu boards changes for v3.12: - kirkwood - convert Dockstar, Guruplug, mv88f6281gtw_ge to DT - remove legacy boards (which have DT support) sheevaplug, lacie boards - ARRAY_AND_SIZE() cleanup - dove - some DT node updates (depends on irqchip/clocksource DT changes earlier) - add the D2Plug board * tag 'boards-3.12-2' of git://git.infradead.org/linux-mvebu: ARM: dove: add initial DT file for Globalscale D2Plug ARM: dove: add GPIO IR receiver node to SolidRun CuBox ARM: dove: add common pinmux functions to DT ARM: dove: add cpu device tree node arch/arm/mach-kirkwood: Avoid using ARRAY_AND_SIZE(e) as a function argument ARM: kirkwood: fix DT building and update defconfig ARM: kirkwood: Remove all remaining trace of DNS-320/325 platform code ARM: kirkwood: use dts pre-processor for mv88f6281gtw-ge ARM: kirkwood: convert the mv88f6281gtw_ge board to DT ARM: kirkwood: remove LaCie boards that are supported through DT ARM: kirkwood: remove support for legacy booting of Sheevaplug ARM: kirkwood: remove support for legacy booting of Guruplug ARM: kirkwood: remove support for legacy booting of Dockstar Signed-off-by: Olof Johansson <olof@lixom.net>
2013-08-14Merge tag 'renesas-boards-cleanup-for-v3.12' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards From Simon Horman: Renesas ARM based SoC boards cleanups for v3.12 * Add __initdata annotations to lager board * Add __initconst annotations to ape6evm board * tag 'renesas-boards-cleanup-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: lager: add missing __initdata ARM: shmobile: ape6evm: add "__initconst" annotations where needed Signed-off-by: Olof Johansson <olof@lixom.net>
2013-08-14Merge tag 'renesas-boards2-for-v3.12' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards From Simon Horman: Second round of Renesas ARM-based SoC board updates for v3.12 * Enable ether on lager board * Enable GPIO LEDs and switches on ape6evm board * tag 'renesas-boards2-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: lager: enable Ether ARM: shmobile: ape6evm: Add GPIO LEDs ARM: shmobile: ape6evm: support GPIO switches Signed-off-by: Olof Johansson <olof@lixom.net>
2013-08-14Merge tag 'renesas-defconfig-for-v3.12' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards From Simon Horman: Renesas ARM based SoC defconfig updates for v3.12 * Enable GPIO LEDs and keys for ape6evm board * Enable ARM_APPENDED_DTB for marzen board * Add lager defconfig board * tag 'renesas-defconfig-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: ape6evm: Enable gpio-leds in defconfig ARM: shmobile: ape6evm: Enable gpio-keys in defconfig ARM: shmobile: Add lager defconfig ARM: shmobile: marzen: Enable ARM_APPENDED_DTB in defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
2013-08-14Merge tag 'renesas-boards-for-v3.12' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards From Simon Horman: Renesas ARM-based SoC board updates for v3.12 * ape6evm: Add SDHI and MMCIF support * lager: Add MMCIF support * armadillo800eva: Add DMA support for MMCIF * tag 'renesas-boards-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (54 commits) ARM: shmobile: ape6evm: add SDHI interfaces ARM: shmobile: ape6evm: add MMCIF support ARM: shmobile: select the fixed regulator driver on BockW ARM: shmobile: lager: add MMCIF support ARM: shmobile: armadillo800eva: add DMA support to MMCIF ARM: shmobile: Setup r8a7790 arch timer based on MD pins ARM: shmobile: Introduce r8a7790_read_mode_pins() ARM: shmobile: r8a7740: add MMCIF DMA definitions ARM: shmobile: Disconnect EMEV2 SMP code from clocks ARM: shmobile: Make r8a73a4 Arch timer optional ARM: shmobile: Add r8a73a4 CMT10 clock event ARM: shmobile: Make r8a7790 Arch timer optional ARM: shmobile: Add r8a7790 CMT00 clock event ARM: shmobile: Sort r8a7790 MSTP entries ARM: shmobile: r8a73a4: add clocks for I2C controllers ARM: shmobile: r8a73a4: add Z2 clock support ARM: shmobile: r8a73a4: safeguard against wrong clk_set_rate() uses ARM: shmobile: r8a73a4: implement CPU clock scaling for CPUFreq ARM: shmobile: r8a73a4: wait for completion when kicking the clock ARM: shmobile: r8a7790: add thermal driver support ... Signed-off-by: Olof Johansson <olof@lixom.net>
2013-08-14Merge tag 'renesas-tpu-pwm-for-v3.12' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards From Simon Horman: Renesas TPU PWM support for v3.12 Add Renesas TPU PWM unit support * tag 'renesas-tpu-pwm-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: leds: Remove leds-renesas-tpu driver ARM: shmobile: sh73a0: Remove all GPIOs ARM: shmobile: kota2: Use leds-pwm + pwm-rmob ARM: shmobile: armadillo800eva: Add backlight support Signed-off-by: Olof Johansson <olof@lixom.net>
2013-08-12ARM: tegra: defconfig updatesStephen Warren
Enable: * SYSVIPC (needed for some apps, e.g. fakeroot). * Elantech touchpad (touchpad on AC100). * SCSI_MULTI_LUN (needed for some USB SD card readers). * PCI, MSI, and Tegra's PCIe driver. * USB XHCI; useful for testing PCIe. Signed-off-by: Marc Dietrich <marvin24@gmx.de> Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2013-08-12ARM: dove: add initial DT file for Globalscale D2PlugSebastian Hesselbarth
This adds an initial DT file for the Globalscale D2Plug with Dove SoC. Currently, one LED is missing and I have not been able to get SD8787 driver working. Those will be taken care of later. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-08-12ARM: dove: add GPIO IR receiver node to SolidRun CuBoxSebastian Hesselbarth
This adds a node for the IR receiver connected to a GPIO pin on the SolidRun CuBox. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-08-12ARM: dove: add common pinmux functions to DTSebastian Hesselbarth
This adds common dedicated and gpio pinmux functions to SoC pinctrl node. It also relocates pinctrl references to corresponding DT nodes. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-08-12ARM: dove: add cpu device tree nodeSebastian Hesselbarth
This adds a node for the Marvell Sheeva PJ4A CPU found on Dove SoCs. While at it, also move the l2-cache node out of internal registers and consistently name different nodes. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net> Conflicts: arch/arm/boot/dts/dove.dtsi
2013-08-12ARM: dove: update dove_defconfig with SI5351, PCI, and xHCISebastian Hesselbarth
This adds SI5351 clock driver found on the SolidRun CuBox, PCI driver and USB 3.0 xHCI driver found on the Globalscale D3Plug to dove_defconfig. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-08-12arch/arm/mach-kirkwood: Avoid using ARRAY_AND_SIZE(e) as a function argumentJulia Lawall
Replace ARRAY_AND_SIZE(e) in function argument position to avoid hiding the arity of the called function. The semantic match that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression e,f; @@ f(..., - ARRAY_AND_SIZE(e) + e,ARRAY_SIZE(e) ,...) // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-08-12ARM: kirkwood: fix DT building and update defconfigJason Cooper
commit 844703c ARM: kirkwood: Remove all remaining trace of DNS-320/325 platform code removed the last kirkwood DT/platform board in kirkwood_defconfig, this triggered a rescan of the config symbols, the result of which breaks the build because KIRKWOOD_DT does not select OF_IRQ. This commit fixes the regression and updates the defconfig to explicitly enable SERIAL_OF_PLATFORM and KIRWOOD_DT. Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-08-12ARM: kirkwood: Remove all remaining trace of DNS-320/325 platform codeJamie Lentin
No platform code left now, so remove all references to it. The reset gpio code didn't work to begin with, it will be replaced with a DT node at a future date. -jc Signed-off-by: Jamie Lentin <jm@lentin.co.uk> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-08-11Merge tag 'boards-3.12' of git://git.infradead.org/linux-mvebu into next/boardsOlof Johansson
From Jason Cooper: mvebu boards changes for v3.12 - convert kirkwood, dove, orion5x to DT init of mv643xx_eth - _lots_ of board code removal :) - convert kirkwood, dove and orion5x to DT init of clocksource and irqchip * tag 'boards-3.12' of git://git.infradead.org/linux-mvebu: ARM: plat-orion: add reg offset to DT irq driver stub ARM: kirkwood: remove obsolete SDIO clock gate workaround ARM: kirkwood: convert to DT irqchip and clocksource ARM: dove: convert to DT irqchip and clocksource ARM: orion5x: update intc device tree node to new reg layout ARM: kirkwood: move device tree nodes to DT irqchip and clocksource ARM: dove: move device tree nodes to DT irqchip and clocksource ARM: orion5x: remove legacy mv643xx_eth board setup ARM: kirkwood: remove legacy clk alias for mv643xx_eth ARM: kirkwood: remove redundant DT board files ARM: dove: remove legacy mv643xx_eth setup ARM: orion5x: add gigabit ethernet and mvmdio device tree nodes ARM: kirkwood: add gigabit ethernet and mvmdio device tree nodes ARM: dove: add gigabit ethernet and mvmdio device tree nodes + Linux 3.11-rc2 Signed-off-by: Olof Johansson <olof@lixom.net>
2013-08-08ARM: configs: disable DEBUG_LL in bcm_defconfigMatt Porter
DEBUG_LL is not supported yet on bcm281xx and causes a temporary hang due to timeout at boot. Signed-off-by: Matt Porter <matt.porter@linaro.org> Reviewed-by: Markus Mayer <markus.mayer@linaro.org> Reviewed-by: Christian Daudt <csd@broadcom.com>
2013-08-08ARM: bcm281xx: Board specific reboot codeMarkus Mayer
This patch adds the code needed to trigger a reboot on the bcm281xx family. Signed-off-by: Markus Mayer <markus.mayer@linaro.org> Reviewed-by: Tim Kryger <tim.kryger@linaro.org> Reviewed-by: Matt Porter <matt.porter@linaro.org> Reviewed-by: Alex Elder <alex.elder@linaro.org> Acked-by: Christian Daudt <csd@broadcom.com>
2013-08-06ARM bcm281xx: Turn on socket & network support.Markus Mayer
We need this so an actual disk-based root file system will work. Signed-off-by: Markus Mayer <markus.mayer@linaro.org> Acked-by: Christian Daudt <csd@broadcom.com>
2013-08-06ARM: bcm281xx: Turn on L2 cache.Markus Mayer
Turning on the L2 cache for the bcm281xx family. Signed-off-by: Markus Mayer <markus.mayer@linaro.org> Acked-by: Christian Daudt <csd@broadcom.com>
2013-08-06ARM: kirkwood: use dts pre-processor for mv88f6281gtw-geJason Cooper
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-08-06ARM: kirkwood: convert the mv88f6281gtw_ge board to DTThomas Petazzoni
This commit converts the mv88f6281gtw_ge Kirkwood board to use a Device Tree representation, except for the Ethernet devices and the DSA switch. Even though the mv643xx_eth driver has a DT binding, converting this board to use it is for now left on the side because it doesn't use a simple PHY, but a DSA switch instead. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-08-06ARM: kirkwood: remove LaCie boards that are supported through DTThomas Petazzoni
The "LaCie Internet Space v2 NAS Board", "LaCie Network Space Max v2 NAS Board" and "LaCie Network Space v2 NAS Board" boards are all supported through the Device Tree. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-08-06ARM: kirkwood: remove support for legacy booting of SheevaplugThomas Petazzoni
The Kirkwood Sheevaplug platform has already been converted to the Device Tree, so we can remove the legacy booting option for this platform. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-08-06ARM: kirkwood: remove support for legacy booting of GuruplugThomas Petazzoni
The Kirkwood Guruplug platform has already been converted to the Device Tree, so we can remove the legacy booting option for this platform. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-08-06ARM: kirkwood: remove support for legacy booting of DockstarThomas Petazzoni
The Kirkwood Dockstar platform has already been converted to the Device Tree, so we can remove the legacy booting option for this platform. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-08-06ARM: shmobile: lager: enable EtherSimon Horman
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-08-06ARM: shmobile: ape6evm: Add GPIO LEDsSimon Horman
The board has 6 LEDs connected to GPIOs. Add a led-gpio device to support them. Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-08-06ARM: shmobile: ape6evm: support GPIO switchesSimon Horman
The ape6evm board has switches S16 - S23 wired up to GPIO pins. This patch allows access to those pins as gpio-keys. Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-08-06ARM: shmobile: ape6evm: Enable gpio-leds in defconfigSimon Horman
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-08-06ARM: shmobile: ape6evm: Enable gpio-keys in defconfigSimon Horman
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-08-06ARM: shmobile: lager: add missing __initdataKuninori Morimoto
This patch adds missing __initdata to driver data/resource which are used from platform_device_register_xxx() Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-08-04Linux 3.11-rc4v3.11-rc4Linus Torvalds
2013-08-04Merge tag 'renesas-backlight-for-v3.12' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards From Simon Horman: Renesas ARM and SH based SoC backlight drivers for v3.12 Backlight drivers used by SH and ARM SH-Mobile boards. * tag 'renesas-backlight-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: mach-shmobile: ag5evm: Use bd6107 backlight driver sh: kfr2r09: Use lv5207lp backlight sh: ecovec24: Use gpio-backlight ARM: mach-shmobile: mackerel: Use gpio-backlight backlight: Add ROHM BD6107 backlight driver backlight: Add Sanyo LV5207LP backlight driver backlight: Add GPIO-based backlight driver Signed-off-by: Olof Johansson <olof@lixom.net>
2013-08-04Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds
Pull dmaengine fixes from Vinod Koul: "Two fixes for slave dmaengine. The first fixes cyclic dma transfers for pl330 and the second one makes us return the correct error code on probe" * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dma: pl330: Fix cyclic transfers pch_dma: fix error return code in pch_dma_probe()
2013-08-04Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds
Pull drm fix from Dave Airlie: "Just a quick fix that a few people have reported, be nice to have in asap" The drm tree seems to be very confused about 64-bit divides. Here it uses a slow 64-by-64 bit divide to divide by a small constant. Oh well. Doesn't look performance-critical, just stupid. * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/radeon: fix 64 bit divide in SI spm code
2013-08-04tmpfs: fix SEEK_DATA/SEEK_HOLE regressionHugh Dickins
Commit 46a1c2c7ae53 ("vfs: export lseek_execute() to modules") broke the tmpfs SEEK_DATA/SEEK_HOLE implementation, because vfs_setpos() converts the carefully prepared -ENXIO to -EINVAL. Other filesystems avoid it in error cases: do the same in tmpfs. Signed-off-by: Hugh Dickins <hughd@google.com> Cc: Jie Liu <jeff.liu@oracle.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-08-04Merge tag 'sound-3.11' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull sound fixes from Takashi Iwai: "All small regression or small fixes, nothing surprising at this stage. - regression fix for intel Mac Mini quirk - compress ioctl error fix - ASoC fixes for control change notifications, some UI fixes, driver-specific fixes (resource leak, build errors, etc)" * tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda - Fix missing fixup for Mac Mini with STAC9221 ASoC: wm0010: Fix resource leak ASoC: au1x: Fix build ASoC: bf5xx-ac97: Fix compile error with SND_BF5XX_HAVE_COLD_RESET ASoC: bfin-ac97: Fix prototype error following AC'97 refactoring ALSA: compress: fix the return value for SNDRV_COMPRESS_VERSION ASoC: dapm: Fix return value of snd_soc_dapm_put_{volsw,enum_virt}()
2013-08-04drm/radeon: fix 64 bit divide in SI spm codeAlex Deucher
Forgot to use the appropriate math64 function. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@gmail.com>
2013-08-03Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds
Pull networking fixes from David Miller: 1) Don't ignore user initiated wireless regulatory settings on cards with custom regulatory domains, from Arik Nemtsov. 2) Fix length check of bluetooth information responses, from Jaganath Kanakkassery. 3) Fix misuse of PTR_ERR in btusb, from Adam Lee. 4) Handle rfkill properly while iwlwifi devices are offline, from Emmanuel Grumbach. 5) Fix r815x devices DMA'ing to stack buffers, from Hayes Wang. 6) Kernel info leak in ATM packet scheduler, from Dan Carpenter. 7) 8139cp doesn't check for DMA mapping errors, from Neil Horman. 8) Fix bridge multicast code to not snoop when no querier exists, otherwise mutlicast traffic is lost. From Linus Lüssing. 9) Avoid soft lockups in fib6_run_gc(), from Michal Kubecek. 10) Fix races in automatic address asignment on ipv6, which can result in incorrect lifetime assignments. From Jiri Benc. 11) Cure build bustage when CONFIG_NET_LL_RX_POLL is not set and rename it CONFIG_NET_RX_BUSY_POLL to eliminate the last reference to the original naming of this feature. From Cong Wang. 12) Fix crash in TIPC when server socket creation fails, from Ying Xue. 13) macvlan_changelink() silently succeeds when it shouldn't, from Michael S Tsirkin. 14) HTB packet scheduler can crash due to sign extension, fix from Stephen Hemminger. 15) With the cable unplugged, r8169 prints out a message every 10 seconds, make it netif_dbg() instead of netif_warn(). From Peter Wu. 16) Fix memory leak in rtm_to_ifaddr(), from Daniel Borkmann. 17) sis900 gets spurious TX queue timeouts due to mismanagement of link carrier state, from Denis Kirjanov. 18) Validate somaxconn sysctl to make sure it fits inside of a u16. From Roman Gushchin. 19) Fix MAC address filtering on qlcnic, from Shahed Shaikh. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (68 commits) qlcnic: Fix for flash update failure on 83xx adapter qlcnic: Fix link speed and duplex display for 83xx adapter qlcnic: Fix link speed display for 82xx adapter qlcnic: Fix external loopback test. qlcnic: Removed adapter series name from warning messages. qlcnic: Free up memory in error path. qlcnic: Fix ingress MAC learning qlcnic: Fix MAC address filter issue on 82xx adapter net: ethernet: davinci_emac: drop IRQF_DISABLED netlabel: use domain based selectors when address based selectors are not available net: check net.core.somaxconn sysctl values sis900: Fix the tx queue timeout issue net: rtm_to_ifaddr: free ifa if ifa_cacheinfo processing fails r8169: remove "PHY reset until link up" log spam net: ethernet: cpsw: drop IRQF_DISABLED htb: fix sign extension bug macvlan: handle set_promiscuity failures macvlan: better mode validation tipc: fix oops when creating server socket fails net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL ...
2013-08-03qlcnic: Fix for flash update failure on 83xx adapterHimanshu Madhani
Flash update routine was improperly checking register read API return value. Modify register read API and perform proper error check. Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2013-08-03qlcnic: Fix link speed and duplex display for 83xx adapterRajesh Borundia
o Set link speed and duplex to unknown when link is not up. Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com> Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
generated by cgit v1.2.3 (git 2.0.4) at 2024-11-16 17:27:23 +0000