Received: by 2002:a05:6500:1b8f:b0:1fa:5c73:8e2d with SMTP id df15csp522135lqb; Wed, 29 May 2024 03:00:47 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVjb8ARTP4XH81nW/bQlWQItFXqn87JLkUEOYB1Pk9O7w3FLuPN1IOInOuALjPaMqtdLfEC6IUg82F3kPp4PuRtaT93kClvjkM0+Jh4oA== X-Google-Smtp-Source: AGHT+IGuex54VE5VKxEA1Y0F/gBY36q00lbKkZiuxPoNpShaW2Jt9h6l10unm8OLcGTTMOZcH11X X-Received: by 2002:a54:441a:0:b0:3c9:6e80:8ea2 with SMTP id 5614622812f47-3d1a6019290mr14715534b6e.32.1716976847261; Wed, 29 May 2024 03:00:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716976847; cv=pass; d=google.com; s=arc-20160816; b=IyVRl8u12R8Uaklv7nIOdIQUXr4h0cNBj3wVs+MyphbYP7IP46UvWQ1tVsaSUzlOBd jOHU9aF2gLQh1KQxSq7dKNq29G1n+WTYRecXDhY+9z9OCv9dJA54V8Zvf8RYnCE4Py1H +7r7nQ8TGVgIDhMGQBSXwbKbqGCvbHj0QnQDu6tcCRRUP/psDzhQFdYEzGwOO9QbwPam 1Vo3rRuVycniqbvcoh9afnINVXDoInnbpBCUw0lpdLaaldod6b27mq5q5AaktjcE/9u1 EoPgTYHPfTed5H3NsyLs9Jb3OWh7ehXSZmR0CpiJBYaQv/496jQLLKAOssrq7Vc9SELm UfsA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from; bh=x4RyWGEDpX3lkVAIx0ZW0SC32D1KzO1V3YC8x/JwZWQ=; fh=3KszG447OgHTa2SeXZlZ2p0IQkcbqcHSFE+9s8LA3FQ=; b=YLEwl2SMyjrHShxcrfOxKJKA3riFoyA06jeGyX8ktJ5gCRYoi7FlqMu8DTZH6ttFY+ ZD2wfqPON6ZDluXmdQo01qsFdiZuGR6IjnZWmvBnLwS6U3DDg38WUe7rcAQebthfr039 OhOJhZ/WvqNnRkgtEtNVDm5C6HyWuiCXNhqrSQ0tQOqufNPW1sph8DZGphjPl+FYnMuy v9Sj1PBU0iqSZjZW7cfrN/RQZobDPpMkmlulaxmWL4QfPrPXJCL7H2U6wWRXHqxomg9/ qo/uai8Bykb0Wg2AeItJ4sBfNI6nLw2huez8Y6eiGMtIM3jY2ikA1LALjVfPcLHVlFTn oArg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-193902-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-193902-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id d75a77b69052e-43fdd7d5e74si26358171cf.202.2024.05.29.03.00.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 03:00:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-193902-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-193902-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-193902-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id F17381C22E90 for ; Wed, 29 May 2024 10:00:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9A6C817A936; Wed, 29 May 2024 10:00:42 +0000 (UTC) Received: from albert.telenet-ops.be (albert.telenet-ops.be [195.130.137.90]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 58C20178385 for ; Wed, 29 May 2024 10:00:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.130.137.90 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716976842; cv=none; b=N3A6DeYyPZSjk4aBFR4GIwP4c3Mkm8bmNeAdVnioYMj3LU5rWVM+ejygCYAvapJMFRJhSn6udRLy5FLPYcbJ1FDuLzeXGCPyXThcuhqLt70mLP1mCaCkRfKVNdtIqJpu7qhdyXTF7gH2U/91TSRtnP6iEMTbSk20N7zsF0JaOCQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716976842; c=relaxed/simple; bh=j15g7+Zs11MXgNdFt9xjPzQq0JE/TjMvjYfFKO5EiIg=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=GxS6wGbg0twzPlwWCWI/jOHgBkjHHFEw5UydgKgAvcD9mO48in4gTSaHHtORQy58O/ogfu2q+VCTKmb3zHMKyLNr6OXXnd0YSsxuLbb4c77RTA0CHBKcurbIPqaspG45SVowLnDTm5jxSoJGtuYBM1fD3SXEbBz9+ZJPCu7clwM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=glider.be; spf=none smtp.mailfrom=linux-m68k.org; arc=none smtp.client-ip=195.130.137.90 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=glider.be Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux-m68k.org Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed80:1b01:1838:131c:4de4]) by albert.telenet-ops.be with bizsmtp id Uy0Y2C00C3VPV9V06y0Ynv; Wed, 29 May 2024 12:00:38 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1sCG5l-00GLHw-T9; Wed, 29 May 2024 12:00:32 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1sCG6i-0090jY-88; Wed, 29 May 2024 12:00:32 +0200 From: Geert Uytterhoeven To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alex Shi , Yanteng Si , Jonathan Corbet , Andrew Davis , Masahiro Yamada , Andy Shevchenko Cc: devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2] docs: dt: Update overlay file extension Date: Wed, 29 May 2024 12:00:31 +0200 Message-Id: <977f66b9882b6150a8da5787bf94a418aa9affec.1716976241.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Building DTB overlays from .dts files is no longer supported. Update the documentation to reflect this. Fixes: 81d362732bac05f6 ("kbuild: Disallow DTB overlays to built from .dts named source files") Signed-off-by: Geert Uytterhoeven Acked-by: Andrew Davis Reviewed-by: Yanteng Si --- v2: - Add Acked-by, Reviewed-by. --- Documentation/devicetree/overlay-notes.rst | 12 ++++++------ .../translations/zh_CN/devicetree/overlay-notes.rst | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/overlay-notes.rst b/Documentation/devicetree/overlay-notes.rst index e139f22b363e9f36..35e79242af9a928d 100644 --- a/Documentation/devicetree/overlay-notes.rst +++ b/Documentation/devicetree/overlay-notes.rst @@ -38,10 +38,10 @@ Lets take an example where we have a foo board with the following base tree:: }; ---- foo.dts --------------------------------------------------------------- -The overlay bar.dts, +The overlay bar.dtso, :: - ---- bar.dts - overlay target location by label ---------------------------- + ---- bar.dtso - overlay target location by label --------------------------- /dts-v1/; /plugin/; &ocp { @@ -51,7 +51,7 @@ The overlay bar.dts, ... /* various properties and child nodes */ }; }; - ---- bar.dts --------------------------------------------------------------- + ---- bar.dtso -------------------------------------------------------------- when loaded (and resolved as described in [1]) should result in foo+bar.dts:: @@ -88,9 +88,9 @@ in the base DT. In this case, the target path can be provided. The target location by label syntax is preferred because the overlay can be applied to any base DT containing the label, no matter where the label occurs in the DT. -The above bar.dts example modified to use target path syntax is:: +The above bar.dtso example modified to use target path syntax is:: - ---- bar.dts - overlay target location by explicit path -------------------- + ---- bar.dtso - overlay target location by explicit path ------------------- /dts-v1/; /plugin/; &{/ocp} { @@ -100,7 +100,7 @@ The above bar.dts example modified to use target path syntax is:: ... /* various properties and child nodes */ } }; - ---- bar.dts --------------------------------------------------------------- + ---- bar.dtso -------------------------------------------------------------- Overlay in-kernel API diff --git a/Documentation/translations/zh_CN/devicetree/overlay-notes.rst b/Documentation/translations/zh_CN/devicetree/overlay-notes.rst index 43e3c0bc5a9f8235..ba5edd05dc1e7fd2 100644 --- a/Documentation/translations/zh_CN/devicetree/overlay-notes.rst +++ b/Documentation/translations/zh_CN/devicetree/overlay-notes.rst @@ -43,10 +43,10 @@ Documentation/devicetree/dynamic-resolution-notes.rst[1]的配套文档。 }; ---- foo.dts --------------------------------------------------------------- -覆盖bar.dts, +覆盖bar.dtso, :: - ---- bar.dts - 按标签覆盖目标位置 ---------------------------- + ---- bar.dtso - 按标签覆盖目标位置 --------------------------- /dts-v1/; /插件/; &ocp { @@ -56,7 +56,7 @@ Documentation/devicetree/dynamic-resolution-notes.rst[1]的配套文档。 ... /* 各种属性和子节点 */ }; }; - ---- bar.dts --------------------------------------------------------------- + ---- bar.dtso -------------------------------------------------------------- 当加载(并按照[1]中描述的方式解决)时,应该产生foo+bar.dts:: @@ -90,9 +90,9 @@ Documentation/devicetree/dynamic-resolution-notes.rst[1]的配套文档。 DT中的适当位置。在这种情况下,可以提供目标路径。通过标签的目标位置的语法是比 较好的,因为不管标签在DT中出现在哪里,覆盖都可以被应用到任何包含标签的基础DT上。 -上面的bar.dts例子被修改为使用目标路径语法,即为:: +上面的bar.dtso例子被修改为使用目标路径语法,即为:: - ---- bar.dts - 通过明确的路径覆盖目标位置 -------------------- + ---- bar.dtso - 通过明确的路径覆盖目标位置 ------------------- /dts-v1/; /插件/; &{/ocp} { @@ -102,7 +102,7 @@ DT中的适当位置。在这种情况下,可以提供目标路径。通过标 ... /* 各种外围设备和子节点 */ } }; - ---- bar.dts --------------------------------------------------------------- + ---- bar.dtso -------------------------------------------------------------- 内核中关于覆盖的API -- 2.34.1