Shawn Guo
2e534b21a5
dmaengine: imx-sdma: pass sdma firmware name via platform data ...
It is not good to have cpu_name and to_version encoded into sdma
firmware name as variables. For example, there are three TOs of
imx51 soc, the sdma script never changes since TO1, which means
all three TOs of imx51 uses TO1 version of sdma script. But we
have to prepare three identical firmwares, sdma-imx51-to1.bin
sdma-imx51-to2.bin and sdma-imx51-to3.bin, to have the kernel
capable of running on all three TOs.
The patch removes cpu_name and to_version from sdma platform data,
and instead uses fw_name to pass the firmware name, so that we can
pass the TO version where it's relevant and skip it where only one
firmware exists.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-07-07 10:01:12 +02:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2011-05-29 11:19:16 -07:00
libata: fix unexpectedly frozen port after ata_eh_reset()
2011-06-07 15:55:55 -04:00
PM / Runtime: Fix loops in pm_runtime_clk_notify()
2011-06-07 23:34:58 +02:00
drivers/bcma/host_pci.c needs slab.h
2011-05-26 17:12:32 -07:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2011-06-04 08:11:26 +09:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem
2011-06-17 12:40:36 -04:00
block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal
2011-06-02 05:29:19 +09:00
drivers/char/hpet.c: fix periodic-emulation for delayed interrupts
2011-06-15 20:04:02 -07:00
Revert "clocksource: sh_cmt: Runtime PM support"
2011-05-31 15:26:42 +09:00
[CPUFREQ] powernow-k8: Don't try to transition if the pstate is incorrect
2011-06-16 16:31:13 -04:00
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
2011-05-29 11:18:09 -07:00
dmaengine: imx-sdma: pass sdma firmware name via platform data
2011-07-07 10:01:12 +02:00
edac,rcu: use synchronize_rcu() instead of call_rcu()+rcu_barrier()
2011-05-26 17:12:37 -07:00
iscsi_ibft: iscsi_ibft_find unused variable i
2011-06-09 09:05:12 -04:00
Merge remote-tracking branch 'grant/gpio/next-mx' into devel-features
2011-07-07 10:00:49 +02:00
drm/radeon/kms/r6xx+: voltage fixes
2011-06-21 09:38:25 +10:00
Revert "HID: magicmouse: ignore 'ivalid report id' while switching modes"
2011-06-16 12:21:34 +02:00
hwmon: (s3c) Initialize sysfs attributes
2011-06-17 23:22:27 -07:00
ide-cd: signedness warning fix again
2011-06-11 15:06:48 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2011-05-26 12:13:57 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-06-20 08:59:46 -07:00
gigaset: call module_put before restart of if_open()
2011-06-17 15:27:32 -04:00
leds: fix the incorrect display in menuconfig
2011-06-15 20:04:01 -07:00
md/raid5: remove unusual use of bio_iovec_idx()
2011-06-14 14:23:57 +10:00
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
2011-06-09 13:09:07 -07:00
mfd: Fix build breakage caused by tps65910 gpio directory move
2011-05-28 08:38:55 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2011-06-20 20:10:18 -07:00
ARM i.MX dma: Fix burstsize settings
2011-07-07 09:55:50 +02:00
Merge git://git.infradead.org/mtd-2.6
2011-05-27 20:06:53 -07:00
pxa168_eth: fix race in transmit path.
2011-06-20 14:02:07 -07:00
oprofile: Fix locking dependency in sync_start()
2011-05-31 16:33:34 +02:00
Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
2011-05-26 13:19:00 -07:00
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2011-06-14 11:25:32 -07:00
gpio: include linux/gpio.h where needed
2011-06-16 08:40:44 -06:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
2011-05-29 11:44:33 -07:00
Merge git://git.infradead.org/battery-2.6
2011-05-27 10:12:35 -07:00
ptp: Fix some locking bugs in ptp_read()
2011-06-01 19:29:10 -07:00
regulator: Fix _regulator_get_voltage if get_voltage callback is NULL
2011-05-27 10:49:30 +01:00
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-06-13 10:47:04 -07:00
[S390] qdio: Split SBAL entry flags
2011-06-06 14:14:56 +02:00
[SCSI] Fix oops caused by queue refcounting failure
2011-06-02 18:34:43 +09:00
drivers: sh: resume enabled clocks fix
2011-06-14 15:15:25 +09:00
spi/bfin_spi: fix handling of default bits per word setting
2011-06-17 08:27:27 -06:00
ssb: fix PCI(e) driver regression causing oops on PCI cards
2011-06-03 14:19:49 -04:00
staging: fix iio builds when IIO_RING_BUFFER is not enabled
2011-06-16 08:29:00 -07:00
drivers/tty/serial/pch_uart.c: don't oops if dmi_get_system_info returns NULL
2011-06-15 20:04:02 -07:00
USB: serial: add another 4N-GALAXY.DE PID to ftdi_sio driver
2011-06-08 13:48:30 -07:00
vhost: support event index
2011-05-30 11:14:15 +09:30
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x
2011-06-16 09:45:47 -07:00
virtio: add api for delayed callbacks
2011-05-30 11:14:16 +09:30
w1: W1_MASTER_DS1WM should depend on GENERIC_HARDIRQS
2011-06-15 20:04:00 -07:00
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2011-06-20 09:01:33 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2011-05-28 12:35:15 -07:00
2e534b21a5