From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40DDD3DDDC1 for ; Fri, 3 Jul 2026 13:45:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783086334; cv=none; b=VK/GzUiRTHpH/mnRQ8W2VDNFcQxY8ORg7+awHqxikziQd6vqeQekC3Hc9C/XZ6Al5uw989YnGovxxcR6z5tl7uM1+bAQ127hPXShLj8eFrNLAh8E765XpcV9iEQmWhz/ZrXHIrgObe3xKrQYwGPC82neeOdIWNXnLmxCB5unLR8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783086334; c=relaxed/simple; bh=zkO7UGTBhc0abSbmAA7xbPJx3KQa3FMC3+fWJRmAgxA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K02a7hmeS0EeNN4YjqBp6XQQlPkuD/eXmxAMW+hjyLGc2RJERYIwwrNpxJ3mt0iNLC3CuTCFq999BZuuIf2sbQe2nrly/cH1UATmhHuuNFZrNskc5TApOzGZxv1FUN8VSJPAzWzPGNupaUBaOrQfVqzFIFhBnSJxXSZhnrj4uZI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=Z3c7nV1P; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=YG86y5To; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="Z3c7nV1P"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="YG86y5To" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 663D16iN053890 for ; Fri, 3 Jul 2026 13:45:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= AwhIzMOLwD/T1MG78AEfie5XOqWGm9fdRJaKy1+95/o=; b=Z3c7nV1PTRoHjP9Y N8NDqCV0gtQJFr0W6O1wUDef4OW1eTa7rUWJcI+L3YuZPAYrKIcWudhVKzTJqrJZ eb8HX8BJlDfPhqHG2jSC/hXQilE0PXXKmZ/EXQukwgOqzO7ShYU5tnZ9sGpb5/lD 7nQTCQR4TcNLAguTL9DWCbTEh0LP/73+RhvONYTPVoYavquvmBeDzrHwrI6hcJqC GmOV22R4aAteWaxzLt8ZOebOd031WA5/81BkzbBNFt/yQnXsvV37lXp+vd7Dc9me M/Bixtazx6p0hww+H1DWI4pq7M76d95uIY0eGBfVH2w/mfeJPD8nzdIBx4LRNVld RJCFBQ== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f6dkkg4qu-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 03 Jul 2026 13:45:31 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-92e82060977so66127685a.1 for ; Fri, 03 Jul 2026 06:45:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1783086331; x=1783691131; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=AwhIzMOLwD/T1MG78AEfie5XOqWGm9fdRJaKy1+95/o=; b=YG86y5To+FO2Rv/VMacw7djrQ/2lb8pPNYpBbtK4IEjIK8N3JHJ5JXQlA1eTK1SNuO 7NQzEY58U9JJmpZcQqipAVNQKGdWr5JaOEZkfu48PKhB6xW5Sc6ICmMrITEzK0KHrZbK RpRpZBM/4E/gbCXt+c80sxg/yQKn9VhFc0LUWPHJKMQFo1DtINl2Wt2bL0DVj5KXMfpq HtwducqowYCKv+repivOuhGH//2k5c4C6ufuQzu+AD7vFmaWYbjY21xDyV7kKeKl8V/U uC1syAzQ9gVEbsYDBhYpf4K3hf1OiVrphM3yMaUSGBcAGxAfac0rA6xGMKMaZ3vWGVTE JqQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783086331; x=1783691131; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=AwhIzMOLwD/T1MG78AEfie5XOqWGm9fdRJaKy1+95/o=; b=V8LwztNHVy1kSkggxp9dDAiMIIRUVE3PbT8y7NZJN34ei86JlEGTwUhsZqy26cxyj1 pdoLcrhTVjn+md6m3RWHmgR178gUWcvIEvfeNDnt7j/s6XoqrkdiRTxEvLc8jSO5uSmU JhB6KYAxsoiY1OW0lPk1BD/uVHdnhIG+9hdxiBX2VgP3jfW8ELm3Wayt86ztOLpfebVK bzDDozMuefeBUuO4l31jj3Nc/zGugW3E5lQJ8MR7Au31j9re/afIDEqpcutmBtUKfxEq kANKYNgei1FIVfUhfhhPfnDXg9s/Bmus89E39FQtsd8PHNQ4tBodgolQzwVfaeela76P 2Yyg== X-Forwarded-Encrypted: i=1; AFNElJ9uDXDOwmaDGDzskqGuJMgoEfv+mvi45mqEGzL1BtdzA2+dSuwrjnzkud2jFw7QArvnaWDQ2xwfQwz7@vger.kernel.org X-Gm-Message-State: AOJu0Yxv24v75KfH9MamoKJxhwtlwH9cWuBSYHK+f/lfzfqGzTvlhOys cZW9DUvgZaIhUs2c7+lqQ2znE/qXVQTNG13iTkqgG6AvBFpflL5c3RVYXd8wZl9c4WNb8nN7n/M sw0dp/tZgUg4Fmkwiw0L3RYLkeg3tOYT5crt0PRQD7bJS69wdQiq1FNbWpnLJlmlI X-Gm-Gg: AfdE7cmVZ8wSinNvu/2jdKOBKOyacdp2dF03WIVY5iqWxyxLrH0wbD0F5wPLB+Ay3CD DluMtZ3S9LMgUhY7TjURi42U5QcuM4tUiVX13R4ReglE0QfTI87Cz6xZ1MAXuIi+72qJKSdhoqz oXXJX5S2VopqtciaRXp0FiAOJt8cUGOMCkaYOwLBeux1GJS1PjrRabA6lJZOz7NUjRzB4CvghqP o+NmaZra6/ZszfDapXg0qg46Od6ImfDmJbP+lvCswRC/kLGIiLEmKzIZnG3kQLL8EiyfVpP1s+f CZqmyfFVSeW7P8H7Dp1/wKTZDcXn/pzM1eJIczcFt0MPQcB5CFMEqjd92mFU12ZRchSNf+82b49 mSuaUCKMVEjUibomjMOfV9RPsu4ez5TiS4bJBVV8RcEKG14Meb3Q4miYQPLTPMVG+fBy3l3kZsu eZZUZdMIZu3iBT5lBu8e1Z0ceReQXY0RLhFuGMJj3DYi19Ct32EEUtPykUirCQ6+k= X-Received: by 2002:a05:620a:7007:b0:916:5f5:de22 with SMTP id af79cd13be357-92e8b29ea54mr485347485a.12.1783086330556; Fri, 03 Jul 2026 06:45:30 -0700 (PDT) X-Received: by 2002:a05:620a:7007:b0:916:5f5:de22 with SMTP id af79cd13be357-92e8b29ea54mr485340685a.12.1783086329977; Fri, 03 Jul 2026 06:45:29 -0700 (PDT) Received: from QCOM-eG0v1AUPpu.na.qualcomm.com ([2a01:e0a:830:450:809d:5d56:19d9:ff8b]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c12b6059e4csm286135466b.1.2026.07.03.06.45.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jul 2026 06:45:29 -0700 (PDT) From: Loic Poulain Date: Fri, 03 Jul 2026 15:45:17 +0200 Subject: [PATCH v8 4/9] nvmem: layouts: Support fixed-layout as the nvmem device node itself Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260703-block-as-nvmem-v8-4-98ae32bfc49a@oss.qualcomm.com> References: <20260703-block-as-nvmem-v8-0-98ae32bfc49a@oss.qualcomm.com> In-Reply-To: <20260703-block-as-nvmem-v8-0-98ae32bfc49a@oss.qualcomm.com> To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Jens Axboe , Johannes Berg , Jeff Johnson , Bartosz Golaszewski , Marcel Holtmann , Luiz Augusto von Dentz , Balakrishna Godavarthi , Rocky Liao , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Srinivas Kandagatla , Andrew Lunn , Heiner Kallweit , Russell King , Saravana Kannan , Christian Marangi Cc: linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-block@vger.kernel.org, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, daniel@makrotopia.org, Loic Poulain X-Mailer: b4 0.14.2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzAzMDEzNSBTYWx0ZWRfXzNMRK5aHBUrK hEtq9bA36YvtDgwSWne/RXrPr/pl/5d7jcHCSR4GOxQsNCn1vs43iv6UdWaN03ikyeW7/rr6XPe rz0q34+kNSYg/k/fhMuOSclFsMWacpE8NpS9ZQGxwruEBAJ8YqK2XGGqgjhWZ5Wn8KvlkAOltBB cEapc3Wc9+5/8999aWqRCUpTQENZFenwx8cK+YbthPZIgjSEzwqMGAwso/au+Ei3GD7kyp9F968 cYATbMh1jf/EbGJVFkUqkRDZfkL17m9WRBQgZRtwmTvec8uL8cux3D0ahrUSKltFHVYbuA9Quk1 PZ3cLRHJIGZzw9samD0JOBuY4UkQKfUsrnW+GFsdzlrXMGzPeaWaJjgosPVOcINtsIiImm5fjHS NcluPTpZgmkBDDKJdVCAODxXnLwW9CwyixoClOlq7rmyHz7BKYCvMvNR7xTCGI/srAzdxWGXX2y Dv/Cb2438zATnQRPPDg== X-Authority-Analysis: v=2.4 cv=LeUMLDfi c=1 sm=1 tr=0 ts=6a47bcfb cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=4SYEPDBQci7QR0ImIkAA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-ORIG-GUID: zrU5pbpdbtC2XeTF2LJSTeHTGSwSs7MH X-Proofpoint-Spam-Info: AW1haW4tMjYwNzAzMDEzNSBTYWx0ZWRfX4WlA0x6t7+n4 bJKUxYNF/tcNzxKB8G5B9O+HJTNlWXOz8J7tOhFpAawDW5+0BqrHVumTZ4YHj2TjRw/8QEbN5aO S+U6wTmzDOKgXxlNqGJcMViTNZ0SJ9w= X-Proofpoint-GUID: zrU5pbpdbtC2XeTF2LJSTeHTGSwSs7MH X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-07-03_02,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607030135 of_nvmem_layout_get_container() only looks for a child node named "nvmem-layout" to locate the cell definitions. This does not cover providers whose device tree node is itself the fixed-layout container, such as an eMMC boot partition block device whose fwnode points directly at a "fixed-layout" compatible partitions node. When no "nvmem-layout" child is present, fall back to returning the nvmem device node itself if it is compatible with "fixed-layout", so that its cells are parsed by nvmem_add_cells_from_fixed_layout(). Signed-off-by: Loic Poulain --- drivers/nvmem/layouts.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/nvmem/layouts.c b/drivers/nvmem/layouts.c index b90584e1b99eab4217cbe7ec48373e18a7caf0dc..efa631ce7283bdd6c8ecda75915911b5e3a33c99 100644 --- a/drivers/nvmem/layouts.c +++ b/drivers/nvmem/layouts.c @@ -167,7 +167,18 @@ static int nvmem_layout_bus_populate(struct nvmem_device *nvmem, struct device_node *of_nvmem_layout_get_container(struct nvmem_device *nvmem) { - return of_get_child_by_name(nvmem->dev.of_node, "nvmem-layout"); + struct device_node *np; + + /* Search for nvmem-layout child */ + np = of_get_child_by_name(nvmem->dev.of_node, "nvmem-layout"); + if (np) + return np; + + /* The nvmem of_node is itself a fixed-layout node */ + if (of_device_is_compatible(nvmem->dev.of_node, "fixed-layout")) + return of_node_get(nvmem->dev.of_node); + + return NULL; } EXPORT_SYMBOL_GPL(of_nvmem_layout_get_container); -- 2.34.1