From patchwork Tue Jun 26 09:25:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10488465 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6B1D5602B3 for ; Tue, 26 Jun 2018 09:27:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6824B2884E for ; Tue, 26 Jun 2018 09:27:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5CD8B28857; Tue, 26 Jun 2018 09:27:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 04A5C2884E for ; Tue, 26 Jun 2018 09:27:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934544AbeFZJ02 (ORCPT ); Tue, 26 Jun 2018 05:26:28 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:41619 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933933AbeFZJZx (ORCPT ); Tue, 26 Jun 2018 05:25:53 -0400 Received: by mail-wr0-f193.google.com with SMTP id h10-v6so16458584wrq.8 for ; Tue, 26 Jun 2018 02:25:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ahqoiiTcjlh/wyXMEWUU//ONxQ8k9wdMzGQvnnctcxI=; b=OsGmsgvx0I1s1nugGhEtCt6LPvOsAIWBuEe1h4sWQQ2zOJv2WJcdaT/oorKcP1L15g cbElphsJwy5YqQd/zZqbYCLdWS2MJpli8rCYXW5Mo/7tUN5NK9F8p6spFKYRXkbBoYbM qXA9xtjvkeGGR+rK9yaHwcTbg0jIO9+xckP+4/gt94oxtFGi8SbfKi7IjvGMJZwZZ9RV X0gf5n3xe9ssK8PvTMSGuZXP3LLLRcEDnrx4Vez+0QqK5m1A6yBfampznOalDKTDClkH NK+9jTsysBUzz67UNXER3Bfg5YRUHE8Si8zvYf8cyypAME1gMJVUiiErc6587U3aBgFX eZFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ahqoiiTcjlh/wyXMEWUU//ONxQ8k9wdMzGQvnnctcxI=; b=r8Jx3qVZ/yjGMCJiL0/zIrTt+I5Hx2WkIRgouRKbqYEGvkkdCX6UK/f2+KlMDsg9K6 Y/EMqKE3f/4tCrqwEBUwiwtddXZihQDF4kOXyD7zg4Pq7lolWTg8108jxNY7EDZIvMkL ccEIaDVR1wib3WHkzWNd6V3rDgxFJ1ytepDMTtQ6FJ+hKfTQKLBlUBWOp3AnQnemgug5 tonf9T2qdQYBfRId1WAocySDhbi5Pc/PM12EbUjZG1uke8zWgCG2G50e0LaL3kgDHKjM gmyuzKruBypm+TFiyObPbviKXzQte1LuikQTXNim+EAfWP440ttMWoWYqp1HMu143s1J EIQg== X-Gm-Message-State: APt69E2JGd3evLdiIogYh9gyPAP5sisGuWr5g43Bu+LX9h9dJAKOj7At KC2vXphH+agMCEbu9Z5sT2im5A== X-Google-Smtp-Source: AAOMgpcVqvbnBzHSLGE1qVpgXdPlVIsEq9B2rFg995Dm16Lew9yfPUT65Vmy3h4qi3Vcx99LQYTovw== X-Received: by 2002:adf:80c4:: with SMTP id 62-v6mr714949wrl.95.1530005151720; Tue, 26 Jun 2018 02:25:51 -0700 (PDT) Received: from brgl-bgdev.lan (LFbn-NIC-1-55-10.w2-15.abo.wanadoo.fr. [2.15.147.10]) by smtp.gmail.com with ESMTPSA id a8-v6sm1528791wrn.50.2018.06.26.02.25.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 02:25:51 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Russell King , David Lechner , Michael Turquette , Stephen Boyd Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v2 09/13] ARM: davinci: dm644x-evm: use aemif platform driver Date: Tue, 26 Jun 2018 11:25:33 +0200 Message-Id: <20180626092537.6737-10-brgl@bgdev.pl> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180626092537.6737-1-brgl@bgdev.pl> References: <20180626092537.6737-1-brgl@bgdev.pl> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski We now support board files in the aemif driver. Register a platform device instead of using the handcrafted API in dm644x-evm. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/board-dm644x-evm.c | 55 ++++++++++++++++++------ 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index 738e443ab15f..e4a8f9225d16 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -42,6 +42,7 @@ #include #include #include +#include #include "davinci.h" @@ -174,14 +175,47 @@ static struct resource davinci_evm_nandflash_resource[] = { }, }; -static struct platform_device davinci_evm_nandflash_device = { - .name = "davinci_nand", - .id = 0, - .dev = { - .platform_data = &davinci_evm_nandflash_data, +static struct resource davinci_evm_aemif_resource[] = { + { + .start = DM644X_ASYNC_EMIF_CONTROL_BASE, + .end = DM644X_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, }, - .num_resources = ARRAY_SIZE(davinci_evm_nandflash_resource), - .resource = davinci_evm_nandflash_resource, +}; + +static struct aemif_abus_data davinci_evm_aemif_abus_data[] = { + { + .cs = 1, + }, +}; + +static struct platform_device davinci_evm_nandflash_devices[] = { + { + .name = "davinci_nand", + .id = 0, + .dev = { + .platform_data = &davinci_evm_nandflash_data, + }, + .num_resources = ARRAY_SIZE(davinci_evm_nandflash_resource), + .resource = davinci_evm_nandflash_resource, + }, +}; + +static struct aemif_platform_data davinci_evm_aemif_pdata = { + .abus_data = davinci_evm_aemif_abus_data, + .num_abus_data = ARRAY_SIZE(davinci_evm_aemif_abus_data), + .sub_devices = davinci_evm_nandflash_devices, + .num_sub_devices = ARRAY_SIZE(davinci_evm_nandflash_devices), +}; + +static struct platform_device davinci_evm_aemif_device = { + .name = "ti-aemif", + .id = -1, + .dev = { + .platform_data = &davinci_evm_aemif_pdata, + }, + .resource = davinci_evm_aemif_resource, + .num_resources = ARRAY_SIZE(davinci_evm_aemif_resource), }; static u64 davinci_fb_dma_mask = DMA_BIT_MASK(32); @@ -795,12 +829,7 @@ static __init void davinci_evm_init(void) /* only one device will be jumpered and detected */ if (HAS_NAND) { - platform_device_register(&davinci_evm_nandflash_device); - - if (davinci_aemif_setup(&davinci_evm_nandflash_device)) - pr_warn("%s: Cannot configure AEMIF\n", - __func__); - + platform_device_register(&davinci_evm_aemif_device); #ifdef CONFIG_I2C evm_leds[7].default_trigger = "nand-disk"; #endif