From patchwork Thu Dec 13 01:57:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 206192 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 544962C0086 for ; Fri, 14 Dec 2012 04:24:36 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TjCSv-0004GT-9E; Thu, 13 Dec 2012 17:20:57 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tiy3h-0002VX-BY for linux-arm-kernel@lists.infradead.org; Thu, 13 Dec 2012 01:58:01 +0000 Received: by mail-pb0-f49.google.com with SMTP id un15so1014991pbc.36 for ; Wed, 12 Dec 2012 17:57:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=3FfwTQ3uXv2nLrKMZsa+rfVHSC83V1DQb/+aGKWL6UA=; b=pJbcugOylM46bnRDnEdUS2cpH14gCpULTTdH8dIVmY5UhepLz0Yz3238tfmCv4WQ/H aKerOgYIHngs8wRj3DbhbKIgXSg00qVyTLZxIiY/xuleQ0EhxR6mmHpLykKwX2hlesJP FiZoBGq8WHN6zkwzZyLYSjSENDE6YgGvSGnwIN4iZ5DywVYH7qVlN2cl7na/9r9Zjcfq fOWdBoutjBU7bs87JYdO2GSvFFJZPSHzyEeZHUNYN7WemnThQ3GrCTS5jkM2VqVFJQuV zUwN6yWPu3j6tiMVShHc23v7axOzjUlY0CMWfQX9NGuSBfJzzaZDd/AZnk3nuAiAnxRc k7Ag== Received: by 10.68.143.162 with SMTP id sf2mr382130pbb.137.1355363876490; Wed, 12 Dec 2012 17:57:56 -0800 (PST) Received: from localhost (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPS id ip8sm51562pbc.36.2012.12.12.17.57.54 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Dec 2012 17:57:55 -0800 (PST) Date: Wed, 12 Dec 2012 17:57:54 -0800 From: Olof Johansson To: torvalds@linux-foundation.org Subject: [GIT PULL 5/5] ARM: arm-soc board updates, take 2 Message-ID: <20121213015754.GE28281@quad.lixom.net> References: <20121213015543.GA18953@quad.lixom.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121213015543.GA18953@quad.lixom.net> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQmetF58zcBbwKbjRsb/lI024JsiLDVt8CaXVeAHJrTJIhuP0x6drzcIYqUnpizKEUWfmFfm X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121212_205759_008452_F1F9910A X-CRM114-Status: GOOD ( 10.56 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Mailman-Approved-At: Thu, 13 Dec 2012 12:18:34 -0500 Cc: arm@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Linus, 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. Conflict seen with this merge: None ---------------------------------------------------------------- The following changes since commit 370cdda68eb40e69a7a8950abec230976e5d9117: Merge branch 'next/drivers' into HEAD are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/boards2 for you to fetch changes up to d7460f4a3d75469deb1c6c028961da69608d02d9: Merge branch 'boards3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards2 ---------------------------------------------------------------- Arnd Bergmann (3): Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2 Merge branches 'depends/asoc', 'renesas/boards', 'renesas/soc' and 'renesas/soc2' into next/boards2 Merge branch 'boards' of git://git.kernel.org/.../horms/renesas into next/boards2 Bastian Hecht (1): ARM: shmobile: mackerel: Add FLCTL IRQ resource Kuninori Morimoto (12): ASoC: fsi: fixup channels_min/max ASoC: fsi: use devm_request_irq() ASoC: fsi: fsi_set_master_clk() was called from fsi_hw_xxx() only ASoC: fsi: care fsi_hw_start/stop() return value ASoC: fsi: add master clock control functions ARM: shmobile: marzen: add USB phy support ARM: shmobile: marzen: add USB EHCI driver support ARM: shmobile: marzen: add USB OHCI driver support ARM: shmobile: mackerel: enable DMAEngine on USB Host ARM: shmobile: use FSI driver's audio clock on armadillo800eva ARM: shmobile: use FSI driver's audio clock on mackerel ARM: shmobile: use FSI driver's audio clock on ap4evb Olof Johansson (1): Merge branch 'boards3' of git://git.kernel.org/.../horms/renesas into next/boards2 Simon Horman (1): Merge branch 'soc' into boards arch/arm/configs/marzen_defconfig | 14 +- arch/arm/mach-shmobile/Kconfig | 2 + arch/arm/mach-shmobile/board-ap4evb.c | 139 +----- arch/arm/mach-shmobile/board-armadillo800eva.c | 38 +- arch/arm/mach-shmobile/board-mackerel.c | 80 +--- arch/arm/mach-shmobile/board-marzen.c | 186 ++++++++- include/sound/sh_fsi.h | 6 + sound/soc/sh/fsi.c | 441 ++++++++++++++++++-- 8 files changed, 617 insertions(+), 289 deletions(-)