From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 412C8C433F5 for ; Mon, 31 Jan 2022 08:11:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :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=iGkZivpB8B/ENF/sbGnqQ9LHW+2HVVKMhxhbA4E5hXM=; b=1JmAKwNL8JNXuO uF2VTyDXky7SrCCScJtB51sQQfqNKYHJzCvFk2o+zNR2Ic7uGzgbGBsIOi236vFhTfeSwMSWV1O/m AP/JHKWaR2s1IH8b5ZfHSU00TUmkVBO1+MtI311Q0nYetLFxGqh2FgcyvmOi56BwCY7s+9GbSeRmA tmoCgWcTi+nsZ7pDwnZIasyZYUgMTwyFZ4j0YBkHJI+HlRf5Hi8WueQ+Bp74xE2UTbIvr2w/MM7fI 8Vy96jtOW3Ihw92vImsuOZSeC49ynwUSAjM1f3aEV4ZCJVfuWXBokZ4NjisAPcPPknGuBEqXLM0Zq 2ajhE9GBIXgT884vOIcg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nERks-008R5a-Bs; Mon, 31 Jan 2022 08:09:42 +0000 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nERkI-008Qqj-5g for linux-arm-kernel@lists.infradead.org; Mon, 31 Jan 2022 08:09:07 +0000 Received: by mail-wm1-x330.google.com with SMTP id c2so9579008wml.1 for ; Mon, 31 Jan 2022 00:09:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jGYF3pbw01XqjiiSW32sevD0apLMvUfMvdKL2Bcj/k8=; b=JFGHp0YQp3Rgy5f+zViTTGyeENCxz6NzmcXxWaDXUYapSJVcZTZckMMM67RtFhoX1e KhPrcI9Aho3ufBQwefRQQcsSqAeIYLTbZ9U+Cb+tkiZIUPc92y0/BX7SGkLXsXVRIrlf ZNWsVFQUH21ib8wy4+eeCVBeZlhl/xxWGzr58mdpBIGsaez/6ikqM0jkG7yFNLpqNfy5 E2MaYt83Ep+IJ/e+7WwBAbin4GmG+K6U0LcQYfd2dHwt0t6dubHSqvi8Qf0JDEsLCPL2 UUvykSoMk5oszhOe5uC3rz0coPqk5SBrVEVv73FJpwNcKt6EdfkLHoTkeeRYKbCgDbDQ 486A== 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=jGYF3pbw01XqjiiSW32sevD0apLMvUfMvdKL2Bcj/k8=; b=P/XhQJNk9A4UakIPSQWZOZUSO0b8eZrRA6ciE0glXyaBkt2BEZ1Kn8Wt1S6bdiEphu QVDoAckU2RnNTEfvamB1pfuq683i6VbUTABGHB0L3EcVjlATzOQZhAOU/azX5PBGuUuD I4SCfcmC/0/Gy0GW9gnH4ZaROQ7Zlc7DOtEOugN4ApYdsyHk9EvL0I5fZRxUHELjdQV4 8XiXG0kt+SatslKINj1E3/26on3JNA4hYkifW6rLdMI8XIIgIwUuIz2tOHBIx1tn8Njo DVl3TrMi3AVp9SWbnUCHTJsxs51kSTaOavK26bnlCP2v55tsJvzNC8xsc5j8lBzNioS8 QK/Q== X-Gm-Message-State: AOAM530WH5YpW2EMTOY/dR/S/39+OoNHEYTBgHtxgHpIKacbSzYZEQcB QClLMXQZ42lyMNFS0RpCAK3mwi00D2zooQ== X-Google-Smtp-Source: ABdhPJwFgwJSsT6nbgtuR53NdNa+vE/ZtKlTCkZ5BtezvM8OIfeMxhM3bWBO65XrV0Z/IsgK7fxb4Q== X-Received: by 2002:a05:600c:3b9c:: with SMTP id n28mr25437325wms.128.1643616544178; Mon, 31 Jan 2022 00:09:04 -0800 (PST) Received: from localhost.localdomain (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id m12sm12978806wrp.61.2022.01.31.00.09.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 00:09:03 -0800 (PST) From: Corentin Labbe To: linus.walleij@linaro.org, miquel.raynal@bootlin.com, richard@nod.at, robh+dt@kernel.org, vigneshr@ti.com Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, Corentin Labbe Subject: [PATCH v2] dt-bindings: mtd: drop mtd/cortina,gemini-flash.txt Date: Mon, 31 Jan 2022 08:08:58 +0000 Message-Id: <20220131080858.1777518-1-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220131_000906_270495_B555753F X-CRM114-Status: GOOD ( 14.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Drop mtd/cortina,gemini-flash.txt since it is nearly already handled by Documentation/devicetree/bindings/mtd/mtd-physmap.yaml. Reviewed-by: Linus Walleij Signed-off-by: Corentin Labbe --- Change since v1: - fixed typo on syscon .../bindings/mtd/cortina,gemini-flash.txt | 24 ------------------- .../devicetree/bindings/mtd/mtd-physmap.yaml | 18 +++++++++++++- 2 files changed, 17 insertions(+), 25 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt diff --git a/Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt b/Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt deleted file mode 100644 index efa5b2aba829..000000000000 --- a/Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt +++ /dev/null @@ -1,24 +0,0 @@ -Flash device on Cortina Systems Gemini SoC - -This flash is regular CFI compatible (Intel or AMD extended) flash chips with -some special bits that can be controlled by the machine's system controller. - -Required properties: -- compatible : must be "cortina,gemini-flash", "cfi-flash"; -- reg : memory address for the flash chip -- syscon : must be a phandle to the system controller -- bank-width : width in bytes of flash interface, should be <2> - -For the rest of the properties, see mtd-physmap.yaml. - -The device tree may optionally contain sub-nodes describing partitions of the -address space. See partition.txt for more detail. - -Example: - -flash@30000000 { - compatible = "cortina,gemini-flash", "cfi-flash"; - reg = <0x30000000 0x01000000>; - syscon = <&syscon>; - bank-width = <2>; -}; diff --git a/Documentation/devicetree/bindings/mtd/mtd-physmap.yaml b/Documentation/devicetree/bindings/mtd/mtd-physmap.yaml index f827984936f6..82eb4e0f453b 100644 --- a/Documentation/devicetree/bindings/mtd/mtd-physmap.yaml +++ b/Documentation/devicetree/bindings/mtd/mtd-physmap.yaml @@ -44,7 +44,9 @@ properties: - numonyx,js28f128 - sst,sst39vf320 - xlnx,xps-mch-emc-2.00.a - - const: cfi-flash + - enum: + - cfi-flash + - jedec-flash - items: - enum: - cypress,cy7c1019dv33-10zsxi @@ -127,6 +129,20 @@ required: - compatible - reg +if: + properties: + compatible: + contains: + const: cortina,gemini-flash +then: + properties: + syscon: + $ref: /schemas/types.yaml#/definitions/phandle + description: + Phandle to the syscon controller + required: + - syscon + # FIXME: A parent bus may define timing properties additionalProperties: true -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel