#
a3fd869a |
| 25-Jul-2012 |
Paul Mundt <lethal@linux-sh.org> |
Merge branches 'sh/urgent' and 'sh/regulator' into sh-latest
|
#
47b170af |
| 24-Jul-2012 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH updates from Paul Mundt:
- Migration off of old-style dynamic IRQ API.
- irqdomain and generic irq chip propagation.
-
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH updates from Paul Mundt:
- Migration off of old-style dynamic IRQ API.
- irqdomain and generic irq chip propagation.
- div4/6 clock consolidation, another step towards co-existing with the common struct clk infrastructure.
- Extensive PFC rework - Decoupling GPIO from pin state. - Initial pinctrl support to facilitate incremental migration off of legacy pinmux. - gpiolib support made optional, and made pinctrl-backed.
* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (38 commits) sh: pfc: pin config get/set support. sh: pfc: Prefer DRV_NAME over KBUILD_MODNAME. sh: pfc: pinctrl legacy group support. sh: pfc: Ignore pinmux GPIOs with invalid enum IDs. sh: pfc: Export pinctrl binding init symbol. sh: pfc: Error out on pinctrl init resolution failure. sh: pfc: Make pr_fmt consistent across pfc drivers. sh: pfc: pinctrl legacy function support. sh: pfc: Rudimentary pinctrl-backed GPIO support. sh: pfc: Dumb GPIO stringification. sh: pfc: Shuffle PFC support core. sh: pfc: Verify pin type encoding size at build time. sh: pfc: Kill off unused pinmux bias flags. sh: pfc: Make gpio chip support optional where possible. sh: pfc: Split out gpio chip support. sh64: Fix up section mismatch warnings. sh64: Attempt to make reserved insn trap handler resemble C. sh: Consolidate die definitions for trap handlers. sh64: Kill off old exception debugging helpers. sh64: Use generic unaligned access control/counters. ...
show more ...
|
Revision tags: v3.5, v3.5-rc7 |
|
#
9e9fd65d |
| 11-Jul-2012 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'pl022' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into spi-next
|
Revision tags: v3.5-rc6 |
|
#
89d71486 |
| 05-Jul-2012 |
Guennadi Liakhovetski <g.liakhovetski@gmx.de> |
sh: select the fixed regulator driver on several boards
On systems, using regulators to supply power to devices, if the REGULATOR Kconfig option is disabled, regulator API stubs will be used, which
sh: select the fixed regulator driver on several boards
On systems, using regulators to supply power to devices, if the REGULATOR Kconfig option is disabled, regulator API stubs will be used, which often suffices to bring a default configuration up. If REGULATOR is enabled but respective regulator drivers are inactive, the real regulator API calls will be used, which in the absence of drivers will fail to provide services. This patch prevents such a problem on sh-mobile boards by forcing REGULATOR_FIXED_VOLTAGE on if REGULATOR is selected.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
show more ...
|
#
404c3bc3 |
| 04-Jul-2012 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v3.5-rc5' into next
|
Revision tags: v3.5-rc5, v3.5-rc4, v3.5-rc3 |
|
#
9a64e8e0 |
| 15-Jun-2012 |
Sage Weil <sage@inktank.com> |
Merge tag 'v3.5-rc1'
Linux 3.5-rc1
Conflicts: net/ceph/messenger.c
|
#
d987dd13 |
| 14-Jun-2012 |
Kalle Valo <kvalo@qca.qualcomm.com> |
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts: drivers/net/wireless/ath/ath6kl/cfg80211.c
|
#
289733ed |
| 13-Jun-2012 |
Tomi Valkeinen <tomi.valkeinen@ti.com> |
Merge tag 'v3.5-rc2'
Merge v3.5-rc2 to get latest device tree and dynamic debug changes.
|
#
d978006a |
| 13-Jun-2012 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/dynamic-irq-cleanup' into sh-latest
Conflicts: drivers/sh/intc/dynamic.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
|
#
66dd07b8 |
| 10-Jun-2012 |
James Morris <james.l.morris@oracle.com> |
Merge commit 'v3.5-rc2' into next
|
Revision tags: v3.5-rc2, v3.5-rc1 |
|
#
e269f90f |
| 01-Jun-2012 |
Daniel Vetter <daniel.vetter@ffwll.ch> |
Merge remote-tracking branch 'airlied/drm-prime-vmap' into drm-intel-next-queued
We need the latest dma-buf code from Dave Airlie so that we can pimp the backing storage handling code in drm/i915 wi
Merge remote-tracking branch 'airlied/drm-prime-vmap' into drm-intel-next-queued
We need the latest dma-buf code from Dave Airlie so that we can pimp the backing storage handling code in drm/i915 with Chris Wilson's unbound tracking and stolen mem backed gem object code.
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
show more ...
|
#
197b58e6 |
| 24-May-2012 |
Paul Mundt <lethal@linux-sh.org> |
sh: se7343: Move CPLD IRQs to irqdomain and generic irq chip.
Follows the se7722 change, see there for more information.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
|
#
5df38b9b |
| 24-May-2012 |
Paul Mundt <lethal@linux-sh.org> |
sh: se722: Move FPGA IRQs to irqdomain and generic irq chip.
This implements a total rewrite of the rather buggy SE7722 FPGA IRQ code, utilizing a linear irq domain as well as the generic irq chip t
sh: se722: Move FPGA IRQs to irqdomain and generic irq chip.
This implements a total rewrite of the rather buggy SE7722 FPGA IRQ code, utilizing a linear irq domain as well as the generic irq chip type.
While the interaction between the two APIs is a bit clunky (ie, revmap lookup for gc irq_base), they work well enough together that it's easy enough to work with going forward.
While we're at it, deal with irq_mask_ack/unmask of the chained IRQ in the demux handler to prevent smc91x screaming about spurious interrupts.
There's also some more improvement that can be made to the irqdomain code to create backing irqdescs for the entire linear range in one bang instead of iterating over the number of hwirqs and doing it irq-at-a-time. This is easily dealt with at a later point, though.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
show more ...
|
#
b98b3581 |
| 24-May-2012 |
Paul Mundt <lethal@linux-sh.org> |
sh: mach-x3proto: Migrate to linear irq domain.
In the interest of getting off of the create_irq() API we can get all of the functionality we're interested in through a linear IRQ domain. Fairly str
sh: mach-x3proto: Migrate to linear irq domain.
In the interest of getting off of the create_irq() API we can get all of the functionality we're interested in through a linear IRQ domain. Fairly straightforward conversion utilizing a single linear domain.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
show more ...
|
#
6eca954e |
| 30-Jun-2012 |
Len Brown <len.brown@intel.com> |
Merge branches 'acpi_pad-bugzilla-42981', 'apei-bugzilla-43282', 'video-bugzilla-43168', 'bugzilla-40002' and 'bugfix-misc' into release
bug fixes
|
#
d3514abc |
| 04-Jun-2012 |
Len Brown <len.brown@intel.com> |
Merge branches 'bugfix-battery', 'bugfix-misc', 'bugfix-rafael', 'bugfix-turbostat', 'bugfix-video' and 'workaround-pss' into release
bug fixes
Signed-off-by: Len Brown <len.brown@intel.com>
|
#
7e1bd6e3 |
| 04-Jun-2012 |
Len Brown <len.brown@intel.com> |
Merge branch 'upstream' into bugfix-video
Update bugfix-video branch to 2.5-rc1 so I don't have to again resolve the conflict in these patches vs. upstream.
Conflicts: drivers/gpu/drm/gma500/psb_d
Merge branch 'upstream' into bugfix-video
Update bugfix-video branch to 2.5-rc1 so I don't have to again resolve the conflict in these patches vs. upstream.
Conflicts: drivers/gpu/drm/gma500/psb_drv.c
text conflict: add comment vs delete neighboring line
keep just this: /* igd_opregion_init(&dev_priv->opregion_dev); */ /* acpi_video_register(); */
Signed-off-by: Len Brown <len.brown@intel.com>
show more ...
|
#
2e341ca6 |
| 23-May-2012 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "This is the first big chunk for 3.5 merges of sound stuff.
There are a f
Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "This is the first big chunk for 3.5 merges of sound stuff.
There are a few big changes in different areas. First off, the streaming logic of USB-audio endpoints has been largely rewritten for the better support of "implicit feedback". If anything about USB got broken, this change has to be checked.
For HD-audio, the resume procedure was changed; instead of delaying the resume of the hardware until the first use, now waking up immediately at resume. This is for buggy BIOS.
For ASoC, dynamic PCM support and the improved support for digital links between off-SoC devices are major framework changes.
Some highlights are below:
* HD-audio - Avoid accesses of invalid pin-control bits that may stall the codec - V-ref setup cleanups - Fix the races in power-saving code - Fix the races in codec cache hashes and connection lists - Split some common codes for BIOS auto-parser to hda_auto_parser.c - Changed the PM resume code to wake up immediately for buggy BIOS - Creative SoundCore3D support - Add Conexant CX20751/2/3/4 codec support
* ASoC - Dynamic PCM support, allowing support for SoCs with internal routing through components with tight sequencing and formatting constraints within their internal paths or where there are multiple components connected with CPU managed DMA controllers inside the SoC. - Greatly improved support for direct digital links between off-SoC devices, providing a much simpler way of connecting things like digital basebands to CODECs. - Much more fine grained and robust locking, cleaning up some of the confusion that crept in with multi-component. - CPU support for nVidia Tegra 30 I2S and audio hub controllers and ST-Ericsson MSP I2S controolers - New CODEC drivers for Cirrus CS42L52, LAPIS Semiconductor ML26124, Texas Instruments LM49453. - Some regmap changes needed by the Tegra I2S driver. - mc13783 audio support.
* Misc - Rewrite with module_pci_driver() - Xonar DGX support for snd-oxygen - Improvement of packet handling in snd-firewire driver - New USB-endpoint streaming logic - Enhanced M-audio FTU quirks and relevant cleanups - Increment the support of OSS devices to 256 - snd-aloop accuracy improvement
There are a few more pending changes for 3.5, but they will be sent slightly later as partly depending on the changes of DRM."
Fix up conflicts in regmap (due to duplicate patches, with some further updates then having already come in from the regmap tree). Also some fairly trivial context conflicts in the imx and mcx soc drivers.
* tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (280 commits) ALSA: snd-usb: fix stream info output in /proc ALSA: pcm - Add proper state checks to snd_pcm_drain() ALSA: sh: Fix up namespace collision in sh_dac_audio. ALSA: hda/realtek - Fix unused variable compile warning ASoC: sh: fsi: enable chip specific data transfer mode ASoC: sh: fsi: call fsi_hw_startup/shutdown from fsi_dai_trigger() ASoC: sh: fsi: use same format for IN/OUT ASoC: sh: fsi: add fsi_version() and removed meaningless version check ASoC: sh: fsi: use register field macro name on IN/OUT_DMAC ASoC: tegra: Add machine driver for WM8753 codec ALSA: hda - Fix possible races of accesses to connection list array ASoC: OMAP: HDMI: Introduce codec ARM: mx31_3ds: Add sound support ASoC: imx-mc13783 cleanup mx31moboard: Add sound support ASoC: mc13783 codec cleanups ASoC: add imx-mc13783 sound support ASoC: Add mc13783 codec mfd: mc13xxx: add codec platform data ASoC: don't flip master of DT-instantiated DAI links ...
show more ...
|
#
1d767cae |
| 23-May-2012 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH updates from Paul Mundt: - New CPUs: SH7734 (SH-4A), SH7264 and SH7269 (SH-2A) - New boards: RSK2+SH7264, RSK2+SH7269 - Un
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH updates from Paul Mundt: - New CPUs: SH7734 (SH-4A), SH7264 and SH7269 (SH-2A) - New boards: RSK2+SH7264, RSK2+SH7269 - Unbreaking kgdb for SMP - Consolidation of _32/_64 page fault handling. - watchdog and legacy DMA chainsawing, part 1 - Conversion to evt2irq() hwirq lookup, to support relocation of vectored IRQs for irqdomains.
* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (98 commits) sh: intc: Kill off special reservation interface. sh: Enable PIO API for hp6xx and se770x. sh: Kill off machvec IRQ hinting. sh: dma: More legacy cpu dma chainsawing. sh: Kill off MAX_DMA_ADDRESS leftovers. sh: Tidy up some of the cpu legacy dma header mess. sh: Move sh4a dma header from cpu-sh4 to cpu-sh4a. sh64: Fix up vmalloc fault range check. Revert "sh: Ensure fixmap and store queue space can co-exist." serial: sh-sci: Fix for port types without BRI interrupts. sh: legacy PCI evt2irq migration. sh: cpu dma evt2irq migration. sh: sh7763rdp evt2irq migration. sh: sdk7780 evt2irq migration. sh: migor evt2irq migration. sh: landisk evt2irq migration. sh: kfr2r09 evt2irq migration. sh: ecovec24 evt2irq migration. sh: ap325rxa evt2irq migration. sh: urquell evt2irq migration. ...
show more ...
|
#
775b2449 |
| 21-May-2012 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/asoc' into for-linus
|
Revision tags: v3.4, v3.4-rc7 |
|
#
bcb86e0a |
| 10-May-2012 |
Paul Mundt <lethal@linux-sh.org> |
Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest
Conflicts: arch/sh/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
|
#
b6397435 |
| 10-May-2012 |
Phil Edworthy <phil.edworthy@renesas.com> |
sh: Add RSK2+SH7269 board
The RSK2+SH7269 board uses the SH7269 processor. It is often referred to as just rsk7269. NOR Flash, SDRAM, serial, USB Host and ethernet are working.
Signed-off-by: Phil
sh: Add RSK2+SH7269 board
The RSK2+SH7269 board uses the SH7269 processor. It is often referred to as just rsk7269. NOR Flash, SDRAM, serial, USB Host and ethernet are working.
Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
show more ...
|
#
15f99cbd |
| 10-May-2012 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/rsk-updates' into sh-latest
Conflicts: arch/sh/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
|
#
d584e204 |
| 09-May-2012 |
Phil Edworthy <phil.edworthy@renesas.com> |
sh: Add RSK2+SH7264 board
The RSK2+SH7264 board uses the sh7264 processor. It is often referred to as just rsk7264. NOR Flash, SDRAM, serial, USB Host and ethernet are working.
Signed-off-by: Phil
sh: Add RSK2+SH7264 board
The RSK2+SH7264 board uses the sh7264 processor. It is often referred to as just rsk7264. NOR Flash, SDRAM, serial, USB Host and ethernet are working.
Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
show more ...
|
Revision tags: v3.4-rc6, v3.4-rc5, v3.4-rc4 |
|
#
fb56a919 |
| 19-Apr-2012 |
Paul Mundt <lethal@linux-sh.org> |
Merge branches 'sh/st-integration' and 'sh/stackprotector' into sh-latest
|