From patchwork Fri May 31 09:18:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 17332 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9FC9F25CAB for ; Fri, 31 May 2013 09:21:00 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id ha11sf447548vcb.0 for ; Fri, 31 May 2013 02:21:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=c2uwR8plR8N99wzDPx/mzXLZ9NXZbWD45szxa7pgsTg=; b=aVEpSlqXoNAzcQ1W5xMrQxQvMh+Q7nGBWOva16LJrUe1rnnz4DeRl9LaBSIFspa4ua sx58QdM4EtgXiPlp91lLXMeYZQqZMrfyTDLM00p6UmGCdCkNin6tNyJxgIjzDikIMUWs wkRwuK+jkDF7wUp4Ve8wewYsDBGFOHWxfHYqMSGmNBvikRPt4ZHeyPZwM8AoAxP5F3tK VQn0UZz45Z6Hr/CUwZcjnysnf5QpUYxUTWfYRPvoObQWspiVn09HSP3g49rKiPseNFzF KakQ7oTdMchFCIuhZqK3UaoZj5yiVRgyH03s27AjPbsCVF3TSuY7fO8I628Nn8KN9taD GSLg== X-Received: by 10.224.205.138 with SMTP id fq10mr6299420qab.1.1369992060393; Fri, 31 May 2013 02:21:00 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.53.102 with SMTP id a6ls816089qep.59.gmail; Fri, 31 May 2013 02:21:00 -0700 (PDT) X-Received: by 10.220.48.73 with SMTP id q9mr9402775vcf.36.1369992060262; Fri, 31 May 2013 02:21:00 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id zt2si26757539vdb.102.2013.05.31.02.21.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 May 2013 02:21:00 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id kw10so907793vcb.0 for ; Fri, 31 May 2013 02:21:00 -0700 (PDT) X-Received: by 10.220.192.3 with SMTP id do3mr9337985vcb.16.1369992060179; Fri, 31 May 2013 02:21:00 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.229.199 with SMTP id jj7csp42416vcb; Fri, 31 May 2013 02:20:59 -0700 (PDT) X-Received: by 10.15.100.129 with SMTP id bn1mr5154190eeb.93.1369992059002; Fri, 31 May 2013 02:20:59 -0700 (PDT) Received: from eu1sys200aog121.obsmtp.com (eu1sys200aog121.obsmtp.com [207.126.144.151]) by mx.google.com with SMTP id z42si30011923eel.208.2013.05.31.02.20.36 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 31 May 2013 02:20:58 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.151 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.151; Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob121.postini.com ([207.126.147.11]) with SMTP ID DSNKUahrYrlchHEE9tFBmgAmDaY2NUVRPusj@postini.com; Fri, 31 May 2013 09:20:58 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id 1A3F754; Fri, 31 May 2013 09:19:33 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 5A60D57; Fri, 31 May 2013 09:20:33 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id C127B24C07D; Fri, 31 May 2013 11:20:27 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.279.5; Fri, 31 May 2013 11:20:33 +0200 From: Linus Walleij To: Cc: Arnd Bergmann , Linus Walleij Subject: [PATCH 20/39] ARM: u300: add FSMC flash into the device tree Date: Fri, 31 May 2013 11:18:55 +0200 Message-ID: <1369991954-17406-21-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1369991954-17406-1-git-send-email-linus.walleij@stericsson.com> References: <1369991954-17406-1-git-send-email-linus.walleij@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmBzEd0SmW211FAyFhseQ8Sc0JM1vbMc6a8MzeKHaAk1M8IKK5BWTDf6fTes0LWVklcUuWP X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Linus Walleij This registers the U300 FSMC flash controller from the device tree, and defines the three partitions. Skip the BBT scan as in the current platform data. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-u300.dts | 26 ++++++++++++++++++++++++++ arch/arm/mach-u300/core.c | 2 ++ 2 files changed, 28 insertions(+) diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts index 1b20769..b8a8ddb 100644 --- a/arch/arm/boot/dts/ste-u300.dts +++ b/arch/arm/boot/dts/ste-u300.dts @@ -77,6 +77,32 @@ dma-channels = <40>; }; + /* A NAND flash of 128 MiB */ + fsmc: flash@40000000 { + compatible = "stericsson,fsmc-nand"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x9f800000 0x1000>, /* FSMC Register*/ + <0x80000000 0x4000>, /* NAND Base DATA */ + <0x80020000 0x4000>, /* NAND Base ADDR */ + <0x80010000 0x4000>; /* NAND Base CMD */ + reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd"; + nand-skip-bbtscan; + + partition@0 { + label = "boot records"; + reg = <0x0 0x20000>; + }; + partition@20000 { + label = "free"; + reg = <0x20000 0x7e0000>; + }; + partition@800000 { + label = "platform"; + reg = <0x800000 0xf800000>; + }; + }; + i2c0: i2c@c0004000 { compatible = "st,ddci2c"; reg = <0xc0004000 0x1000>; diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index d102cb5..8f9e77a 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -733,6 +733,8 @@ static struct of_dev_auxdata u300_auxdata_lookup[] __initdata = { "rtc-coh901331", NULL), OF_DEV_AUXDATA("stericsson,coh901318", U300_DMAC_BASE, "coh901318", NULL), + OF_DEV_AUXDATA("stericsson,fsmc-nand", U300_NAND_IF_PHYS_BASE, + "fsmc-nand", NULL), OF_DEV_AUXDATA("arm,primecell", U300_UART0_BASE, "uart0", &uart0_plat_data), OF_DEV_AUXDATA("arm,primecell", U300_UART1_BASE,