From patchwork Sun Aug 5 20:39:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Arnaud Patard (Rtp)" X-Patchwork-Id: 1275731 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 1DA303FC23 for ; Sun, 5 Aug 2012 20:47:18 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sy7gB-0002cs-L3; Sun, 05 Aug 2012 20:44:03 +0000 Received: from [2a01:e0b:1:135:62eb:69ff:fe08:4532] (helo=lebrac.rtp-net.org) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Sy7g7-0002cE-9b for linux-arm-kernel@lists.infradead.org; Sun, 05 Aug 2012 20:44:00 +0000 Received: by lebrac.rtp-net.org (Postfix, from userid 1000) id 72AE929253; Sun, 5 Aug 2012 22:43:42 +0200 (CEST) Message-Id: <20120805203920.908663535@rtp-net.org> User-Agent: quilt/0.60-1 Date: Sun, 05 Aug 2012 22:39:13 +0200 From: Arnaud Patard (Rtp) To: linux-arm-kernel@lists.infradead.org Subject: [patch 2/2] ARM: Kirkwood: Describe iconnect nand in DT. References: <20120805203911.915580862@rtp-net.org> Content-Disposition: inline; filename=iconnect-nand.patch X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.1 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.8 RDNS_NONE Delivered to internal network by a host with no rDNS Cc: Andrew Lunn , Jason Cooper X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Define the nand and its partitions in DT and remove them from cmdline Signed-off-by: Arnaud Patard Index: alunn/arch/arm/boot/dts/kirkwood-iconnect.dts =================================================================== --- alunn.orig/arch/arm/boot/dts/kirkwood-iconnect.dts 2012-07-25 23:46:57.819861775 +0200 +++ alunn/arch/arm/boot/dts/kirkwood-iconnect.dts 2012-07-25 23:54:47.307841120 +0200 @@ -12,7 +12,7 @@ }; chosen { - bootargs = "console=ttyS0,115200n8 earlyprintk mtdparts=orion_nand:0xc0000@0x0(uboot),0x20000@0xa0000(env),0x300000@0x100000(zImage),0x300000@0x540000(initrd),0x1f400000@0x980000(boot)"; + bootargs = "console=ttyS0,115200n8 earlyprintk"; linux,initrd-start = <0x4500040>; linux,initrd-end = <0x4800000>; }; @@ -30,7 +30,37 @@ clock-frequency = <200000000>; status = "ok"; }; + + nand@3000000 { + status = "okay"; + + partition@0 { + label = "uboot"; + reg = <0x0000000 0xc0000>; + }; + + partition@a0000 { + label = "env"; + reg = <0xa0000 0x20000>; + }; + + partition@100000 { + label = "zImage"; + reg = <0x100000 0x300000>; + }; + + partition@540000 { + label = "initrd"; + reg = <0x540000 0x300000>; + }; + + partition@980000 { + label = "boot"; + reg = <0x980000 0x1f400000>; + }; + }; }; + gpio-leds { compatible = "gpio-leds"; Index: alunn/arch/arm/mach-kirkwood/board-iconnect.c =================================================================== --- alunn.orig/arch/arm/mach-kirkwood/board-iconnect.c 2012-07-25 23:46:57.831861775 +0200 +++ alunn/arch/arm/mach-kirkwood/board-iconnect.c 2012-07-25 23:46:57.000000000 +0200 @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -42,18 +41,9 @@ static unsigned int iconnect_mpp_config[ 0 }; -static struct mtd_partition iconnect_nand_parts[] = { - { - .name = "flash", - .offset = 0, - .size = MTDPART_SIZ_FULL, - }, -}; - void __init iconnect_init(void) { kirkwood_mpp_conf(iconnect_mpp_config); - kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25); kirkwood_ehci_init(); kirkwood_ge00_init(&iconnect_ge00_data);