From patchwork Fri Aug 28 22:05:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mark A. Greer" X-Patchwork-Id: 44657 Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7SM5g8A003051 for ; Fri, 28 Aug 2009 22:05:43 GMT Received: from dlep36.itg.ti.com ([157.170.170.91]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id n7SM5bra024608 for ; Fri, 28 Aug 2009 17:05:42 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id n7SM5bd6001143 for ; Fri, 28 Aug 2009 17:05:37 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id ED8F480639 for ; Fri, 28 Aug 2009 17:05:35 -0500 (CDT) X-Original-To: Davinci-linux-open-source@linux.davincidsp.com Delivered-To: Davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id 7093F80626 for ; Fri, 28 Aug 2009 17:05:29 -0500 (CDT) Received: from white.ext.ti.com (localhost [127.0.0.1]) by dflp52.itg.ti.com (8.13.7/8.13.7) with ESMTP id n7SM5TQn002009 for ; Fri, 28 Aug 2009 17:05:29 -0500 (CDT) Received: from mail178-tx2-R.bigfish.com (mail-tx2.bigfish.com [65.55.88.114]) by white.ext.ti.com (8.13.7/8.13.7) with ESMTP id n7SM5NMV014705 for ; Fri, 28 Aug 2009 17:05:28 -0500 Received: from mail178-tx2 (localhost.localdomain [127.0.0.1]) by mail178-tx2-R.bigfish.com (Postfix) with ESMTP id CC153F000E2 for ; Fri, 28 Aug 2009 22:05:23 +0000 (UTC) X-SpamScore: 9 X-BigFish: vps9(z34a4jza4b1ozz1202hzzz2dh6bh35h62h) X-Spam-TCS-SCL: 1:0 X-FB-SS: 5, X-MS-Exchange-Organization-Antispam-Report: OrigIP: 63.81.120.158; Service: EHS Received: by mail178-tx2 (MessageSwitch) id 1251497122356389_2724; Fri, 28 Aug 2009 22:05:22 +0000 (UCT) Received: from gateway-1237.mvista.com (gateway-1237.mvista.com [63.81.120.158]) by mail178-tx2.bigfish.com (Postfix) with ESMTP id 36C4613E8053 for ; Fri, 28 Aug 2009 22:05:22 +0000 (UTC) Received: from mag.az.mvista.com (mag.az.mvista.com [10.50.1.99]) by hermes.mvista.com (Postfix) with ESMTP id 4FA001B810; Fri, 28 Aug 2009 15:05:21 -0700 (PDT) Received: from mgreer by mag.az.mvista.com with local (Exim 4.69) (envelope-from ) id 1Mh9ZR-0002Cf-6U; Fri, 28 Aug 2009 15:05:21 -0700 Date: Fri, 28 Aug 2009 15:05:21 -0700 From: "Mark A. Greer" To: "Mark A. Greer" Message-ID: <20090828220521.GB8417@mag.az.mvista.com> References: <20090828220254.GA8387@mag.az.mvista.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090828220254.GA8387@mag.az.mvista.com> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Cc: Davinci List Subject: [PATCH 3/3] davinci: Add DA830/OMAP-L137 EVM specific pinmux setting for McASP1 X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.4 Precedence: list List-Id: davinci-linux-open-source.linux.davincidsp.com List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com From: Mark A. Greer The DA830/OMAP-L137 EVM cannot use the default pinmux setup for McASP1 so put the correct settings in the board file for that platform. Signed-off-by: Mark A. Greer --- arch/arm/mach-davinci/board-da830-evm.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index 22d9fe4..39711c1 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -55,6 +56,14 @@ static struct davinci_uart_config da830_evm_uart_config __initdata = { .enabled_uarts = 0x7, }; +static const short da830_evm_mcasp1_pins[] = { + DA830_AHCLKX1, DA830_ACLKX1, DA830_AFSX1, DA830_AHCLKR1, DA830_AFSR1, + DA830_AMUTE1, DA830_AXR1_0, DA830_AXR1_1, DA830_AXR1_2, DA830_AXR1_5, + DA830_ACLKR1, DA830_AXR1_6, DA830_AXR1_7, DA830_AXR1_8, DA830_AXR1_10, + DA830_AXR1_11, + -1 +}; + static u8 da830_iis_serializer_direction[] = { RX_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, TX_MODE, INACTIVE_MODE, INACTIVE_MODE, @@ -117,7 +126,7 @@ static __init void da830_evm_init(void) i2c_register_board_info(1, da830_evm_i2c_devices, ARRAY_SIZE(da830_evm_i2c_devices)); - ret = da8xx_pinmux_setup(da830_mcasp1_pins); + ret = da8xx_pinmux_setup(da830_evm_mcasp1_pins); if (ret) pr_warning("da830_evm_init: mcasp1 mux setup failed: %d\n", ret);