Skip to content

Commit 36a6418

Browse files
Revert "ARM: dts: stm32: add CAN support on stm32f746"
This reverts commit 0920ccd. The commit 0920ccd ("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/[email protected] Cc: Dario Binacchi <[email protected]> Cc: Alexandre TORGUE <[email protected]> Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected] Closes: https://lore.kernel.org/oe-kbuild-all/[email protected] Fixes: 0920ccd ("ARM: dts: stm32: add CAN support on stm32f746") Suggested-by: Krzysztof Kozlowski <[email protected]> Link: https://lore.kernel.org/[email protected] Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent c1e4f5a commit 36a6418

File tree

1 file changed

+0
-47
lines changed

1 file changed

+0
-47
lines changed

arch/arm/boot/dts/stm32f746.dtsi

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -257,23 +257,6 @@
257257
status = "disabled";
258258
};
259259

260-
can3: can@40003400 {
261-
compatible = "st,stm32f4-bxcan";
262-
reg = <0x40003400 0x200>;
263-
interrupts = <104>, <105>, <106>, <107>;
264-
interrupt-names = "tx", "rx0", "rx1", "sce";
265-
resets = <&rcc STM32F7_APB1_RESET(CAN3)>;
266-
clocks = <&rcc 0 STM32F7_APB1_CLOCK(CAN3)>;
267-
st,gcan = <&gcan3>;
268-
status = "disabled";
269-
};
270-
271-
gcan3: gcan@40003600 {
272-
compatible = "st,stm32f4-gcan", "syscon";
273-
reg = <0x40003600 0x200>;
274-
clocks = <&rcc 0 STM32F7_APB1_CLOCK(CAN3)>;
275-
};
276-
277260
usart2: serial@40004400 {
278261
compatible = "st,stm32f7-uart";
279262
reg = <0x40004400 0x400>;
@@ -354,36 +337,6 @@
354337
status = "disabled";
355338
};
356339

357-
can1: can@40006400 {
358-
compatible = "st,stm32f4-bxcan";
359-
reg = <0x40006400 0x200>;
360-
interrupts = <19>, <20>, <21>, <22>;
361-
interrupt-names = "tx", "rx0", "rx1", "sce";
362-
resets = <&rcc STM32F7_APB1_RESET(CAN1)>;
363-
clocks = <&rcc 0 STM32F7_APB1_CLOCK(CAN1)>;
364-
st,can-primary;
365-
st,gcan = <&gcan1>;
366-
status = "disabled";
367-
};
368-
369-
gcan1: gcan@40006600 {
370-
compatible = "st,stm32f4-gcan", "syscon";
371-
reg = <0x40006600 0x200>;
372-
clocks = <&rcc 0 STM32F7_APB1_CLOCK(CAN1)>;
373-
};
374-
375-
can2: can@40006800 {
376-
compatible = "st,stm32f4-bxcan";
377-
reg = <0x40006800 0x200>;
378-
interrupts = <63>, <64>, <65>, <66>;
379-
interrupt-names = "tx", "rx0", "rx1", "sce";
380-
resets = <&rcc STM32F7_APB1_RESET(CAN2)>;
381-
clocks = <&rcc 0 STM32F7_APB1_CLOCK(CAN2)>;
382-
st,can-secondary;
383-
st,gcan = <&gcan1>;
384-
status = "disabled";
385-
};
386-
387340
cec: cec@40006c00 {
388341
compatible = "st,stm32-cec";
389342
reg = <0x40006C00 0x400>;

0 commit comments

Comments
 (0)