Skip to content

Commit 2c3294b

Browse files
passgatpanicking
authored andcommitted
dts: arm: st: re-enable master can gating clock for can2
Commit 57723cf ("dts: arm: st: Refactor DTSI files to use macro"), which replaced raw hex codes by using STM32_CLOCK macro, causes regression in the case of the CAN device where the previous raw value contained more than one bit set to 1. The macro is in fact correct only for values with a single bit set. In all other cases, raw values must continue to be used. Tested on STM32F429I-DISC1 board Fixes: 57723cf Co-authored-by: Michael Trimarchi <[email protected]> Signed-off-by: Dario Binacchi <[email protected]>
1 parent 5db74f2 commit 2c3294b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

dts/arm/st/f1/stm32f105.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
interrupts = <63 0>, <64 0>, <65 0>, <66 0>;
5050
interrupt-names = "TX", "RX0", "RX1", "SCE";
5151
/* also enabling clock for can1 (master instance) */
52-
clocks = <&rcc STM32_CLOCK(APB1, 26U)>;
52+
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>;
5353
status = "disabled";
5454
};
5555

dts/arm/st/f4/stm32f405.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
interrupts = <63 0>, <64 0>, <65 0>, <66 0>;
221221
interrupt-names = "TX", "RX0", "RX1", "SCE";
222222
/* also enabling clock for can1 (master instance) */
223-
clocks = <&rcc STM32_CLOCK(APB1, 26U)>;
223+
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>;
224224
master-can-reg = <0x40006400>;
225225
status = "disabled";
226226
};

dts/arm/st/f4/stm32f412.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
interrupts = <63 0>, <64 0>, <65 0>, <66 0>;
238238
interrupt-names = "TX", "RX0", "RX1", "SCE";
239239
/* also enabling clock for can1 (master instance) */
240-
clocks = <&rcc STM32_CLOCK(APB1, 26U)>;
240+
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>;
241241
master-can-reg = <0x40006400>;
242242
status = "disabled";
243243
};

dts/arm/st/f4/stm32f446.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
interrupts = <63 0>, <64 0>, <65 0>, <66 0>;
7474
interrupt-names = "TX", "RX0", "RX1", "SCE";
7575
/* also enabling clock for can1 (master instance) */
76-
clocks = <&rcc STM32_CLOCK(APB1, 26U)>;
76+
clocks = <&rcc STM32_CLOCK_BUS_APB1 0x06000000>;
7777
master-can-reg = <0x40006400>;
7878
status = "disabled";
7979
};

0 commit comments

Comments
 (0)