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: 13111718 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 B6C08C38142 for ; Mon, 23 Jan 2023 07:18:00 +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=pInIBhdEEW/Is0hWmOrDm3qQ5wqJ3LcAZc5dYp6gRTg=; b=FyuYMchV2V58eY Oa4hmTJHjwBDIJ+rEh/WvhAmiLRP5WAQ3dXVZD3fDJZLNmPIhZJki0xgN7nc4PUx2XStIJfyM5YLd DxuDCjMvYyHLHrf18hdah40b2+i2qv6w407C6IHkREabxYrxeTrHP4nXsR/kRfKTjV1sZvDuuFBwE LCoITHvDmG4548o0y1jvURWmh5IzTVSYdR78JluPOXkfAXnQ3tQNHVsbG8v7GeSA2URjWWnitzhzB Ys2foGZCHbsqOFxyL2OMrwkIgJJZMX7XlpkZM3MxF0Y51A5UYYEwG9yuDKOVLWTVuJBU+NFUd9q/E QWFWFtZ0rzF9xNhUnoOg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr5Q-00GB1W-GJ; Mon, 23 Jan 2023 07:17:48 +0000 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr53-00GAsz-1X for linux-rockchip@lists.infradead.org; Mon, 23 Jan 2023 07:17:27 +0000 Received: by mail-pj1-x1030.google.com with SMTP id u1-20020a17090a450100b0022936a63a21so14454601pjg.4 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=wJ3ElEE0aIu4vbuaH1QqrS0L1ouC8ccO230DJ9mh5UVqpODBQfeHOhJaJ6eql2CvLP 3XVeBHlbM+kX1iCBfsz0GDuZzCtpqFCH9E1qPFfUP9WsY5tNyDK45uMSF0I3+0XEjXu6 AUmhwqeKPnDlkq4+2okO7JEDD7B/MgbY1VI4GMH7bJo3Gm6NQX1X3gdkpI4Lly1GJrKV uNMMxg1Ex4SlGjPmFQ+XAmB+nuF0/wkh+pfkYskrMsk7DDtrfQrW64Uci2SpIAVOATXP Tnbx3c9lf46vHkYLNk2Ci7kl8TpwnORAZx2vSj8kLFpBA7egyE89s5Xmx1KViu8FDWnB hGfg== X-Gm-Message-State: AFqh2kqh+992QOYNQp7fxOgMEB1rIiq4qThqqJfbOoCyHrpQfMxP3Td2 8shKYWDRN+kvWpr68vD73HFxFA== 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_127317_E5A210C5 X-CRM114-Status: GOOD ( 11.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 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: 13111719 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 4B336C05027 for ; Mon, 23 Jan 2023 07:18:22 +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=f5YCfCWMzxGiTvgbhrFkNtbmmQ+5S1MN43MmIz19OPY=; b=TsS4mMzYQzLWtM FqmBIzjAivdNu4fYvkuZm2udfdjyTvdGr0bkygyPQECVQMA9xo8NkZp+c2Wz6Wt/xsuFX3ocPkKp7 OigyK2pZ/oeIF81K3Zwxgsvc0lRKW/xH8zJJgp6JUje02MiMUjMNWNBrJE2ev4OAaQn6gMNOYWeWH hwcSN657lMjhhzcpsGmNqjQMyW2ANYxCS6iHsvT2l26kIwjwpDoBak/j65Ut/VHhOpKrq0sKNdb96 SDbg4nD26czulfWHElMiW1/XPaDz1pjgrKFeI2yQLBccr3wO9Ektxyiv2LoqqlRjJsPiho7OKzCqh QGdHNdvg4dPYgEVZ+6HQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr5o-00GBA7-BK; Mon, 23 Jan 2023 07:18:12 +0000 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr56-00GAu7-7Z for linux-rockchip@lists.infradead.org; Mon, 23 Jan 2023 07:17:30 +0000 Received: by mail-pj1-x1029.google.com with SMTP id t12-20020a17090aae0c00b00229f4cff534so5782454pjq.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=aHOqCo4suAImvcV9od/u7mlMMDvi77+89zHpy20iYKz9b5D6CojgPNNNebwSsmaG6c kf+wxcs+gv+grucZUdyI5zOE+egZJU4kPeHZfiuu8Bw7FKUDUY2/nPH5AzV38JYyO/0G pM9RQr6L+fyKI8Gcx8ceoZp7hcjswrhYW3oqlfnGcpOZARQkoBItEb4kpirRvsKFoiWt FjSDT901ENOc575o1ZLLVhHDITPqK3grYMNseYA3qfd3l/CL54TJj3aA3koL/mErymSJ 7Ro5UPfdondsDO8Fc4cbTr30XPffBMQO+TXruJcw6MZSdQ0E9Zv0LboPIw0ktG6kOyJi ndoA== X-Gm-Message-State: AFqh2krDNyBz6mYiFkFEchvnG9NhFALC7/auafH+mWbkxI4ubFfOwuNa uSr6Z0B17t5W3EMkOpPSzUcsRw== 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_371053_5D29A9E6 X-CRM114-Status: GOOD ( 11.56 ) 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 --- 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: 13111729 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 D5C4AC38142 for ; Mon, 23 Jan 2023 07:18:42 +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=tWNibh29egbK7lQS41aJwFhvdm4OfK5oSmuFoNtmD8o=; b=BC0k4Rkgvtw+JH h0dQLlHtuoLd2YMAuQesgzuFNsSRp6PtzUrjustBBTl0NBkb/AAW1oBu3t+Oj0FPlRKu0FqPZtpj1 7HK+B2two8CFVY/rL0WLNZVhSK+n1KUC6i8hcesjSKhXRh4NWrvqtKSrWuVefqnBtrM4y3v7d/48v HsNq/JEze8dpIvD+LScz6KlKdZdKRefJY6bvH1BmzNshMialpNu9i6BlPH+kZ2/iJOoA7I0/mPvFV 9BHVgQjvbKNG8xbQ5Di8UD9XWBpUV283DvlCEpa47lUDtFbeGfqHsk7122ZL1YiHK1hl1eywFWR1l U7Jf7xLsskiEIn36nDfw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr66-00GBIM-JO; Mon, 23 Jan 2023 07:18:30 +0000 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr5D-00GAwl-Jp for linux-rockchip@lists.infradead.org; Mon, 23 Jan 2023 07:17:37 +0000 Received: by mail-pj1-x1034.google.com with SMTP id h5-20020a17090a9c0500b0022bb85eb35dso5822397pjp.3 for ; Sun, 22 Jan 2023 23:17:35 -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=N1X/B8uXFrrnDFcIxIMlYqCZk/Cz+cfFFE9xW3I0PeX9wBIgY9f+7xl4MX59GnfGbp B0uHaDIeaXg8LRiPqTL1L99qcYD6AtBg0hGLmeQMCt1HfowWal2NxhhnZfkFgB4Ue8P7 ISWQHbnFYLkzIrx7ev19Y9SBRmRoeze8zeBum72kYBDzT++cR8OglOGlDS/7YphAQMQc 7xeBWaSaLIiTJjg+uEFnswvROkV/9xGtRYSrDGLhVRqCNw0q44DTnZc6NMj1q2Dutq91 ZaUi0VwI5e2+JYvwj3ZKv/QfeOOS/LQwAJgHf/3yzDF3oSXVSP+qwcFp9sAVpE+QXBMh HhMw== X-Gm-Message-State: AFqh2krNIKNGS0+Z+H56vBYF4i3/RYWnYMdvc3gSU3Yc+DZGRo9rV3NE HM1wBpVN2ZVB1SO2Z6xk+XKKpg== 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_696486_7484D3CE X-CRM114-Status: GOOD ( 11.42 ) 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 --- 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: 13111728 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 C961FC38142 for ; Mon, 23 Jan 2023 07:18:36 +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=LKj9B++nSadDe1YKqEgWbXB7hcLqYutTi/B83cXpLM4=; b=KXZIcron0NTciQ FrbQzldcjdoCD6Uf7X/i841rIc8m94eRJj3CQOlDSV7PYNToxspZbN5igvmOe32ie1Bz4V1bOiEQG TeRcaoHIK8XR5eQx+3AIiDHV8J3CYwxaOV0w0mVvZWoXY+ZN6ZtIwscQwgbivYCguGSEf8FggCHlR wtDxFLef5x3m7Al505hWUBoJ8qIoahefQBYrypkhv/ZpV/2TOHdZWgZnmrA7YbDuedSuWXJi6NIkh YGZyN1TTKDFf5HvsUdirMywvcklIeBC+L4blY7x9ulv9QVoJxKil6CM52fZsNpsKXLpZVLNHUymQo BNtNe/lWXU0xBHEcpmdA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr67-00GBIe-5J; Mon, 23 Jan 2023 07:18:31 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pJr5J-00GAyk-2S for linux-rockchip@lists.infradead.org; Mon, 23 Jan 2023 07:17:42 +0000 Received: by mail-pj1-x1033.google.com with SMTP id z1-20020a17090a66c100b00226f05b9595so10255038pjl.0 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=sWdUK7Xcogqs0o0QB/BBG61TxX4g9EwzDVtXr3LyhWI+wTHIc4o3sriOWqDp7X6W0r mqnPV4+HVmCNl4zfXlCBx2mIiXW3Qolgusi2r1K87Dcz5EG6bCcXpWJ48HdJEJ22acKu xkXeB0DGhbQkuluUGhA1IhK/j+wa8dOOtqk9Lk5uLXMqrA3qjY391t7tCdJ+VYF/inz4 Lj3IRRh05V78SCcjyULB4Z87kpvACn7TihUC4b4KPkCb1VFUlk+1fybfBbXIqcTKD9B8 LIG1k5TQuqxAFsqJCtrZIxJINnPvKkQu6DUOMXvVfykMiMPZnlIAJpeYgbH6JxVFFIlq H9NA== X-Gm-Message-State: AFqh2kqVNXqS9kJ7ezFVo10TYeyUq9XZFSh5OBKNSqXaUNY70mSx00ZM 6bzuIGrwZR26ltNxjkbbJ2VVpg== 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_152397_379FC105 X-CRM114-Status: GOOD ( 12.40 ) 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 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 {