From patchwork Mon Feb 13 17:49:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Ferre X-Patchwork-Id: 140948 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [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 35D1BB6FC3 for ; Tue, 14 Feb 2012 04:53:06 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Rx02Y-0002d3-02; Mon, 13 Feb 2012 17:50:14 +0000 Received: from bombadil.infradead.org ([2001:4830:2446:ff00:4687:fcff:fea6:5117]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Rx02V-0002cf-DJ for linux-arm-kernel@merlin.infradead.org; Mon, 13 Feb 2012 17:50:11 +0000 Received: from newsmtp5.atmel.com ([204.2.163.5] helo=sjogate2.atmel.com) by bombadil.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Rx02L-0002yz-Sv for linux-arm-kernel@lists.infradead.org; Mon, 13 Feb 2012 17:50:09 +0000 Received: from meyreuil.atmel.fr ([10.159.254.132]) by sjogate2.atmel.com (8.13.6/8.13.6) with ESMTP id q1DHjf6E029057; Mon, 13 Feb 2012 09:45:50 -0800 (PST) Received: from [10.159.245.112] ([10.159.245.112]) by meyreuil.atmel.fr (8.11.7p1+Sun/8.11.7) with ESMTP id q1DHnde18150; Mon, 13 Feb 2012 18:49:39 +0100 (MET) Message-ID: <4F394D34.6000604@atmel.com> Date: Mon, 13 Feb 2012 18:49:40 +0100 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0) Gecko/20120129 Thunderbird/10.0 MIME-Version: 1.0 To: Olof Johansson , Arnd Bergmann , Jean-Christophe PLAGNIOL-VILLARD , Linux Kernel list , linux-arm-kernel Subject: [GIT PULL] at91: fixes for 3.3-rc4 X-Enigmail-Version: 1.3.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20120213_125008_364006_4F6767AE X-CRM114-Status: GOOD ( 18.07 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Ryan Mallon , Sergei Shtylyov 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 Olof, Arnd, Here is the second "fixes" pull request. It collects a simple #ifdef fix, the proper use of ioremap() in the RTC driver and a set of SMC related modifications. The SMC has been modified recently and has broken the pata_at91 driver. The new accessors are fixing this situation. Finally, the old at91_ide driver is removed because it is not maintained anymore, the IDE tree is frozen and PATA should be used instead. I have also verified that it merges correctly with depends/rmk/for-armsoc and all at91 related 3.4 material... You can find all this here: The following changes since commit d65b4e98d7ea3038b767b70fe8be959b2913f16d: Linux 3.3-rc3 (2012-02-08 19:21:53 -0800) are available in the git repository at: git://github.com/at91linux/linux-at91.git at91-fixes for you to fetch changes up to cf844751fb25e095d8fa30332cb173a73e5a736c: ARM: at91: drop ide driver in favor of the pata one (2012-02-13 18:31:37 +0100) ---------------------------------------------------------------- Jean-Christophe PLAGNIOL-VILLARD (4): ARM: at91:rtc/rtc-at91sam9: ioremap register bank ARM: at91: add accessor to manage SMC pata/at91: use newly introduced SMC accessors ARM: at91: drop ide driver in favor of the pata one Nicolas Ferre (1): ARM: at91: USB AT91 gadget registration for module arch/arm/mach-at91/at91rm9200_devices.c | 2 +- arch/arm/mach-at91/at91sam9260_devices.c | 9 +- arch/arm/mach-at91/at91sam9261_devices.c | 2 +- arch/arm/mach-at91/at91sam9263_devices.c | 8 +- arch/arm/mach-at91/include/mach/at91sam9_smc.h | 29 ++ arch/arm/mach-at91/sam9_smc.c | 76 +++++- arch/arm/mach-at91/sam9_smc.h | 23 -- drivers/ata/pata_at91.c | 48 ++-- drivers/ide/Makefile | 1 - drivers/ide/at91_ide.c | 366 ------------------------ drivers/rtc/rtc-at91sam9.c | 13 +- 11 files changed, 140 insertions(+), 437 deletions(-) delete mode 100644 drivers/ide/at91_ide.c Thanks a lot, best regards,