random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 12:56:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

stm32mp: fdt: update etzpc for STM32MP15x

Browse Source 
Introduce STM32MP15 function and defines to prepare the
STM32MP13 introduction.

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Change-Id: I909b205e73dcf207e0216aae5905c3c52472020e
This commit is contained in:
Patrick Delaunay 2022-05-09 17:13:21 +02:00
parent b94b275b0a
commit ca9c9e7e92
1 changed files with 70 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
arch/arm/mach-stm32mp/fdt.c
View File

@ -28,13 +28,13 @@
#define ETZPC_RESERVED 0xffffffff #define ETZPC_RESERVED 0xffffffff
#define STM32_FDCAN_BASE 0x4400e000 #define STM32MP15_FDCAN_BASE 0x4400e000
#define STM32_CRYP2_BASE 0x4c005000 #define STM32MP15_CRYP2_BASE 0x4c005000
#define STM32_CRYP1_BASE 0x54001000 #define STM32MP15_CRYP1_BASE 0x54001000
#define STM32_GPU_BASE 0x59000000 #define STM32MP15_GPU_BASE 0x59000000
#define STM32_DSI_BASE 0x5a000000 #define STM32MP15_DSI_BASE 0x5a000000
static const u32 stm32mp1_ip_addr[] = { static const u32 stm32mp15_ip_addr[] = {
0x5c008000, /* 00 stgenc */ 0x5c008000, /* 00 stgenc */
0x54000000, /* 01 bkpsram */ 0x54000000, /* 01 bkpsram */
0x5c003000, /* 02 iwdg1 */ 0x5c003000, /* 02 iwdg1 */
@ -44,7 +44,7 @@ static const u32 stm32mp1_ip_addr[] = {
ETZPC_RESERVED, /* 06 reserved */ ETZPC_RESERVED, /* 06 reserved */
0x54003000, /* 07 rng1 */ 0x54003000, /* 07 rng1 */
0x54002000, /* 08 hash1 */ 0x54002000, /* 08 hash1 */
STM32_CRYP1_BASE, /* 09 cryp1 */ STM32MP15_CRYP1_BASE, /* 09 cryp1 */
0x5a003000, /* 0A ddrctrl */ 0x5a003000, /* 0A ddrctrl */
0x5a004000, /* 0B ddrphyc */ 0x5a004000, /* 0B ddrphyc */
0x5c009000, /* 0C i2c6 */ 0x5c009000, /* 0C i2c6 */
@ -97,7 +97,7 @@ static const u32 stm32mp1_ip_addr[] = {
0x4400b000, /* 3B sai2 */ 0x4400b000, /* 3B sai2 */
0x4400c000, /* 3C sai3 */ 0x4400c000, /* 3C sai3 */
0x4400d000, /* 3D dfsdm */ 0x4400d000, /* 3D dfsdm */
STM32_FDCAN_BASE, /* 3E tt_fdcan */ STM32MP15_FDCAN_BASE, /* 3E tt_fdcan */
ETZPC_RESERVED, /* 3F reserved */ ETZPC_RESERVED, /* 3F reserved */
0x50021000, /* 40 lptim2 */ 0x50021000, /* 40 lptim2 */
0x50022000, /* 41 lptim3 */ 0x50022000, /* 41 lptim3 */
@ -110,7 +110,7 @@ static const u32 stm32mp1_ip_addr[] = {
0x48003000, /* 48 adc */ 0x48003000, /* 48 adc */
0x4c002000, /* 49 hash2 */ 0x4c002000, /* 49 hash2 */
0x4c003000, /* 4A rng2 */ 0x4c003000, /* 4A rng2 */
STM32_CRYP2_BASE, /* 4B cryp2 */ STM32MP15_CRYP2_BASE, /* 4B cryp2 */
ETZPC_RESERVED, /* 4C reserved */ ETZPC_RESERVED, /* 4C reserved */
ETZPC_RESERVED, /* 4D reserved */ ETZPC_RESERVED, /* 4D reserved */
ETZPC_RESERVED, /* 4E reserved */ ETZPC_RESERVED, /* 4E reserved */
@ -163,8 +163,13 @@ static int stm32_fdt_fixup_etzpc(void *fdt, int soc_node)
int offset, shift; int offset, shift;
u32 addr, status, decprot[ETZPC_DECPROT_NB]; u32 addr, status, decprot[ETZPC_DECPROT_NB];
array = stm32mp1_ip_addr; if (IS_ENABLED(CONFIG_STM32MP13x))
array_size = ARRAY_SIZE(stm32mp1_ip_addr); return 0;
if (IS_ENABLED(CONFIG_STM32MP15x)) {
array = stm32mp15_ip_addr;
array_size = ARRAY_SIZE(stm32mp15_ip_addr);
}
for (i = 0; i < ETZPC_DECPROT_NB; i++) for (i = 0; i < ETZPC_DECPROT_NB; i++)
decprot[i] = readl(ETZPC_DECPROT(i)); decprot[i] = readl(ETZPC_DECPROT(i));
@ -248,36 +253,9 @@ static void stm32_fdt_disable_optee(void *blob)
} }
} }
/* static void stm32mp15_fdt_fixup(void *blob, int soc, u32 cpu, char *name)
* This function is called right before the kernel is booted. "blob" is the
* device tree that will be passed to the kernel.
*/
int ft_system_setup(void *blob, struct bd_info *bd)
{ {
int ret = 0; u32 pkg;
int soc;
u32 pkg, cpu;
char name[SOC_NAME_SIZE];
if (IS_ENABLED(CONFIG_STM32MP13x))
return 0;
soc = fdt_path_offset(blob, "/soc");
/* when absent, nothing to do */
if (soc == -FDT_ERR_NOTFOUND)
return 0;
if (soc < 0)
return soc;
if (CONFIG_IS_ENABLED(STM32_ETZPC)) {
ret = stm32_fdt_fixup_etzpc(blob, soc);
if (ret)
return ret;
}
/* MPUs Part Numbers and name*/
cpu = get_cpu_type();
get_soc_name(name);
switch (cpu) { switch (cpu) {
case CPU_STM32MP151Fxx: case CPU_STM32MP151Fxx:
@ -287,19 +265,18 @@ int ft_system_setup(void *blob, struct bd_info *bd)
stm32_fdt_fixup_cpu(blob, name); stm32_fdt_fixup_cpu(blob, name);
/* after cpu delete we can't trust the soc offsets anymore */ /* after cpu delete we can't trust the soc offsets anymore */
soc = fdt_path_offset(blob, "/soc"); soc = fdt_path_offset(blob, "/soc");
stm32_fdt_disable(blob, soc, STM32_FDCAN_BASE, "can", name); stm32_fdt_disable(blob, soc, STM32MP15_FDCAN_BASE, "can", name);
/* fall through */ fallthrough;
case CPU_STM32MP153Fxx: case CPU_STM32MP153Fxx:
case CPU_STM32MP153Dxx: case CPU_STM32MP153Dxx:
case CPU_STM32MP153Cxx: case CPU_STM32MP153Cxx:
case CPU_STM32MP153Axx: case CPU_STM32MP153Axx:
stm32_fdt_disable(blob, soc, STM32_GPU_BASE, "gpu", name); stm32_fdt_disable(blob, soc, STM32MP15_GPU_BASE, "gpu", name);
stm32_fdt_disable(blob, soc, STM32_DSI_BASE, "dsi", name); stm32_fdt_disable(blob, soc, STM32MP15_DSI_BASE, "dsi", name);
break; break;
default: default:
break; break;
} }
switch (cpu) { switch (cpu) {
case CPU_STM32MP157Dxx: case CPU_STM32MP157Dxx:
case CPU_STM32MP157Axx: case CPU_STM32MP157Axx:
@ -307,13 +284,14 @@ int ft_system_setup(void *blob, struct bd_info *bd)
case CPU_STM32MP153Axx: case CPU_STM32MP153Axx:
case CPU_STM32MP151Dxx: case CPU_STM32MP151Dxx:
case CPU_STM32MP151Axx: case CPU_STM32MP151Axx:
stm32_fdt_disable(blob, soc, STM32_CRYP1_BASE, "cryp", name); stm32_fdt_disable(blob, soc, STM32MP15_CRYP1_BASE, "cryp",
stm32_fdt_disable(blob, soc, STM32_CRYP2_BASE, "cryp", name); name);
stm32_fdt_disable(blob, soc, STM32MP15_CRYP2_BASE, "cryp",
name);
break; break;
default: default:
break; break;
} }
switch (get_cpu_package()) { switch (get_cpu_package()) {
case STM32MP15_PKG_AA_LBGA448: case STM32MP15_PKG_AA_LBGA448:
pkg = STM32MP_PKG_AA; pkg = STM32MP_PKG_AA;
@ -337,6 +315,38 @@ int ft_system_setup(void *blob, struct bd_info *bd)
do_fixup_by_compat_u32(blob, "st,stm32mp157-z-pinctrl", do_fixup_by_compat_u32(blob, "st,stm32mp157-z-pinctrl",
"st,package", pkg, false); "st,package", pkg, false);
} }
}
/*
* This function is called right before the kernel is booted. "blob" is the
* device tree that will be passed to the kernel.
*/
int ft_system_setup(void *blob, struct bd_info *bd)
{
int ret = 0;
int soc;
u32 cpu;
char name[SOC_NAME_SIZE];
soc = fdt_path_offset(blob, "/soc");
/* when absent, nothing to do */
if (soc == -FDT_ERR_NOTFOUND)
return 0;
if (soc < 0)
return soc;
if (CONFIG_IS_ENABLED(STM32_ETZPC)) {
ret = stm32_fdt_fixup_etzpc(blob, soc);
if (ret)
return ret;
}
/* MPUs Part Numbers and name*/
cpu = get_cpu_type();
get_soc_name(name);
if (IS_ENABLED(CONFIG_STM32MP15x)) {
stm32mp15_fdt_fixup(blob, soc, cpu, name);
/* /*
* TEMP: remove OP-TEE nodes in kernel device tree * TEMP: remove OP-TEE nodes in kernel device tree
@ -349,6 +359,7 @@ int ft_system_setup(void *blob, struct bd_info *bd)
if (CONFIG_IS_ENABLED(STM32MP15x_STM32IMAGE) && if (CONFIG_IS_ENABLED(STM32MP15x_STM32IMAGE) &&
!tee_find_device(NULL, NULL, NULL, NULL)) !tee_find_device(NULL, NULL, NULL, NULL))
stm32_fdt_disable_optee(blob); stm32_fdt_disable_optee(blob);
}
return ret; return ret;
} }