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. > Best Regards > Eric By the way, please avoid top-posting if possible. Thanks, Yao Zi > On Mon, Jul 27, 2026 at 7:52 PM Yao Zi <[email protected]> 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 <[email protected]> > > > > 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(-)
