From patchwork Fri Sep 13 19:16:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 20296 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 002B620F2F for ; Fri, 13 Sep 2013 19:16:47 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id c41sf1764300yho.4 for ; Fri, 13 Sep 2013 12:16:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=3MY/4r4wAE/juL5KWD3M/inGnM7GpPSPyoXllra7Aak=; b=HAMaN4x4WP7EJwhAYCCTPoI7d6PJ3nzoz3RE7J3sb5vovflYspQtLsDxIN94SJ3IAF UTBfoWORcPBvR6cj2FYEQ59YhMXvX3hb/MRiwLqkXFLeUSSl5RW1afCfdyaTXD4RXHtn dWiaFBH0IGKyfRvNUX81+YZnBPANICh0t/2VL1UF0CHtx9b39FCA7ygeny4fmBJdh+GL Md873fxH59Uta8mH0FOCKr/l/mB18+l+staMjK6gKaKEWbY8H6Hky1pamgpDtOyNuW8c EDFT8p62UbqDhHgDXdIJSdeblpNEvvqEBuIyYOaTPllhxVLQ/ZV4Z+cDWcegINvLcYvD LnbQ== X-Gm-Message-State: ALoCoQkpo9KHUxo/eUSiGiDaZoo9Z3jhgEBq/ubGXnAkmbinhpajLJXvG9qhVE1sCWdZC1hv49Tc X-Received: by 10.236.216.17 with SMTP id f17mr939502yhp.18.1379099807162; Fri, 13 Sep 2013 12:16:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.121.104 with SMTP id lj8ls1358955qeb.11.gmail; Fri, 13 Sep 2013 12:16:46 -0700 (PDT) X-Received: by 10.58.187.47 with SMTP id fp15mr8447847vec.22.1379099806780; Fri, 13 Sep 2013 12:16:46 -0700 (PDT) Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com [209.85.212.54]) by mx.google.com with ESMTPS id sn2si3591514vec.64.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Sep 2013 12:16:46 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.54 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.54; Received: by mail-vb0-f54.google.com with SMTP id q14so1271702vbe.13 for ; Fri, 13 Sep 2013 12:16:46 -0700 (PDT) X-Received: by 10.58.190.34 with SMTP id gn2mr637466vec.34.1379099806665; Fri, 13 Sep 2013 12:16:46 -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.174.196 with SMTP id u4csp96653vcz; Fri, 13 Sep 2013 12:16:46 -0700 (PDT) X-Received: by 10.152.88.74 with SMTP id be10mr12350464lab.4.1379099805496; Fri, 13 Sep 2013 12:16:45 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com [209.85.215.46]) by mx.google.com with ESMTPS id m1si4403865lae.130.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Sep 2013 12:16:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.46 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id eh20so1360529lab.33 for ; Fri, 13 Sep 2013 12:16:44 -0700 (PDT) X-Received: by 10.152.45.106 with SMTP id l10mr12369779lam.12.1379099804825; Fri, 13 Sep 2013 12:16:44 -0700 (PDT) Received: from localhost.localdomain (c83-249-209-96.bredband.comhem.se. [83.249.209.96]) by mx.google.com with ESMTPSA id u18sm6959724lbp.4.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 13 Sep 2013 12:16:44 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Linus Walleij Subject: [PATCH] ARM: nomadik: delete FSMC platform data Date: Fri, 13 Sep 2013 21:16:36 +0200 Message-Id: <1379099796-15912-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.1.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.54 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: , We now have device tree support for setting the NAND timings for FSMC from the device tree, so delete the last piece of platform data and auxdata. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 1 + arch/arm/mach-nomadik/cpu-8815.c | 22 +--------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index 0e543e0..79425e3 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi @@ -653,6 +653,7 @@ reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd"; clocks = <&hclksmc>; status = "okay"; + timings = /bits/ 8 <0 0 0 0x10 0x0a 0>; partition@0 { label = "X-Loader(NAND)"; diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index 7a00506..c6c156e 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include @@ -145,17 +144,6 @@ static void __init cpu8815_timer_init_of(void) clocksource_of_init(); } -static struct fsmc_nand_timings cpu8815_nand_timings = { - .thiz = 0, - .thold = 0x10, - .twait = 0x0A, - .tset = 0, -}; - -static struct fsmc_nand_platform_data cpu8815_nand_data = { - .nand_timings = &cpu8815_nand_timings, -}; - /* * The SMSC911x IRQ is connected to a GPIO pin, but the driver expects * to simply request an IRQ passed as a resource. So the GPIO pin needs @@ -222,21 +210,13 @@ static int __init cpu8815_mmcsd_init(void) } device_initcall(cpu8815_mmcsd_init); -/* This still waits for a device tree enablement patch */ -static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = { - OF_DEV_AUXDATA("stericsson,fsmc-nand", NOMADIK_FSMC_BASE, - NULL, &cpu8815_nand_data), - { /* sentinel */ }, -}; - static void __init cpu8815_init_of(void) { #ifdef CONFIG_CACHE_L2X0 /* At full speed latency must be >=2, so 0x249 in low bits */ l2x0_of_init(0x00730249, 0xfe000fff); #endif - of_platform_populate(NULL, of_default_bus_match_table, - cpu8815_auxdata_lookup, NULL); + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } static const char * cpu8815_board_compat[] = {