Skip to content

Commit 65b7470

Browse files
emillindqkartben
authored andcommitted
hwinfo: stm32: reverse device id byte order to match v4.1 order
Reverse back the device id byte order to the way it was in v4.1 to return the same device id. Signed-off-by: Emil Lindqvist <emil@lindq.gr>
1 parent 4c3491d commit 65b7470

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

drivers/hwinfo/hwinfo_stm32.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,19 @@
1818
#if defined(CONFIG_SOC_SERIES_STM32MP13X)
1919

2020
/* No ll_utils for the stm32mp13x series, instead use the HAL functions */
21+
/* zephyr-keep-sorted-start */
2122
#define STM32_UID_WORD_0 HAL_GetUIDw2()
2223
#define STM32_UID_WORD_1 HAL_GetUIDw1()
2324
#define STM32_UID_WORD_2 HAL_GetUIDw0()
25+
/* zephyr-keep-sorted-stop */
2426

2527
#else
2628

29+
/* zephyr-keep-sorted-start */
2730
#define STM32_UID_WORD_0 LL_GetUID_Word2()
2831
#define STM32_UID_WORD_1 LL_GetUID_Word1()
2932
#define STM32_UID_WORD_2 LL_GetUID_Word0()
33+
/* zephyr-keep-sorted-stop */
3034

3135
#endif /* CONFIG_SOC_SERIES_STM32MP13X */
3236

@@ -42,9 +46,11 @@ ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
4246
sys_cache_instr_disable();
4347
#endif /* CONFIG_SOC_SERIES_STM32H5X */
4448

45-
dev_id.id[0] = sys_cpu_to_be32(STM32_UID_WORD_2);
49+
/* zephyr-keep-sorted-start */
50+
dev_id.id[0] = sys_cpu_to_be32(STM32_UID_WORD_0);
4651
dev_id.id[1] = sys_cpu_to_be32(STM32_UID_WORD_1);
47-
dev_id.id[2] = sys_cpu_to_be32(STM32_UID_WORD_0);
52+
dev_id.id[2] = sys_cpu_to_be32(STM32_UID_WORD_2);
53+
/* zephyr-keep-sorted-stop */
4854

4955
#if defined(CONFIG_SOC_SERIES_STM32H5X)
5056
sys_cache_instr_enable();

0 commit comments

Comments
 (0)