From patchwork Wed Oct 28 17:41:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "A. Porodko" X-Patchwork-Id: 56322 Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9SHiJEb002810 for ; Wed, 28 Oct 2009 17:44:20 GMT Received: from dlep33.itg.ti.com ([157.170.170.112]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id n9SHfaab015298 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 28 Oct 2009 12:41:37 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id n9SHfZrv014287; Wed, 28 Oct 2009 12:41:35 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 93ED780627; Wed, 28 Oct 2009 11:41:35 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp53.itg.ti.com (dflp53.itg.ti.com [128.247.5.6]) by linux.omap.com (Postfix) with ESMTP id 376F680626 for ; Wed, 28 Oct 2009 11:41:33 -0600 (CST) Received: from medina.ext.ti.com (localhost [127.0.0.1]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id n9SHfWGS004721 for ; Wed, 28 Oct 2009 12:41:32 -0500 (CDT) Received: from mail170-tx2-R.bigfish.com (mail-tx2.bigfish.com [65.55.88.114]) by medina.ext.ti.com (8.13.7/8.13.7) with ESMTP id n9SHfWJN009727 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Wed, 28 Oct 2009 12:41:32 -0500 Received: from mail170-tx2 (localhost.localdomain [127.0.0.1]) by mail170-tx2-R.bigfish.com (Postfix) with ESMTP id 1393512E0583 for ; Wed, 28 Oct 2009 17:41:32 +0000 (UTC) X-SpamScore: 0 X-BigFish: vps0(zzzz1202hzzz2fh6bh62h) X-Spam-TCS-SCL: 1:0 X-MS-Exchange-Organization-Antispam-Report: OrigIP: 83.142.161.14; Service: EHS Received: by mail170-tx2 (MessageSwitch) id 125675169063239_8601; Wed, 28 Oct 2009 17:41:30 +0000 (UCT) Received: from TX2EHSMHS015.bigfish.com (unknown [10.9.14.236]) by mail170-tx2.bigfish.com (Postfix) with ESMTP id 099FCC28056 for ; Wed, 28 Oct 2009 17:41:30 +0000 (UTC) Received: from relay.intersvyaz.net (83.142.161.14) by TX2EHSMHS015.bigfish.com (10.9.99.115) with Microsoft SMTP Server id 14.0.482.32; Wed, 28 Oct 2009 17:41:27 +0000 Received: from localhost (unknown [10.100.10.115]) by relay.intersvyaz.net (Postfix) with ESMTP id 16FF480AAE1 for ; Wed, 28 Oct 2009 22:41:25 +0500 (YEKT) Received: from relay.intersvyaz.net ([10.100.10.225]) by localhost (relay.intersvyaz.net [10.100.10.115]) (amavisd-new, port 10024) with ESMTP id Z4evlo9IEu3k for ; Wed, 28 Oct 2009 22:41:24 +0500 (YEKT) Received: from [172.16.100.10] (pool-77-222-110-19.is74.ru [77.222.110.19]) by relay.intersvyaz.net (Postfix) with ESMTP id BADA480AAEB for ; Wed, 28 Oct 2009 22:41:24 +0500 (YEKT) Message-ID: <4AE88244.2020309@chelcom.ru> Date: Wed, 28 Oct 2009 22:41:24 +0500 From: "A. Porodko" User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20090706) MIME-Version: 1.0 To: davinci-linux-open-source@linux.davincidsp.com X-Enigmail-Version: 0.96.0 X-Reverse-DNS: mail.is74.ru Subject: Patch 2/2 Initial Neuros OSD2 support 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@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 84d3d26..d721440 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -368,6 +368,11 @@ MUX_CFG(DM644X, ATAEN_DISABLE, 0, 17, 1, 0, true) MUX_CFG(DM644X, HPIEN_DISABLE, 0, 29, 1, 0, true) MUX_CFG(DM644X, AEAW, 0, 0, 31, 31, true) +MUX_CFG(DM644X, AEAW0, 0, 0, 1, 0, true) +MUX_CFG(DM644X, AEAW1, 0, 1, 1, 0, true) +MUX_CFG(DM644X, AEAW2, 0, 2, 1, 0, true) +MUX_CFG(DM644X, AEAW3, 0, 3, 1, 0, true) +MUX_CFG(DM644X, AEAW4, 0, 4, 1, 0, true) MUX_CFG(DM644X, MSTK, 1, 9, 1, 0, false) @@ -378,7 +383,7 @@ MUX_CFG(DM644X, MCBSP, 1, 10, 1, 1, false) MUX_CFG(DM644X, UART1, 1, 1, 1, 1, true) MUX_CFG(DM644X, UART2, 1, 2, 1, 1, true) -MUX_CFG(DM644X, PWM0, 1, 4, 1, 1, false) +MUX_CFG(DM644X, PWM0, 1, 4, 2, 2, false) MUX_CFG(DM644X, PWM1, 1, 5, 1, 1, false) diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h index 16b8a7f..5f74b41 100644 --- a/arch/arm/mach-davinci/include/mach/mux.h +++ b/arch/arm/mach-davinci/include/mach/mux.h @@ -40,6 +40,11 @@ enum davinci_dm644x_index { /* AEAW functions */ DM644X_AEAW, + DM644X_AEAW0, + DM644X_AEAW1, + DM644X_AEAW2, + DM644X_AEAW3, + DM644X_AEAW4, /* Memory Stick */ DM644X_MSTK,