From patchwork Sat Dec 25 04:46:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Bourdon X-Patchwork-Id: 1573134 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=H60eTJlB; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JLWdl6NVBz9s1l for ; Sat, 25 Dec 2021 15:48:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4877282FBC; Sat, 25 Dec 2021 05:47:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="H60eTJlB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E40AB837CF; Sat, 25 Dec 2021 05:47:54 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D3A0A82A59 for ; Sat, 25 Dec 2021 05:47:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=delroth@gmail.com Received: by mail-ed1-x536.google.com with SMTP id j6so39567179edw.12 for ; Fri, 24 Dec 2021 20:47:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9Ynw+T4IhAzMeh+ve/nhOvd4ZRpBZT/OFXsLt8xJAqE=; b=H60eTJlBckZ3mLv3NaGvKHA/gXqNQQTfKxblpe9HV7N/fRfBr/Qz52vU270QCzhMgz zSk+hxdSy3WBPBgBN8mZt6Qf7ITT8MEkIj/sIkKKLybbSxfQRHoxYWusunjj57vP6rk+ OuI6WUBAoNfGtP0Jqe1JCmLBq3UfrAFY9a4lHIXk2P9XFm31ES7q6KmRL8DALM28pHIj ieBtzB1qE067/3Tumk+tEhUAEvixuefpZSFJnAQ9E5Qxvi2RpoPwVV3kSo18b6RtZZ4B uFOP54pVtXbwPyTbHed5YcmDpEF23XikVBezDxpftdJgdst5NfCRgvaMP1Yr9Dzl2ch+ 1N4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9Ynw+T4IhAzMeh+ve/nhOvd4ZRpBZT/OFXsLt8xJAqE=; b=dRNIqH8vCt1Hw7a1QZXLismbjL6kucZUb3Ntb67IK302+aZv1MOOPJGvQw5TqRNIr8 ebt5R7rZ4LU/YWefVpXk/Bmd9AjPssZuLuJsdeVQ/37F5HDQ/+f94HwO9H/AdpoAJsRo RO+VrxV5Wk8x2aKYHSdHULtMABm2cxnVd0pbtppwcXkxqBVQrTr5sgNu5IOBo5GnxttD n0FiAlE0GXe9VdyL0BeLHfF5WUeR4zspPl9ec+YPToLoZl4Zo7H6wXVkFinGvCIrVUtB MiKSt+QhKrlGj8yfFplvBK5EupA+r1gJSFhtNA95pcJL1Bi7omKqGHBj7j6apvRAkK9L NoYg== X-Gm-Message-State: AOAM531LM8r4P1EV/b4D8V3mKbQOoJnlzf+vOhA8ncLptmF7ye1fURBr MxdsrAHWHNSlROZoMQG1iwWTMvHT1oE= X-Google-Smtp-Source: ABdhPJzQlImqxsC0XHgYmHtACuPkoeFNkj2VliY5dWCiSHzbAKv0su/QK8cKI/q0USoAp0rlNV/FtA== X-Received: by 2002:a17:907:3d88:: with SMTP id he8mr7335983ejc.707.1640407671176; Fri, 24 Dec 2021 20:47:51 -0800 (PST) Received: from lowell.delroth.net ([2a02:168:6426::ff88]) by smtp.gmail.com with ESMTPSA id ot19sm3138372ejb.63.2021.12.24.20.47.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Dec 2021 20:47:50 -0800 (PST) From: Pierre Bourdon To: u-boot@lists.denx.de Cc: Baruch Siach , Konstantin Porotchkin , Pierre Bourdon Subject: [PATCH] mtd: nand: pxa3xx: use marvell, prefix for custom DT properties Date: Sat, 25 Dec 2021 05:46:29 +0100 Message-Id: <20211225044629.1322122-1-delroth@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean The DT properties for the "enable-arbiter" and "keep-config" config knobs were previously named inconsistently: - The u-boot driver used "nand-enable-arbiter" and "nand-keep-config" names, without Marvell prefixes. - The Linux driver uses "marvell,nand-keep-config" ("enable-arbiter" does not exist anymore in recent kernels, but it also used to be "marvell,nand-enable-arbiter"). - The device trees almost all use "marvell," prefixed names, except for one single instance of "nand-enable-arbiter" without vendor prefix. This commit standardizes on the vendor prefixed version, making the u-boot driver read from DT props "marvell,nand-enable-arbiter" and "marvell,nand-keep-config". The one device tree using the unprefixed version is also changed to use the new naming. This has the side effect of making the previously no-op "marvell," config knobs already present in some DTs actually do something. This was likely the original intention of the DT authors, but note that this commit was not tested on every single impacted board. Signed-off-by: Pierre Bourdon --- arch/arm/dts/armada-cp110.dtsi | 2 +- drivers/mtd/nand/raw/pxa3xx_nand.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/armada-cp110.dtsi b/arch/arm/dts/armada-cp110.dtsi index abf1e4ea08..ddc10d2374 100644 --- a/arch/arm/dts/armada-cp110.dtsi +++ b/arch/arm/dts/armada-cp110.dtsi @@ -231,7 +231,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&CP110_LABEL(syscon0) 1 2>; - nand-enable-arbiter; + marvell,nand-enable-arbiter; num-cs = <1>; nand-ecc-strength = <8>; nand-ecc-step-size = <512>; diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c index 8ff58a7038..3a9c9ca508 100644 --- a/drivers/mtd/nand/raw/pxa3xx_nand.c +++ b/drivers/mtd/nand/raw/pxa3xx_nand.c @@ -1862,10 +1862,10 @@ static int pxa3xx_nand_probe_dt(struct udevice *dev, struct pxa3xx_nand_info *in return -EINVAL; } - if (dev_read_bool(dev, "nand-enable-arbiter")) + if (dev_read_bool(dev, "marvell,nand-enable-arbiter")) pdata->enable_arbiter = 1; - if (dev_read_bool(dev, "nand-keep-config")) + if (dev_read_bool(dev, "marvell,nand-keep-config")) pdata->keep_config = 1; /*