From patchwork Fri Jul 8 09:13:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sekhar Nori X-Patchwork-Id: 103789 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 E99C6B6F00 for ; Fri, 8 Jul 2011 19:13:34 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qf77j-0003yz-P8; Fri, 08 Jul 2011 09:13:24 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qf77j-0008A9-4g; Fri, 08 Jul 2011 09:13:23 +0000 Received: from comal.ext.ti.com ([198.47.26.152]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qf77f-00089a-UV for linux-arm-kernel@lists.infradead.org; Fri, 08 Jul 2011 09:13:20 +0000 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id p689DAWv019581 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 8 Jul 2011 04:13:12 -0500 Received: from dbde70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id p689D55D010128; Fri, 8 Jul 2011 14:43:06 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde70.ent.ti.com ([172.24.170.148]) with mapi; Fri, 8 Jul 2011 14:43:05 +0530 From: "Nori, Sekhar" To: Arnd Bergmann Date: Fri, 8 Jul 2011 14:43:04 +0530 Subject: [GIT PULL] DaVinci features for v3.1 Thread-Topic: [GIT PULL] DaVinci features for v3.1 Thread-Index: Acw9Tz42BBl7nkxXR9yb5qs/P2W5xw== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110708_051320_104511_F4380498 X-CRM114-Status: GOOD ( 13.28 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [198.47.26.152 listed in list.dnswl.org] -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: "Hilman, Kevin" , Thomas Gleixner , "davinci-linux-open-source@linux.davincidsp.com" , "linux-arm-kernel@lists.infradead.org" , Nicolas Pitre X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 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 Arnd, Please pull the following DaVinci features for v3.1. This pull request depends on the patch "davinci: dm6467/T EVM: fix setting up of reference clock rate" in clean-up pull request for successful build. Pulling this after the earlier clean-up pull request generates this merge conflict: <<<<<<< HEAD:arch/arm/mach-davinci/include/mach/psc.h #define MDSTAT_STATE_MASK 0x1f ======= #define MDSTAT_STATE_MASK 0x1f #define MDCTL_FORCE BIT(31) >>>>>>> 8bb2c4813c534d26eba3beb7888fbd3cbc931f62:arch/arm/mach-davinci/include/mach/psc.h The resolution is: #define MDSTAT_STATE_MASK 0x1f #define MDCTL_FORCE BIT(31) Thanks, Sekhar The following changes since commit fe0d42203cb5616eeff68b14576a0f7e2dd56625: Linus Torvalds (1): Linux 3.0-rc6 are available in the git repository at: git://gitorious.org/linux-davinci/linux-davinci.git features Christian Riesch (1): davinci: da850: add a .set_rate method to ref_clk Sekhar Nori (4): davinci: pass clock flags to davinci_psc_config() davinci: enable forced transitions on PSC davinci: da850: add support for SATA interface davinci: da850 evm: register SATA device arch/arm/mach-davinci/board-da850-evm.c | 7 ++ arch/arm/mach-davinci/clock.c | 8 +- arch/arm/mach-davinci/clock.h | 1 + arch/arm/mach-davinci/da850.c | 10 ++ arch/arm/mach-davinci/devices-da8xx.c | 126 ++++++++++++++++++++++++++++ arch/arm/mach-davinci/include/mach/da8xx.h | 2 + arch/arm/mach-davinci/include/mach/psc.h | 3 +- arch/arm/mach-davinci/psc.c | 14 +++- 8 files changed, 164 insertions(+), 7 deletions(-)