From patchwork Tue Jan 17 10:54:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 13104490 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 B9A7AC3DA78 for ; Tue, 17 Jan 2023 10:55:40 +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=9YlTYmnDhXoSdewbkWUesMa38olg5Nba3RzX6omhuzI=; b=jNfPUyD8ryODS/ F7mlbaO80OFHqYtu+A0DxPpdW2jvuP1zItuuNmIG3xtIR4UPc/PzKQkPrC3tnAjaKzsK3sPz8EkfM Q9QcrbiAjQiDOGlhSZQvYuthHkAHJ+4yREYtGo5sfT0Ashget+QhqoH5jy0kn/SbYW/xp+amKnDv4 uDawZnT83uoA5cDJlG6BqhejBJNQb69O486i36LT+ST32dhPhzETMrLId/EaFQYygeqWqITqA2gDt ak11BLZ2kKQgEYc1TmD/Tv+47zGYxRCjdbI/+fBMVfPbxwk98RoSeCM11J6bNRQiaIozEntXHrfZA a9sSEyekH4GYeMxHoocQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjcj-00Drt8-93; Tue, 17 Jan 2023 10:55:25 +0000 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjcg-00Drrt-Nc for linux-rockchip@lists.infradead.org; Tue, 17 Jan 2023 10:55:23 +0000 Received: by mail-pf1-x430.google.com with SMTP id 200so16962180pfx.7 for ; Tue, 17 Jan 2023 02:55:20 -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=qOF7bx95Z8wnUFb9gD3h0pfpEaJ7VWuHHhX7nwVF1yA=; b=iVUkXXLpx1zGmybSOhB2rmec4ccs5M78Qz4iv3yo27AZAo4JIUr0w31F1IoYNQc/mO LnMjlzFLJTeWxRO7cvWzTk6eOGGpRnrbKy8r5xtAWOl3GzzwuTT1Y/oFKPEgUOTtgFW/ jSgK3UlPMV40XAicWWR+P4wgQxncJibNbBGW4= 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=qOF7bx95Z8wnUFb9gD3h0pfpEaJ7VWuHHhX7nwVF1yA=; b=ozIkqvu0UXsbV1KTJxVgyLe6LI5gRW2q7SPeaUXzoYF2Pdih0pQl3X5w0ifeUbp52H 5WTUvWtjrVKoKzhDnT9VnClkQ4H1MuOAlZxHI2Z7UPKzv7nK2VG5pIXhR+nk0amS3p0S NrbMXjC4egQPFhIirXKzzLryWPT+PfeCDQyh7CwvoofAkoW/uPNgoelvnvC0q44i7o6J Gg+NutV5V0I52sPlDkjODzCp5jojUT7zDBWmba691pHp3wdbWRAehWHkxZbfmPR6zT0F Dx9tVxRsYkQnYGK9fq7vL49w5kcdAsyDH/frrMmogvvRQNh2bSNQFtI65swP69pUx1uX wWyA== X-Gm-Message-State: AFqh2kqs9/lvw964OMLLffzSoIe3cJf96tzBujiJK613BKgT/U34iEXX N5XOppH7oAwDVYXcLbAA2tSB0w== X-Google-Smtp-Source: AMrXdXsfzJ+YkkpEUjE+FWgc2BUm3mJP4q0oyf24OAl58Jt6dz6b8z5VwC6e0tj/Tu3mHymKP/zcQQ== X-Received: by 2002:a62:1ac9:0:b0:57a:7b74:4ec5 with SMTP id a192-20020a621ac9000000b0057a7b744ec5mr3072066pfa.13.1673952920132; Tue, 17 Jan 2023 02:55:20 -0800 (PST) Received: from localhost.localdomain ([45.249.78.214]) by smtp.gmail.com with ESMTPSA id w65-20020a623044000000b0056c349f5c70sm19837413pfw.79.2023.01.17.02.55.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 02:55:19 -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 Subject: [PATCH 1/7] dt-bindings: arm: rockchip: Add meaningful comments for Radxa CM3 Date: Tue, 17 Jan 2023 16:24:58 +0530 Message-Id: <20230117105504.18296-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-20230117_025522_802562_69333066 X-CRM114-Status: GOOD ( 12.32 ) 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 produced several versions of the RK356x-based Compute modules called Radxa Compute Module 3(CM3) for consumer and industrial use with a variety of form factors. So, adding meaningful comments on dt-bindings would help to understand more about specific module relevance. This patch is trying to add comments on existing CM3 bindings and expecting the subsequent modules are following similar comments while adding dt-bindings to it. Signed-off-by: Jagan Teki Acked-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/arm/rockchip.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index 98afd7c6b8e6..3d3c59624483 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -621,11 +621,11 @@ properties: - const: pine64,soquartz - const: rockchip,rk3566 - - description: Radxa Compute Module 3(CM3) + - description: Radxa Compute Module 3(CM3) SoM based boards items: - enum: - - radxa,radxa-cm3-io - - const: radxa,radxa-cm3 + - radxa,radxa-cm3-io # Radxa Compute Module 3(CM3) IO Board + - const: radxa,radxa-cm3 # Radxa Compute Module 3(CM3) - const: rockchip,rk3566 - description: Radxa CM3 Industrial From patchwork Tue Jan 17 10:54:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 13104492 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 6783BC678D4 for ; Tue, 17 Jan 2023 10:55:57 +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=cmtyXOdhSxgETmydtDFCPHFnUihIlU6Qt2VNZYWszNA=; b=jlENMD4s4mNNXi Bk7isJiSfkMpd0Uo+jwEPf+0tvjulGc9ZBoo7+bKGmxRBTPPx3jU1VVNn2ifGtoBwG4bErWMPNQQc Ax6QWqP7wChtKjGtXwp4Tixo85EEnZrtF8euXD6+bXvJBenilgtOQT42Z+Euln4NKQ5BCaExIzjTX UOUgQm4w+9fN4kZFtXVuJozuhyuNNTgq4cfV1FZ3ywF42xL8m+RUK0DpmSyEG9qm01aqk1DS4WgEy Gs7iFo+WIRvdYncJhsioGWeFU2hlfw9nEfSBs8hqWvIysGvv34/vvK7zcGSg4BQr5J2WRcFZCfzKn HDnrxdmLGhM1W/bV9yLA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjd5-00Ds3D-2z; Tue, 17 Jan 2023 10:55:47 +0000 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjcj-00Drse-ET for linux-rockchip@lists.infradead.org; Tue, 17 Jan 2023 10:55:26 +0000 Received: by mail-pf1-x436.google.com with SMTP id y5so23140792pfe.2 for ; Tue, 17 Jan 2023 02:55:23 -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=fJtlHTF1df2A4QOlLz/TKZ1XjsPQU9/4l4s+9UMdIZk=; b=kFh241HwYWmbl4x1/yagUljldgPrlmPtvL5XHrexyBctIdoiAPJfCUWEaLkCSxn/GR MYHy5gW4MJwVlqrhgyrBUQuf2tRxSEFKHsli8ZFMaRFZxhgtYoYw+G7QWcPQOLxtH9n2 rq350DftfAKkfPPf/Ye68bXh35jM+4WPOtfyQ= 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=fJtlHTF1df2A4QOlLz/TKZ1XjsPQU9/4l4s+9UMdIZk=; b=GlliUYHb7dQLx0JgBXWGtzxzluRq4Jc9r20XlSn+nL1BhpfIDyoDHlxY6QL0YkG8sq oc74jMn0lgR66KqIFxzYfm3obQ2p/SNn7hfZXG/OFY4GDi7b4RgKoCZqOpnq/z3nc4Zv g8INs4s1o44PWhYYRPeuQ5agDSu2JzyOqx/qLUtlTyNR/b1/4ls4QuvzFWDkN55x0Nlt F+309xwbCCGct2h7tRmOaj6mmknm7umRaB4HdeRh53SDsifqMT/8MWvBF/HWce6svWZA HTxWy3z04AJU+XHcflrOqPv7ZLlNJ8/rK3673hsdaPAU+mCex+WQiZCexZbflt0IKnfM F7IA== X-Gm-Message-State: AFqh2kpFNc9SMS+Hb3Jl8eEQFDEWeXQmpTTdjMRTtiAoxPt3IazOY5Wn GWE1LN0ykPWk/0w+tFQltEtzWg== X-Google-Smtp-Source: AMrXdXsPDMqwTVNS1gDyLpPkddAuu0QHiS066qXAINEfq7x9//tUGuC7qb5GYz+YpGg492whi0urCg== X-Received: by 2002:a62:be0f:0:b0:588:d6c1:66f9 with SMTP id l15-20020a62be0f000000b00588d6c166f9mr2526471pff.31.1673952923409; Tue, 17 Jan 2023 02:55:23 -0800 (PST) Received: from localhost.localdomain ([45.249.78.214]) by smtp.gmail.com with ESMTPSA id w65-20020a623044000000b0056c349f5c70sm19837413pfw.79.2023.01.17.02.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 02:55:22 -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 , Chukun Pan Subject: [PATCH 2/7] arm64: dts: rockchip: Add missing CM3i fallback compatible for Radxa E25 Date: Tue, 17 Jan 2023 16:24:59 +0530 Message-Id: <20230117105504.18296-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230117105504.18296-1-jagan@amarulasolutions.com> References: <20230117105504.18296-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230117_025525_489379_575BD886 X-CRM114-Status: GOOD ( 12.31 ) 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 In order to function the Radxa E25 Carrier board, it is mandatory to mount the Radxa CM3i module.  Add Radxa CM3i compatible as fallback compatible to string to satisfy the Module and Carrier board topology. Fixes: 2bf2f4d9f673 ("arm64: dts: rockchip: Add Radxa CM3I E25") Cc: Chukun Pan Signed-off-by: Jagan Teki --- arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts index fb96019b0e87..a4c33310ca42 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts @@ -5,7 +5,7 @@ / { model = "Radxa E25"; - compatible = "radxa,e25", "rockchip,rk3568"; + compatible = "radxa,e25", "radxa,cm3i", "rockchip,rk3568"; aliases { mmc0 = &sdmmc0; From patchwork Tue Jan 17 10:55:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 13104491 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 7E2A2C3DA78 for ; Tue, 17 Jan 2023 10:55:56 +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=GR5ptn0xZl53LlN79bFaEihLsF512ZPNvU9Zl4xxBHw=; b=C8RVA6qF2Ud4ZA xUBssQA6S4ozSwHRtSnT8F64ClVI/cSp6BBEYqNQccGOZ7LKx9TuV9RVN0mA8DO25yeoefs8suyfE apQTo5R08WPRAblKkRePY769ZmOBygIQdWanyNsuvXHpMPlOX2NiIp8SwOMeJH8+x0e1JbdjPLcmG IW6BiTB5Qb1+b2XtpUDt5DNHnNS8tuwIHQ3rduA6Cv+MU9yCpw18PE10haOJpbF/6D2In/Z0VkYaS DpDkHPFZ3GJmZuQTDDOEb9hXWiwkwjntGi77BBhE9x1KG8rxqiB3OAphsIRdLr59oWExT6zDz5XG6 zVrH8KKbu5RfELBddKIg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjd6-00Ds4h-Ps; Tue, 17 Jan 2023 10:55:48 +0000 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjcm-00Dru3-PJ for linux-rockchip@lists.infradead.org; Tue, 17 Jan 2023 10:55:30 +0000 Received: by mail-pf1-x42f.google.com with SMTP id g205so6048189pfb.6 for ; Tue, 17 Jan 2023 02:55:27 -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=chQ7HxST9kD6+SAwU/aUHt+HkzjYxiYOol+zzwdXg7Q=; b=gKHOtnHdAjf0f1bpd3Q+T7IR8mzBkVmftBpHkt3HoEjRw3ofxVtZc1ufB+CwpMc+S3 V9KEhuSY7NSGtcNl57abFU71lycQmLDcNomSSgOfxBf6FRP92I88SnJTWrmedSYxNPiz 0dip4UJMSEACslxHV2cg40Ke7+ARvhpa3yCfQ= 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=chQ7HxST9kD6+SAwU/aUHt+HkzjYxiYOol+zzwdXg7Q=; b=oyKSV32WsljXRb7/Ao68FsL1yoscgTp7LQCWCOy7XTcW8jRyvfAllNjs732sS56IN1 gBePd9gPrYT/T7SakFhQY21fWLtYGr6GkjsVCMZlzvfhmAfA3zg4DZ2D76JGlBDZgHHy PYjC7alsNI3mO6hB5aEGeEAqrW707E5TxRFAT2Xc0XTLXYZ0PwvGd0mT0ps/KcF07nDr gf2lQ6ovpv31KUQshgFhzt1yzeRGfz83ua3WBrvk0vLvgAfmDuZuZX2/860IHOJYjD87 vXEmkVKWq0wxzJco6kpoO+uU2eNgXqwxDcR/XPEvrnRLX4941p9W+maDQRh0gVId9EJ7 dyng== X-Gm-Message-State: AFqh2ko/lkL118MQqFLuw5ex+oxkXfDupyFi5457Fpb0/VXSiylvAUj8 z7HZH0vj1+kXbuKUMnMdBFzYIg== X-Google-Smtp-Source: AMrXdXtQ28X7l9/UiAPdc0ZzbjmweYSnidXPeSq8ZhHOcsZEGTK6XyG8V210X8vmV9Fyb4TSmnOjbg== X-Received: by 2002:aa7:87ca:0:b0:56b:dae1:e946 with SMTP id i10-20020aa787ca000000b0056bdae1e946mr2908282pfo.28.1673952927041; Tue, 17 Jan 2023 02:55:27 -0800 (PST) Received: from localhost.localdomain ([45.249.78.214]) by smtp.gmail.com with ESMTPSA id w65-20020a623044000000b0056c349f5c70sm19837413pfw.79.2023.01.17.02.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 02:55:26 -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 , Chukun Pan , FUKAUMI Naoki Subject: [PATCH 3/7] dt-bindings: arm: rockchip: Fix description and compatible for Radxa CM3i Date: Tue, 17 Jan 2023 16:25:00 +0530 Message-Id: <20230117105504.18296-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230117105504.18296-1-jagan@amarulasolutions.com> References: <20230117105504.18296-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230117_025528_849291_91DD5FE0 X-CRM114-Status: GOOD ( 10.89 ) 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 Fix the dt-bindings for Radxa CM3i SoM based boards with proper description and compatible strings recommended by Radxa. Fixes: ae9fbe0b1f96 ("dt-bindings: arm: rockchip: add Radxa CM3I E25") Cc: Chukun Pan Reported-by: FUKAUMI Naoki Signed-off-by: Jagan Teki --- Documentation/devicetree/bindings/arm/rockchip.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index 3d3c59624483..6f276d787e50 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -628,11 +628,11 @@ properties: - const: radxa,radxa-cm3 # Radxa Compute Module 3(CM3) - const: rockchip,rk3566 - - description: Radxa CM3 Industrial + - description: Radxa Compute Module 3 Industrial(CM3i) SoM based boards items: - enum: - - radxa,e25 - - const: radxa,cm3i + - radxa,radxa-e25 # Radxa E25 Carrier Board + - const: radxa,radxa-cm3i # Radxa Compute Module 3 Industrial(CM3i) - const: rockchip,rk3568 - description: Radxa Rock From patchwork Tue Jan 17 10:55:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 13104493 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 1F77DC3DA78 for ; Tue, 17 Jan 2023 10:56:18 +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=SHOZOh3tCt8tR5t+H0Q0/Pzod9SfoVvUGU713UV8jKc=; b=xBgpix7q01p9aD SWoNyKkVNMA0+d8FScFEpSuFb8hAx9AkIrj4BnFWX5uriswyNDYI+0ylE1tGwVYlFvlaJ78HsVFFm 4/BLcobEmQI681KqJvTkVUxH/iOTTSav2LGyQCMiVcLqNPGwrQ5Pf5IS8BZNQ0O4zXmiYalw9+2kc p+REuIP4IbeA+3izIKVm+oi03o7b9t5xgFm7clVK70qT9QnLaRsl9CO7WmBrDVn3bVZ7InwM4iKlg /4DKRyAJXdNBMijuVr9MZwWgzTHnOkozn1F+0M8OlLUXs+FLiw4A3l1mhev33fUu/5APAiuFRn56F yASdlyxll7Sh8s5/LskA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjdM-00DsCs-B0; Tue, 17 Jan 2023 10:56:04 +0000 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjcq-00Drvs-Bq for linux-rockchip@lists.infradead.org; Tue, 17 Jan 2023 10:55:33 +0000 Received: by mail-pg1-x52d.google.com with SMTP id q9so21646089pgq.5 for ; Tue, 17 Jan 2023 02:55:31 -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=jdJOc6HmPoDjd/7V0dPuhrTlxhOueTXLQLGnwbV08gU=; b=UJfOAbjo/SviBm6fQ+/Vv6qQAtLAxZYsQ3sy0EzbA5CjQxx1KD0nfPyNLhVyONvIec 4jIFsE46Nrh14tYR98YtTwA4Usxs1vRfa5sCH+UzDCTL3vUd0/IUa+hzw8K6+m8H3TqP sAbSC2TGtsjcoz4pMczGJ3U2F6DfbzdfROKfw= 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=jdJOc6HmPoDjd/7V0dPuhrTlxhOueTXLQLGnwbV08gU=; b=qaAz/USXmTQzzzzmdxkkC1kz35LZeUby0HAbLrlCbghVKMv2CK9peijDjpmrvZkkxx mQnjUwR65rEyWM8EK0Ts6OG8LkoYE9JF3CKXcP9ki1Qsyy8TCc2Qu4/UbgGL3xDMvUZo rj6V5sCltpvWzIdn6g5eCdqzuQrQpJmOLkXbPcYp+Tf1nLHu+ppDcdMWfI7gMyMNdKpx Aq+7mqGFXhfDPKV6Yp47IaxvLNkSqocV9fysjAk+OYxW9VPO88rkBgO/ECawYEpGwWJ1 nNkTfbGAWZpLurgKg2I/n6B8CSSWsksMYQgKQEJLgMDmB8VkKRL1fBKVHX1LQWKoBJdJ ucHw== X-Gm-Message-State: AFqh2kqFIoJS2P+Qwp587hNgfCKrqjE7QlsHzx+r83RvqL0D+pOWJtaN LJGpUAeWZ0KvRybf75S8UusuVw== X-Google-Smtp-Source: AMrXdXu33Ja/XnAn0PBA98EgnuNi0Z24u9Km2ZUY11zOLBU0mcHpF6cB39J5Msmh0iMQEv2NcknUoA== X-Received: by 2002:aa7:8a0e:0:b0:58d:9850:d55f with SMTP id m14-20020aa78a0e000000b0058d9850d55fmr3003182pfa.21.1673952930589; Tue, 17 Jan 2023 02:55:30 -0800 (PST) Received: from localhost.localdomain ([45.249.78.214]) by smtp.gmail.com with ESMTPSA id w65-20020a623044000000b0056c349f5c70sm19837413pfw.79.2023.01.17.02.55.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 02:55:30 -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 , Chukun Pan , FUKAUMI Naoki Subject: [PATCH 4/7] arm64: dts: rockchip: Fix compatible and model for Radxa CM3i Date: Tue, 17 Jan 2023 16:25:01 +0530 Message-Id: <20230117105504.18296-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230117105504.18296-1-jagan@amarulasolutions.com> References: <20230117105504.18296-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230117_025532_425676_81DF1F6A X-CRM114-Status: GOOD ( 13.27 ) 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 Fix the model name and compatible strings for Radxa CM3i SoM and Carrier board based on Radxa recommendation. Fixes: 2bf2f4d9f673 ("arm64: dts: rockchip: Add Radxa CM3I E25") Cc: Chukun Pan Reported-by: FUKAUMI Naoki Signed-off-by: Jagan Teki --- arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi index 225dbbe4955d..0c9a918b809a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi @@ -7,7 +7,7 @@ / { model = "Radxa CM3 Industrial Board"; - compatible = "radxa,cm3i", "rockchip,rk3568"; + compatible = "radxa,radxa-cm3i", "rockchip,rk3568"; aliases { mmc0 = &sdhci; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts index a4c33310ca42..8ca15b723799 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts @@ -4,8 +4,8 @@ #include "rk3568-radxa-cm3i.dtsi" / { - model = "Radxa E25"; - compatible = "radxa,e25", "radxa,cm3i", "rockchip,rk3568"; + model = "Radxa E25 Carrier Board"; + compatible = "radxa,radxa-e25", "radxa,radxa-cm3i", "rockchip,rk3568"; aliases { mmc0 = &sdmmc0; From patchwork Tue Jan 17 10:55:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 13104494 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 9F5C4C63797 for ; Tue, 17 Jan 2023 10:56:43 +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=bmyIDzHUGXlnHAMCswknIFzvSS7X06V1wYhLlCvYmDU=; b=xnFv91rQN5b523 iEaOELt4UogvUpBhYqIwdskMtdlFm9TUU8qh7XCOsmJmve9QRKvDv0zbxetmpwt+/g5SWQJ5drNtY vb3eKUeXUJZZjTvcY5IXZRU9EqXzOj2IJHElq53/csXXWyyTpwxhzC5C5Xqp47Ho+5TDw8BFxjB/w S7qnEWoyeox2ix7E8+VuxNc/OYALF/0hpGNy9QjCZvdT0xJF4rEcS+aL7jQYKt4edw99tthUrACwv I5rguHesJluwUvP3WLZlm0sm+3OPFcAhNjoAVhQeTkRDDNiNfGm6JCq6i2RSngxMN3mLDGI8ElQB0 5i6KzzphisllC2tsv6+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjdt-00DsVR-PK; Tue, 17 Jan 2023 10:56:37 +0000 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjct-00DrxL-QV for linux-rockchip@lists.infradead.org; Tue, 17 Jan 2023 10:55:37 +0000 Received: by mail-pg1-x535.google.com with SMTP id s67so21644002pgs.3 for ; Tue, 17 Jan 2023 02:55:34 -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=Nu/Ix+1gOtGEiBRhLoDua7gRgmdwQFVNbDjh3YIsf54=; b=SJpFephnhqR1betrvPfxruzIEt2ihI0Xv5lNtiGSQjI9uZ13A8TY3i7bEpzQwRXwZ2 J0E7adH6YIdCu8m1NGc63e9+UJy9+LECBMdXItkPPO1ZzycLFf445/FFDOJAz/heea4t sZeKSNRpLL4dyVgH2HW/QtP7gyoQ2VdRN4Mdo= 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=Nu/Ix+1gOtGEiBRhLoDua7gRgmdwQFVNbDjh3YIsf54=; b=e+DryJoyKCHXwnVXqfyxmprvPNWuvJ/WNazNQJ3/bKaEEdelWTuRPXiHhZQwstDvce /13+X4q1XuYMkoPjam1YN8Alxl0fQUM2NEilQiyyCril3/A/Asr2kV6nCsfRr7Nf5wqT e6X8dc1TnxONtza4uZELAj61WdD+tj0lu4PflN2cGXDgKa9vb49wr3rEU+QLI7E7vRrI VaXI2GDC0/0COg0GK5EyMHltqOGsRSx0f/If2/VYwfbF0jCQ/Sy4EQjZl/hxUq9JafAA F3RaDjORB0kkKFPRi2db8+jgGqDbFf1w/cFvYCPzD9hnd09ji1AmbN5jHU5TtbK95/i2 SCIg== X-Gm-Message-State: AFqh2krazaMI3KTwJXfceKyk2ApOVA6WoZAViQMy7XlkgBfIq72OiUwQ Ieyyb8vrafCdyosfTTjBTQCG7w== X-Google-Smtp-Source: AMrXdXuCQoqv/WgWQnkqCbkSTbfMvmwfrLPdhpYntThE9zYVbc5QmSgQpIcstJa3f0G3+1TCPxnu+g== X-Received: by 2002:aa7:910c:0:b0:58d:a924:9ce with SMTP id 12-20020aa7910c000000b0058da92409cemr2944036pfh.7.1673952934037; Tue, 17 Jan 2023 02:55:34 -0800 (PST) Received: from localhost.localdomain ([45.249.78.214]) by smtp.gmail.com with ESMTPSA id w65-20020a623044000000b0056c349f5c70sm19837413pfw.79.2023.01.17.02.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 02:55:33 -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 , Chukun Pan Subject: [PATCH 5/7] arm64: dts: rockchip: Drop unneeded model for Radxa CM3i Date: Tue, 17 Jan 2023 16:25:02 +0530 Message-Id: <20230117105504.18296-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230117105504.18296-1-jagan@amarulasolutions.com> References: <20230117105504.18296-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230117_025535_892146_2310E61A X-CRM114-Status: GOOD ( 12.20 ) 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 With module and carrier board topology, carrier board dts will include module dtsi files for creating complete platform. The carrier board dts will have final model name and compatible string so any model name added in module dtsi will eventually replaced. This happened for any devicetree property if the same property is updated or added twice. So, drop this unneeded model name from module dtsi. Cc: Chukun Pan Signed-off-by: Jagan Teki --- arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi index 0c9a918b809a..1bada98a4d8b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi @@ -6,7 +6,6 @@ #include "rk3568.dtsi" / { - model = "Radxa CM3 Industrial Board"; compatible = "radxa,radxa-cm3i", "rockchip,rk3568"; aliases { From patchwork Tue Jan 17 10:55:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 13104495 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 39F18C3DA78 for ; Tue, 17 Jan 2023 10:57:02 +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=nJ/qC718DHwQFi3RNefm8cUDUM+Rx+rRwjbgnVAe7PI=; b=vkXOIiAjfTZohJ 3W5D5uCjoyrBCaaUmOBufImHCbUwz/dnek8fC3kn2z2Bc9JFXVnH4HxT+vWTRHxnYfTQy4xAhOl7S D+vD/l86AR1R/ezDAam4rsU/dLs5/REdQ4PNbbkKiVL8G7xwjTMxirnYW3QFiYaeeIu4o7/LpZUv2 wGdh/2dChScSdm/NBlzuyZwBMP3notmCd3KY5fcZ1oqFgagx9uMteNNNnbOhMeobTg2A8tGyC/+o6 mIph2jsNDQyNS84CfFxMoJDl0ChmUhtE7xV9G6xlUTPj4XPbO4bDbxFd0S+K+lw+L5Pzu4ZLWahpH +RZmyEvP0JwY8jyZrerg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjeB-00Dsfy-0a; Tue, 17 Jan 2023 10:56:55 +0000 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjcv-00Drrs-LY for linux-rockchip@lists.infradead.org; Tue, 17 Jan 2023 10:55:38 +0000 Received: by mail-pg1-x52f.google.com with SMTP id g68so20543195pgc.11 for ; Tue, 17 Jan 2023 02:55:37 -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=aA0h7+i/e4ORQDizV97KwrYpiHUD9zotB5aOejEPv+o=; b=TGeGqDsE7RJMSKyavjjZsVLWS7cJC0p1TproYR6qdyB9B8dP9zdXqOFoCeAfbENO6/ UAgRysLBEnDK/T1dgEKv6e2zDqUKZjneiR1xmSY7EaNX9cqp7HD/k22g3nNgFc5PNGOC LtN9Vjw0VJGD0No/UiKxyGodKDPARYYgaaJsc= 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=aA0h7+i/e4ORQDizV97KwrYpiHUD9zotB5aOejEPv+o=; b=TMfPdBiUj8msCkWjOj9BNIr3QmUZmeXkulF7/DsdogGQ8OAAJb4KjgT2DZyGq26y3l WiCr7sOCR3QYyGeOmzhRqlSLhM+/ytfxN78uSTQcEavxbFATjixO6NttkVMFnrzEBTKo XJiETgODtT7KXk0JEF40hTR41X3QL2Ufyd0fDOHOHfvFJlocB9Yv2fN6qgOjmW2ZTL/K ooJFTyuzwlGCtZ7iE8rLqzga8T2mnzjnvaPNa9dCQyzUuqG+BIyB9/AOvyuR/TN/xnBY 4+9UppV4MY1fXY50riBKQFlZBdGGJ8us/cr9HJ5N0h+c3z4/oh/ygblUYx/8Qhj6ysup +f/w== X-Gm-Message-State: AFqh2kpKTMAYA9lQ+y5VlmZZfn7MzRsYDL6h3ABi4JvhasG0Ul0cDcMv r/KHoK94eaHzKjGYXfnRnMK8klIr1ai5zdv2NQE= X-Google-Smtp-Source: AMrXdXuKP2deY2p66/oJaTqLcAzmY7HEDbyW2X9tUITOO82QbsRl5nQtIw6DvjtB96recgFkfs4Ftg== X-Received: by 2002:a05:6a00:190e:b0:58b:c1a1:4006 with SMTP id y14-20020a056a00190e00b0058bc1a14006mr2439021pfi.18.1673952937304; Tue, 17 Jan 2023 02:55:37 -0800 (PST) Received: from localhost.localdomain ([45.249.78.214]) by smtp.gmail.com with ESMTPSA id w65-20020a623044000000b0056c349f5c70sm19837413pfw.79.2023.01.17.02.55.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 02:55:36 -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 6/7] arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SoM boards Date: Tue, 17 Jan 2023 16:25:03 +0530 Message-Id: <20230117105504.18296-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230117105504.18296-1-jagan@amarulasolutions.com> References: <20230117105504.18296-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230117_025537_730930_BB617F85 X-CRM114-Status: GOOD ( 12.43 ) 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 --- 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 8ca15b723799..6a3d964f6207 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,radxa-e25", "radxa,radxa-cm3i", "rockchip,rk3568"; aliases { - mmc0 = &sdmmc0; - mmc1 = &sdhci; + mmc1 = &sdmmc0; }; pwm-leds { From patchwork Tue Jan 17 10:55:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 13104496 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 2727AC63797 for ; Tue, 17 Jan 2023 10:57:09 +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=FgGkYgicwQp1U56IVktNa2nveQj/iPi5Tjk3I21ufC4=; b=gKK0AHCktq7f9i ByV5XpWjqgMMUvxel+D6qQFRPPeTr0mMkQHFI0XrXnx6TS6xTGUOyINhiDT2EIftcBxIoixR/VVMD L36J1Ck+ZluyPioAyS1tVvAYSDDiIzo3PEhUvFYLZ7sSARIhjMGQ8V7Cn4odWwemctCB7katB0aR1 QOsGl4dk0Nuavpae5DlCYcDJQMxMzRyswKBCsbpvZdIwdY8dzjTWmhRTCaWVVGJXCUBxJl9SYf2MM WEpyp9sXOUXiEWOh4dLJhelG2OMWLtEZy73zYoRFSaYlGg6zz524sb2M4Ql2jesaSTto86Twzqst7 4H0p0K0pnWogA+hZ+lKw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjeB-00DsgZ-Oo; Tue, 17 Jan 2023 10:56:55 +0000 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjd0-00Ds0g-I6 for linux-rockchip@lists.infradead.org; Tue, 17 Jan 2023 10:55:45 +0000 Received: by mail-pg1-x52a.google.com with SMTP id h192so21642361pgc.7 for ; Tue, 17 Jan 2023 02:55:41 -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=rntfRZnff+n5lbhzJZ4A2rcNW7HidbhUCoXTa14UKAc=; b=SnQ+hjWEox1G5YrR4AQn7aHZmdA/ONYA//zFLJArkoZxXZCUpUssTTqz96FvIzoNDh p0q4hJyV/G2t4ks9mesRxmQ5wl2zaqSf68B2mZmH8H5kJxSTJSjFcEqNVhskYYdpMFJ+ U/qxP3WmXlvOTFTBzSs+bV1WTBcaWKy9pHgTA= 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=rntfRZnff+n5lbhzJZ4A2rcNW7HidbhUCoXTa14UKAc=; b=farhzFrHJUiHGyl4hP0GWRHqiyJPFEDehf4hFi0nvrvB4IzrzqWhP5T9ih/foRFTMF Ll0SbqjDxArabYhUatr2MalYMYksKNA8SHl2ouPbclvecKiPXMZUuQAiAVzejHFwIlxY q5mFlib2YCN3G0GO+CtbDX2HDApf1LO/iLZZFBgATOVaZEYDzj4G8clyFR75tq8PlBSr ZFt1Q/VWWVUuO/B6vHOGrfpQOuLIz5RxVboiwXsrxG8GKnPLoRDc8rbihiq1HAVyB7Lw fwTWbTxqv3QDCHrNhMjtRtlo+bXPR7ChC4UiFBCaO6sSmu0NGftUGc0pbRJyAIt8HXCZ sQmg== X-Gm-Message-State: AFqh2kqbGMnONws5+sHPaUoDYTmegPcubGkn8mj50E0puXiGS+JM9rm4 NHy4Y7pgBNRr3t0lnOTVJrhEQQ== X-Google-Smtp-Source: AMrXdXvV6zuZ2hXmO+gpQebDvUeI4P7sWLhlUX5aBmzVEj6XfkP2Wcs/QSQ80SSR/kRv20F7ZDRLgQ== X-Received: by 2002:a62:790d:0:b0:58a:fccd:9eb5 with SMTP id u13-20020a62790d000000b0058afccd9eb5mr25431472pfc.23.1673952940718; Tue, 17 Jan 2023 02:55:40 -0800 (PST) Received: from localhost.localdomain ([45.249.78.214]) by smtp.gmail.com with ESMTPSA id w65-20020a623044000000b0056c349f5c70sm19837413pfw.79.2023.01.17.02.55.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 02:55:40 -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 7/7] arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SBC boards Date: Tue, 17 Jan 2023 16:25:04 +0530 Message-Id: <20230117105504.18296-7-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230117105504.18296-1-jagan@amarulasolutions.com> References: <20230117105504.18296-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230117_025542_631518_18BAA39E X-CRM114-Status: GOOD ( 12.45 ) 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 --- 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 {