From patchwork Tue Jun 26 09:25:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10488471 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 A1D80602B3 for ; Tue, 26 Jun 2018 09:27:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FCC62884E for ; Tue, 26 Jun 2018 09:27:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94B5A28857; Tue, 26 Jun 2018 09:27:42 +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 42C2D2884E for ; Tue, 26 Jun 2018 09:27:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934094AbeFZJ00 (ORCPT ); Tue, 26 Jun 2018 05:26:26 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:36998 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934398AbeFZJZz (ORCPT ); Tue, 26 Jun 2018 05:25:55 -0400 Received: by mail-wr0-f196.google.com with SMTP id k6-v6so16470724wrp.4 for ; Tue, 26 Jun 2018 02:25:54 -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=PQzAQTbw8eievQfXi/WPD9sXn9pGn5pxikfMpK7fZDleENggpZn5dCHW+eMiUq1/gz WYrz8I5wFdk7rFOGMQjWW2ZPdVc9d4sPnu2/iRwwFHBqucQtDew8l0HqcQdbxxJT4DbC Rz7HIxUF1FfeDovTeGbeobeoGZ/3dGbCigeSVpaTRzCbaANnovrTOWDUqDXQC6qdXrqq F+G9Ssg1c8ghhA/7+dg7+TcPSJG0L2Px7r1fXe/dZhKJ7rvhOqlnUHMNX8Rlx9e6lRXS 4hQOkc/nSzCu9Ude2Rv5DkDun77MZmgzMwLepAJLfm3/PcKcJFGbOpxjPjW8mYRb7UYf 9acA== 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=rZcC+cKCf0GEzkWDRcwbwpKG4//LTJT1v87QUdymSaKaO4UvjDNSN5UQ/csOtOS3hB U2t14UWXwnALSioVk8AMj5Zg7XTwr8yQz0dRAipkV64ClfK54dBz8hdGdVfesnEXoY/b xuw2q/6iIjQ3T3NCuaHeYnie20S+E6eH5F8fEKIbEeA7BnFx/3aFzc/84zgRvk24DESO RXQB45G+ZvcLLyD5OIPKZzCyD0/1CvvPHMeVsITQXBEWycepFIlD+hu9/sBb4Uz0V4B5 zT9mHXUnkReA+eYadnWSRk3SGEywMMU+FdgOC9WuRtLQpHwgKG9ha/rKlix4tvrPxkbk bTnA== X-Gm-Message-State: APt69E2Au6eZF8P74POledpSQlrCHSSmkeUQC9D0yj4b0vT1QSGhjYiD j7y0fJ7Sig8jwXMbKCz6oBTPwg== X-Google-Smtp-Source: AAOMgpcy2FFPUjJHrSLcY95Xy9+Y3cE5VJC4fuw7zaQ2pdr2+WZDSnPfX6b6BfYj1rUefXU4yzkfLg== X-Received: by 2002:adf:890a:: with SMTP id s10-v6mr774544wrs.122.1530005153943; Tue, 26 Jun 2018 02:25:53 -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.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 02:25:53 -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 11/13] ARM: davinci: dm646x-evm: use aemif platform driver Date: Tue, 26 Jun 2018 11:25:35 +0200 Message-Id: <20180626092537.6737-12-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 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);