From nobody Mon Jun 29 23:58:10 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9E6DC433F5 for ; Mon, 31 Jan 2022 08:09:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244021AbiAaIJO (ORCPT ); Mon, 31 Jan 2022 03:09:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238130AbiAaIJG (ORCPT ); Mon, 31 Jan 2022 03:09:06 -0500 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B369C061714 for ; Mon, 31 Jan 2022 00:09:05 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id o30-20020a05600c511e00b0034f4c3186f4so13032454wms.3 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=AqFfZm1AlUxoqQVwR+IiJ38BcAVcAJvXqNxulYoD//KQqHXkywRU1JAtIZY+EweqAf Kd9RFCrbz46N/XDu8A2/i49T2JED+adig21UBf2Z2fYmzcjISM3wVlQS5kzxcBlx0zNv fUwb/9Vsbt2kwWfqJ0FuWrWrkwxVAZU3Emn/wQIUhwNKxpC2uTWb7Sg4vSXGn+zCkQil gIvmSpQboif0SJQDHn7yVb5yrog+/I6tHioQRYjeE59JAuNowN84OWh//pP3TXPFYVlj bZ3u4ILL6vMwVlEwsP39xd/pYYhcznZkvzVFnfDfdK1DLbk6gQN0Zc+YWvZtvZDMLaZl +krg== X-Gm-Message-State: AOAM530UsH5fvJeBzJdeH+7IGFUc2GPtrYDRvhC95uEewAcjb2UFAU7r stKqBrRNho+Ip2NZ2qI/krRz3A== 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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-fl= ash.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 w= ith -some special bits that can be controlled by the machine's system controlle= r. - -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 =3D "cortina,gemini-flash", "cfi-flash"; - reg =3D <0x30000000 0x01000000>; - syscon =3D <&syscon>; - bank-width =3D <2>; -}; diff --git a/Documentation/devicetree/bindings/mtd/mtd-physmap.yaml b/Docum= entation/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 =20 +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 =20 --=20 2.34.1