From patchwork Mon Jan 9 14:54:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lauri Hintsala X-Patchwork-Id: 135036 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 [205.233.59.134]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 08D50B6F70 for ; Tue, 10 Jan 2012 02:07:45 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RkGcO-0005Qb-89; Mon, 09 Jan 2012 14:54:36 +0000 Received: from bluegiga.fi ([194.100.31.45] helo=blue-gw.bluegiga.fi) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RkGcH-0005PA-8f for linux-arm-kernel@lists.infradead.org; Mon, 09 Jan 2012 14:54:33 +0000 Received: from bgtlh.bgt.local (unknown [10.1.1.28]) by blue-gw.bluegiga.fi (Postfix) with ESMTP id E5CD37BE1D3; Mon, 9 Jan 2012 16:54:23 +0200 (EET) From: Lauri Hintsala To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] MXS: apx4devkit: add platform data for saif Date: Mon, 9 Jan 2012 16:54:06 +0200 Message-Id: <1326120846-32554-1-git-send-email-lauri.hintsala@bluegiga.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1325864366-17995-1-git-send-email-shawn.guo@linaro.org> References: <1325864366-17995-1-git-send-email-shawn.guo@linaro.org> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: shawn.guo@linaro.org, Lauri Hintsala 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: , MIME-Version: 1.0 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 Signed-off-by: Lauri Hintsala cc: shawn.guo@linaro.org --- Hi Shawn, My patch was based on mainline tree and saif patches broke it. This patch fixes compiling issue which was caused by saif patches. If you think so we can apply also this patch later when apx4devkit is pulled to mainline (hopefully to 3.3). Lauri arch/arm/mach-mxs/mach-apx4devkit.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-mxs/mach-apx4devkit.c b/arch/arm/mach-mxs/mach-apx4devkit.c index 08693f1..013aae5 100644 --- a/arch/arm/mach-mxs/mach-apx4devkit.c +++ b/arch/arm/mach-mxs/mach-apx4devkit.c @@ -33,6 +33,7 @@ #include #include +#include #include "devices-mx28.h" @@ -192,6 +193,18 @@ static int apx4devkit_phy_fixup(struct phy_device *phy) return 0; } +static const struct mxs_saif_platform_data + apx4devkit_mxs_saif_pdata[] __initconst = { + /* working on EXTMSTR0 mode (saif0 master, saif1 slave) */ + { + .master_mode = 1, + .master_id = 0, + }, { + .master_mode = 0, + .master_id = 0, + }, +}; + static void __init apx4devkit_init(void) { mxs_iomux_setup_multiple_pads(apx4devkit_pads, @@ -216,8 +229,9 @@ static void __init apx4devkit_init(void) gpio_led_register_device(0, &apx4devkit_led_data); - mx28_add_saif(0); - mx28_add_saif(1); + mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0); + mx28_add_saif(0, &apx4devkit_mxs_saif_pdata[0]); + mx28_add_saif(1, &apx4devkit_mxs_saif_pdata[1]); apx4devkit_add_regulators();