13 Jan, 2012
1 commit
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)
ASoC: twl6040 - Add method to query optimum PDM_DL1 gain
ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
ALSA: usb-audio: add Yamaha MOX6/MOX8 support
ALSA: virtuoso: add S/PDIF input support for all Xonars
ALSA: ice1724 - Support for ooAoo SQ210a
ALSA: ice1724 - Allow card info based on model only
ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations
ALSA: hdspm - Provide unique driver id based on card serial
ASoC: Dynamically allocate the rtd device for a non-empty release()
ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()
ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()
ALSA: hda/cirrus - support for iMac12,2 model
ASoC: cx20442: add bias control over a platform provided regulator
ALSA: usb-audio - Avoid flood of frame-active debug messages
ALSA: snd-usb-us122l: Delete calls to preempt_disable
mfd: Put WM8994 into cache only mode when suspending
...Fix up trivial conflicts in:
- arch/arm/mach-s3c64xx/mach-crag6410.c:
renamed speyside_wm8962 to tobermory, added littlemill right
next to it
- drivers/base/regmap/{regcache.c,regmap.c}:
duplicate diff that had already come in with other changes in
the regmap tree
10 Jan, 2012
1 commit
-
Conflicts:
arch/arm/mach-mxs/include/mach/common.hPull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.Signed-off-by: Arnd Bergmann
05 Jan, 2012
1 commit
-
Hook these platforms restart code into the new restart hook rather
than using arch_reset().Acked-by: Richard Purdie
Signed-off-by: Russell King
17 Dec, 2011
1 commit
-
Use snd_soc_register_card() instead of creating a "soc-audio" platform device.
Signed-off-by: Axel Lin
Signed-off-by: Mark Brown
14 Nov, 2011
1 commit
-
Avoid to define gpio_to_irq() and irq_to_gpio() for potential name
confliction since multiple architecture will be built together.Signed-off-by: Haojian Zhuang
11 Nov, 2011
1 commit
-
Add a default restart mode to reflect the hard-coded restart mode
found in these files.Acked-by: Nicolas Pitre
Acked-by: Will Deacon
Acked-by: H Hartley Sweeten
Acked-by: Robert Jarzmik
Signed-off-by: Russell King
17 Oct, 2011
1 commit
-
Get rid of the mdesc pointer in the fixup function call. No one uses
the mdesc pointer, it shouldn't be modified anyway, and we can't wrap
it, so let's remove it.Platform files found by:
$ regexp=$(git grep -h '\.fixup.*=' arch/arm |
sed 's!.*= *\([^,]*\),* *!\1!' | sort -u |
tr '\n' '|' | sed 's,|$,,;s,|,\\|,g')
$ git grep $regexp arch/armAcked-by: Nicolas Pitre
Signed-off-by: Russell King
12 Jul, 2011
1 commit
-
Signed-off-by: Eric Miao
26 Mar, 2011
1 commit
-
…-linux-2.6 into devel-stable
Conflicts:
arch/arm/mach-pxa/tosa.c
21 Mar, 2011
1 commit
-
This patch moves the platform data definition from
arch/arm/plat-pxa/include/plat/i2c.h to include/linux/i2c/pxa-i2c.h so
it can be accessed from x86 the same way as on ARM.This change should make no functional change to the PXA code. The move
is verified by building the following defconfigs:
cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig
imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig
raumfeld_defconfig magician_defconfig mmp2_defconfig pxa168_defconfig
pxa910_defconfigSigned-off-by: Sebastian Andrzej Siewior
Signed-off-by: Dirk Brandewie
Signed-off-by: Ben Dooks
16 Mar, 2011
1 commit
-
Switch from handling gpio-vbus in pxa25x_udc to using standard gpio-vbus
tranceiver.Signed-off-by: Dmitry Eremin-Solenikov
Signed-off-by: Eric Miao
27 Feb, 2011
1 commit
-
Since f0fba2ad1b it's required to register platform devices even for
AC'97 codecs. Register one on tosa (wm9712-codec).Signed-off-by: Dmitry Eremin-Solenikov
Cc: Eric Miao
Signed-off-by: Eric Miao
08 Jan, 2011
1 commit
-
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits)
spi/omap: Fix DMA API usage in OMAP MCSPI driver
spi/imx: correct the test on platform_get_irq() return value
spi/topcliff: Typo fix threhold to threshold
spi/dw_spi Typo change diable to disable.
spi/fsl_espi: change the read behaviour of the SPIRF
spi/mpc52xx-psc-spi: move probe/remove to proper sections
spi/dw_spi: add DMA support
spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
spi/dw_spi: Fix too short timeout in spi polling loop
spi/pl022: convert running variable
spi/pl022: convert busy flag to a bool
spi/pl022: pass the returned sglen to the DMA engine
spi/pl022: map the buffers on the DMA engine
spi/topcliff_pch: Fix data transfer issue
spi/imx: remove autodetection
spi/pxa2xx: pass of_node to spi device and set a parent device
spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
spi/pxa2xx: Add chipselect support for Sodaville
spi/pxa2xx: Consider CE4100's FIFO depth
spi/pxa2xx: Add CE4100 support
...
16 Dec, 2010
2 commits
-
This is important because on PXA3xx, the physical mapping of SMEMC registers
differs from the one on PXA2xx. In order to get PCMCIA working on both PXA2xx
and PXA320, the PCMCIA driver was adjusted accordingly as well.Also, various places in the kernel had to be patched to use
__raw_read/__raw_write.Signed-off-by: Marek Vasut
Acked-by: Haojian Zhuang
Signed-off-by: Eric Miao -
This patch introduces pxa2xx_map_io() and pxa3xx_map_io() to distinguish
between PXA25x/PXA27x and PXA3xx memory mapping.Also, fixup for platforms broken after introducing pxa{25x,27x}_map_io()
and pxa3xx_map_io() is included.Signed-off-by: Marek Vasut
Signed-off-by: Eric Miao
01 Dec, 2010
1 commit
-
The PXA-SPI driver relies on some files / defines which are arm specific
and are within the ARM tree. The CE4100 SoC which is x86 has also the
SPI core.
This patch moves the ssp and spi files from arm/mach-pxa and plat-pxa to
include/linux where the CE4100 can access them.This move got verified by building the following defconfigs:
cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig
imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig
raumfeld_defconfig magician_defconfigSigned-off-by: Sebastian Andrzej Siewior
Signed-off-by: Dirk Brandewie
20 Oct, 2010
1 commit
-
Since we're now using addruart to establish the debug mapping, we can
remove the io_pg_offst and phys_io members of struct machine_desc.The various declarations were removed using the following script:
grep -rl MACHINE_START arch/arm | xargs \
sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }'[ Initial patch was from Jeremy Kerr, example script from Russell King ]
Signed-off-by: Nicolas Pitre
Acked-by: Eric Miao
08 Oct, 2010
1 commit
-
Signed-off-by: Haojian Zhuang
Acked-by: Antonio Ospite
Signed-off-by: Eric Miao
16 Jul, 2010
1 commit
-
Everything should now be using sparsemem rather than discontigmem, so
remove the code supporting discontigmem from ARM.Signed-off-by: Russell King
11 May, 2010
1 commit
-
delay_detect in HZ is confusing, convert it to be millisecond based. And
thus remove those unnecessary call to msecs_to_jiffies() at runtime for
this field. Other constants are converted assuming HZ == 100, which are
basically true for those platforms.The assignment in csb726.c was incorrect, and is fixed in this patch as
a result.Signed-off-by: Eric Miao
Acked-by: Robert Jarzmik
Acked-by: Marc Zyngier
Acked-by: Marek Vasut
Acked-by: Mike Rapoport
Acked-by: Daniel Mack
02 Mar, 2010
1 commit
-
Cc: Dmitry Eremin-Solenikov
Signed-off-by: Eric Miao
01 Dec, 2009
1 commit
-
For some platforms, it is inappropriate to register all PXA UARTs.
In some cases, the UARTs may not be used, and in others we may want
to avoid registering the UARTs to allow other drivers (eg, FICP) to
make use of the UART.In addition, a while back there was a request to be able to pass
platform data to the UART driver.This patch enables all of this by providing functions platforms can
call to register each individual UART.Signed-off-by: Russell King
Acked-by: Mike Rapoport
Acked-by: Robert Jarzmik
Signed-off-by: Eric Miao
10 Sep, 2009
2 commits
-
and convert PXA-based devices to gpio_pwdown where possible.
Signed-off-by: Marek Vasut
Signed-off-by: Eric Miao -
Several boards use always the same pattern with pxamci :
request gpio, request irq for that gpio to detect MMC card
insertion, request gpio for read-only mode detection, etc
...Now that pxamci provides platform_data to describe simple
gpio management of the MMC external controls, use it.Signed-off-by: Robert Jarzmik
Acked-by: Mike Rapoport
Acked-by: Philipp Zabel
Acked-by: Dmitry Eremin-Solenikov
Cc: rpurdie@rpsys.net
Cc: drwyrm@gmail.com
Cc: sakoman@gmail.com
Cc: marek.vasut@gmail.com
Cc: s.hauer@pengutronix.de
Signed-off-by: Eric Miao
15 Jun, 2009
1 commit
-
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
05 Jun, 2009
1 commit
-
Signed-off-by: Paul Shen
Signed-off-by: Eric Miao
04 Jun, 2009
1 commit
-
This patch completely rewrites the rfkill core to address
the following deficiencies:* all rfkill drivers need to implement polling where necessary
rather than having one central implementation* updating the rfkill state cannot be done from arbitrary
contexts, forcing drivers to use schedule_work and requiring
lots of code* rfkill drivers need to keep track of soft/hard blocked
internally -- the core should do this* the rfkill API has many unexpected quirks, for example being
asymmetric wrt. alloc/free and register/unregister* rfkill can call back into a driver from within a function the
driver called -- this is prone to deadlocks and generally
should be avoided* rfkill-input pointlessly is a separate module
* drivers need to #ifdef rfkill functions (unless they want to
depend on or select RFKILL) -- rfkill should provide inlines
that do nothing if it isn't compiled in* the rfkill structure is not opaque -- drivers need to initialise
it correctly (lots of sanity checking code required) -- instead
force drivers to pass the right variables to rfkill_alloc()* the documentation is hard to read because it always assumes the
reader is completely clueless and contains way TOO MANY CAPS* the rfkill code needlessly uses a lot of locks and atomic
operations in locked sections* fix LED trigger to actually change the LED when the radio state
changes -- this wasn't done beforeTested-by: Alan Jenkins
Signed-off-by: Henrique de Moraes Holschuh [thinkpad]
Signed-off-by: Johannes Berg
Signed-off-by: John W. Linville
18 May, 2009
1 commit
-
I want to reuse tosa/spitz gpio_reset code, but my board needs the reset
gpio to be driven high during normal operation.Signed-off-by: Daniel Ribeiro
Acked-by: Dmitry Eremin-Solenikov
Signed-off-by: Eric Miao
04 Apr, 2009
1 commit
-
The tosa, e740, e750, e800 and mioa701 all use AC97 audio codecs
but does not register the platform device for the AC97 controller.
Doing so is now required by ASoC.Signed-off-by: Mark Brown
Acked-by: Dmitry Eremin-Solenikov
Acked-by: Ian Molton
Signed-off-by: Robert Jarzmik
Signed-off-by: Eric Miao
25 Mar, 2009
1 commit
-
…-linux-2.6 into devel
23 Mar, 2009
1 commit
-
…inux-2.6.git into devel
20 Mar, 2009
1 commit
-
OMAP wishes to pass state to the boot loader upon reboot in order to
instruct it whether to wait for USB-based reflashing or not. There is
already a facility to do this via the reboot() syscall, except we ignore
the string passed to machine_restart().This patch fixes things to pass this string to arch_reset(). This means
that we keep the reboot mode limited to telling the kernel _how_ to
perform the reboot which should be independent of what we request the
boot loader to do.Acked-by: Tony Lindgren
Signed-off-by: Russell King
19 Mar, 2009
1 commit
-
clk_add_alias is commonly called for platform devices that are not yet
registered in the device tree. Thus the clock alias is associated with
NULL device name. Fix this by passing the device name instead of just
device pointer.Signed-off-by: Dmitry Eremin-Solenikov
Signed-off-by: Eric Miao
09 Mar, 2009
1 commit
-
Considering the header mess ATM, it is not always possible to include
the correct header files within board code. Let's keep this simple:- for pxa25x based platforms
- for pxa27x based platforms
- for pxa300 based platforms
- for pxa320 based platforms
- for pxa930 based platformsNOTE:
1. one header one board file, they are not compatible (i.e. they have
conflicting definitions which won't compile if included together).2. Unless strictly necessary, the following header files are considered
to be SoC files use _only_, and is not recommended to be included in
board code:
Signed-off-by: Eric Miao
02 Dec, 2008
3 commits
-
Add mapping for system ROM using physmap-flash mapping.
Signed-off-by: Dmitry Baryshkov
Signed-off-by: Eric Miao -
Signed-off-by: Dmitry Baryshkov
Signed-off-by: Eric Miao -
Add platform data necessary to support tmiofb on tosa.
Signed-off-by: Dmitry Baryshkov
Signed-off-by: Eric Miao
21 Oct, 2008
1 commit
-
Signed-off-by: Dmitry Baryshkov
20 Oct, 2008
2 commits
-
As requested by Ian make state restore only if it's requested
by platform data: some platforms do correctly save the state of
the chip during suspend/resume, but some (like tosa) incorrectly
power off the chip at suspend, so the driver supports restoring
some bits of the tc6393xb state (not full, merely enough to support
resume on tosa). With this patch this code is disabled by default.Signed-off-by: Dmitry Baryshkov
Acked-by: Ian Molton
Signed-off-by: Samuel Ortiz -
Instead of using bitfields for initial gpio setup,
provide generic setup/teardown hooks that can be used
to set the gpio states, register child devices, etc.Signed-off-by: Dmitry Baryshkov
Signed-off-by: Samuel Ortiz