From patchwork Mon Jan 23 07:16:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 13111727 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 D8220C38142 for ; Mon, 23 Jan 2023 07:18:29 +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=zNLB8TsBhCVssWN+8VRkCXYOmiStJsOxGLZCEVHsR6M=; b=F+ZuFThVAdfNIN Fk2zRUsMptoq+eCwRClAyZVsPDRiw4Ksfx+OaFRlkoO4skbvqUP4M5RY1Kym/OcRGDozP64obgsOs 4iPOd6eXXznZYisA5GMaE5r9qflR1gyonoIsNwSmHHsMocJaM3AjiA8CkFitJ8AZc4MiUX5/6iSUk LbbRQis1jaWH1mrZ+KBkodhXP3hvfF3d7QaLf01c34rKcD0EZ+7A8Ra/+cmoE0II4Dn2gCjLrr0Qj xXvjLZ0ugyqCJb9pt5mot8HOEfbbr2um2yhyNNfaHVS9vcUl7nfEC9ERQXfSAThlfTYF1OHQeEjp3 W6DviFwKon1L2IyAir+A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr5A-00GAva-0B; Mon, 23 Jan 2023 07:17:32 +0000 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr52-00GAt0-V9 for linux-arm-kernel@lists.infradead.org; Mon, 23 Jan 2023 07:17:26 +0000 Received: by mail-pj1-x1031.google.com with SMTP id x2-20020a17090a46c200b002295ca9855aso14484147pjg.2 for ; Sun, 22 Jan 2023 23:17:23 -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=42R4c843N+9FNQP8hHKQVlyc9l8sQ4OucSn1xsY1hAU=; b=iuAO05Cqc7TibS/2AjBK9OF4YSvQ+KYPtV8ecxQLxqC4a8HkbcsftI26XOdtPnlMuH fO4ULtQr4lFKylg3kdBp95gvu8W1gAOLFJcTto/KBxiIZAA1fihFu0Z/OUSJtOifBRmY 0het6htv1U2pwlZPLGIJ7nvODcKRlpQSCD+3s= 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=42R4c843N+9FNQP8hHKQVlyc9l8sQ4OucSn1xsY1hAU=; b=K3GKbtAgVzUz7oFOjDEGQRI0HXSgyjQ6OuTcsYmfA3psN7/pRRYCXk2QklzW4FMvec HR5YNcg329OYbHxcjh3UYzyFMKEfRyitNxG9Da8ZRXs/5+qu/w10Pvm7Thuh66yREwhz /BmTlJl0gmMCpWOFIC9icaoHvcpRfow49g0ZP5+qZKVdYQsdMPG8gp4p1MNNmLoUZZm9 CM3d7vBGIbpKHWjwz4ZZ30aGx+XN/koBLIXTLej5dIWoE/erbZ06wVqJj+xCrrREYIVe mqLdibEDKn4RaHYNTRmjgSZm+WRHhIPGvxX1xd9bR2kfqCQkpbFaogUCsM5tCuGdH92G cSFw== X-Gm-Message-State: AFqh2kqu1+GqWFUVwHQxYaqSsrdmtdj/7XoZAcVX3UvYXtmjySHcGhAo h8OL9eA6LoW2aqDUtgXEIZFGGw== X-Google-Smtp-Source: AMrXdXu0tzRY9cZn2S4ClWD/KYgzUZWc6dop9Wi4ucM2HsK4KYG4LPUt2rWQEYNlTN/xx5CRObK/Hw== X-Received: by 2002:a17:902:b611:b0:194:8dea:44ed with SMTP id b17-20020a170902b61100b001948dea44edmr23243589pls.30.1674458243141; Sun, 22 Jan 2023 23:17:23 -0800 (PST) Received: from localhost.localdomain ([2405:201:c00a:a15f:3847:3e45:1d7:787c]) by smtp.gmail.com with ESMTPSA id e3-20020a17090301c300b00172cb8b97a8sm17742091plh.5.2023.01.22.23.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Jan 2023 23:17: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, FUKAUMI Naoki , Jagan Teki , Krzysztof Kozlowski Subject: [PATCH v2 1/4] arm64: dts: rockchip: Fix compatible for Radxa CM3 Date: Mon, 23 Jan 2023 12:46:50 +0530 Message-Id: <20230123071654.73139-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-20230122_231725_074245_EF99D3C7 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 The compatible string "radxa,radxa-cm3" referring the product name as "Radxa Radxa CM3" but the actual product name is "Radxa CM3". Fix the compatible strings. Fixes: 24a28d3eb07d ("dt-bindings: arm: rockchip: Add Radxa Compute Module 3") Fixes: 7469ab529bca ("arm64: dts: rockchip: Add rk3566 based Radxa Compute Module 3") Fixes: 096ebfb74b19 ("arm64: dts: rockchip: Add Radxa Compute Module 3 IO board") Suggested-by: Krzysztof Kozlowski Signed-off-by: Jagan Teki Acked-by: Krzysztof Kozlowski --- Changes for v2: - new patch Documentation/devicetree/bindings/arm/rockchip.yaml | 4 ++-- arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index 98afd7c6b8e6..35f74eda30ae 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -624,8 +624,8 @@ properties: - description: Radxa Compute Module 3(CM3) items: - enum: - - radxa,radxa-cm3-io - - const: radxa,radxa-cm3 + - radxa,cm3-io + - const: radxa,cm3 - const: rockchip,rk3566 - description: Radxa CM3 Industrial diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts index 3e6578f27ec0..4f8ac9fbbf7c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts @@ -11,7 +11,7 @@ / { model = "Radxa Compute Module 3(CM3) IO Board"; - compatible = "radxa,radxa-cm3-io", "radxa,radxa-cm3", "rockchip,rk3566"; + compatible = "radxa,cm3-io", "radxa,cm3", "rockchip,rk3566"; aliases { mmc1 = &sdmmc0; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi index 23a85a13311a..0bc747997c14 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi @@ -8,7 +8,7 @@ #include / { - compatible = "radxa,radxa-cm3", "rockchip,rk3566"; + compatible = "radxa,cm3", "rockchip,rk3566"; aliases { mmc0 = &sdhci; From patchwork Mon Jan 23 07:16:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 13111730 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 B5FFAC38142 for ; Mon, 23 Jan 2023 07:18: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=v6RBC02+Wr6HHQtQcutu9EAtxr2Z7j9x0AFSLI9jK0c=; b=DYxS/3bHXkuMfW afQc29ILG02PqLXYgo3KfIESWhYsCSKDuXplmXI9gM5tYF/ylEVgUL7ezZt3uL6bjx/Pt2TGR4Qao 87NKFrwPL+hevs0DqTA7dWjayYQIRVJzBazw1fhbu4BnDp0UV9tySTKLoG7i9fnqwYtJDlXQ5Zyci pNtxHPn69K+myrTPx7bjacmI6Dc5GdMWZT7sSzV0FqoSpzC5kDa4a1O0/loNzdcKvbFb+gc3owGEL AKDl+XRD/YtWRzdgMjNJzPOqxEYDeYA+DS9usaFASigytvBFicEH8w+yDYW3yOojgjQndKqPiJRyf hJdppbGt2+XtIzWU2GVA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr5R-00GB1i-Gu; Mon, 23 Jan 2023 07:17:49 +0000 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr56-00GAu6-7I for linux-arm-kernel@lists.infradead.org; Mon, 23 Jan 2023 07:17:29 +0000 Received: by mail-pj1-x102a.google.com with SMTP id t12-20020a17090aae0c00b00229f4cff534so5782455pjq.1 for ; Sun, 22 Jan 2023 23:17: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=nMwonOiSUVp9jhT90JcUAzZvSTpZ6/Yz1M6VtYsU3xE=; b=CQIlqmQAloiuVIqAm5JZ1Bk2PqJWFMwN8DX8XROZo/z+rWmcVm75yRw9ovQyokUyYT g1IGiBCEfgZ3PXfjw18lx0k1UHzJj3zLlyfye29ULiXhcUT3E1YQambsJYa57pmrjk1l MctNVSrMcKQOg/gjp4AtQjpbBCikx3eMd8ywg= 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=nMwonOiSUVp9jhT90JcUAzZvSTpZ6/Yz1M6VtYsU3xE=; b=HWK/3hkfn5+kA6KW7AtYtuB4eenPJ/NuDWUyJ0IwpoisL6YTPR51G5HD4KNxaRftpK 3itYii284OHufDt+kwVH0xZ2tscnMOFCpydN1cpdtnhCkpnToeOMnOZtG8gm+L8/LLk8 1n8mqs0AuT22e+7Y54SHSEmhSJPySYz48GXROS6oGScSI8VDjs7s9sWWi/CFtKTgx3sJ zC4KM/H9z3EAgPakY78VSCMfDWZcnQg3LhAjH4KGmMI+Rw9kLxk7Ai/49vysVcetALLq fwyhF6TuXokZMfraH9aX7EPTBo6WvHV2tJhchoab/oUdNKp4i9/Eo3kHtekxKq2mTj7C vzSQ== X-Gm-Message-State: AFqh2koPxYPND7EKcq/F8XIwKZ602gn2yNQa0AHB0KOWx1n8bRzR7MUz 4hIhM+pgpE0/HrKf4T0kynm/Iw== X-Google-Smtp-Source: AMrXdXvUu2JbWD9FpaP1gO1cV4kQmyV69aEA3EdyJN8SBgUCbshXSTxactSZpS/eyxpH+6ZvLEoCFA== X-Received: by 2002:a05:6a20:7fa5:b0:b9:4afb:1472 with SMTP id d37-20020a056a207fa500b000b94afb1472mr21863315pzj.13.1674458246817; Sun, 22 Jan 2023 23:17:26 -0800 (PST) Received: from localhost.localdomain ([2405:201:c00a:a15f:3847:3e45:1d7:787c]) by smtp.gmail.com with ESMTPSA id e3-20020a17090301c300b00172cb8b97a8sm17742091plh.5.2023.01.22.23.17.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Jan 2023 23:17: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, FUKAUMI Naoki , Jagan Teki , Chukun Pan Subject: [PATCH v2 2/4] arm64: dts: rockchip: Add missing CM3i fallback compatible for Radxa E25 Date: Mon, 23 Jan 2023 12:46:51 +0530 Message-Id: <20230123071654.73139-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230123071654.73139-1-jagan@amarulasolutions.com> References: <20230123071654.73139-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230122_231728_320805_70257C9D X-CRM114-Status: GOOD ( 12.97 ) 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 --- Changes for v2: - none 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 0372dd97c392..9fc9459505bd 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 { mmc1 = &sdmmc0; From patchwork Mon Jan 23 07:16:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 13111731 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 1485BC05027 for ; Mon, 23 Jan 2023 07:19: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=CQbs76Yqr5H6ieaAs5z3GGStHNNhYbahV629RZ32698=; b=sDmcf3eUjt1Fey GG/ixknBKTTPCMFgj6hv73cprsH34bbWCNeflrKtxlM6dFgFdkZ0ESXjif60IIqAy6JhyYzlf6fWJ +piuhR2tJsyRBD5pHuOSyWg5ZbZkPVG6coRxfv9Qtc7gtEn3I92gdyiDYkwX08zUnIH7SrSIAktLT frZonoanm13Ma1PGbBCrVxkXpvDHlPHVK9pL9uK7+rlJjLvQCqvGRO4T9SV4AB0MEUAiCcHoRzKBb eQ8pMPkD9khxvt6A4ldh6k2bdpMdnMHPT1hFsXVXr75CYZgm6Bs+iHnDcKken2Sc3s3wwBspz05A2 lZEyhC+CcrtOtYyqhOKw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr5q-00GBAX-BB; Mon, 23 Jan 2023 07:18:14 +0000 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr5C-00GAt0-Tt for linux-arm-kernel@lists.infradead.org; Mon, 23 Jan 2023 07:17:36 +0000 Received: by mail-pj1-x1031.google.com with SMTP id x2-20020a17090a46c200b002295ca9855aso14484545pjg.2 for ; Sun, 22 Jan 2023 23:17: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=GI8NCTgrz3eH8HHLTGGwu4ZgM3J2mR0tZKBmJm8ZEFI=; b=AyHSatqd3SUjFsZkrghnvnPkSgYtNAYZoegmcjQ8bkGVdN9rOP/5QyzHb7MuYYZe6E PjyIXgUSZ47Jd/uwzJ0o7sEDXjCCvWYcmafwW8Lozy6zNDY2RuClH4qDFstKW5IEwVu9 CeigfEACWVJvv3FPV/J0I3zK+7VflToE5PWSA= 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=GI8NCTgrz3eH8HHLTGGwu4ZgM3J2mR0tZKBmJm8ZEFI=; b=LoiUX/gsULtCj055VRETCM1j2oaHa1Wwc83ZfCC77ww6q7gu+vzf+jVo5/TgNgRnAU /Mi4CNCIZqo6fWx2MKeT4OIMOGuKKHAPlKn/0DSnAKJD5d7HMAONoVGXeKja4VLriRB1 MR8GFhQnVABp7TgUL6VR8IXL051JFBAMAjTD+qlp64Oo4e4HMQlPc8N9haBk9CgMfSVz xn8aNRzV6MgxMUx8YFZsI5HgO3DVyWzbluS2U9qA3MQ6t3zV4FXpJ/4gtwCNsyNA8+1a IbQs9LAcr9RKJO5F1CDr9QB5tAyNKroc1LKoc5Krf3LgSgbQWGGztGK4Ovo1esWrvNiZ Kvvw== X-Gm-Message-State: AFqh2kqoohFQAVtBbsVeiYGHot0Mge8bete4XtfqpfxV4iPDgiYLJhIa bCEnIvHabnKeQ2najtIyjFvbKQ== X-Google-Smtp-Source: AMrXdXsOSisp+SnbTKLWuVOng0nj+csLrTEKupg1J6PgyZ1aQ/kMu0a27LLno5vdQZS39iibZqWZCw== X-Received: by 2002:a05:6a20:1bc7:b0:b8:653a:6376 with SMTP id cv7-20020a056a201bc700b000b8653a6376mr21850436pzb.2.1674458254574; Sun, 22 Jan 2023 23:17:34 -0800 (PST) Received: from localhost.localdomain ([2405:201:c00a:a15f:3847:3e45:1d7:787c]) by smtp.gmail.com with ESMTPSA id e3-20020a17090301c300b00172cb8b97a8sm17742091plh.5.2023.01.22.23.17.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Jan 2023 23:17: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, FUKAUMI Naoki , Jagan Teki , Chukun Pan Subject: [PATCH v2 3/4] arm64: dts: rockchip: Drop unneeded model for Radxa CM3i Date: Mon, 23 Jan 2023 12:46:52 +0530 Message-Id: <20230123071654.73139-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230123071654.73139-1-jagan@amarulasolutions.com> References: <20230123071654.73139-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230122_231735_000377_83E916A6 X-CRM114-Status: GOOD ( 12.83 ) 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 --- Changes for v2: - none 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 225dbbe4955d..c50fbdd48680 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,cm3i", "rockchip,rk3568"; aliases { From patchwork Mon Jan 23 07:16: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: 13111732 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 541D1C38142 for ; Mon, 23 Jan 2023 07:19:31 +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=OOQi8HNO9vMP6RrQHPYY214l7TPWcdVJHCcW2VwYY2M=; b=0fkXZXE5CWDAgU lVkfcFKJvOBGgX8pJMUNFDkdLh3j5Yifdde7KbdNQLF2r7F2vGMflNKWHdGjlX2USfZG/P/mPApG2 DcKOdLLCzTZmJNJ35TrBFoChZG41wsuef482op04rEuTAI+E0H7H0nktORUB3YET8dNJ+Sxf8Wk8c vhSxy6Lozj3vkW/uMaR6BL0iJChjXRlcXmISiIanEBwM1rl2O10b+oxk8znhKUk4yUyQUTLXolPuA UyuuU0o1vUoCoGiG8VVcYWz0NYsG46sxF5ACxtlVZdCulL0CloqPAz+MJBgrhJTbQa3KOvAWqp7nC /dmm2TUWDi5qk7+lfeyw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr6A-00GBJQ-5U; Mon, 23 Jan 2023 07:18:34 +0000 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr5J-00GAyj-46 for linux-arm-kernel@lists.infradead.org; Mon, 23 Jan 2023 07:17:42 +0000 Received: by mail-pj1-x102c.google.com with SMTP id b10so10857530pjo.1 for ; Sun, 22 Jan 2023 23:17:40 -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=d2YGakH9pYkYD73KfKfwouPB9cCWa0mtmcn+X4PJ1qI=; b=rKOwd5XzvsFOgekLFnlLwsvEiUCrNhSlvpUvRYxSIohtqmWAvIsJgJGOV7e3BEWDcw VYZjE4nIQjYuOrnUxUllf/dXlseQY8xfX8YsKvpEDRhjYSX8cDjvQgt0Rtg8s4Ji+2Wi 2H/3vlt9dZEQ/XT0ypBjM3bROlf5v+iNQvfio= 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=d2YGakH9pYkYD73KfKfwouPB9cCWa0mtmcn+X4PJ1qI=; b=g0qb9uZWhe0cpYwgHWL4thVKPCrStfC1GD8UReMOO1oXdZ7qWju1h10PH45LhQp8NV TrVig82UkP65b3nfxqw/L+8T/1tt/eHRAlbm369v47XObIumvy+rwIJliJgr5LW3INzE 01AyMqfexUYe5yskExhqeKNDdVy+K2uRFxUAwdR6q4LriLf+wS8akDE5QWaJhhEHG9UI 4d7f5Si0N3EH/PoNBSMokSy66CNrAFbhPW5ACxKOXwTweKwJNpiJZfNbVM5GqOQnpS2M zdWQtPbrd3drvasmLsEpDGDDduIF7CZXQM1IutekIf+drEvwVIH+TcQ1IPILk+wynb/H qltw== X-Gm-Message-State: AFqh2krbjO7oE4YMsgNEJFHKqgpoNt5KSF1HQV80DXVIEjcy1qABhjx+ 4dd1emttAD00gCCeRnAS4tJ9uA== X-Google-Smtp-Source: AMrXdXviTJZzXMOc8OKmyBpNavbXFCp4YfwA3oQupaeAFEbtlVRcNlIe4OclPoA1jLQng7UdgTEO3w== X-Received: by 2002:a05:6a20:4d91:b0:b9:7a34:a78d with SMTP id gj17-20020a056a204d9100b000b97a34a78dmr9923977pzb.9.1674458260089; Sun, 22 Jan 2023 23:17:40 -0800 (PST) Received: from localhost.localdomain ([2405:201:c00a:a15f:3847:3e45:1d7:787c]) by smtp.gmail.com with ESMTPSA id e3-20020a17090301c300b00172cb8b97a8sm17742091plh.5.2023.01.22.23.17.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Jan 2023 23:17:39 -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, FUKAUMI Naoki , Jagan Teki , Chukun Pan Subject: [PATCH v2 4/4] arm64: dts: rockchip: Correct the model name for Radxa E25 Date: Mon, 23 Jan 2023 12:46:53 +0530 Message-Id: <20230123071654.73139-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230123071654.73139-1-jagan@amarulasolutions.com> References: <20230123071654.73139-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230122_231741_199886_910EC2CE X-CRM114-Status: GOOD ( 13.81 ) 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 E25 is a Carrier board, so update the model name for Radxa E25 as suggested by the Radxa website. Fixes: 2bf2f4d9f673 ("arm64: dts: rockchip: Add Radxa CM3I E25") Cc: Chukun Pan Signed-off-by: Jagan Teki --- Changes for v2: - update commit message add Fixes tag 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 9fc9459505bd..63c4bd873188 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts @@ -4,7 +4,7 @@ #include "rk3568-radxa-cm3i.dtsi" / { - model = "Radxa E25"; + model = "Radxa E25 Carrier Board"; compatible = "radxa,e25", "radxa,cm3i", "rockchip,rk3568"; aliases {