From: Linus Torvalds Date: Thu, 13 Dec 2012 19:00:00 +0000 (-0800) Subject: Merge tag 'boards2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc X-Git-Tag: firefly_0821_release~3680^2~1475 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fe504c5c745aeb767d978fbedeb94775fd4cb69c;p=firefly-linux-kernel-4.4.55.git Merge tag 'boards2' of git://git./linux/kernel/git/arm/arm-soc Pull ARM SoC board updates, take 2 from Olof Johansson: "This branch contains board updates for shmobile that had dependencies on earlier branches past the first driver branch, and thus are merged separately. Most of these are to enable audio and USB on shmobile. They contain a dependent ASoC branch that has been coordinated with Mark Brown." * tag 'boards2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: shmobile: mackerel: Add FLCTL IRQ resource ARM: shmobile: use FSI driver's audio clock on ap4evb ARM: shmobile: use FSI driver's audio clock on mackerel ARM: shmobile: use FSI driver's audio clock on armadillo800eva ARM: shmobile: mackerel: enable DMAEngine on USB Host ARM: shmobile: marzen: add USB OHCI driver support ARM: shmobile: marzen: add USB EHCI driver support ARM: shmobile: marzen: add USB phy support ASoC: fsi: add master clock control functions ASoC: fsi: care fsi_hw_start/stop() return value ASoC: fsi: fsi_set_master_clk() was called from fsi_hw_xxx() only ASoC: fsi: use devm_request_irq() ASoC: fsi: fixup channels_min/max --- fe504c5c745aeb767d978fbedeb94775fd4cb69c