From patchwork Mon Apr 22 10:02:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 16311 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f69.google.com (mail-qe0-f69.google.com [209.85.128.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C0E1125DEE for ; Mon, 22 Apr 2013 10:03:30 +0000 (UTC) Received: by mail-qe0-f69.google.com with SMTP id a11sf6577592qen.0 for ; Mon, 22 Apr 2013 03:02:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :from:to:cc:subject:date:message-id:x-mailer: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=PHBOgRO6dW1rvb4VImII0oF8p8ycDbLuLyysRhLZ0lw=; b=MpL4sShG1HvPhcqaWHAd5CaCZp+kmA7R2l9ltqLHje60dMx77PineW27wBXu6Rk5wq lMTfxgixjJKJuaf/VFzwDbywBuKe1fGFIUPv9DALT0S/HpuqtD7tMzMKwNcj1AqSft/o QAne/Q+++eYp3CGHhGo4i6N7WoFqkdXokbVIj6CXRR7EKKZeHnmjCKCqclDB2MeWIrQ2 ETz8B/Oxb89YR7Il/xL1U9p85Qul0EA9r6uYGeDd6KfGqUkSYjkJ5sxfbifjpb0UgcGK tD9KZ1iA1pc+nTry+XGBzHYZOdIDL3dijuZNcOcP7u2RzoQKD77zj6Og73qMGi6zGu15 DbhQ== X-Received: by 10.236.78.103 with SMTP id f67mr12877955yhe.52.1366624964661; Mon, 22 Apr 2013 03:02:44 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.84.132 with SMTP id z4ls2317101qey.50.gmail; Mon, 22 Apr 2013 03:02:44 -0700 (PDT) X-Received: by 10.58.144.170 with SMTP id sn10mr13803522veb.7.1366624964508; Mon, 22 Apr 2013 03:02:44 -0700 (PDT) Received: from mail-vb0-x22f.google.com (mail-vb0-x22f.google.com [2607:f8b0:400c:c02::22f]) by mx.google.com with ESMTPS id ir6si1125216vdb.143.2013.04.22.03.02.44 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Apr 2013 03:02:44 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::22f is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::22f; Received: by mail-vb0-f47.google.com with SMTP id x13so5673896vbb.34 for ; Mon, 22 Apr 2013 03:02:44 -0700 (PDT) X-Received: by 10.58.181.201 with SMTP id dy9mr18537528vec.34.1366624964394; Mon, 22 Apr 2013 03:02:44 -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.58.127.98 with SMTP id nf2csp69070veb; Mon, 22 Apr 2013 03:02:43 -0700 (PDT) X-Received: by 10.194.93.231 with SMTP id cx7mr43933071wjb.33.1366624962524; Mon, 22 Apr 2013 03:02:42 -0700 (PDT) Received: from eu1sys200aog106.obsmtp.com (eu1sys200aog106.obsmtp.com [207.126.144.121]) by mx.google.com with SMTP id r6si10162696eeg.107.2013.04.22.03.02.32 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 22 Apr 2013 03:02:42 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.121 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.121; Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob106.postini.com ([207.126.147.11]) with SMTP ID DSNKUXUKtHsKwMeBwoTvqIPRxtBaX8Mv/s28@postini.com; Mon, 22 Apr 2013 10:02:41 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 864D3F2; Mon, 22 Apr 2013 09:54:17 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 6CEA1140D; Mon, 22 Apr 2013 10:02:24 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 33AC9A8081; Mon, 22 Apr 2013 12:02:19 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.279.5; Mon, 22 Apr 2013 12:02:23 +0200 From: Linus Walleij To: , David Woodhouse , Cc: Arnd Bergmann , , Linus Walleij Subject: [PATCH 22/23] ARM: u300: add FSMC flash into the device tree Date: Mon, 22 Apr 2013 12:02:19 +0200 Message-ID: <1366624939-7003-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmDAVGi31VLFbcKVxrQUuUElsXJ2+FQT/ulgaqWjB/PL+H2q9npOX+muN2jIOl/vbuSkQcp X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::22f 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 9a163e1..e4b8c7b 100644 --- a/arch/arm/boot/dts/ste-u300.dts +++ b/arch/arm/boot/dts/ste-u300.dts @@ -75,6 +75,32 @@ interrupts = <2>; }; + /* 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 9467ffe..82f57f1 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -732,6 +732,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,