From patchwork Thu Oct 11 18:53:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 148667 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp2481813lji; Thu, 11 Oct 2018 11:54:11 -0700 (PDT) X-Google-Smtp-Source: ACcGV62bRLTjy7MqVXwufmHUgb4XEn440c7QRfBZGNVAxOfZxacoKce8xk0edgUWj1XElDSwqyvI X-Received: by 2002:a63:e116:: with SMTP id z22-v6mr2435956pgh.20.1539284051346; Thu, 11 Oct 2018 11:54:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539284051; cv=none; d=google.com; s=arc-20160816; b=TJGb70tblJQCUfvS3NjSxVPNCZW+mL4geMZAtzIkTvhiF4lTNLtB8hDQzw8TpF7oIF 8n31rPaq6CqOT014x8CC8IWeffetw0VImF2NsfDlVFgv19741ve2SpSocpr5KK80qizY QPgnaxe1chuGrgccTAjPi0JODwjq0qyRFs5jxbZxUxRWa8ZssksHJxjtFMXDBzBM4NH4 /9NlGTUlaQCe+yXCgJd8vUC2BtddFmrpUiud+ZaIhUg8CYiCHGrBR6cn94v29xPVY/hJ CD0bArnNAOFYGMu68FC2+eSbW08xxxzClxJ1MsMonNeaG+jWyxbW7l5EluZWb00esrzg bxAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:message-id:date:subject:to:from:dkim-signature :dkim-signature; bh=qSxVl+Qr7OZ6JrZcM97jYRgvAh2dPQ0Fpqb1gdUSC+8=; b=wCPtdtiHD/woBU1VdfESVtJyDvWOuFvadugZQphZywbOu32MQcL7BLs5IHNskFB6F5 Ei0gdLjvqEe6K7556CofnbYs/AS8CMMzdmbRt0jtGTC75jEDVOjQ5s4Ft58EPuEvC9rn 5ZwEK9IQa+GUWp0qFoc1I7dbmO/vHMR/R0LBEVl6TWEJGhkUi/MWuk0CjlaNo6wROgeg rVUdqpzQ1gOCFX9Kpi5K4g4A1M+8tp3gsemR/rBrUFJcqyVPWuOYSiyfeydPUVbZnAFR ZqZGyiTI/W7tFV+PcQIloZD72nAArUf4FvYzWDyImsyOtG7aK3YDKmjNuObsJb5zD2tn EqsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=bombadil.20170209 header.b="Znvlxd2/"; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=E4UFDSvr; spf=pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom="linux-mtd-bounces+patch=linaro.org@lists.infradead.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id n3-v6si30039084plb.435.2018.10.11.11.54.11 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Oct 2018 11:54:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=bombadil.20170209 header.b="Znvlxd2/"; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=E4UFDSvr; spf=pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom="linux-mtd-bounces+patch=linaro.org@lists.infradead.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=qSxVl+Qr7OZ6JrZcM97jYRgvAh2dPQ0Fpqb1gdUSC+8=; b=Znv lxd2/CI0A3wNYu/GizLNOxfyThoeg2HuKL2e6Ikj2Txzl6AmS7Jn/gAS4Auime2aF0lI3QfUUDgA9 P/v5j2duWshIUawLyQBjE7DdJokLk3S9b0Y9cFrgeyLh7SFOjgl63QXgokuYcpB0JVMxOtF/WJRfL ikd+wRIN0ANtDo+1EehqFk8pjQwLKzm7N7W9rQRCNcAnCnLf8TyAYp0ll1hhjzVKVLMXZVcDRzP5b 64eau+c7GAlOYrK9+/ykehqjKFLC5qMAcxQH8Fdhdd2BDF2bw/VN16YhKmoVnZeE60nEsQumL/UM3 0WP65W6biehCDQtRZr430TfAFWXAD6Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gAg5m-00028p-1c; Thu, 11 Oct 2018 18:53:50 +0000 Received: from mail-lf1-x142.google.com ([2a00:1450:4864:20::142]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gAg5i-00024I-Dx for linux-mtd@lists.infradead.org; Thu, 11 Oct 2018 18:53:47 +0000 Received: by mail-lf1-x142.google.com with SMTP id w21-v6so7489434lff.6 for ; Thu, 11 Oct 2018 11:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=ak5cx/E4OF+zESD37+v90KDpS1hZEtug/OhCwtS59V4=; b=E4UFDSvrxirWFUVSCc3qjZpWSngnTqUPJFDHMYI/oNlbq+r4JG69Da9eTudL8LSEsS GcQBOB4katWavkqpoUHLLvrw32hCCWbiH3bejzPIbhz7DbqoqSutpoaLReqQsAKnCMKL RUhpwK9QtKds7ancZNiINNRq1C5TECXlq0qOo= 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; bh=ak5cx/E4OF+zESD37+v90KDpS1hZEtug/OhCwtS59V4=; b=ooNAq7dibaMyvakaJ0ammb5FslKW3VmJvDClB01pPeTPFzKRd9uziY7Comn5A5fzv0 TBYAJV988gwzEZCdi/06rlqNvcZfAR/T3ugr6iuQIb1KalJMHakeNWHVD+T1d72Fdwq1 WO3skZbBRqX5/e8urIrWDrABw8MkcduVpJpSGqaRfE3N1GMEKSBQ/Zuxv28XPKkpD0kM R/f3HiBU/owKCs+xXp4EBAihD87pCEBoEdqrXW+2Pq/uOYa7h+g1TjVkjYxYpDGr9Rva MQSRgpQfc018cp2Y1CjdU63PnM6RSYhA+tpIzJKSpCh5WO5fpNAI0pwdVJypBgj6irs9 3cAQ== X-Gm-Message-State: ABuFfojhgxgrhtlPh/PD0Abx9J8/9dVai3D6FWTMiK/KC2JWHzrYtgtF E0myL31NpWXD1QoaevhIBHPEgg== X-Received: by 2002:a19:c7c2:: with SMTP id x185-v6mr1955445lff.123.1539284013305; Thu, 11 Oct 2018 11:53:33 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-ae7b71d5.014-348-6c756e10.bbcust.telenor.se. [213.113.123.174]) by smtp.gmail.com with ESMTPSA id t21-v6sm6362632ljg.32.2018.10.11.11.53.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Oct 2018 11:53:32 -0700 (PDT) From: Linus Walleij To: David Woodhouse , Brian Norris , Boris Brezillon , Marek Vasut , Richard Weinberger , linux-mtd@lists.infradead.org Subject: [PATCH 1/2] mtd: physmap_of: Move custom initialization Date: Thu, 11 Oct 2018 20:53:25 +0200 Message-Id: <20181011185326.1371-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181011_115346_480553_E49CC35B X-CRM114-Status: GOOD ( 15.92 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:142 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+patch=linaro.org@lists.infradead.org In order to be able to assign custom complex mappings to the physmap_of plugin for Gemini, move the initialization so that the simple map is initialized before we enter the platform-specific functions so the latter can override them. Signed-off-by: Linus Walleij --- drivers/mtd/maps/physmap_of_core.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -- 2.17.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/ diff --git a/drivers/mtd/maps/physmap_of_core.c b/drivers/mtd/maps/physmap_of_core.c index 4129535b8e46..74ad753265f3 100644 --- a/drivers/mtd/maps/physmap_of_core.c +++ b/drivers/mtd/maps/physmap_of_core.c @@ -239,13 +239,6 @@ static int of_flash_probe(struct platform_device *dev) else if (of_property_read_bool(dp, "little-endian")) info->list[i].map.swap = CFI_LITTLE_ENDIAN; - err = of_flash_probe_gemini(dev, dp, &info->list[i].map); - if (err) - goto err_out; - err = of_flash_probe_versatile(dev, dp, &info->list[i].map); - if (err) - goto err_out; - err = -ENOMEM; info->list[i].map.virt = ioremap(info->list[i].map.phys, info->list[i].map.size); @@ -257,6 +250,14 @@ static int of_flash_probe(struct platform_device *dev) simple_map_init(&info->list[i].map); + /* Variants can override map accessors */ + err = of_flash_probe_gemini(dev, dp, &info->list[i].map); + if (err) + goto err_out; + err = of_flash_probe_versatile(dev, dp, &info->list[i].map); + if (err) + goto err_out; + /* * On some platforms (e.g. MPC5200) a direct 1:1 mapping * may cause problems with JFFS2 usage, as the local bus (LPB)