From patchwork Tue Jul 27 11:15:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 12402537 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1076C4338F for ; Tue, 27 Jul 2021 11:18:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B97486054F for ; Tue, 27 Jul 2021 11:18:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B97486054F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=BDqV45K+3QyOdnM15N0JFw4tUtD0vluVa47R0gGKnAM=; b=z9kbek/wC6629k Ul+PBnnjmtx/3PeNgoS9NAnAab4dirxuxSpI4ksxaNdwjHl04vpEJXv6zppkvmmmJuVu9Rc27B/U/ +vk0XMfqHNJNlc3BfY7uucMDOCVOTqmVnKzrB2i3HDhg6uzGn8azIHSZqC4/qUzYhTTKGYyNClLrq dnNkQk3uRgFxUwWptX1BzoptQJXDYxgi74pKgs5mO9M7Jt8YJ2xSBKPapsCgcL4vs34vw5Gtv2NHa JPyl+4HUyrQptsUW/BJNLXPfM+DtxgXM8nCTFfjnCyUFhithHhFDCMF9EzuhuECsJRKEYw0wsCLga /+qakmgr94kqCKYc0Btg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m8L3L-00EaG4-7P; Tue, 27 Jul 2021 11:15:15 +0000 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m8L3G-00EaDQ-9d for linux-arm-kernel@lists.infradead.org; Tue, 27 Jul 2021 11:15:12 +0000 Received: by mail-pj1-x1029.google.com with SMTP id a4-20020a17090aa504b0290176a0d2b67aso3647657pjq.2 for ; Tue, 27 Jul 2021 04:15:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BHNyu7k4UK63DVq7rOYoExZI6cBgQIh7p/Fi6u7I8PE=; b=DGLK8ZaGcLZ9qrMkM7KdMWjTsFlwbZzg7dIvgy3A8POI0ux2QLqiOutfmPLYOEy4S3 SP9jaEuFOZwpSipJm9CdJ26hVsVcFyDj2KUHgIZUqc0dxdkxJ7F20hWTGNo4LjSloYR6 76hzq7Dk1EiJMfPvfji7Zk5dTMsT4XQXW9j8o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BHNyu7k4UK63DVq7rOYoExZI6cBgQIh7p/Fi6u7I8PE=; b=UxrHdFv6LzqQ29RKKRHMVFtFIOv1MxQtZl+Bwqnh3DgW4DnjAnhYsuVJY5kNLukdKT Dq8VjBnu0UkPBbGfYto/g4hzmttfbTV12SEXHHq0gX2S6YNMK6dH42VNaQ0k3ktHTI9H Ra+HXtvA4iFwVRXXuDWdFSomDdAkEtcOyKpGtuhRACDk99IIQKlNiODoEn+6uc5cBxqa PUhkufC12jU4Vt/1b8KiYCefFj8dphgNC+eTj5aQBxTcyCxYnLmyJhqYAcHjXIxfA+fT J43cMeCO0B+qgZdA8kXH6jd5KkgLxO93goeOxhPuafov1EAfoUWwwQULAvGPEEoYGSbZ PmBw== X-Gm-Message-State: AOAM532fj2vH1XkfXYQ3824H4GgdoB6k6dkRejEacpoXmwgABRwxC8DC Fcmytcnv5dKM4YvtCvs44OqNSg== X-Google-Smtp-Source: ABdhPJzIMWQIKWL3D4AB+HqQObX91XCw/5cAdIwjOgJtQrBbMGoOuLOom54j+toKSzvKj0sN+PeEJw== X-Received: by 2002:a63:5344:: with SMTP id t4mr5589835pgl.372.1627384507409; Tue, 27 Jul 2021 04:15:07 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:5176:76cc:2193:9b8f]) by smtp.gmail.com with ESMTPSA id t1sm3362305pgp.42.2021.07.27.04.15.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jul 2021 04:15:07 -0700 (PDT) From: Hsin-Yi Wang To: Matthias Brugger Cc: Rob Herring , Enric Balletbo Serra , eizan@chromium.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] arm64: dts: mt8183: kukui: Use aliases to mmc nodes Date: Tue, 27 Jul 2021 19:15:01 +0800 Message-Id: <20210727111502.2506311-1-hsinyi@chromium.org> X-Mailer: git-send-email 2.32.0.432.gabb21c7263-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210727_041510_412661_6F49BA8B X-CRM114-Status: GOOD ( 12.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org fa2d0aa96941 ("mmc: core: Allow setting slot index via device tree alias") allows the use of aliases to number SD/MMC slots. This patch use aliases to mmc nodes so the partition name for eMMC and SD card will be consistent across boots. Signed-off-by: Hsin-Yi Wang Reviewed-by: Chen-Yu Tsai Tested-by: Enric Balletbo i Serra --- arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi index ae549d55a94fc..ed499e17b6570 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi @@ -13,6 +13,8 @@ / { aliases { serial0 = &uart0; + mmc0 = &mmc0; + mmc1 = &mmc1; }; chosen { From patchwork Tue Jul 27 11:15:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 12402535 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A0E2C4338F for ; Tue, 27 Jul 2021 11:18:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0E334619E5 for ; Tue, 27 Jul 2021 11:18:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0E334619E5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7555D/MRuAKDsn6in6ISayoxSko2iMu6bo4GwybQIJQ=; b=bpz22VKgLMPEsZ OwDFMhAOk6GYk8wsN48DkUaPl1g1YM7uPt1d3qUzOcCjSPQAP9fhyS5tR7U9P5YUfVJFZveXG7OzC ysT0yqYdgvuQXORsbzQEfJ8h0qeyibk4wgdwNNefuCZS34Ah1b5GHEfijhK/6HdxAoUHFg9Yt2qBC QRlxrDZ6jQj3UDEMSNQb81fLzwveEp6NKPTpMQn5rXKVKNNVN/JdsE0pJwHENuybM41n6FItWGbu1 pqUb4UefnbEFODvCyfOVyFc5bIu9mc8gOOeRvW+tsogneOiMIBc7QvfiwF3Yc2229y5cc+xZ8QGB5 DQUB63Is8d8z9dUg0pPQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m8L3W-00EaNx-Vl; Tue, 27 Jul 2021 11:15:27 +0000 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m8L3H-00EaEI-6N for linux-arm-kernel@lists.infradead.org; Tue, 27 Jul 2021 11:15:12 +0000 Received: by mail-pl1-x62f.google.com with SMTP id c11so15307987plg.11 for ; Tue, 27 Jul 2021 04:15:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+kNbslq7vj9YiuOoktOVh6hBVXag9OQ/inx+NSoMTgg=; b=EKGqxJGnjY+bKuBecKb+9x9V4U/zyM+DfI9cY8TJhi7MREHhy+5CblfukvfTyY1GnK qLPMOn0NfI5IO1onW2adkZwW/WzOoH05UqDRSyeJKs5LkjOYVDEoomKGyJe01U66eDjT cDOB5epPM1W3XhF+rOhslBK60tOGTaMakKcCU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+kNbslq7vj9YiuOoktOVh6hBVXag9OQ/inx+NSoMTgg=; b=UXJFSgTJNYMojAglHCC5hlYvWpi+fn04w7I79VC70g9JoIVG+veQ451Vv1c23/qaBh cHkUFWoi/VYzFQKf6jVxPld4C2VaFjSabwcFS0TrzHpDxutKUr+CtppmRqVrh+nQQLJV pPPBmBvTAoqP2x4LmatF7dyvKuUaa/C1DxIvOv/uizJpBCCIDm6qVV/RWZ73HqGbglLz UfCZyxvN81DvVri+w1q66qZZ/K6v/hVwga+cT4f4vubDMHaD0n2S6roEV069KlLGqajm Ymrjsk+vdLHCFIzLcbwKkUmtj+sfCm8eHohTqnwREfs8Eyf5XhAtG0j4RNP2h7VNVvti AMYA== X-Gm-Message-State: AOAM5321frrKyNcIbndncNLgrl7fdItPeUV/NT1zqcpw8ti+Pwwcg0Sb DawP8RqOYkLH3tYXv/7dFsN8Ag== X-Google-Smtp-Source: ABdhPJzkLIgghdfrbRoZrulmILkoZzo0xSTn37F9lFpSImUcxzYkhY/lOslEJ4rksKObpe9qSWZe7Q== X-Received: by 2002:a63:5f55:: with SMTP id t82mr23038185pgb.226.1627384510116; Tue, 27 Jul 2021 04:15:10 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:5176:76cc:2193:9b8f]) by smtp.gmail.com with ESMTPSA id t1sm3362305pgp.42.2021.07.27.04.15.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jul 2021 04:15:09 -0700 (PDT) From: Hsin-Yi Wang To: Matthias Brugger Cc: Rob Herring , Enric Balletbo Serra , eizan@chromium.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] arm64: dts: mt8173: elm: Use aliases to mmc nodes Date: Tue, 27 Jul 2021 19:15:02 +0800 Message-Id: <20210727111502.2506311-2-hsinyi@chromium.org> X-Mailer: git-send-email 2.32.0.432.gabb21c7263-goog In-Reply-To: <20210727111502.2506311-1-hsinyi@chromium.org> References: <20210727111502.2506311-1-hsinyi@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210727_041511_260571_75D2CBBE X-CRM114-Status: GOOD ( 13.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org fa2d0aa96941 ("mmc: core: Allow setting slot index via device tree alias") allows the use of aliases to number SD/MMC slots. This patch use aliases to mmc nodes so the partition name for eMMC and SD card will be consistent across boots. Signed-off-by: Hsin-Yi Wang Reviewed-by: Chen-Yu Tsai --- arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi index 21452c51a20a8..d5a2cad39c9c7 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi @@ -10,6 +10,12 @@ #include "mt8173.dtsi" / { + aliases { + mmc0 = &mmc0; + mmc1 = &mmc1; + mmc2 = &mmc3; + }; + memory@40000000 { device_type = "memory"; reg = <0 0x40000000 0 0x80000000>;