From patchwork Tue Jul 27 11:22:07 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: 12402571 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 615B7C4338F for ; Tue, 27 Jul 2021 11:25:21 +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 17FA1610D0 for ; Tue, 27 Jul 2021 11:25:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 17FA1610D0 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=i/08BmJWc7OFP0jBzQy0minUlTQ3JX1CDUOcDPks6hY=; b=lAkut4slKTVAlb wlb2n+yIW+IXqKfiYx9GVfyTftlzjv5VJGdP0sCeWF6vR/fgb7Mpnmt+8FYpzTM3eoabSW88iE7TW RPIrkwnuoc/ZIQKexRVoV/cL+RjQGGhlU4qNfnxTTSnb3AohM/6vr0AYSIfkoRucyzLFhvpWnUDYE v35LBdvFfgneTFhLadzPBOThb7zZu/r3hzVwZHJdP2CETwqPS52YVba9cJGSfzC3fE8HZB5HBZ2GK M8s3VGsOZSTR+A8PK29DvVjS5LyA2fkulcecyBjMyalV+OoEIFLcwS/Y3rq/1Pr2Yqcbg/JoKGs+I T8S6hMLNVA5wZbRQ80+A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m8LAM-00Ecbz-QY; Tue, 27 Jul 2021 11:22:31 +0000 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m8LA6-00EcWa-Jb for linux-arm-kernel@lists.infradead.org; Tue, 27 Jul 2021 11:22:17 +0000 Received: by mail-pj1-x102e.google.com with SMTP id m1so17261560pjv.2 for ; Tue, 27 Jul 2021 04:22:13 -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=A9OpObOhNKRT1oPCp9Nu/AHOlXXiMYSXBYlg8dkzJ3E=; b=DiqnuquaXJwP3eaObksalDscAsH+YhayozsjW33Um66W84C9i6JolTO8sPjpHayoGX Ust6aHXUxkBKmmpQzgoYt0z4noDFlUKo7Aid+kRozpswPZwPI+u+dMdkK0nlTuOhLjBF ZdQ2JagFO3TqOd+66LDEiQ1243a2V6zstmblM= 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=A9OpObOhNKRT1oPCp9Nu/AHOlXXiMYSXBYlg8dkzJ3E=; b=XZlLSIYwNI/k3ehEaeSElgqWK7ggG0zqelPPuHkKngjdUk8pxrbrpCE9m5hHBB4mUN BLtcpxCGNjmUz3TyxFHGR3UpmWBI8dCxVfIdonweP2lgElBHu3JyVrRptRmgbryipWJr QJ5/j0Zzya0TM+K5me9tOPg0r738LH+NDYPnpxhaNr57gHpKjmchINIHq6MHeJ3b3JCA +q2CoJxmvNLkgcA1uwNsMgJewRrx8OifXuRCz+3SzB+pwsUSKByAk/vz9VS/JJ8ZncQA nNMqTgxq8EC0RhzBIZS/eRUzOFtDX1sClHqU+cmxbse9qQc2yxXv5YnvKK1SN7AWsO4S 1sJA== X-Gm-Message-State: AOAM531ZnMWgAtXjxFQ0xPz5pPR5qILM+9McYICgN4NerOxRTtY3CKxJ UeHZQdbH7FfM9id6Pu7FXfA86A== X-Google-Smtp-Source: ABdhPJxj1u4Gxg84zfPYkvKEg+0aPmJrlpRhck/HakTm5IhumkZ5XEl0Y2WzjGh2P9uFjnQZaZYWQw== X-Received: by 2002:a17:90a:f86:: with SMTP id 6mr3889825pjz.68.1627384933489; Tue, 27 Jul 2021 04:22:13 -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 20sm3506467pfh.15.2021.07.27.04.22.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jul 2021 04:22:13 -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 v3 1/2] arm64: dts: mt8183: kukui: Use aliases to mmc nodes Date: Tue, 27 Jul 2021 19:22:07 +0800 Message-Id: <20210727112208.2508675-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_042214_751472_84258F01 X-CRM114-Status: GOOD ( 12.75 ) 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 --- v2->v3: fix indentation error and add more commit message. --- 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..8e9cf36a9a41a 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:22:08 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: 12402573 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 30859C4338F for ; Tue, 27 Jul 2021 11:25:43 +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 EB7C7610D0 for ; Tue, 27 Jul 2021 11:25:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EB7C7610D0 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=xbJID/wqQxEZNz19I2jVj1u03D42tOy3QHBpyo4A740=; b=AhRhjgu2jyxTyk e6W2G0nU/jLE2Vc4Ax5WMByQCnnfm4HnZkxCTBYWD1+1+yd/H6FJewl5IonwFM+/DWTK17kuAEBL2 rvgADlIoQKEn7UlTmG0bk8bmm4UQk10sReXdd1TCHsdnN74rm3pQwXuo5ox6/2QVlsUVH98VoTT3k 3gQXOj/tqABJS+7/ppGbmpqGMz9j2dFw3BPRd38LxieYW2c/cZvgKSGHIJ0P2E5nQObjsCcVRHd/v gRV6LobIwvxhn5eOHoYjLZj0XglwEYyvtcuvbH748GNj7GTKeTdNTWBiG3CgfCg+SdFHVT4o1tB3n wxXI/E2sRoLGaXuX978g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m8LAn-00Ecn9-3p; Tue, 27 Jul 2021 11:22:57 +0000 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m8LA7-00EcXV-OC for linux-arm-kernel@lists.infradead.org; Tue, 27 Jul 2021 11:22:17 +0000 Received: by mail-pj1-x102e.google.com with SMTP id m2-20020a17090a71c2b0290175cf22899cso4370926pjs.2 for ; Tue, 27 Jul 2021 04:22:15 -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=7I/jF2S0x4GNrJTMatkqZ5v2AExG75w8sw95n03TZZ0=; b=PqCGjDl0ZDJC6BzPx1oirKsbbPKW0TT0QoNZEJ5bgaUHxNW2pP0EjwwbnRgprztDqb BEn6zo6NOK4y1DgVh5S9XW+su4WkiyxAGq2tH16BQ26TyZZep208NdTgIfaVkUv+aGo6 c359te2EWFAgsQ15StoybDeaVCYRnApyYGWh0= 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=7I/jF2S0x4GNrJTMatkqZ5v2AExG75w8sw95n03TZZ0=; b=BCx3nn4vdOD4ewhYZ/37hM0a54rj3cBX0eJ6rnNnKGnaiqxhYVDGXIj7mY4cJQEjJM 8SxhOY+xwODEAz/mjj57t9/GEQlHnTB/kOXp8SsZSgoGelCX6d7TP5luEcrQ/qdhkGuL LCWKh2hhpprN1msiu9sfe2ocgLCh4xTf+X1N0cRGKre6UN/6hFK9+AhBGUhrLzj6Vj6K R55J6VGp4Xz/QCed6MxJ/zfhDNOInFv2gDJHC7D9EMv6Qxd99CA+n0s5mtB2i9M2B0RD nQtqsUvjSmGpl8lCkh4Q0mqlEfvvF+Et+APJIoT8maz/MBlHlqqLHayCHcqJ41rk6/6h FXOQ== X-Gm-Message-State: AOAM5319sHZexjNZkYVoJv3uxMqa5/FRtoCFSm/FSoPW1jQXicwBcioG 4Koog5LpQv7ZSDLEZqGvHDlXYA== X-Google-Smtp-Source: ABdhPJxO2igEEqSKLOzbj7utbR/KZmD++/50YFoHbGgBIVgwGez26YNeYy09LVDcdVm7+GbWPGivmA== X-Received: by 2002:a63:f515:: with SMTP id w21mr22984558pgh.343.1627384935268; Tue, 27 Jul 2021 04:22:15 -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 20sm3506467pfh.15.2021.07.27.04.22.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jul 2021 04:22:14 -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 2/2] arm64: dts: mt8173: elm: Use aliases to mmc nodes Date: Tue, 27 Jul 2021 19:22:08 +0800 Message-Id: <20210727112208.2508675-2-hsinyi@chromium.org> X-Mailer: git-send-email 2.32.0.432.gabb21c7263-goog In-Reply-To: <20210727112208.2508675-1-hsinyi@chromium.org> References: <20210727112208.2508675-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_042215_865386_A554CB85 X-CRM114-Status: GOOD ( 13.46 ) 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 --- v2->v3: add more commit message. --- 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>;