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: 13104498 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 EAE30C67871 for ; Tue, 17 Jan 2023 10:56:32 +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=wL55zg+lUql6yW69PDhWa4K5Qsj73BZ3aTEayja+B4E=; b=Nq63joq4RqyqFs E5/NDhBQwP5GH8EraGTeWSjvZ4DCzac9EiUEDmclKHsXVPOP7c3aMMAp/pQJcj1o2+5TXH6UZBDqm ef33dZbHhyIi/jCYLRy+EGZTnBTW911B6i+N7DBfK/gTQgBDVahKSzd0xhP3ZNxxi9DK/EXI0t8q3 zgST+Rye6a3ii0Y9EG1PUYLj6sjiiqUjDtXfsVEi3A6nld9mafgcrXGzHhC5See4aI44RK6ZQY9Of B10a0mhmRmWolMLB9QAZ4qGhOCUexq4iAPV+D1Bcq+7zW7puoUrPmsoLEZjrFjyvFlyonOsK9v/vv X1eOyKpLpUYMUP40OBBA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjck-00DrtV-4K; Tue, 17 Jan 2023 10:55:26 +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 1pHjch-00Drrs-Ay for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2023 10:55:24 +0000 Received: by mail-pg1-x52f.google.com with SMTP id g68so20542700pgc.11 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=01TsbjmIPdwjRZuoapDnkA8k0FnX3pvOk5z8ZreEC90ckZdi8ekVvbg0M4eiz0Smn8 VYnKKeC7HgX0NWUj8lRcB9l1PVu6H7rkMQNmBtdD3tyZ00DBIvqJfkOVFhMOYiGa96ou ODQS3fqVJENq9OuflfskBzUIl9sBxCP0iTlgxlUYJJlZ5NwfhBwGG8l1MA4+wN92IPYl C2uiwWpWLx7uYa3j1yhDFqbynMKuZqF/06p7cfLaaOn3vtzZdRzbir+XURf5rqtmqeSF kx8zLJATwcBpI7WX1wrzCH6XgN8Sk6yY4oMG3RGPkye/0I3Dtrz+gX6M402lTtGkplDF 1uhA== X-Gm-Message-State: AFqh2kpjoyijADTtUkkNaJep8yrWnyFW1MIYGRM7dzCw9AfNK+/47xba 7an6sx1Dgp/yN58saZuS37I/Ww== 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_025523_386143_D0740DA2 X-CRM114-Status: GOOD ( 13.41 ) 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 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: 13104497 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 9C982C678D4 for ; Tue, 17 Jan 2023 10:56:34 +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=7eYx52EoQeJ/JcI7yzXQYqjlYTNN6VQtS3q8gnedBhI=; b=Ic6uDDkiF6clMa K4YQyRlXRX/hXiuForbLMPx+q3pE7rd6naQtkEQj8gS8xoVvnKgAcgHfwSGRdup08kHgTxbVMctiX R6fWuaOdFPTnvu7muyYemhzfM7W8OFy9e38mFu1EN9IbaEZDTHnfUB3lC6qBbzRHArWcrm1v9ozK0 h8aZFbFSQe6unhs36MGuk5QNftqEptoitG+Q1XYeS1Mkl9DvXvZiXCS3fK3UNjlu3QbxM9KVXRrui 0wreIbgmbG2ag7kTqEyuefB47J9LwZHEjnTPPBHMZI0MMXLWMdbWzojo0+KqBvMKOOZD6jATd2IGE POicXQTAJh6xQ+xnNObg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjct-00Drxi-6y; Tue, 17 Jan 2023 10:55:35 +0000 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjcj-00Drsf-5i for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2023 10:55:26 +0000 Received: by mail-pf1-x42d.google.com with SMTP id w2so7734853pfc.11 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=pnOyXd55tYZPdpZ3dvyN+n+/oQgohF/Ju9zqs1p2Hi9klFkl6OUXP1FIMRsK0kfRcz Sc+Hs+Bf0znTJU6sncZUg2tEGx1CW9zdgF3buYjozP2rqk1L7SHV3plHVsFHVKb6jLeM u4E76wdQsBnml4HiotZsCfyf6tNjGBPEplBzPEIhapU5YMeT+TskOEHOmRTyo1rJXzyD sQql3Oq4VK5FLUtJ+UHIQLbIfCCuCaoIRpEwcjMq4XFbCv3zLQ9vFb8Lt9bFf6+3UMYN IbsvG6QOsXo5b42YY25bR5GDHP8POtvOm4MB160IxPOi2UBdtvyaUz0f1bbcTvCN7Fme of9g== X-Gm-Message-State: AFqh2kont5giKBTWMVOaaVka8A37othOtd1nmgOno9nE4LVo0QY6JcP3 02NWpMzfmdjJkQ2JMpyVd/osPg== 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_228080_5186F5E9 X-CRM114-Status: GOOD ( 13.40 ) 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 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: 13104499 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 7BDC1C3DA78 for ; Tue, 17 Jan 2023 10:56:53 +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=D+dV/hoP1MceOiuHF5xR6gKH3XbRSzPy3cFYENt+o88=; b=HG9KNCOkh5hmLF eR3vZOKeUnxpoH6QLNJNKX/OiyLXY1wguujndq8BVF8t/quPkX9N2YboJwREaoufYmdyLyJWJ8Wwg a6cPNxZB++7GD1MJ75dnJn/SQkC/uCbKT8u8rqbUja28APMse0XwJfePuE725+2eNBUcpCi+7WFRM 2ecVnRwN6+rgv5pQH8uKwXFUCE0B2nUGOJOFj2c3Ty+1iKk9tDGw/+2fcY5JPZNpPLAVTkz4kEvb9 jq2KA50bU9qKDhDCuMTVduhkmuKQZnzONWxJ1j90WfdHPpMlAa+UhIVXGblXEgySll/5gWYS5V7O2 mPiz7lmQ95zE20LfuDEg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjdA-00Ds69-BJ; Tue, 17 Jan 2023 10:55:52 +0000 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjco-00Dru4-0Z for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2023 10:55:31 +0000 Received: by mail-pg1-x531.google.com with SMTP id e10so21633811pgc.9 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=5sNDdxPSOQX1oOVLjr8jiWeVNXyQ01yvQNpx34CE4NncUw6YMcpbIOHQ4qpFAlSAXp dFZb+KEXJYjPGEyAIeLXgRgFwiXxxQGY/jmTMA5NOtNTzLNWnZY+dEQR7WSuS2++WDEG w/tA34/WDMsaBKN/T6fFs+gVihJ2Y96R3mwoUgsKkDWDzBIk37wd47NdnE0ADN58JhyC lFFL6fV0FbXij2YFx5Qsk8cbNPXpyyMjn3Np7l/u7blm+u48vrBl4OQxrD39p2RjXVZB IQFVqAFQd3wKYfzQ8iPPUUxAVgWtvfMMVzWa/X9u8Vg6/EKK05RO4Z85bHKg91g/fJCh 4fVw== X-Gm-Message-State: AFqh2koTkeMKtRlcoCSF395tL8PqlOd6xHyv3k2vz8teVnB8kCIi8mH+ yki73LioRgwWkXEAPR539yTpOg== 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_025530_062991_87493543 X-CRM114-Status: GOOD ( 11.98 ) 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 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: 13104500 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 C4474C63797 for ; Tue, 17 Jan 2023 10:57: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=M5/k8LE7DxRN1NopzrVVXi2+Ukph7Wpu/YyPvGFEF18=; b=MHDUvFsPNHtzqw 5wjJMBR7sI3IQ1Mo0rigWgKKz624mFitdIvKVY3RDbvgw9ikzu58P2B57TvxghbDsBZV+i6IRyfCH AxbARt2NMe9bY04i8UmjSaj3rjumDVKuVLwgW7fXFuM43bEYD5tbbMTXimGMZXmgeyqMTGNhYdY1K 5XqjDRhtaXKEz2DfLUdkshfkYhtqCHgiY1x7IGqQP2k6obh3VrAduxz/2uLDSw3wuzTzAt1DLmjCw LUJP9QTDdXqEvYcqlFeLoqXkqFH/6IkwcKEchtt6Mr1B7nS+DAzcHrSjTvcE6AaqI3tUoOLhMOr/k LHht5EIUfYvf3zqMMaeg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjdO-00DsDQ-EN; Tue, 17 Jan 2023 10:56:06 +0000 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjcq-00Drvt-Kb for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2023 10:55:33 +0000 Received: by mail-pg1-x530.google.com with SMTP id 36so21630345pgp.10 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=14sB231a2vSKBxxEUM99nLVCd1up28ApHO6BpZFCpiw5g9mU6Gu+NiiFmCEzX11x5p xHQ6b1ZNQDhT42fkOgndo86w2RajhVsW/ozZVDcJGLqhNDwqW3sjV7k4n44/alp73FHd mQbqkHElbUFWCVNT0vSMgh5yyKGOWINv2ReNOQvTPDi8F9obMErsLBFLk1LB42+qKugC DtIUWo1d5KRp2hkDdlM34HobfMfpTisJNpTeYkS5X771VHlBTioR4gxkbYMZkg4OPKRJ r2fSJ3HM+jIiJ39wuIKD3Dw9SCv6FTAUhJx1yWrQ1I/r4QgXPs2pHaOObGGAlrSdk5PN rRwA== X-Gm-Message-State: AFqh2ko75VsbHGi1RUvwGoYFpG7lOWw3kC7Uv9QRXlYQlgkdxs6jlBhZ 3QiuG+GmpwRJnajvOXNXkvKwnQ== 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_685723_27780E1A X-CRM114-Status: GOOD ( 14.36 ) 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 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: 13104501 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 2E4BFC3DA78 for ; Tue, 17 Jan 2023 10:57:23 +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=c2stc7XZdbgFh6K2eezPwrKDzqZi9yE2XyQo17LNBh8=; b=w7tFLFZ7U8JqVZ J2oi7Dmu41jwDA3B/ev+31wkw1X4jy3PERt0Hw+bUmXpAEhu9h6jf4h0LNEKj6Lh6YRoDGuMzJ99D SNu72M3wPYYv3XWNyXgv8yGAbN6ahypEjSuZ9biMzoEp+g0Gc3X8aKFHzonQw8noR4T7DxmrR+u/G gE2TwbAs0JA8AFgF1VaA/WJtB0N+xULucLhsr//HB/EXcEgcHKPq3XTMzEUXEwyHoI9ZjiYdiHv5u KgDUGl30LAQFwxj6yVNMfdYAK1769Azehik58ZslHfyE2UjtAZQ/w4kK0uh9KXDRgdzmiq891yHSX Lt/FnHkg6GzQ0hd6SzpQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjdd-00DsLx-6M; Tue, 17 Jan 2023 10:56:21 +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 1pHjcs-00DrxK-Hm for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2023 10:55:35 +0000 Received: by mail-pf1-x430.google.com with SMTP id c26so18703191pfp.10 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=7sVS91g2o5SHllnrKHnWjef+TQ9a2/b9aWWpd55HM0v0I0qamtNuZSZKUTQwW7NhSl kcqoQN7dfzrQ8ghAzzJMJy1/Vp0Baxnlytbk/UwBUdPzC/KIpZGpB18N73Zco3WZ2zWg l8APhzDanvZ76e4s+QDK2XNAwe+zJC3sQ30O7Jl31H+VWVlPP6sBWgF2ws4HZpjmXcS1 +viIlfH3HMq+W8qUFl1qk9X4xGYiDpmk59oScgW+XYIDwEWcedPw1R9r1v59UBduT9q5 weOlzb9XNX6ntsxfnO1UPhcdlmSx6MvLLFgTocARhUATHELT3SndcHfPZt8HGb3uK9jT GS5w== X-Gm-Message-State: AFqh2krwGWY7OY9iYvFHxhrCNoad9Fak2aRTtDY/TQ8c6o4P+6CgbzSJ VIA3q6j257Rf8xpSa/pEsd80pg== 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_025534_609625_2BCD28C1 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 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: 13104502 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 09254C63797 for ; Tue, 17 Jan 2023 10:57:48 +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=coDSALhMAUZLbWx0MMjZdM9bFkd9FUv8TaiYjwrNBcY=; b=pGRBSpzsNOYj3g 9Y45NWcCCrTiFEVuIQtQZuacLSQ8f0suRyLWZZHQOcXJNiclHWFLqgQ58dSXbJcXjfoCIJfZNsvbp I47wn3IRymMX9iOAkY7truGzIbcJijAVMn6caZjkUpFJFBKq8Rde6L5FIOFC9hsHXkTYnevMlDwza K47IWvIaBES4jl0AqjYbdhiZx/ddxPux23wWHHQGafsdBJFi8YbpdwaHvxUyZKm3M1joT5qcBBZfK AEwBFs4t8yJcmQHaxY+c3Q1pKHNR5625qOpFwuwN9TqTDJPP9VONrrAN30oZJS6uQIsqkI5gG7wXK AwXfErvxtkhrB3RcYDrw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjdv-00DsVs-3B; Tue, 17 Jan 2023 10:56:39 +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 1pHjcv-00Dryy-N0 for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2023 10:55:39 +0000 Received: by mail-pg1-x535.google.com with SMTP id 78so21639851pgb.8 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=AHYr4XSKpeKyi7+dmEb6+kffAWtPOpgYjbiaToHTgPEEvdybvEGSQ4vRAbpCSoye0O 1IWnzR6hes3t7v1uvxYlvd3oFEV9LvHaWz86jFNKMN0gC74pFgI0SgBRaWZ5sDmo8al0 8y3IpCae9IYG4ppXOAI2LrzkPw1qTsRdOPwkb19/wSBKUpL/Jy10JzPW2t64HzbmUDBO PoPcqDs7DpDBLo5uTMTQqlymOEJNrnAMjyVMvDkJgPEHngUT5qshjgNHidxhUva3zEnN UNXhQZfNZmsnz2UiVvGaOEY6ALS4hpRmbOES1ckvNUzFZMg5lGEls5D2Q8SEdaxox9TI yamQ== X-Gm-Message-State: AFqh2ko7E6G4HcVu/UjqO4SYYDuOE6gXG9Z6VaqvHWsLOigXehLU7NG+ l72holGESosHFXCLzw7Z9L6nrg== 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_758457_06C670BD X-CRM114-Status: GOOD ( 13.52 ) 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 --- 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: 13104503 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 34A0DC678D4 for ; Tue, 17 Jan 2023 10:58:06 +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=FajL8JjLy/uj3qn32nEvjaCc8JRuACCOCj4tW3Walm0=; b=syZ/8TjXE+034d +jfH8GDAdV1TTPDt27LnbaBDJXifXurveaTV8iE5h6SfGYMBxFQUX5gMjwQG2HHacxJFCeh/GXrIC 1IV668239YR5q61p2FypQ+x/Wva+9N2+I8XlzRN5UxEcA28piX+dR644Sm+w1jqwhe8ykgAZkqhlo qBJzXZ8+A2ryCRWM44OOEhPz8+O9t2zSnS+nxgHK5grormERWpMZt+z2vP88T4QFpF30Us5VQ2y5/ Mgfv7zpEdL1nWJ/keWyJKUrUBR/3+hRbQKU5kWrDn7FAtVzoopvb9rsU+pvvVk1xCu0yzZLzimd2D bW4Rf8XwvP3knIS6kraA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHjeD-00Dsh1-Cb; Tue, 17 Jan 2023 10:56:57 +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 1pHjcz-00Drrt-1n for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2023 10:55:45 +0000 Received: by mail-pf1-x430.google.com with SMTP id 200so16962761pfx.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=AATVIvAUkj6ZUq6X3bXmh3B/ogxbWW2cQrZ7wgm0MnNFdo0/QsLIep8ApTHJ/LzD8n Qq/or69ZwyaaSrE+dhM4NqgZcbAx25S49xfm7JCiq4pNKavFw1fjrN1zJzElzBN90mI4 CJ36ulgdf6Y9jKVK73RCRxFweEmuyaUvkW+6WgtwkVi9Gut6YCS+OwZCY6/VsHNpzzwm Q9erSvxUWSRNFlc2iqLsthbO5dA41Tv8I+kP65mz7cfGZWXLDIAjpOZHt7VdpIm6h/VK p/CDM6S1aCCmwRpZEs88Kbb2ygMUzEEUyd80r5Y0KsOl5VDTuq1avkSUrX9BdhX71ZLr tTiw== X-Gm-Message-State: AFqh2kpZQwAkCE3BKDL+JMKeN+a973dc95tcJkiKRuc+rhzT7XAdSzLF RC5vtVE1ms2fUJ0pwwT2uqWzJQ== 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_025541_114517_2753FFF5 X-CRM114-Status: GOOD ( 13.55 ) 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 --- 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 {