diff options
| author | Tom Rini <trini@konsulko.com> | 2022-09-08 08:33:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-09-08 08:33:41 -0400 |
| commit | e9de8c8c649044080371399a1ef4923b08632611 (patch) | |
| tree | dedfaadf7f1c9f38f60dfc75c24f5229e0b6c8e8 /arch/arm/mach-stm32mp/stm32mp15x.c | |
| parent | e3fce5e5604472a20fbce78ca12d07712f2dd86d (diff) | |
| parent | d6ff3c9f04f744345fe77a3d82c5b5e0c07c456a (diff) | |
Merge tag 'u-boot-stm32-20220907' of https://source.denx.de/u-boot/custodians/u-boot-stm
- simplify the STM32MP15x package parsing code
- remove test on CONFIG_DM_REGULATOR in stm32mp1 board
and enable CONFIG_DM_REGULATOR for stm32f769-disco
- handle ck_usbo_48m clock provided by USBPHYC to fix the command 'usb start'
after alignment with Linux kernel v5.19 DT (clocks = <&usbphyc>)
- Fix SYS_HZ_CLOCK value for stih410-b2260 board
- Switch STMM32MP15x DHSOM to FMC2 EBI driver
- Remove hwlocks from pinctrl in STM32MP15x to avoid issue with kernel
Diffstat (limited to 'arch/arm/mach-stm32mp/stm32mp15x.c')
| -rw-r--r-- | arch/arm/mach-stm32mp/stm32mp15x.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/arm/mach-stm32mp/stm32mp15x.c b/arch/arm/mach-stm32mp/stm32mp15x.c index a093e6163e6..660c907a6ba 100644 --- a/arch/arm/mach-stm32mp/stm32mp15x.c +++ b/arch/arm/mach-stm32mp/stm32mp15x.c @@ -274,7 +274,6 @@ static void get_cpu_string_offsets(unsigned int *type, unsigned int *pkg, u32 cpu_type = get_cpu_type(); u32 ct = cpu_type & ~(BIT(7) | BIT(0)); u32 cm = ((cpu_type & BIT(7)) >> 6) | (cpu_type & BIT(0)); - u32 cp = get_cpu_package(); /* Bits 0 and 7 are the ACDF, 00:C 01:A 10:F 11:D */ switch (ct) { @@ -293,17 +292,9 @@ static void get_cpu_string_offsets(unsigned int *type, unsigned int *pkg, } /* Package */ - switch (cp) { - case STM32MP15_PKG_AA_LBGA448: - case STM32MP15_PKG_AB_LBGA354: - case STM32MP15_PKG_AC_TFBGA361: - case STM32MP15_PKG_AD_TFBGA257: - *pkg = cp; - break; - default: - *pkg = 0; - break; - } + *pkg = get_cpu_package(); + if (*pkg > STM32MP15_PKG_AA_LBGA448) + *pkg = STM32MP15_PKG_UNKNOWN; /* Revision */ switch (get_cpu_rev()) { |