From patchwork Wed Jan 18 08:04:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 13105812 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2987FC004D4 for ; Wed, 18 Jan 2023 08:05:28 +0000 (UTC) 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=Oy2wFs/lRBMA5LO3SzgSkplt4z8vhBvwe+RJ4j/RuPw=; b=EBj1WyYr4F4za9 bWUuUDP5Gr/YYyDty60LErAasA5WrlI03nxV8JZEToUfbiaJAHSvUzbB0/A+cTnpiHidB3yev6o98 +rHfB6m22UmuvUPPO+KmWoKnFvkANyFwwMlaPCbmko16EqxuagiZBPPIXhsIZzK8tt3TVv4X0gqLv I5j+l+JSP4KzW8R8G0ZpJDrUU/W7FUvKzHc4tTJcnqw9vfiPQOuIKPaUvvMQyOFibiOl7NNwfSVFs PKsGzn5Bym9iBE4hS0dqY2Otc1pUZR1St48ZVhlp8fPquVvedZ2O0GtAH3xjE1PRBVqe3or33c7Oz vpZUbAo8G7ayH669gyJg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pI3Rb-00HPVn-Lq; Wed, 18 Jan 2023 08:05:15 +0000 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pI3RR-00HPSY-1U for linux-rockchip@lists.infradead.org; Wed, 18 Jan 2023 08:05:06 +0000 Received: by mail-pl1-x631.google.com with SMTP id g23so20522629plq.12 for ; Wed, 18 Jan 2023 00:05:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=K7FNf3cY1zZ/AJ4VVIAB6BnVQ7mGdN3Wmm9LVsYAJeM=; b=Gh8xAivpogDa/io3OxMECljq874hzlfAuBqXesz35uF7axqbKJaSpmorFQm041JV5F duC0T9IWk2/bsKRu5gC7sGgFNZw3G+4KpQimXDn6EJZbZFjSxJDepE+sJt/EX0d0iKLm U/NGK3bCOeBh7JVco1VASVgtrb+gbrkwrOGrM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=K7FNf3cY1zZ/AJ4VVIAB6BnVQ7mGdN3Wmm9LVsYAJeM=; b=wpMCSShQiMOZfHKraZEgJ7ftQ0AfoyWfZH0Rq//+DRrGkx6aMNCYq8UleDWHG/HZhR JFWFU0lnnGGx/cnA8WlzAMZxQZQFb2Q/Wwpzf/Gu41cLG0OHn/dwDGzNmW9kNqQFWgXe 05Z0C23P5q2rT/YbRSCfBm10ZjjU0hSlCzFBFdjDLKt4c3BF03rk8O2AiEcUESjS0JBd WXu/cDw1o+VqEhQhEe1FjflB4V6i8N3KYzoAS4Lhz68mWZQrUzKbNWObxm5r94sEmJpK +nt9ZA+TW0DKBGnc3l2DkcodmC2KOCxQXNTla2nXGTkUHAHC9rQ4Pj34uuTGt2xTsL1M VpJw== X-Gm-Message-State: AFqh2koDqj+cE6/mOiEGBX7TctvuBZXIYYzP++uxptvt8mvP9HUWM+rm Ll6w1u0pmkpcrt7lkuruCH3BrQ== X-Google-Smtp-Source: AMrXdXtYQ5CeIC95aaPg6AvDUyjo8yurJ6WGgW+zdlAJeavRBTynpPiBeK908Y0hHtEk63FsAOSp5Q== X-Received: by 2002:a05:6a20:2a0a:b0:b3:87f8:8386 with SMTP id e10-20020a056a202a0a00b000b387f88386mr6214009pzh.24.1674029101974; Wed, 18 Jan 2023 00:05:01 -0800 (PST) Received: from localhost.localdomain ([45.249.78.214]) by smtp.gmail.com with ESMTPSA id u14-20020a170902e5ce00b0018958a913a2sm22403511plf.223.2023.01.18.00.04.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 00:05:01 -0800 (PST) From: Jagan Teki To: Heiko Stuebner , Rob Herring , Krzysztof Kozlowski Cc: linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jagan Teki , FUKAUMI Naoki Subject: [PATCH v2 1/2] arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SoM boards Date: Wed, 18 Jan 2023 13:34:53 +0530 Message-Id: <20230118080454.11643-1-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230118_000505_088218_B496EE61 X-CRM114-Status: GOOD ( 11.49 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Radxa has produced Compute Modules like RK3399pro VMARC and CM3i with onboarding eMMC flash, so the eMMC is the primary MMC device. On the other hand, Rockchip boot orders start from eMMC from an MMC device perspective. Mark, the eMMC has mmc0 to satisfy the above two conditions. Reported-by: FUKAUMI Naoki Signed-off-by: Jagan Teki --- Changes for v2: - none arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi index bf9eb0405b62..8b8992a8e9c0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi @@ -13,8 +13,8 @@ / { compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro"; aliases { - mmc0 = &sdmmc; - mmc1 = &sdhci; + mmc0 = &sdhci; + mmc1 = &sdmmc; }; vcc3v3_pcie: vcc-pcie-regulator { diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts index fb96019b0e87..0372dd97c392 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts @@ -8,8 +8,7 @@ / { compatible = "radxa,e25", "rockchip,rk3568"; aliases { - mmc0 = &sdmmc0; - mmc1 = &sdhci; + mmc1 = &sdmmc0; }; pwm-leds { From patchwork Wed Jan 18 08:04:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 13105811 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 86D67C004D4 for ; Wed, 18 Jan 2023 08:05:24 +0000 (UTC) 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=98Sjtgmd00IUV6EvAyiRNDK4aCeYYo1Illd0CLKMHHQ=; b=qBikkiYn4NnNoQ iTczWgm5IDkmtk0rOVMd3CpTPoRKG7cSOqgwa3QOBu8TWVoqoFvuR5Sn+cwaqHZiDnGxPxylzj+85 Obz0ce3Wkp/0rLlWA6gWaHocts73ygK92ldWeELnN1Nd5Alqr7bLgtEuP8cxPn2IaeIedS00p8132 8kTVPmDsgNi/yI/cxECUBxZl9t+wnSorP0A+n0MiUvKnvEWo1t2Q+cAM+gThSxMiOE7+l1Lrg/uNx dfoz3j63/qEr/s2E6EbOy6AQO37LVjtURljz03ZvIcY1fRM4X0cPnUxCtTB9zsF09W4sMHfhiGvBe uvwWRsyy/QUhVdp/CugA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pI3Rc-00HPW2-G1; Wed, 18 Jan 2023 08:05:16 +0000 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pI3RS-00HPTC-5p for linux-rockchip@lists.infradead.org; Wed, 18 Jan 2023 08:05:07 +0000 Received: by mail-pj1-x1036.google.com with SMTP id z1-20020a17090a66c100b00226f05b9595so1405976pjl.0 for ; Wed, 18 Jan 2023 00:05:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lIoR0K2nD9tduWKzfzbB6LQE1NJ1KepAUnYgmYC1vTs=; b=ZM+85AyLj6yZlk8HHeGl4RmKwuuN+e02kJjo7q4EmMr1Pdy8h+Mb6xrfOEQp4BpbXI T8XlvFz7+2luLFHyqxELNWmUVSNRh3IvON4d5cwwVNGXpHn20JvNXv1j5z/Ch/e1xviA hOuDTpJHBgEknJyIojbKEOWtHR0MXjDUSzSwk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lIoR0K2nD9tduWKzfzbB6LQE1NJ1KepAUnYgmYC1vTs=; b=VEPq6yNuTDqndsb+F57oa9jyeq3Md4e844wdDhx022MsTwkRGfWmMDEe9CjXK0y5YD R4idkiUStDDolKHK4cOIoIT/5ZD7IlWD2NE1kb1xf3ub0lNbq9iOFsX4RHGfejyKR0mZ k/lO0re6/h3pRt615ZGfnqM/+KE9IyAS931nM+JESeu0ypZAn6n9jh8X9UEHIAS7lMFV RapKhuU+8ff9oH5xgZ9wpddTru5p/R1JUuvZyCU11wQ4qQbV9Kz6qKsdvKYC9Zc8yyrS Qc0900qg55pRRoV4DpGA4S8g8JuWxRAu02PhK5aosg+5qYm/qx9XPg3QzBya2P6NN6mn Q8ow== X-Gm-Message-State: AFqh2kqNF2SccUW4wdfkmK/OUioOdIL5HgnEcjxKL0Q0wEN1kKs1OIpi PhxWeKIHpT9HMCvJpHfRM1e7PQ== X-Google-Smtp-Source: AMrXdXt6mhtRxaboJ+MQJbeDaCuPCrUVGHYxOx6dP9fkGdmLAXXDOLKN7QEXh3wylLLOfCxa7S339w== X-Received: by 2002:a17:903:50f:b0:194:7d6d:10bb with SMTP id jn15-20020a170903050f00b001947d6d10bbmr6588406plb.4.1674029105362; Wed, 18 Jan 2023 00:05:05 -0800 (PST) Received: from localhost.localdomain ([45.249.78.214]) by smtp.gmail.com with ESMTPSA id u14-20020a170902e5ce00b0018958a913a2sm22403511plf.223.2023.01.18.00.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 00:05:04 -0800 (PST) From: Jagan Teki To: Heiko Stuebner , Rob Herring , Krzysztof Kozlowski Cc: linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jagan Teki , FUKAUMI Naoki Subject: [PATCH v2 2/2] arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SBC boards Date: Wed, 18 Jan 2023 13:34:54 +0530 Message-Id: <20230118080454.11643-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230118080454.11643-1-jagan@amarulasolutions.com> References: <20230118080454.11643-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230118_000506_235354_471621BB X-CRM114-Status: GOOD ( 11.88 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Radxa SBC boards like ROCK 3A/4 models do support eMMC and SDcard via external connector slots. Mark, the eMMC has mmc0 by considering the Rockchip boot order priority as both MMC devices are connected externally. Reported-by: FUKAUMI Naoki Signed-off-by: Jagan Teki --- Changes for v2: - none arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts | 4 ++-- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts index 309c35d7fca8..028eb508ae30 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts @@ -15,8 +15,8 @@ / { compatible = "radxa,rock-4c-plus", "rockchip,rk3399"; aliases { - mmc0 = &sdmmc; - mmc1 = &sdhci; + mmc0 = &sdhci; + mmc1 = &sdmmc; }; chosen { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi index 1f76d3501bda..907071d4fe80 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -13,8 +13,8 @@ / { aliases { - mmc0 = &sdmmc; - mmc1 = &sdhci; + mmc0 = &sdhci; + mmc1 = &sdmmc; }; chosen { diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts index cd1e1d8e1244..77ba37ce6d6c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts @@ -13,8 +13,8 @@ / { aliases { ethernet0 = &gmac1; - mmc0 = &sdmmc0; - mmc1 = &sdhci; + mmc0 = &sdhci; + mmc1 = &sdmmc0; }; chosen: chosen {