From patchwork Thu Jun 28 09:57:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10493435 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 D5225601BE for ; Thu, 28 Jun 2018 09:59:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEF0A298FB for ; Thu, 28 Jun 2018 09:59:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B24FD2990A; Thu, 28 Jun 2018 09:59:15 +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=ham 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 4EEDF298FB for ; Thu, 28 Jun 2018 09:59:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935258AbeF1J7O (ORCPT ); Thu, 28 Jun 2018 05:59:14 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:36657 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935257AbeF1J6G (ORCPT ); Thu, 28 Jun 2018 05:58:06 -0400 Received: by mail-wr0-f195.google.com with SMTP id f16-v6so4857087wrm.3 for ; Thu, 28 Jun 2018 02:58:06 -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=j6SLFUgVHHRJpbH5ihivwb9rD7uFTMGfc/GXU/rCRMTSx+hbT1h0h5wbR1d8+xHeuw mdXxeKs6gKyZDpTIhyfCBwq4JDemRfYZpdA6675JNtOUpv1lip93AzM7rsnS499FBjVC dBiQQwJr0VI6NIEdX+Hf6NCpIMc/pVdGg5JjCAwD+lwL7wBfYNAQCFaOWwyZQQCixT2S gkV2FXc5YQarEap1Myi8SZe7TsmgC0jnGPSQZUCunJuKChSI21a1Eb8sf9zNWE+5YX4u 4QkyOgziMHI0GjwQtghP8Kg3AHqvdKOEXGMUYeqP6aEVJ/1tqjBdg357n+hnpf2WDyGE DXfg== 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=iH8Pw24SFa5Hcaw5DXsg6uisQzQC0Atd8RWW24cohDaffzwRbOcZY4cZNubciDipro jizuw94qrYUkI40KwtBN5Q20T7NmicvsUIai1jowoBIsavO1JM0dwQgKNfTk8XW7JEpY 74H0KqqrxpsL+yyPCmoKPIljwMhF+G2VdaJB5IqEEEx7AVvcVwX4oC456zy5hXgxAWjY L22YCxoKbVtrRh1MIoiM7JcGsjyqVDfKm3a9Zf/23SXw+TkPjXOPwgaunF75PRh1PrQz 0qO5P7SvuVrwwbk7wg2HKAhCUi30KOxzZ1RpHFdG43XV4Kl4ilBhDRVSNXV0UoaDFUZb 4v5g== X-Gm-Message-State: APt69E06bbCjhPzhdrE2ObG6kXdfT/sPAxbiBkauOIcInEmhvj+RUqsp JNrN7sWnppsj7ZOYQhWIggd1KA== X-Google-Smtp-Source: AAOMgpcWJUWXA2ioMHNnXFqbr5swL4piByWtP7qaLCZh5nue9hHHmteO7qX2npx2mTVxDG3IFSmKuQ== X-Received: by 2002:adf:e207:: with SMTP id j7-v6mr8125988wri.205.1530179885537; Thu, 28 Jun 2018 02:58:05 -0700 (PDT) Received: from brgl-bgdev.baylibre.local (AStLambert-681-1-87-41.w90-86.abo.wanadoo.fr. [90.86.29.41]) by smtp.gmail.com with ESMTPSA id s8-v6sm1550352wrm.84.2018.06.28.02.58.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 02:58:04 -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 v3 09/13] ARM: davinci: dm644x-evm: use aemif platform driver Date: Thu, 28 Jun 2018 11:57:44 +0200 Message-Id: <20180628095748.4462-10-brgl@bgdev.pl> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180628095748.4462-1-brgl@bgdev.pl> References: <20180628095748.4462-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