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 smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 E34A9C54EFC for ; Tue, 28 Jul 2026 09:11:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9C72E81316; Tue, 28 Jul 2026 09:11:08 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id JOvPpDd39YX3; Tue, 28 Jul 2026 09:11:06 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=u-boot-bounces@lists.u-boot-project.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 894FB812F8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.u-boot-project.org ; s=default; t=1785229866; bh=bCR7/9/1eFl9YsqqJf1N/num8lRQztqaGtwKRIiQl+E=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=BCHRzxhBDDBjGfn048aM/Gt5M3+cBXmCLXeR/zLeDJvNF61UsGBykEdKwdHBasMoq 0zFR5D5n7qtaSLlCwq6ywwGQELQmwL9eigwPt1wZDOCSX4XOYbmihJMkgjzRKhEfVH G+7wHNb2rmrZYXQPh367qUsF7WMiB+h3xakBZQczhwLQBy7ojLg8ar22Va2UG1DO0h LUKAqRs+CJoL7g7sgdwGyuCeWhj5L/0CCcAQOYGUXflLzLeDGKhfoYLVceYf5aEGIB HryWHUJSvmyueCbFbj6JU1ii+RQMhVIUTGaABmpMwgiair1t3mCrb1ukYnQwfAnog7 QJIPP4KN6BAwg== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp1.osuosl.org (Postfix) with ESMTP id 894FB812F8; Tue, 28 Jul 2026 09:11:06 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists1.osuosl.org (Postfix) with ESMTP id B0DD626C for ; Tue, 28 Jul 2026 09:11:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 9705E60735 for ; Tue, 28 Jul 2026 09:11:04 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id zElCggzppnXQ for ; Tue, 28 Jul 2026 09:11:02 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=136.143.188.12; helo=sender4-op-o12.zoho.com; envelope-from=me@ziyao.cc; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org CB083606C2 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org CB083606C2 Received: from sender4-op-o12.zoho.com (sender4-op-o12.zoho.com [136.143.188.12]) by smtp3.osuosl.org (Postfix) with ESMTPS id CB083606C2 for ; Tue, 28 Jul 2026 09:11:01 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1785229840; cv=none; d=zohomail.com; s=zohoarc; b=kiUAQf3rEvAojr0aZ9IxiO7wWr1oU95YEb86RWfdc98Ernzjmtyw4Fb4FBSniYfoX6tPw4cmv2EPr74nxHSeGurk07tWrLtpK22Lj1BpA+CILxr6kuT14Sc7VH5pp0VJrBsHplzAgZvLaozBpFniY4s/I+ISRvFnrfDWvR1C8Ug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785229840; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=bCR7/9/1eFl9YsqqJf1N/num8lRQztqaGtwKRIiQl+E=; b=WPPWrnsJ/mB6noAC5heNHQPs0lDZGfuD02fgoO7nb4oLqKCOBasvE+pnckQi64Nsp01svu5DXLXXLbEfUF1/hI4pfWIjaa6nUIbiRM7dBovBOniyRKWJc13RnMGOe/yjgR/UG6S4sPe3PtBVn499baHYnp6xWM3CHtNQCAG6Bts= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=ziyao.cc; spf=pass smtp.mailfrom=me@ziyao.cc; dmarc=pass header.from= Received: by mx.zohomail.com with SMTPS id 1785229838488573.712737461287; Tue, 28 Jul 2026 02:10:38 -0700 (PDT) Date: Tue, 28 Jul 2026 09:10:25 +0000 From: Yao Zi To: Eric Chung , Yao Zi Cc: u-boot-spacemit@groups.io, u-boot@lists.u-boot-project.org, Tom Rini , Tim Ouyang , Leo Liang , Peng Fan , Huan Zhou , Raymond Mao , Jaehoon Chung , Bhimeswararao Matsa , Tanmay Kathpalia , Kaustabh Chakraborty , Han Xu , Yanir Levin , Christoph Stoidner , Balsundar Ponnusamy , Daniel Palmer , Anshul Dalal , Bastien Curutchet , Angelo Dureghello , Johan Jonker , Sam Protsenko , Guodong Xu , Rick Chen , Leo Subject: Re: [PATCH v6 06/11] dts: k1: add SD card support in u-boot overlay Message-ID: References: <20260727-m4-v6-0-2f58566d48ca@riscstar.com> <20260727-m4-v6-6-2f58566d48ca@riscstar.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Zoho-Virus-Status: 1 X-Zoho-AV-Stamp: zmail-av-0.2.10.1.5.2/285.205.57 X-ZohoMailClient: External X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1785229840; s=zmail; d=ziyao.cc; i=me@ziyao.cc; h=Date:Date:From:From:To:To:Cc:Cc:Subject:Subject:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:Message-Id:Reply-To; bh=bCR7/9/1eFl9YsqqJf1N/num8lRQztqaGtwKRIiQl+E=; b=ZHkUeWbh3RIQ2ccVcG0xFLaLTNk+ToSTsTDcPaBCpbKQ854Za9fZSkrvVSd5en6a drpiyivKP0Ns6PkaV7LoMHGrPWM/OFitn4MSjKb0/PaxCQQCSOrxc39vNIbDToB3gFd mJmTan29bdbJALuTroLxpxIQFWvbupiv4o8dY4BA= X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=ziyao.cc X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=ziyao.cc header.i=me@ziyao.cc header.a=rsa-sha256 header.s=zmail header.b=ZHkUeWbh X-BeenThere: u-boot@lists.u-boot-project.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.u-boot-project.org Sender: "U-Boot" On Tue, Jul 28, 2026 at 09:04:52AM +0800, Eric Chung wrote: > On Tue, Jul 28, 2026 at 1:08 AM Yao Zi wrote: > > > > On Mon, Jul 27, 2026 at 09:08:52PM +0800, Eric Chung wrote: > > > Hi Yao, > > > > > > I'm not familiar with the policy for syncing DTS files from the Linux upstream. > > > Could you clarify how this script works? > > > > > > Does it sync all DTS files from Linux upstream at once, or is it > > > possible to sync > > > only the Spacemit DTS file? > > > > update-subtree.sh cherry-picks a commit from the upstream, or > > merge an upstream tag into the subtree. Cherry-picking SD-related > > commits from Linux upstream suits for your case. > > > > > If I choose to sync only the Spacemit DTS file and include it in my patch set, > > > would that cause conflicts later when others try to sync all DTS files? > > > > Tom synchronizes the dts subtree with Linux upstream irregularly, there > > should be no conflict or relatively small ones if you cherry-pick the > > changes, while adding downstream nodes in *-u-boot.dtsi might suffer > > from duplication, too, during synchronization. > > > > The process is a bit complex. Since my main issue is that the DTS > files are out of > date, would it be simpler if I just copy the relevant Spacemit DTS > files directly > from the Linux upstream into the dts/upstream folder? The answer is simply no. > > > Best Regards > > > Eric Regards, Yao Zi > > By the way, please avoid top-posting if possible. > > > > Thanks, > > Yao Zi > > > > > On Mon, Jul 27, 2026 at 7:52 PM Yao Zi wrote: > > > > > > > > On Mon, Jul 27, 2026 at 02:59:08PM +0800, Eric Chung wrote: > > > > > Add the SDH0 controller node and its pinctrl groups to the u-boot > > > > > overlay. The upstream DTS only contains the eMMC node; the SD card > > > > > controller (sdhci@d4280000) and its MMC1 pinctrl configuration are > > > > > missing. Place the new node inside the storage-bus via path-based > > > > > merge so it inherits the dma-ranges from the parent bus. > > > > > > > > > > Signed-off-by: Eric Chung > > > > > > > > Please cherry-pick upstream devicetree changes from Linux upstream with > > > > tools/update-subtree.sh instead of adding our own copies. Changes for > > > > k1-bananapi-f3 and k1-muse-pi-pro have both landed in Linux v7.2. > > > > > > > > Best regards, > > > > Yao Zi > > > > > > > > > --- > > > > > v5: > > > > > - Append power source field on eMMC/SD pinctrl. > > > > > v3: > > > > > - Fix SD pinctrl as uhs. > > > > > v2: > > > > > - Use vmmc-supply as vqmmc-supply on SD node. > > > > > - Add alias of mmc0 and mmc1. > > > > > --- > > > > > arch/riscv/dts/k1-bananapi-f3-u-boot.dtsi | 91 ++++++++++++++++++++++++++++++- > > > > > arch/riscv/dts/k1-musepi-pro-u-boot.dtsi | 86 ++++++++++++++++++++++++++++- > > > > > 2 files changed, 173 insertions(+), 4 deletions(-)