From patchwork Tue Jul 4 17:33:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 13301516 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 5910DEB64D9 for ; Tue, 4 Jul 2023 17:33:58 +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=gq2DcvYo2CiVd7tVD5lKDPQ1NAnddEcKh6c8uDG/oPI=; b=K1SuP7Pkb4n6IG Wol3WzCtQRmE3ieo0WMDBXgqY0g6TabWhMhCKWGzlNGsmZAqEwhW/BSvtTa6TICCvDwi0t7hgXa5n YxlWdKLNDhVKMXxyGrLqmc16ro3vFTp/sH7onAx+raaGjgZUxKAfHwugsc9W2CK+2WQNeAP6KYtMP jLY18v2llCwObjTnzwZymicUPtUfs0R69HHNGweVXJWChOXdBG1Vi3FuuIUwX0urrRBUHvavMqeRt c72/jyfvb/g/OxWZYBXr/mazPM8toPZBOOvhJx8ep2NbnXS1I+sanrDbt8YOtTGuZQlOlyXGCE8OE A0MS4icKxkBrhRjTGTmQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qGju5-00DwCm-33; Tue, 04 Jul 2023 17:33:29 +0000 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qGju2-00DwBi-39 for linux-arm-kernel@lists.infradead.org; Tue, 04 Jul 2023 17:33:28 +0000 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-51d91e9b533so6511568a12.3 for ; Tue, 04 Jul 2023 10:33:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1688492001; x=1691084001; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=voSV3r6liSTPswELgXfBz+FbRIZzGdFTovggUY0LZ1c=; b=niI9qf70lz6ehiJfC5AEObc/h1RpkL9AWeQrbq4VstdIAjIdYtxtiE+305qWdgfmIr EGqP51lbJpROOFM446kUlZhkHSvo1czE7oDyobhSC/pEjwlgh9p1Nts6bHvMLwfiR/ll sZovZO3WkNucyZMbpVsNCxUQ6X+Tq8qiYXtFA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688492001; x=1691084001; 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=voSV3r6liSTPswELgXfBz+FbRIZzGdFTovggUY0LZ1c=; b=LaV1byOzYfE3tEc+eIm6xuReFJo2i9jVqnD71+kRsgxgfair1LCIlCgQZ/3NE+8YJW QHbM40TxkkJqphzk3dSvMZFKGxKKOLTLMOEEtLrtqidX1I9QYEvjbYALWBy5K427qzZC Jk3t60y5rnPJ1+1doZCPTJ2HEjx9rG8Nfa8YxYo95CdHk/aFb0GdIIyV3odnHXX12JPU Nii10ZklHTf2b03s6CDu98fv0blFlSNDdXZ3kwdnd60xtXgie4skyF6IYk+kSLjmYyri KABKCCjrQXZMMSlNkBNFax/AX39QI3jJMEI/m4ZuoJ4kRTGVxwqp/LTZ5ZJ5xMcIXLKt ay8A== X-Gm-Message-State: ABy/qLZHnPlfUmYjENqRPqczLn41gRz2P1lIXMiGR0c1aW00tTBF4kUb rEakwOMGpwrUlpFMESrA1iq/GQ== X-Google-Smtp-Source: APBJJlHsQfO4bzGm+NE7pP3Z/pJZH72loPlBskyiVeaBbdPwNWxr2fgtRrjBVIkAOtimINeZlnEhDA== X-Received: by 2002:aa7:df85:0:b0:51e:1692:1111 with SMTP id b5-20020aa7df85000000b0051e16921111mr3710970edy.3.1688492001252; Tue, 04 Jul 2023 10:33:21 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-82-58-49-236.retail.telecomitalia.it. [82.58.49.236]) by smtp.gmail.com with ESMTPSA id p18-20020aa7d312000000b0051a2d2f82fdsm12241239edq.6.2023.07.04.10.33.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 10:33:20 -0700 (PDT) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: Dario Binacchi , Alexandre Torgue , Conor Dooley , Krzysztof Kozlowski , Maxime Coquelin , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH] ARM: dts: stm32: re-add CAN support on stm32f746 Date: Tue, 4 Jul 2023 19:33:17 +0200 Message-Id: <20230704173317.590190-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230704_103327_020951_8D3F4EB0 X-CRM114-Status: GOOD ( 12.04 ) 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 revert commit 36a6418bb1259 ("Revert "ARM: dts: stm32: add CAN support on stm32f746"") prevented parsing errors due to the lack of CAN3 binding. Now that the binding definition for CAN3 is available in the mainline thanks to commit 8f3ef556f8e1a ("dt-bindings: mfd: stm32f7: Add binding definition for CAN3"), we can re-add the CAN support and make the driver usable again. Signed-off-by: Dario Binacchi --- arch/arm/boot/dts/st/stm32f746.dtsi | 47 +++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/arch/arm/boot/dts/st/stm32f746.dtsi b/arch/arm/boot/dts/st/stm32f746.dtsi index d1802efd067c..bfff1a58bf3d 100644 --- a/arch/arm/boot/dts/st/stm32f746.dtsi +++ b/arch/arm/boot/dts/st/stm32f746.dtsi @@ -257,6 +257,23 @@ rtc: rtc@40002800 { status = "disabled"; }; + can3: can@40003400 { + compatible = "st,stm32f4-bxcan"; + reg = <0x40003400 0x200>; + interrupts = <104>, <105>, <106>, <107>; + interrupt-names = "tx", "rx0", "rx1", "sce"; + resets = <&rcc STM32F7_APB1_RESET(CAN3)>; + clocks = <&rcc 0 STM32F7_APB1_CLOCK(CAN3)>; + st,gcan = <&gcan3>; + status = "disabled"; + }; + + gcan3: gcan@40003600 { + compatible = "st,stm32f4-gcan", "syscon"; + reg = <0x40003600 0x200>; + clocks = <&rcc 0 STM32F7_APB1_CLOCK(CAN3)>; + }; + usart2: serial@40004400 { compatible = "st,stm32f7-uart"; reg = <0x40004400 0x400>; @@ -337,6 +354,36 @@ i2c4: i2c@40006000 { status = "disabled"; }; + can1: can@40006400 { + compatible = "st,stm32f4-bxcan"; + reg = <0x40006400 0x200>; + interrupts = <19>, <20>, <21>, <22>; + interrupt-names = "tx", "rx0", "rx1", "sce"; + resets = <&rcc STM32F7_APB1_RESET(CAN1)>; + clocks = <&rcc 0 STM32F7_APB1_CLOCK(CAN1)>; + st,can-primary; + st,gcan = <&gcan1>; + status = "disabled"; + }; + + gcan1: gcan@40006600 { + compatible = "st,stm32f4-gcan", "syscon"; + reg = <0x40006600 0x200>; + clocks = <&rcc 0 STM32F7_APB1_CLOCK(CAN1)>; + }; + + can2: can@40006800 { + compatible = "st,stm32f4-bxcan"; + reg = <0x40006800 0x200>; + iterrupts = <63>, <64>, <65>, <66>; + interrupt-names = "tx", "rx0", "rx1", "sce"; + resets = <&rcc STM32F7_APB1_RESET(CAN2)>; + clocks = <&rcc 0 STM32F7_APB1_CLOCK(CAN2)>; + st,can-secondary; + st,gcan = <&gcan1>; + status = "disabled"; + }; + cec: cec@40006c00 { compatible = "st,stm32-cec"; reg = <0x40006C00 0x400>;