From patchwork Thu Jun 28 09:57:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10493429 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 74F3F60230 for ; Thu, 28 Jun 2018 09:59:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 606FC298FB for ; Thu, 28 Jun 2018 09:59:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54B602990A; Thu, 28 Jun 2018 09:59:04 +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 EACBB298FB for ; Thu, 28 Jun 2018 09:59:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935286AbeF1J6y (ORCPT ); Thu, 28 Jun 2018 05:58:54 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:51873 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935260AbeF1J6I (ORCPT ); Thu, 28 Jun 2018 05:58:08 -0400 Received: by mail-wm0-f68.google.com with SMTP id w137-v6so8949164wmw.1 for ; Thu, 28 Jun 2018 02:58:08 -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=MJvgkDiHW4gPWvPNjt08VsbgJnWIDweim6LTyj60Vb4=; b=dg74wn+NYJwlK0qg6jZc6uAt8PlAUshd0nWRa82aP4wfk/Erb6D7ABaPlGmO/+U44U QCBoZQOZSxfvIVQCyOIQZcivCFsqFDW3s3gpM+7Xux6hLBO09z8NdeEse+D3OFoWT3FZ Sxz+Fm1x1cdnJ5wL82x7zFLwXszDkrW9HW2a+lU3GAHPy4/+Wye6LM/JNGYTQUSIysXQ 5dTqMjcTYqJblgfDFhHo7qxXLb5MgznHX6EixTIyNMpa81z50FcIOuSQRIjdSDIVX3z2 KITHLNor6QJjMNNw7iea4uFvsfr4GcKjeVI9eJ90GXTEXNwgaAkmbmLi+Xg37w63OimF uhIw== 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=MJvgkDiHW4gPWvPNjt08VsbgJnWIDweim6LTyj60Vb4=; b=HlChoaZJ51Z6JXFTR2BGIG/bf3/TQDL26uv6Kh5EUzo0W8vWufj0z5HlrQucKR6ac9 7CnCdAG/uc2CZCZmbbUG+J2mDLGLxq/wVFKNSnfMzdSPn4SafW3fd0DXeCyF3pgzkQV4 tYRRTb/nRKhQNK+iLGYMbSqOZsfxUzxGKFrsMt60Xzo4gSrsnmaGrIjMrDzo8ybZMio5 CMEP1qotnz2Oxp9XJSAx2I1xO8cUQueEd3ua9EkXJcrxqBioIBhP/rUdjfVPlnl9q7y+ xYSk/NlhcJJ8Y2YqRoStI8WMDS34P+uY4ciYGntWWxuR7TCJmCrAwKIitD7LeGjN3W9S E7XQ== X-Gm-Message-State: APt69E2+1Un6SOYEK09Qn4QfDQ5XfuFfj4+UAp450ImquXDgCWb/UoPa ypFXXEOoLzWQ5+BVF/fak4oojw== X-Google-Smtp-Source: AAOMgpdrhUx/3sDXLQ4A/KxVsu6QSWli8bxrV50V2+Kqn4AaEaCYTiOhhc6G/8XnRWD3Sb5EB064jA== X-Received: by 2002:a1c:8893:: with SMTP id k141-v6mr7697396wmd.133.1530179887651; Thu, 28 Jun 2018 02:58:07 -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.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 02:58:07 -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 11/13] ARM: davinci: dm646x-evm: use aemif platform driver Date: Thu, 28 Jun 2018 11:57:46 +0200 Message-Id: <20180628095748.4462-12-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 dm646x-evm. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/board-dm646x-evm.c | 52 +++++++++++++++++++----- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index 867ab2fa6cfd..3e5ee09ee717 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -106,16 +107,47 @@ static struct resource davinci_nand_resources[] = { }, }; -static struct platform_device davinci_nand_device = { - .name = "davinci_nand", - .id = 0, +static struct platform_device davinci_aemif_devices[] = { + { + .name = "davinci_nand", + .id = 0, + .num_resources = ARRAY_SIZE(davinci_nand_resources), + .resource = davinci_nand_resources, + .dev = { + .platform_data = &davinci_nand_data, + }, + }, +}; + +static struct resource davinci_aemif_resources[] = { + { + .start = DM646X_ASYNC_EMIF_CONTROL_BASE, + .end = DM646X_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, +}; - .num_resources = ARRAY_SIZE(davinci_nand_resources), - .resource = davinci_nand_resources, +static struct aemif_abus_data davinci_aemif_abus_data[] = { + { + .cs = 1, + }, +}; - .dev = { - .platform_data = &davinci_nand_data, +static struct aemif_platform_data davinci_aemif_pdata = { + .abus_data = davinci_aemif_abus_data, + .num_abus_data = ARRAY_SIZE(davinci_aemif_abus_data), + .sub_devices = davinci_aemif_devices, + .num_sub_devices = ARRAY_SIZE(davinci_aemif_devices), +}; + +static struct platform_device davinci_aemif_device = { + .name = "ti-aemif", + .id = -1, + .dev = { + .platform_data = &davinci_aemif_pdata, }, + .resource = davinci_aemif_resources, + .num_resources = ARRAY_SIZE(davinci_aemif_resources), }; #define HAS_ATA (IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ @@ -793,10 +825,8 @@ static __init void evm_init(void) if (machine_is_davinci_dm6467tevm()) davinci_nand_data.timing = &dm6467tevm_nandflash_timing; - platform_device_register(&davinci_nand_device); - - if (davinci_aemif_setup(&davinci_nand_device)) - pr_warn("%s: Cannot configure AEMIF.\n", __func__); + if (platform_device_register(&davinci_aemif_device)) + pr_warn("%s: Cannot register AEMIF device.\n", __func__); dm646x_init_edma(dm646x_edma_rsv);