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: 699024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41F02EB64D9 for ; Tue, 4 Jul 2023 17:33:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229645AbjGDRdZ (ORCPT ); Tue, 4 Jul 2023 13:33:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229895AbjGDRdY (ORCPT ); Tue, 4 Jul 2023 13:33:24 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D16E710E0 for ; Tue, 4 Jul 2023 10:33:22 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-51da8a744c4so6534123a12.0 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=HHAd/+gkD7TTeUt9wAykG9Vq1voqxsGtYHMUtVeXcJkqNvJ3Ku8fqh2qSx1QtBZifw 6q1AESx6X7lURDKZbL6VtBB5v3yhU7mlyhjodLHfz3DGJKPm4bu1uC7wycft3aZNIOM4 gS9tcp0ujXEisFtHenjIypH4kP/CP1HXYnrjc57olPMnwhEN2f/o8yHzQv5pdkGfKKME aZhgVppO2GpCIzR66b985GN8MesDIEJwSBok2r59TRso4e3d/HU8irjEm3T2TQL/lDgn tv4C6oyM2v/gRSaJT07nXXExGpyTXYzUPhl2X8KnYOfNRnoN5r3203mprvJzlbllpNJ2 fl3g== X-Gm-Message-State: ABy/qLbs0kbrXzmNiHIdTWEGfJtTzO+UtDweU0K/ByaQkoXxcc3X0iHH DWAM+Vdr/4P3BAjo1JR+vvU2uJmv7p4amqZuH6E= 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 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.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>;