]> git.itanic.dy.fi Git - linux-stable/commitdiff
Revert "ARM: dts: stm32: add CAN support on stm32f746"
authorMarc Kleine-Budde <mkl@pengutronix.de>
Wed, 17 May 2023 18:02:51 +0000 (20:02 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Wed, 17 May 2023 18:20:12 +0000 (20:20 +0200)
This reverts commit 0920ccdf41e3078a4dd2567eb905ea154bc826e6.

The commit 0920ccdf41e3 ("ARM: dts: stm32: add CAN support on
stm32f746") depends on the patch "dt-bindings: mfd: stm32f7: add
binding definition for CAN3" [1], which is not in net/main, yet. This
results in a parsing error of "stm32f746.dtsi".

So revert this commit.

[1] https://lore.kernel.org/all/20230423172528.1398158-2-dario.binacchi@amarulasolutions.com

Cc: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Cc: Alexandre TORGUE <alexandre.torgue@foss.st.com>
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202305172108.x5acbaQG-lkp@intel.com
Closes: https://lore.kernel.org/oe-kbuild-all/202305172130.eGGEUhpi-lkp@intel.com
Fixes: 0920ccdf41e3 ("ARM: dts: stm32: add CAN support on stm32f746")
Suggested-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/20230517181950.1106697-1-mkl@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
arch/arm/boot/dts/stm32f746.dtsi

index 973698bc9ef4b63c6d2d9fedb7fa4eb375e18f28..dc868e6da40e0fae8e98cfca3f3674efa61210d7 100644 (file)
@@ -257,23 +257,6 @@ 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>;
@@ -354,36 +337,6 @@ 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>;
-                       interrupts = <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>;