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: 13105816 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 CFCDCC004D4 for ; Wed, 18 Jan 2023 08:06:16 +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=Rop94LDStlveq0pyi8BZpwnAp+MfbqY7s8vaqK3v3Jw=; b=nG2rpc0AjSuAwM +Bo1HDHlpuQS6vc/Fl/o1qUPnt7I+lDvVpoZAW6yzvkbDNctC5nArD7iYwQwwgfbGizrgsY9pzbUh aG2xVBkvDiESGXE2XrTK0D7vOJIGkp07SrsDJf1ktcTvIrWBmCUEFOll99U3kS+CMKre5GtvidUWv ypNnKAt5jbFmPwG2U84IRmqIEaa9vxl5zTMTcaLDhk8LF8NPiE+A+7O9XKpPr1EkBqPzTGjE6Zpjd aHSxIU3+EGOMIPi8IGZO6rpgPt8eByaZR2DdSHudG7AkkXJGkrDAUEl3Ac7uHl6LRAyjJlAKZAzH1 jhdk6ZlKlfaF01Me3l8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pI3RT-00HPTp-NN; Wed, 18 Jan 2023 08:05:07 +0000 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pI3RQ-00HPSX-G2 for linux-arm-kernel@lists.infradead.org; Wed, 18 Jan 2023 08:05:05 +0000 Received: by mail-pl1-x632.google.com with SMTP id v23so31210686plo.1 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=g0iPSOKpJ9BvJNzYl7rq2gb8s3Dhq8mgWt4I2POIh2Hq6sqWkINyW4ZmUvx1EKNvwj DRK4pPDrCJettnMtkrs9kDuYS2zobsVcMoqDZWW4Hn63YeqoPBcmum8uiQRuUU/zJgKo GvAE9nt/Ut6S3sqW7qMWPe5vf+cai+VeCF+7BaUqWW0iIFDhGTiBVTuTvt7idH1ojcTG e+FKxb+/6tutRHx3vR5fk9YF8sxfUfsPUD9mBtQfaBb+BL6sFhZruMFNN7ZMU5vliL1E oMBn4YIvRsr6UyMk+tHmrxIZnw/dekeFEl7eC/Z4rruxhMK+agH6XktU1ObnTEpignbF zqtA== X-Gm-Message-State: AFqh2kojb5voNvokbozgOfCFpueiCi9O/O38gInN8EK1UeCicZdKy9SR zn/IJO6rjrGvNn0mesSAOgbVbg== 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_000504_576286_4F51E9E9 X-CRM114-Status: GOOD ( 12.90 ) 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 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: 13105815 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 10472C32793 for ; Wed, 18 Jan 2023 08:06:15 +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=LnEYX2RwRiOFOG2IgEKh4EnHYFLEspi4fk5/3KlBWs0=; b=4gYbc85rY5Sn2S hg3hBmXQDh7oX3SRcjWliraZ5W5DRFrw0fYSn42ruJtzg0oDHpWNcQn2fKleOVcGoCkkqeJH72pi7 z+C4wevxquuZkSDlfKDSlbdztpuNTUxdMTkq9nN4PRx1fWKhk3u9XyVc8vP659g5KN3JSuSUAF6A3 nQ5CKIT3ludaMDT1l/C66a1HbhecYb54XfnfJndek5XJxQ+zKPlryjC0sGfW9CMHOcSkmzgi1c11c j2kTCQryIxUPPHxzTvccoq4Bfxf0QE2IS7EOlibOb2RWlHDrcvpNazdh/dHhk52OmGvl6DbMJxVu/ Q1fQV6Yz4Qpq8b92C6ag==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pI3Rd-00HPWB-Bx; Wed, 18 Jan 2023 08:05:17 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pI3RV-00HPTD-6o for linux-arm-kernel@lists.infradead.org; Wed, 18 Jan 2023 08:05:11 +0000 Received: by mail-pj1-x1033.google.com with SMTP id y3-20020a17090a390300b00229add7bb36so1366902pjb.4 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=i0xlE67w+OOa6X82YrG1vQrl4lKtoOFBRh/VkbFs527lGjtrvLOrjfQNiCQq4Odh2d udHIUTkNdSEQU/Vv396aDLo6RYP+pROaPStchK2RJjrjizF4dz8LnATxqqOrD2mBi7hf ThPcV/vR6E4+3vKsvFe20U7Ek7MQ4/n9iIH2b4IxEF2npje/81Qy+/7E0YORAjiwOEeC PdN1QlXWeDGzTbrHEYP4gV7bxoXDnytVEkUp0WLN9o8+HPlJz+GtpVluxv6Pi+mGB7Cy mY8lfGcSBjzomJeWgUfYRQFEWKZHtKvc30twTsXjWCMnN+gBkeF1MnfY9yK2l/wZXOsR b7Iw== X-Gm-Message-State: AFqh2kpGMgik70VGkdfGN1qd6f+rsWvT6fi1yGhmbg5yyOhPM/wINjBV x05qTj0KMcVXy/VXMnlC+wiipA== 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_000509_254262_2193905C X-CRM114-Status: GOOD ( 13.30 ) 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 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 {