From patchwork Tue Apr 20 09:26:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 50526 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B7D7FB7D0F for ; Tue, 20 Apr 2010 19:28:56 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1O49k0-00034T-Jw; Tue, 20 Apr 2010 09:27:36 +0000 Received: from aeryn.fluff.org.uk ([87.194.8.8] helo=kira.home.fluff.org) by bombadil.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux)) id 1O49jr-0002XZ-1b; Tue, 20 Apr 2010 09:27:28 +0000 Received: from ben by kira.home.fluff.org with local (Exim 4.71) (envelope-from ) id 1O49jp-0002pi-Gi; Tue, 20 Apr 2010 10:27:25 +0100 Message-Id: <20100420092725.436746990@fluff.org.uk> User-Agent: quilt/0.48-1 Date: Tue, 20 Apr 2010 10:26:19 +0100 From: Ben Dooks To: linux-arm-kernel@lists.infradead.org Subject: [patch 2/4] kirkwood: allow machines to register RnB callback References: <20100420092617.075835456@fluff.org.uk> Content-Disposition: inline; filename=slinux/arm/kirkwood/allow-mtd-ready-not-busy-registration.patch X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100420_052727_363866_3E57E7A4 X-CRM114-Status: UNSURE ( 8.86 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: Linux MTD X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Add a kirkwood_nand_init_rnb() call to allow boards which have RnB line detection to register this instead of a static delay. Signed-off-by: Ben Dooks Cc: Linux MTD Index: linux-2.6-2.6.32.9/arch/arm/mach-kirkwood/common.c =================================================================== --- linux-2.6-2.6.32.9.orig/arch/arm/mach-kirkwood/common.c 2010-02-23 15:38:51.%N +0000 +++ linux-2.6-2.6.32.9/arch/arm/mach-kirkwood/common.c 2010-03-11 13:25:01.%N +0000 @@ -305,6 +305,15 @@ platform_device_register(&kirkwood_nand_flash); } +void __init kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts, + int (*dev_ready)(struct mtd_info *)) +{ + kirkwood_clk_ctrl |= CGC_RUNIT; + kirkwood_nand_data.parts = parts; + kirkwood_nand_data.nr_parts = nr_parts; + kirkwood_nand_data.dev_ready = dev_ready; + platform_device_register(&kirkwood_nand_flash); +} /***************************************************************************** * SoC RTC Index: linux-2.6-2.6.32.9/arch/arm/mach-kirkwood/common.h =================================================================== --- linux-2.6-2.6.32.9.orig/arch/arm/mach-kirkwood/common.h 2010-02-23 15:38:51.%N +0000 +++ linux-2.6-2.6.32.9/arch/arm/mach-kirkwood/common.h 2010-03-11 13:25:01.%N +0000 @@ -16,6 +16,7 @@ struct mv_sata_platform_data; struct mvsdio_platform_data; struct mtd_partition; +struct mtd_info; /* * Basic Kirkwood init functions used early by machine-setup. @@ -41,6 +42,7 @@ void kirkwood_uart0_init(void); void kirkwood_uart1_init(void); void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay); +void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts, int (*dev_ready)(struct mtd_info *)); extern int kirkwood_tclk; extern struct sys_timer kirkwood_timer;