From patchwork Tue Oct 21 21:55:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Belloni X-Patchwork-Id: 5128611 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 731A79F387 for ; Tue, 21 Oct 2014 21:58:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 91AB420176 for ; Tue, 21 Oct 2014 21:58:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6483D2024F for ; Tue, 21 Oct 2014 21:58:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934078AbaJUV6d (ORCPT ); Tue, 21 Oct 2014 17:58:33 -0400 Received: from down.free-electrons.com ([37.187.137.238]:52058 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933696AbaJUV4J (ORCPT ); Tue, 21 Oct 2014 17:56:09 -0400 Received: by mail.free-electrons.com (Postfix, from userid 106) id 934FB5001; Tue, 21 Oct 2014 23:56:08 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost (128-79-216-6.hfc.dyn.abo.bbox.fr [128.79.216.6]) by mail.free-electrons.com (Postfix) with ESMTPSA id 3FF1D4FFC; Tue, 21 Oct 2014 23:56:08 +0200 (CEST) From: Alexandre Belloni To: Nicolas Ferre , Sebastian Reichel Cc: Jean-Christophe Plagniol-Villard , Dmitry Eremin-Solenikov , David Woodhouse , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Alexandre Belloni Subject: [PATCH 2/8] memory: atmel-sdramc: allow probing from pdata Date: Tue, 21 Oct 2014 23:55:34 +0200 Message-Id: <1413928540-27099-3-git-send-email-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413928540-27099-1-git-send-email-alexandre.belloni@free-electrons.com> References: <1413928540-27099-1-git-send-email-alexandre.belloni@free-electrons.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Allow probing the atmel-sdramc from platform_data. Signed-off-by: Alexandre Belloni --- drivers/memory/atmel-sdramc.c | 44 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/drivers/memory/atmel-sdramc.c b/drivers/memory/atmel-sdramc.c index 148906dabe55..e1222557dc9d 100644 --- a/drivers/memory/atmel-sdramc.c +++ b/drivers/memory/atmel-sdramc.c @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -127,7 +128,7 @@ static const struct of_device_id atmel_ramc_of_match[] = { }; MODULE_DEVICE_TABLE(of, atmel_ramc_of_match); -static int atmel_ramc_probe(struct platform_device *pdev) +static int atmel_ramc_of_probe(struct platform_device *pdev) { const struct of_device_id *match; const struct at91_ramc_caps *caps; @@ -168,6 +169,46 @@ static int atmel_ramc_probe(struct platform_device *pdev) return 0; } +static int atmel_ramc_platform_probe(struct platform_device *pdev) +{ + struct resource *res; + const struct platform_device_id *match; + int idx = 0; + + for (idx = 0; idx < 2; idx++) { + res = platform_get_resource(pdev, IORESOURCE_MEM, idx + 1); + at91_ramc_base[idx] = devm_ioremap(&pdev->dev, res->start, + resource_size(res)); + if (IS_ERR(at91_ramc_base[idx])) { + dev_err(&pdev->dev, "Could not map ram controller address\n"); + return PTR_ERR(at91_ramc_base[idx]); + } + } + + match = platform_get_device_id(pdev); + at91_ramc_shutdown = (void (*)(void))match->driver_data; + + return 0; +}; + +static int atmel_ramc_probe(struct platform_device *pdev) +{ + int ret; + + if (pdev->dev.of_node) + ret = atmel_ramc_of_probe(pdev); + else + ret = atmel_ramc_platform_probe(pdev); + + return ret; +} + +static struct platform_device_id atmel_ramc_plat_match[] = { + { "at91sam9260-sdramc", (unsigned long)at91sam9260_shutdown, }, + { "at91sam9g45-ddramc", (unsigned long)at91sam9g45_shutdown, }, + { /* sentinel */ } +}; + static struct platform_driver atmel_ramc_driver = { .probe = atmel_ramc_probe, .driver = { @@ -175,6 +216,7 @@ static struct platform_driver atmel_ramc_driver = { .owner = THIS_MODULE, .of_match_table = atmel_ramc_of_match, }, + .id_table = atmel_ramc_plat_match, }; static int __init atmel_ramc_init(void)