Skip to content

GitLab

Commit 4156d4da authored by Yann Gautier's avatar Yann Gautier
Browse files

drivers: st: update drivers code 



Reword some traces.
Use uintptr_t where required.
Reduce scope of variables.
Improve io_stm32image algo.
Complete some IP registers definitions.
Add failure on supported DDR (stm32mp1_ddr_init()).
Fix cache flush on cache disable (stm32mp1_ddr_setup).

Change-Id: Ie02fa71e02b9d69abc807fd5b7df233e5be6668c
Signed-off-by: default avatarYann Gautier <yann.gautier@st.com>
Signed-off-by: default avatarEtienne Carriere <etienne.carriere@st.com>
Signed-off-by: default avatarLionel Debieve <lionel.debieve@st.com>
Signed-off-by: default avatarNicolas Le Bayon <nicolas.le.bayon@st.com>
Signed-off-by: default avatarPatrick Delaunay <patrick.delaunay@st.com>
parent 077f6828
Show whitespace changes
Inline Side-by-side
drivers/st/clk/stm32mp1_clkfunc.c
View file @ 4156d4da
/* /*
* Copyright (c) 2017-2018, STMicroelectronics - All Rights Reserved * Copyright (c) 2017-2019, STMicroelectronics - All Rights Reserved
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -34,8 +34,8 @@ const char *stm32mp_osc_node_label[NB_OSC] = { ...@@ -34,8 +34,8 @@ const char *stm32mp_osc_node_label[NB_OSC] = {
/******************************************************************************* /*******************************************************************************
* This function reads the frequency of an oscillator from its name. * This function reads the frequency of an oscillator from its name.
* It reads the value indicated inside the device tree. * It reads the value indicated inside the device tree.
* Returns 0 if success, and a negative value else. * Returns 0 on success, and a negative FDT/ERRNO error code on failure.
* If success, value is stored in the second parameter. * On success, value is stored in the second parameter.
******************************************************************************/ ******************************************************************************/
int fdt_osc_read_freq(const char *name, uint32_t *freq) int fdt_osc_read_freq(const char *name, uint32_t *freq)
{ {
...@@ -127,7 +127,7 @@ bool fdt_osc_read_bool(enum stm32mp_osc_id osc_id, const char *prop_name) ...@@ -127,7 +127,7 @@ bool fdt_osc_read_bool(enum stm32mp_osc_id osc_id, const char *prop_name)
/******************************************************************************* /*******************************************************************************
* This function reads a value of a oscillator property from its id. * This function reads a value of a oscillator property from its id.
* Returns value if success, and a default value if property not found. * Returns value on success, and a default value if property not found.
* Default value is passed as parameter. * Default value is passed as parameter.
******************************************************************************/ ******************************************************************************/
uint32_t fdt_osc_read_uint32_default(enum stm32mp_osc_id osc_id, uint32_t fdt_osc_read_uint32_default(enum stm32mp_osc_id osc_id,
......
drivers/st/ddr/stm32mp1_ddr.c
View file @ 4156d4da
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause * SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
*/ */
#include <errno.h>
#include <stddef.h> #include <stddef.h>
#include <platform_def.h> #include <platform_def.h>
...@@ -233,40 +234,67 @@ struct ddr_reg_info { ...@@ -233,40 +234,67 @@ struct ddr_reg_info {
static const struct ddr_reg_info ddr_registers[REG_TYPE_NB] = { static const struct ddr_reg_info ddr_registers[REG_TYPE_NB] = {
[REG_REG] = { [REG_REG] = {
"static", ddr_reg, ARRAY_SIZE(ddr_reg), DDR_BASE .name = "static",
.desc = ddr_reg,
.size = ARRAY_SIZE(ddr_reg),
.base = DDR_BASE
}, },
[REG_TIMING] = { [REG_TIMING] = {
"timing", ddr_timing, ARRAY_SIZE(ddr_timing), DDR_BASE .name = "timing",
.desc = ddr_timing,
.size = ARRAY_SIZE(ddr_timing),
.base = DDR_BASE
}, },
[REG_PERF] = { [REG_PERF] = {
"perf", ddr_perf, ARRAY_SIZE(ddr_perf), DDR_BASE .name = "perf",
.desc = ddr_perf,
.size = ARRAY_SIZE(ddr_perf),
.base = DDR_BASE
}, },
[REG_MAP] = { [REG_MAP] = {
"map", ddr_map, ARRAY_SIZE(ddr_map), DDR_BASE .name = "map",
.desc = ddr_map,
.size = ARRAY_SIZE(ddr_map),
.base = DDR_BASE
}, },
[REGPHY_REG] = { [REGPHY_REG] = {
"static", ddrphy_reg, ARRAY_SIZE(ddrphy_reg), DDRPHY_BASE .name = "static",
.desc = ddrphy_reg,
.size = ARRAY_SIZE(ddrphy_reg),
.base = DDRPHY_BASE
}, },
[REGPHY_TIMING] = { [REGPHY_TIMING] = {
"timing", ddrphy_timing, ARRAY_SIZE(ddrphy_timing), DDRPHY_BASE .name = "timing",
.desc = ddrphy_timing,
.size = ARRAY_SIZE(ddrphy_timing),
.base = DDRPHY_BASE
}, },
[REGPHY_CAL] = { [REGPHY_CAL] = {
"cal", ddrphy_cal, ARRAY_SIZE(ddrphy_cal), DDRPHY_BASE .name = "cal",
.desc = ddrphy_cal,
.size = ARRAY_SIZE(ddrphy_cal),
.base = DDRPHY_BASE
}, },
[REG_DYN] = { [REG_DYN] = {
"dyn", ddr_dyn, ARRAY_SIZE(ddr_dyn), DDR_BASE .name = "dyn",
.desc = ddr_dyn,
.size = ARRAY_SIZE(ddr_dyn),
.base = DDR_BASE
}, },
[REGPHY_DYN] = { [REGPHY_DYN] = {
"dyn", ddrphy_dyn, ARRAY_SIZE(ddrphy_dyn), DDRPHY_BASE .name = "dyn",
.desc = ddrphy_dyn,
.size = ARRAY_SIZE(ddrphy_dyn),
.base = DDRPHY_BASE
}, },
}; };
static uint32_t get_base_addr(const struct ddr_info *priv, enum base_type base) static uintptr_t get_base_addr(const struct ddr_info *priv, enum base_type base)
{ {
if (base == DDRPHY_BASE) { if (base == DDRPHY_BASE) {
return (uint32_t)priv->phy; return (uintptr_t)priv->phy;
} else { } else {
return (uint32_t)priv->ctl; return (uintptr_t)priv->ctl;
} }
} }
...@@ -275,21 +303,22 @@ static void set_reg(const struct ddr_info *priv, ...@@ -275,21 +303,22 @@ static void set_reg(const struct ddr_info *priv,
const void *param) const void *param)
{ {
unsigned int i; unsigned int i;
unsigned int *ptr, value; unsigned int value;
enum base_type base = ddr_registers[type].base; enum base_type base = ddr_registers[type].base;
uint32_t base_addr = get_base_addr(priv, base); uintptr_t base_addr = get_base_addr(priv, base);
const struct reg_desc *desc = ddr_registers[type].desc; const struct reg_desc *desc = ddr_registers[type].desc;
VERBOSE("init %s\n", ddr_registers[type].name); VERBOSE("init %s\n", ddr_registers[type].name);
for (i = 0; i < ddr_registers[type].size; i++) { for (i = 0; i < ddr_registers[type].size; i++) {
ptr = (unsigned int *)(base_addr + desc[i].offset); uintptr_t ptr = base_addr + desc[i].offset;
if (desc[i].par_offset == INVALID_OFFSET) { if (desc[i].par_offset == INVALID_OFFSET) {
ERROR("invalid parameter offset for %s", desc[i].name); ERROR("invalid parameter offset for %s", desc[i].name);
panic(); panic();
} else { } else {
value = *((uint32_t *)((uint32_t)param + value = *((uint32_t *)((uintptr_t)param +
desc[i].par_offset)); desc[i].par_offset));
mmio_write_32((uint32_t)ptr, value); mmio_write_32(ptr, value);
} }
} }
} }
...@@ -305,15 +334,15 @@ static void stm32mp1_ddrphy_idone_wait(struct stm32mp1_ddrphy *phy) ...@@ -305,15 +334,15 @@ static void stm32mp1_ddrphy_idone_wait(struct stm32mp1_ddrphy *phy)
time0 = start; time0 = start;
do { do {
pgsr = mmio_read_32((uint32_t)&phy->pgsr); pgsr = mmio_read_32((uintptr_t)&phy->pgsr);
time = get_timer(start); time = get_timer(start);
if (time != time0) { if (time != time0) {
VERBOSE(" > [0x%x] pgsr = 0x%x &\n", VERBOSE(" > [0x%lx] pgsr = 0x%x &\n",
(uint32_t)&phy->pgsr, pgsr); (uintptr_t)&phy->pgsr, pgsr);
VERBOSE(" [0x%x] pir = 0x%x (time=%x)\n", VERBOSE(" [0x%lx] pir = 0x%x (time=%lx)\n",
(uint32_t)&phy->pir, (uintptr_t)&phy->pir,
mmio_read_32((uint32_t)&phy->pir), mmio_read_32((uintptr_t)&phy->pir),
(uint32_t)time); time);
} }
time0 = time; time0 = time;
...@@ -341,18 +370,18 @@ static void stm32mp1_ddrphy_idone_wait(struct stm32mp1_ddrphy *phy) ...@@ -341,18 +370,18 @@ static void stm32mp1_ddrphy_idone_wait(struct stm32mp1_ddrphy *phy)
error++; error++;
} }
} while ((pgsr & DDRPHYC_PGSR_IDONE) == 0U && error == 0); } while ((pgsr & DDRPHYC_PGSR_IDONE) == 0U && error == 0);
VERBOSE("\n[0x%x] pgsr = 0x%x\n", VERBOSE("\n[0x%lx] pgsr = 0x%x\n",
(uint32_t)&phy->pgsr, pgsr); (uintptr_t)&phy->pgsr, pgsr);
} }
static void stm32mp1_ddrphy_init(struct stm32mp1_ddrphy *phy, uint32_t pir) static void stm32mp1_ddrphy_init(struct stm32mp1_ddrphy *phy, uint32_t pir)
{ {
uint32_t pir_init = pir | DDRPHYC_PIR_INIT; uint32_t pir_init = pir | DDRPHYC_PIR_INIT;
mmio_write_32((uint32_t)&phy->pir, pir_init); mmio_write_32((uintptr_t)&phy->pir, pir_init);
VERBOSE("[0x%x] pir = 0x%x -> 0x%x\n", VERBOSE("[0x%lx] pir = 0x%x -> 0x%x\n",
(uint32_t)&phy->pir, pir_init, (uintptr_t)&phy->pir, pir_init,
mmio_read_32((uint32_t)&phy->pir)); mmio_read_32((uintptr_t)&phy->pir));
/* Need to wait 10 configuration clock before start polling */ /* Need to wait 10 configuration clock before start polling */
udelay(10); udelay(10);
...@@ -364,9 +393,9 @@ static void stm32mp1_ddrphy_init(struct stm32mp1_ddrphy *phy, uint32_t pir) ...@@ -364,9 +393,9 @@ static void stm32mp1_ddrphy_init(struct stm32mp1_ddrphy *phy, uint32_t pir)
/* Start quasi dynamic register update */ /* Start quasi dynamic register update */
static void stm32mp1_start_sw_done(struct stm32mp1_ddrctl *ctl) static void stm32mp1_start_sw_done(struct stm32mp1_ddrctl *ctl)
{ {
mmio_clrbits_32((uint32_t)&ctl->swctl, DDRCTRL_SWCTL_SW_DONE); mmio_clrbits_32((uintptr_t)&ctl->swctl, DDRCTRL_SWCTL_SW_DONE);
VERBOSE("[0x%x] swctl = 0x%x\n", VERBOSE("[0x%lx] swctl = 0x%x\n",
(uint32_t)&ctl->swctl, mmio_read_32((uint32_t)&ctl->swctl)); (uintptr_t)&ctl->swctl, mmio_read_32((uintptr_t)&ctl->swctl));
} }
/* Wait quasi dynamic register update */ /* Wait quasi dynamic register update */
...@@ -375,15 +404,15 @@ static void stm32mp1_wait_sw_done_ack(struct stm32mp1_ddrctl *ctl) ...@@ -375,15 +404,15 @@ static void stm32mp1_wait_sw_done_ack(struct stm32mp1_ddrctl *ctl)
unsigned long start; unsigned long start;
uint32_t swstat; uint32_t swstat;
mmio_setbits_32((uint32_t)&ctl->swctl, DDRCTRL_SWCTL_SW_DONE); mmio_setbits_32((uintptr_t)&ctl->swctl, DDRCTRL_SWCTL_SW_DONE);
VERBOSE("[0x%x] swctl = 0x%x\n", VERBOSE("[0x%lx] swctl = 0x%x\n",
(uint32_t)&ctl->swctl, mmio_read_32((uint32_t)&ctl->swctl)); (uintptr_t)&ctl->swctl, mmio_read_32((uintptr_t)&ctl->swctl));
start = get_timer(0); start = get_timer(0);
do { do {
swstat = mmio_read_32((uint32_t)&ctl->swstat); swstat = mmio_read_32((uintptr_t)&ctl->swstat);
VERBOSE("[0x%x] swstat = 0x%x ", VERBOSE("[0x%lx] swstat = 0x%x ",
(uint32_t)&ctl->swstat, swstat); (uintptr_t)&ctl->swstat, swstat);
VERBOSE("timer in ms 0x%x = start 0x%lx\r", VERBOSE("timer in ms 0x%x = start 0x%lx\r",
get_timer(0), start); get_timer(0), start);
if (get_timer(start) > plat_get_syscnt_freq2()) { if (get_timer(start) > plat_get_syscnt_freq2()) {
...@@ -391,8 +420,8 @@ static void stm32mp1_wait_sw_done_ack(struct stm32mp1_ddrctl *ctl) ...@@ -391,8 +420,8 @@ static void stm32mp1_wait_sw_done_ack(struct stm32mp1_ddrctl *ctl)
} }
} while ((swstat & DDRCTRL_SWSTAT_SW_DONE_ACK) == 0U); } while ((swstat & DDRCTRL_SWSTAT_SW_DONE_ACK) == 0U);
VERBOSE("[0x%x] swstat = 0x%x\n", VERBOSE("[0x%lx] swstat = 0x%x\n",
(uint32_t)&ctl->swstat, swstat); (uintptr_t)&ctl->swstat, swstat);
} }
/* Wait quasi dynamic register update */ /* Wait quasi dynamic register update */
...@@ -406,11 +435,11 @@ static void stm32mp1_wait_operating_mode(struct ddr_info *priv, uint32_t mode) ...@@ -406,11 +435,11 @@ static void stm32mp1_wait_operating_mode(struct ddr_info *priv, uint32_t mode)
start = get_timer(0); start = get_timer(0);
for ( ; ; ) { for ( ; ; ) {
stat = mmio_read_32((uint32_t)&priv->ctl->stat); stat = mmio_read_32((uintptr_t)&priv->ctl->stat);
operating_mode = stat & DDRCTRL_STAT_OPERATING_MODE_MASK; operating_mode = stat & DDRCTRL_STAT_OPERATING_MODE_MASK;
selref_type = stat & DDRCTRL_STAT_SELFREF_TYPE_MASK; selref_type = stat & DDRCTRL_STAT_SELFREF_TYPE_MASK;
VERBOSE("[0x%x] stat = 0x%x\n", VERBOSE("[0x%lx] stat = 0x%x\n",
(uint32_t)&priv->ctl->stat, stat); (uintptr_t)&priv->ctl->stat, stat);
VERBOSE("timer in ms 0x%x = start 0x%lx\r", VERBOSE("timer in ms 0x%x = start 0x%lx\r",
get_timer(0), start); get_timer(0), start);
if (get_timer(start) > plat_get_syscnt_freq2()) { if (get_timer(start) > plat_get_syscnt_freq2()) {
...@@ -441,8 +470,8 @@ static void stm32mp1_wait_operating_mode(struct ddr_info *priv, uint32_t mode) ...@@ -441,8 +470,8 @@ static void stm32mp1_wait_operating_mode(struct ddr_info *priv, uint32_t mode)
} }
} }
VERBOSE("[0x%x] stat = 0x%x\n", VERBOSE("[0x%lx] stat = 0x%x\n",
(uint32_t)&priv->ctl->stat, stat); (uintptr_t)&priv->ctl->stat, stat);
} }
/* Mode Register Writes (MRW or MRS) */ /* Mode Register Writes (MRW or MRS) */
...@@ -459,7 +488,7 @@ static void stm32mp1_mode_register_write(struct ddr_info *priv, uint8_t addr, ...@@ -459,7 +488,7 @@ static void stm32mp1_mode_register_write(struct ddr_info *priv, uint8_t addr,
* No write should be performed to MRCTRL0 and MRCTRL1 * No write should be performed to MRCTRL0 and MRCTRL1
* if MRSTAT.mr_wr_busy = 1. * if MRSTAT.mr_wr_busy = 1.
*/ */
while ((mmio_read_32((uint32_t)&priv->ctl->mrstat) & while ((mmio_read_32((uintptr_t)&priv->ctl->mrstat) &
DDRCTRL_MRSTAT_MR_WR_BUSY) != 0U) { DDRCTRL_MRSTAT_MR_WR_BUSY) != 0U) {
; ;
} }
...@@ -472,14 +501,14 @@ static void stm32mp1_mode_register_write(struct ddr_info *priv, uint8_t addr, ...@@ -472,14 +501,14 @@ static void stm32mp1_mode_register_write(struct ddr_info *priv, uint8_t addr,
DDRCTRL_MRCTRL0_MR_RANK_ALL | DDRCTRL_MRCTRL0_MR_RANK_ALL |
(((uint32_t)addr << DDRCTRL_MRCTRL0_MR_ADDR_SHIFT) & (((uint32_t)addr << DDRCTRL_MRCTRL0_MR_ADDR_SHIFT) &
DDRCTRL_MRCTRL0_MR_ADDR_MASK); DDRCTRL_MRCTRL0_MR_ADDR_MASK);
mmio_write_32((uint32_t)&priv->ctl->mrctrl0, mrctrl0); mmio_write_32((uintptr_t)&priv->ctl->mrctrl0, mrctrl0);
VERBOSE("[0x%x] mrctrl0 = 0x%x (0x%x)\n", VERBOSE("[0x%lx] mrctrl0 = 0x%x (0x%x)\n",
(uint32_t)&priv->ctl->mrctrl0, (uintptr_t)&priv->ctl->mrctrl0,
mmio_read_32((uint32_t)&priv->ctl->mrctrl0), mrctrl0); mmio_read_32((uintptr_t)&priv->ctl->mrctrl0), mrctrl0);
mmio_write_32((uint32_t)&priv->ctl->mrctrl1, data); mmio_write_32((uintptr_t)&priv->ctl->mrctrl1, data);
VERBOSE("[0x%x] mrctrl1 = 0x%x\n", VERBOSE("[0x%lx] mrctrl1 = 0x%x\n",
(uint32_t)&priv->ctl->mrctrl1, (uintptr_t)&priv->ctl->mrctrl1,
mmio_read_32((uint32_t)&priv->ctl->mrctrl1)); mmio_read_32((uintptr_t)&priv->ctl->mrctrl1));
/* /*
* 3. In a separate APB transaction, write the MRCTRL0.mr_wr to 1. This * 3. In a separate APB transaction, write the MRCTRL0.mr_wr to 1. This
...@@ -489,22 +518,22 @@ static void stm32mp1_mode_register_write(struct ddr_info *priv, uint8_t addr, ...@@ -489,22 +518,22 @@ static void stm32mp1_mode_register_write(struct ddr_info *priv, uint8_t addr,
* initiated until it is deasserted. * initiated until it is deasserted.
*/ */
mrctrl0 |= DDRCTRL_MRCTRL0_MR_WR; mrctrl0 |= DDRCTRL_MRCTRL0_MR_WR;
mmio_write_32((uint32_t)&priv->ctl->mrctrl0, mrctrl0); mmio_write_32((uintptr_t)&priv->ctl->mrctrl0, mrctrl0);
while ((mmio_read_32((uint32_t)&priv->ctl->mrstat) & while ((mmio_read_32((uintptr_t)&priv->ctl->mrstat) &
DDRCTRL_MRSTAT_MR_WR_BUSY) != 0U) { DDRCTRL_MRSTAT_MR_WR_BUSY) != 0U) {
; ;
} }
VERBOSE("[0x%x] mrctrl0 = 0x%x\n", VERBOSE("[0x%lx] mrctrl0 = 0x%x\n",
(uint32_t)&priv->ctl->mrctrl0, mrctrl0); (uintptr_t)&priv->ctl->mrctrl0, mrctrl0);
} }
/* Switch DDR3 from DLL-on to DLL-off */ /* Switch DDR3 from DLL-on to DLL-off */
static void stm32mp1_ddr3_dll_off(struct ddr_info *priv) static void stm32mp1_ddr3_dll_off(struct ddr_info *priv)
{ {
uint32_t mr1 = mmio_read_32((uint32_t)&priv->phy->mr1); uint32_t mr1 = mmio_read_32((uintptr_t)&priv->phy->mr1);
uint32_t mr2 = mmio_read_32((uint32_t)&priv->phy->mr2); uint32_t mr2 = mmio_read_32((uintptr_t)&priv->phy->mr2);
uint32_t dbgcam; uint32_t dbgcam;
VERBOSE("mr1: 0x%x\n", mr1); VERBOSE("mr1: 0x%x\n", mr1);
...@@ -514,10 +543,10 @@ static void stm32mp1_ddr3_dll_off(struct ddr_info *priv) ...@@ -514,10 +543,10 @@ static void stm32mp1_ddr3_dll_off(struct ddr_info *priv)
* 1. Set the DBG1.dis_hif = 1. * 1. Set the DBG1.dis_hif = 1.
* This prevents further reads/writes being received on the HIF. * This prevents further reads/writes being received on the HIF.
*/ */
mmio_setbits_32((uint32_t)&priv->ctl->dbg1, DDRCTRL_DBG1_DIS_HIF); mmio_setbits_32((uintptr_t)&priv->ctl->dbg1, DDRCTRL_DBG1_DIS_HIF);
VERBOSE("[0x%x] dbg1 = 0x%x\n", VERBOSE("[0x%lx] dbg1 = 0x%x\n",
(uint32_t)&priv->ctl->dbg1, (uintptr_t)&priv->ctl->dbg1,
mmio_read_32((uint32_t)&priv->ctl->dbg1)); mmio_read_32((uintptr_t)&priv->ctl->dbg1));
/* /*
* 2. Ensure all commands have been flushed from the uMCTL2 by polling * 2. Ensure all commands have been flushed from the uMCTL2 by polling
...@@ -528,9 +557,9 @@ static void stm32mp1_ddr3_dll_off(struct ddr_info *priv) ...@@ -528,9 +557,9 @@ static void stm32mp1_ddr3_dll_off(struct ddr_info *priv)
* DBGCAM.dbg_hpr_q_depth = 0. * DBGCAM.dbg_hpr_q_depth = 0.
*/ */
do { do {
dbgcam = mmio_read_32((uint32_t)&priv->ctl->dbgcam); dbgcam = mmio_read_32((uintptr_t)&priv->ctl->dbgcam);
VERBOSE("[0x%x] dbgcam = 0x%x\n", VERBOSE("[0x%lx] dbgcam = 0x%x\n",
(uint32_t)&priv->ctl->dbgcam, dbgcam); (uintptr_t)&priv->ctl->dbgcam, dbgcam);
} while ((((dbgcam & DDRCTRL_DBGCAM_DATA_PIPELINE_EMPTY) == } while ((((dbgcam & DDRCTRL_DBGCAM_DATA_PIPELINE_EMPTY) ==
DDRCTRL_DBGCAM_DATA_PIPELINE_EMPTY)) && DDRCTRL_DBGCAM_DATA_PIPELINE_EMPTY)) &&
((dbgcam & DDRCTRL_DBGCAM_DBG_Q_DEPTH) == 0U)); ((dbgcam & DDRCTRL_DBGCAM_DBG_Q_DEPTH) == 0U));
...@@ -574,11 +603,11 @@ static void stm32mp1_ddr3_dll_off(struct ddr_info *priv) ...@@ -574,11 +603,11 @@ static void stm32mp1_ddr3_dll_off(struct ddr_info *priv)
* PWRCTL.selfref_sw = 1, and polling STAT.operating_mode to ensure * PWRCTL.selfref_sw = 1, and polling STAT.operating_mode to ensure
* the DDRC has entered self-refresh. * the DDRC has entered self-refresh.
*/ */
mmio_setbits_32((uint32_t)&priv->ctl->pwrctl, mmio_setbits_32((uintptr_t)&priv->ctl->pwrctl,
DDRCTRL_PWRCTL_SELFREF_SW); DDRCTRL_PWRCTL_SELFREF_SW);
VERBOSE("[0x%x] pwrctl = 0x%x\n", VERBOSE("[0x%lx] pwrctl = 0x%x\n",
(uint32_t)&priv->ctl->pwrctl, (uintptr_t)&priv->ctl->pwrctl,
mmio_read_32((uint32_t)&priv->ctl->pwrctl)); mmio_read_32((uintptr_t)&priv->ctl->pwrctl));
/* /*
* 8. Wait until STAT.operating_mode[1:0]==11 indicating that the * 8. Wait until STAT.operating_mode[1:0]==11 indicating that the
...@@ -594,10 +623,10 @@ static void stm32mp1_ddr3_dll_off(struct ddr_info *priv) ...@@ -594,10 +623,10 @@ static void stm32mp1_ddr3_dll_off(struct ddr_info *priv)
*/ */
stm32mp1_start_sw_done(priv->ctl); stm32mp1_start_sw_done(priv->ctl);
mmio_setbits_32((uint32_t)&priv->ctl->mstr, DDRCTRL_MSTR_DLL_OFF_MODE); mmio_setbits_32((uintptr_t)&priv->ctl->mstr, DDRCTRL_MSTR_DLL_OFF_MODE);
VERBOSE("[0x%x] mstr = 0x%x\n", VERBOSE("[0x%lx] mstr = 0x%x\n",
(uint32_t)&priv->ctl->mstr, (uintptr_t)&priv->ctl->mstr,
mmio_read_32((uint32_t)&priv->ctl->mstr)); mmio_read_32((uintptr_t)&priv->ctl->mstr));
stm32mp1_wait_sw_done_ack(priv->ctl); stm32mp1_wait_sw_done_ack(priv->ctl);
...@@ -611,26 +640,26 @@ static void stm32mp1_ddr3_dll_off(struct ddr_info *priv) ...@@ -611,26 +640,26 @@ static void stm32mp1_ddr3_dll_off(struct ddr_info *priv)
/* Change Bypass Mode Frequency Range */ /* Change Bypass Mode Frequency Range */
if (stm32mp1_clk_get_rate(DDRPHYC) < 100000000U) { if (stm32mp1_clk_get_rate(DDRPHYC) < 100000000U) {
mmio_clrbits_32((uint32_t)&priv->phy->dllgcr, mmio_clrbits_32((uintptr_t)&priv->phy->dllgcr,
DDRPHYC_DLLGCR_BPS200); DDRPHYC_DLLGCR_BPS200);
} else { } else {
mmio_setbits_32((uint32_t)&priv->phy->dllgcr, mmio_setbits_32((uintptr_t)&priv->phy->dllgcr,
DDRPHYC_DLLGCR_BPS200); DDRPHYC_DLLGCR_BPS200);
} }
mmio_setbits_32((uint32_t)&priv->phy->acdllcr, DDRPHYC_ACDLLCR_DLLDIS); mmio_setbits_32((uintptr_t)&priv->phy->acdllcr, DDRPHYC_ACDLLCR_DLLDIS);
mmio_setbits_32((uint32_t)&priv->phy->dx0dllcr, mmio_setbits_32((uintptr_t)&priv->phy->dx0dllcr,
DDRPHYC_DXNDLLCR_DLLDIS); DDRPHYC_DXNDLLCR_DLLDIS);
mmio_setbits_32((uint32_t)&priv->phy->dx1dllcr, mmio_setbits_32((uintptr_t)&priv->phy->dx1dllcr,
DDRPHYC_DXNDLLCR_DLLDIS); DDRPHYC_DXNDLLCR_DLLDIS);
mmio_setbits_32((uint32_t)&priv->phy->dx2dllcr, mmio_setbits_32((uintptr_t)&priv->phy->dx2dllcr,
DDRPHYC_DXNDLLCR_DLLDIS); DDRPHYC_DXNDLLCR_DLLDIS);
mmio_setbits_32((uint32_t)&priv->phy->dx3dllcr, mmio_setbits_32((uintptr_t)&priv->phy->dx3dllcr,
DDRPHYC_DXNDLLCR_DLLDIS); DDRPHYC_DXNDLLCR_DLLDIS);
/* 12. Exit the self-refresh state by setting PWRCTL.selfref_sw = 0. */ /* 12. Exit the self-refresh state by setting PWRCTL.selfref_sw = 0. */
mmio_clrbits_32((uint32_t)&priv->ctl->pwrctl, mmio_clrbits_32((uintptr_t)&priv->ctl->pwrctl,
DDRCTRL_PWRCTL_SELFREF_SW); DDRCTRL_PWRCTL_SELFREF_SW);
stm32mp1_wait_operating_mode(priv, DDRCTRL_STAT_OPERATING_MODE_NORMAL); stm32mp1_wait_operating_mode(priv, DDRCTRL_STAT_OPERATING_MODE_NORMAL);
...@@ -646,20 +675,20 @@ static void stm32mp1_ddr3_dll_off(struct ddr_info *priv) ...@@ -646,20 +675,20 @@ static void stm32mp1_ddr3_dll_off(struct ddr_info *priv)
*/ */
/* 15. Write DBG1.dis_hif = 0 to re-enable reads and writes. */ /* 15. Write DBG1.dis_hif = 0 to re-enable reads and writes. */
mmio_clrbits_32((uint32_t)&priv->ctl->dbg1, DDRCTRL_DBG1_DIS_HIF); mmio_clrbits_32((uintptr_t)&priv->ctl->dbg1, DDRCTRL_DBG1_DIS_HIF);
VERBOSE("[0x%x] dbg1 = 0x%x\n", VERBOSE("[0x%lx] dbg1 = 0x%x\n",
(uint32_t)&priv->ctl->dbg1, (uintptr_t)&priv->ctl->dbg1,
mmio_read_32((uint32_t)&priv->ctl->dbg1)); mmio_read_32((uintptr_t)&priv->ctl->dbg1));
} }
static void stm32mp1_refresh_disable(struct stm32mp1_ddrctl *ctl) static void stm32mp1_refresh_disable(struct stm32mp1_ddrctl *ctl)
{ {
stm32mp1_start_sw_done(ctl); stm32mp1_start_sw_done(ctl);
/* Quasi-dynamic register update*/ /* Quasi-dynamic register update*/
mmio_setbits_32((uint32_t)&ctl->rfshctl3, mmio_setbits_32((uintptr_t)&ctl->rfshctl3,
DDRCTRL_RFSHCTL3_DIS_AUTO_REFRESH); DDRCTRL_RFSHCTL3_DIS_AUTO_REFRESH);
mmio_clrbits_32((uint32_t)&ctl->pwrctl, DDRCTRL_PWRCTL_POWERDOWN_EN); mmio_clrbits_32((uintptr_t)&ctl->pwrctl, DDRCTRL_PWRCTL_POWERDOWN_EN);
mmio_clrbits_32((uint32_t)&ctl->dfimisc, mmio_clrbits_32((uintptr_t)&ctl->dfimisc,
DDRCTRL_DFIMISC_DFI_INIT_COMPLETE_EN); DDRCTRL_DFIMISC_DFI_INIT_COMPLETE_EN);
stm32mp1_wait_sw_done_ack(ctl); stm32mp1_wait_sw_done_ack(ctl);
} }
...@@ -669,14 +698,14 @@ static void stm32mp1_refresh_restore(struct stm32mp1_ddrctl *ctl, ...@@ -669,14 +698,14 @@ static void stm32mp1_refresh_restore(struct stm32mp1_ddrctl *ctl,
{ {
stm32mp1_start_sw_done(ctl); stm32mp1_start_sw_done(ctl);
if ((rfshctl3 & DDRCTRL_RFSHCTL3_DIS_AUTO_REFRESH) == 0U) { if ((rfshctl3 & DDRCTRL_RFSHCTL3_DIS_AUTO_REFRESH) == 0U) {
mmio_clrbits_32((uint32_t)&ctl->rfshctl3, mmio_clrbits_32((uintptr_t)&ctl->rfshctl3,
DDRCTRL_RFSHCTL3_DIS_AUTO_REFRESH); DDRCTRL_RFSHCTL3_DIS_AUTO_REFRESH);
} }
if ((pwrctl & DDRCTRL_PWRCTL_POWERDOWN_EN) != 0U) { if ((pwrctl & DDRCTRL_PWRCTL_POWERDOWN_EN) != 0U) {
mmio_setbits_32((uint32_t)&ctl->pwrctl, mmio_setbits_32((uintptr_t)&ctl->pwrctl,
DDRCTRL_PWRCTL_POWERDOWN_EN); DDRCTRL_PWRCTL_POWERDOWN_EN);
} }
mmio_setbits_32((uint32_t)&ctl->dfimisc, mmio_setbits_32((uintptr_t)&ctl->dfimisc,
DDRCTRL_DFIMISC_DFI_INIT_COMPLETE_EN); DDRCTRL_DFIMISC_DFI_INIT_COMPLETE_EN);
stm32mp1_wait_sw_done_ack(ctl); stm32mp1_wait_sw_done_ack(ctl);
} }
...@@ -694,12 +723,14 @@ void stm32mp1_ddr_init(struct ddr_info *priv, ...@@ -694,12 +723,14 @@ void stm32mp1_ddr_init(struct ddr_info *priv,
struct stm32mp1_ddr_config *config) struct stm32mp1_ddr_config *config)
{ {
uint32_t pir; uint32_t pir;
int ret; int ret = -EINVAL;
if ((config->c_reg.mstr & DDRCTRL_MSTR_DDR3) != 0U) { if ((config->c_reg.mstr & DDRCTRL_MSTR_DDR3) != 0U) {
ret = board_ddr_power_init(STM32MP_DDR3); ret = board_ddr_power_init(STM32MP_DDR3);
} else { } else if ((config->c_reg.mstr & DDRCTRL_MSTR_LPDDR2) != 0U) {
ret = board_ddr_power_init(STM32MP_LPDDR2); ret = board_ddr_power_init(STM32MP_LPDDR2);
} else {
ERROR("DDR type not supported\n");
} }
if (ret != 0) { if (ret != 0) {
...@@ -746,11 +777,11 @@ void stm32mp1_ddr_init(struct ddr_info *priv, ...@@ -746,11 +777,11 @@ void stm32mp1_ddr_init(struct ddr_info *priv,
/* 1.5. initialize registers ddr_umctl2 */ /* 1.5. initialize registers ddr_umctl2 */
/* Stop uMCTL2 before PHY is ready */ /* Stop uMCTL2 before PHY is ready */
mmio_clrbits_32((uint32_t)&priv->ctl->dfimisc, mmio_clrbits_32((uintptr_t)&priv->ctl->dfimisc,
DDRCTRL_DFIMISC_DFI_INIT_COMPLETE_EN); DDRCTRL_DFIMISC_DFI_INIT_COMPLETE_EN);
VERBOSE("[0x%x] dfimisc = 0x%x\n", VERBOSE("[0x%lx] dfimisc = 0x%x\n",
(uint32_t)&priv->ctl->dfimisc, (uintptr_t)&priv->ctl->dfimisc,
mmio_read_32((uint32_t)&priv->ctl->dfimisc)); mmio_read_32((uintptr_t)&priv->ctl->dfimisc));
set_reg(priv, REG_REG, &config->c_reg); set_reg(priv, REG_REG, &config->c_reg);
...@@ -759,23 +790,23 @@ void stm32mp1_ddr_init(struct ddr_info *priv, ...@@ -759,23 +790,23 @@ void stm32mp1_ddr_init(struct ddr_info *priv,
(DDRCTRL_MSTR_DDR3 | DDRCTRL_MSTR_DLL_OFF_MODE)) (DDRCTRL_MSTR_DDR3 | DDRCTRL_MSTR_DLL_OFF_MODE))
== (DDRCTRL_MSTR_DDR3 | DDRCTRL_MSTR_DLL_OFF_MODE)) { == (DDRCTRL_MSTR_DDR3 | DDRCTRL_MSTR_DLL_OFF_MODE)) {
VERBOSE("deactivate DLL OFF in mstr\n"); VERBOSE("deactivate DLL OFF in mstr\n");
mmio_clrbits_32((uint32_t)&priv->ctl->mstr, mmio_clrbits_32((uintptr_t)&priv->ctl->mstr,
DDRCTRL_MSTR_DLL_OFF_MODE); DDRCTRL_MSTR_DLL_OFF_MODE);
VERBOSE("[0x%x] mstr = 0x%x\n", VERBOSE("[0x%lx] mstr = 0x%x\n",
(uint32_t)&priv->ctl->mstr, (uintptr_t)&priv->ctl->mstr,
mmio_read_32((uint32_t)&priv->ctl->mstr)); mmio_read_32((uintptr_t)&priv->ctl->mstr));
} }
set_reg(priv, REG_TIMING, &config->c_timing); set_reg(priv, REG_TIMING, &config->c_timing);
set_reg(priv, REG_MAP, &config->c_map); set_reg(priv, REG_MAP, &config->c_map);
/* Skip CTRL init, SDRAM init is done by PHY PUBL */ /* Skip CTRL init, SDRAM init is done by PHY PUBL */
mmio_clrsetbits_32((uint32_t)&priv->ctl->init0, mmio_clrsetbits_32((uintptr_t)&priv->ctl->init0,
DDRCTRL_INIT0_SKIP_DRAM_INIT_MASK, DDRCTRL_INIT0_SKIP_DRAM_INIT_MASK,
DDRCTRL_INIT0_SKIP_DRAM_INIT_NORMAL); DDRCTRL_INIT0_SKIP_DRAM_INIT_NORMAL);
VERBOSE("[0x%x] init0 = 0x%x\n", VERBOSE("[0x%lx] init0 = 0x%x\n",
(uint32_t)&priv->ctl->init0, (uintptr_t)&priv->ctl->init0,
mmio_read_32((uint32_t)&priv->ctl->init0)); mmio_read_32((uintptr_t)&priv->ctl->init0));
set_reg(priv, REG_PERF, &config->c_perf); set_reg(priv, REG_PERF, &config->c_perf);
...@@ -797,10 +828,10 @@ void stm32mp1_ddr_init(struct ddr_info *priv, ...@@ -797,10 +828,10 @@ void stm32mp1_ddr_init(struct ddr_info *priv,
(DDRCTRL_MSTR_DDR3 | DDRCTRL_MSTR_DLL_OFF_MODE)) (DDRCTRL_MSTR_DDR3 | DDRCTRL_MSTR_DLL_OFF_MODE))
== (DDRCTRL_MSTR_DDR3 | DDRCTRL_MSTR_DLL_OFF_MODE)) { == (DDRCTRL_MSTR_DDR3 | DDRCTRL_MSTR_DLL_OFF_MODE)) {
VERBOSE("deactivate DLL OFF in mr1\n"); VERBOSE("deactivate DLL OFF in mr1\n");
mmio_clrbits_32((uint32_t)&priv->phy->mr1, BIT(0)); mmio_clrbits_32((uintptr_t)&priv->phy->mr1, BIT(0));
VERBOSE("[0x%x] mr1 = 0x%x\n", VERBOSE("[0x%lx] mr1 = 0x%x\n",
(uint32_t)&priv->phy->mr1, (uintptr_t)&priv->phy->mr1,
mmio_read_32((uint32_t)&priv->phy->mr1)); mmio_read_32((uintptr_t)&priv->phy->mr1));
} }
/* /*
...@@ -830,11 +861,11 @@ void stm32mp1_ddr_init(struct ddr_info *priv, ...@@ -830,11 +861,11 @@ void stm32mp1_ddr_init(struct ddr_info *priv,
*/ */
stm32mp1_start_sw_done(priv->ctl); stm32mp1_start_sw_done(priv->ctl);
mmio_setbits_32((uint32_t)&priv->ctl->dfimisc, mmio_setbits_32((uintptr_t)&priv->ctl->dfimisc,
DDRCTRL_DFIMISC_DFI_INIT_COMPLETE_EN); DDRCTRL_DFIMISC_DFI_INIT_COMPLETE_EN);
VERBOSE("[0x%x] dfimisc = 0x%x\n", VERBOSE("[0x%lx] dfimisc = 0x%x\n",
(uint32_t)&priv->ctl->dfimisc, (uintptr_t)&priv->ctl->dfimisc,
mmio_read_32((uint32_t)&priv->ctl->dfimisc)); mmio_read_32((uintptr_t)&priv->ctl->dfimisc));
stm32mp1_wait_sw_done_ack(priv->ctl); stm32mp1_wait_sw_done_ack(priv->ctl);
...@@ -884,14 +915,16 @@ void stm32mp1_ddr_init(struct ddr_info *priv, ...@@ -884,14 +915,16 @@ void stm32mp1_ddr_init(struct ddr_info *priv,
config->c_reg.pwrctl); config->c_reg.pwrctl);
/* Enable uMCTL2 AXI port 0 */ /* Enable uMCTL2 AXI port 0 */
mmio_setbits_32((uint32_t)&priv->ctl->pctrl_0, DDRCTRL_PCTRL_N_PORT_EN); mmio_setbits_32((uintptr_t)&priv->ctl->pctrl_0,
VERBOSE("[0x%x] pctrl_0 = 0x%x\n", DDRCTRL_PCTRL_N_PORT_EN);
(uint32_t)&priv->ctl->pctrl_0, VERBOSE("[0x%lx] pctrl_0 = 0x%x\n",
mmio_read_32((uint32_t)&priv->ctl->pctrl_0)); (uintptr_t)&priv->ctl->pctrl_0,
mmio_read_32((uintptr_t)&priv->ctl->pctrl_0));
/* Enable uMCTL2 AXI port 1 */ /* Enable uMCTL2 AXI port 1 */
mmio_setbits_32((uint32_t)&priv->ctl->pctrl_1, DDRCTRL_PCTRL_N_PORT_EN); mmio_setbits_32((uintptr_t)&priv->ctl->pctrl_1,
VERBOSE("[0x%x] pctrl_1 = 0x%x\n", DDRCTRL_PCTRL_N_PORT_EN);
(uint32_t)&priv->ctl->pctrl_1, VERBOSE("[0x%lx] pctrl_1 = 0x%x\n",
mmio_read_32((uint32_t)&priv->ctl->pctrl_1)); (uintptr_t)&priv->ctl->pctrl_1,
mmio_read_32((uintptr_t)&priv->ctl->pctrl_1));
} }
drivers/st/ddr/stm32mp1_ram.c
View file @ 4156d4da
...@@ -266,8 +266,8 @@ static int stm32mp1_ddr_setup(void) ...@@ -266,8 +266,8 @@ static int stm32mp1_ddr_setup(void)
VERBOSE("%s : ram size(%x, %x)\n", __func__, VERBOSE("%s : ram size(%x, %x)\n", __func__,
(uint32_t)priv->info.base, (uint32_t)priv->info.size); (uint32_t)priv->info.base, (uint32_t)priv->info.size);
dcsw_op_all(DC_OP_CISW);
write_sctlr(read_sctlr() & ~SCTLR_C_BIT); write_sctlr(read_sctlr() & ~SCTLR_C_BIT);
dcsw_op_all(DC_OP_CISW);
uret = ddr_test_data_bus(); uret = ddr_test_data_bus();
if (uret != 0U) { if (uret != 0U) {
......
drivers/st/gpio/stm32_gpio.c
View file @ 4156d4da
/* /*
* Copyright (c) 2016-2018, STMicroelectronics - All Rights Reserved * Copyright (c) 2016-2019, STMicroelectronics - All Rights Reserved
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -29,59 +29,60 @@ static bool check_gpio(uint32_t bank, uint32_t pin) ...@@ -29,59 +29,60 @@ static bool check_gpio(uint32_t bank, uint32_t pin)
void set_gpio(uint32_t bank, uint32_t pin, uint32_t mode, uint32_t speed, void set_gpio(uint32_t bank, uint32_t pin, uint32_t mode, uint32_t speed,
uint32_t pull, uint32_t alternate) uint32_t pull, uint32_t alternate)
{ {
volatile uint32_t bank_address; uintptr_t base;
if (!check_gpio(bank, pin)) { if (!check_gpio(bank, pin)) {
return; return;
} }
if (bank == GPIO_BANK_Z) { if (bank == GPIO_BANK_Z) {
bank_address = STM32_GPIOZ_BANK; base = STM32_GPIOZ_BANK;
} else { } else {
bank_address = STM32_GPIOA_BANK + base = STM32_GPIOA_BANK +
(bank * STM32_GPIO_BANK_OFFSET); (bank * STM32_GPIO_BANK_OFFSET);
} }
mmio_clrbits_32(bank_address + GPIO_MODE_OFFSET, mmio_clrbits_32(base + GPIO_MODE_OFFSET,
((uint32_t)GPIO_MODE_MASK << (pin << 1))); ((uint32_t)GPIO_MODE_MASK << (pin << 1)));
mmio_setbits_32(bank_address + GPIO_MODE_OFFSET, mmio_setbits_32(base + GPIO_MODE_OFFSET,
(mode & ~GPIO_OPEN_DRAIN) << (pin << 1)); (mode & ~GPIO_OPEN_DRAIN) << (pin << 1));
if ((mode & GPIO_OPEN_DRAIN) != 0U) { if ((mode & GPIO_OPEN_DRAIN) != 0U) {
mmio_setbits_32(bank_address + GPIO_TYPE_OFFSET, mmio_setbits_32(base + GPIO_TYPE_OFFSET, BIT(pin));
BIT(pin)); } else {
mmio_clrbits_32(base + GPIO_TYPE_OFFSET, BIT(pin));
} }
mmio_clrbits_32(bank_address + GPIO_SPEED_OFFSET, mmio_clrbits_32(base + GPIO_SPEED_OFFSET,
((uint32_t)GPIO_SPEED_MASK << (pin << 1))); ((uint32_t)GPIO_SPEED_MASK << (pin << 1)));
mmio_setbits_32(bank_address + GPIO_SPEED_OFFSET, speed << (pin << 1)); mmio_setbits_32(base + GPIO_SPEED_OFFSET, speed << (pin << 1));
mmio_clrbits_32(bank_address + GPIO_PUPD_OFFSET, mmio_clrbits_32(base + GPIO_PUPD_OFFSET,
((uint32_t)GPIO_PULL_MASK << (pin << 1))); ((uint32_t)GPIO_PULL_MASK << (pin << 1)));
mmio_setbits_32(bank_address + GPIO_PUPD_OFFSET, pull << (pin << 1)); mmio_setbits_32(base + GPIO_PUPD_OFFSET, pull << (pin << 1));
if (pin < GPIO_ALT_LOWER_LIMIT) { if (pin < GPIO_ALT_LOWER_LIMIT) {
mmio_clrbits_32(bank_address + GPIO_AFRL_OFFSET, mmio_clrbits_32(base + GPIO_AFRL_OFFSET,
((uint32_t)GPIO_ALTERNATE_MASK << (pin << 2))); ((uint32_t)GPIO_ALTERNATE_MASK << (pin << 2)));
mmio_setbits_32(bank_address + GPIO_AFRL_OFFSET, mmio_setbits_32(base + GPIO_AFRL_OFFSET,
alternate << (pin << 2)); alternate << (pin << 2));
} else { } else {
mmio_clrbits_32(bank_address + GPIO_AFRH_OFFSET, mmio_clrbits_32(base + GPIO_AFRH_OFFSET,
((uint32_t)GPIO_ALTERNATE_MASK << ((uint32_t)GPIO_ALTERNATE_MASK <<
((pin - GPIO_ALT_LOWER_LIMIT) << 2))); ((pin - GPIO_ALT_LOWER_LIMIT) << 2)));
mmio_setbits_32(bank_address + GPIO_AFRH_OFFSET, mmio_setbits_32(base + GPIO_AFRH_OFFSET,
alternate << ((pin - GPIO_ALT_LOWER_LIMIT) << alternate << ((pin - GPIO_ALT_LOWER_LIMIT) <<
2)); 2));
} }
VERBOSE("GPIO %u mode set to 0x%x\n", bank, VERBOSE("GPIO %u mode set to 0x%x\n", bank,
mmio_read_32(bank_address + GPIO_MODE_OFFSET)); mmio_read_32(base + GPIO_MODE_OFFSET));
VERBOSE("GPIO %u speed set to 0x%x\n", bank, VERBOSE("GPIO %u speed set to 0x%x\n", bank,
mmio_read_32(bank_address + GPIO_SPEED_OFFSET)); mmio_read_32(base + GPIO_SPEED_OFFSET));
VERBOSE("GPIO %u mode pull to 0x%x\n", bank, VERBOSE("GPIO %u mode pull to 0x%x\n", bank,
mmio_read_32(bank_address + GPIO_PUPD_OFFSET)); mmio_read_32(base + GPIO_PUPD_OFFSET));
VERBOSE("GPIO %u mode alternate low to 0x%x\n", bank, VERBOSE("GPIO %u mode alternate low to 0x%x\n", bank,
mmio_read_32(bank_address + GPIO_AFRL_OFFSET)); mmio_read_32(base + GPIO_AFRL_OFFSET));
VERBOSE("GPIO %u mode alternate high to 0x%x\n", bank, VERBOSE("GPIO %u mode alternate high to 0x%x\n", bank,
mmio_read_32(bank_address + GPIO_AFRH_OFFSET)); mmio_read_32(base + GPIO_AFRH_OFFSET));
} }
drivers/st/io/io_stm32image.c
View file @ 4156d4da
/* /*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -94,6 +94,8 @@ static int stm32image_dev_open(const uintptr_t init_params, ...@@ -94,6 +94,8 @@ static int stm32image_dev_open(const uintptr_t init_params,
for (i = 0; i < STM32_PART_NUM; i++) { for (i = 0; i < STM32_PART_NUM; i++) {
memcpy(stm32image_dev.part_info[i].name, memcpy(stm32image_dev.part_info[i].name,
device_info->part_info[i].name, MAX_PART_NAME_SIZE); device_info->part_info[i].name, MAX_PART_NAME_SIZE);
stm32image_dev.part_info[i].binary_type =
device_info->part_info[i].binary_type;
stm32image_dev.part_info[i].part_offset = stm32image_dev.part_info[i].part_offset =
device_info->part_info[i].part_offset; device_info->part_info[i].part_offset;
stm32image_dev.part_info[i].bkp_offset = stm32image_dev.part_info[i].bkp_offset =
...@@ -193,21 +195,29 @@ static int stm32image_partition_size(io_entity_t *entity, size_t *length) ...@@ -193,21 +195,29 @@ static int stm32image_partition_size(io_entity_t *entity, size_t *length)
result = io_read(backend_handle, (uintptr_t)header, result = io_read(backend_handle, (uintptr_t)header,
MAX_LBA_SIZE, (size_t *)&bytes_read); MAX_LBA_SIZE, (size_t *)&bytes_read);
if (result != 0) { if (result != 0) {
if (current_part->bkp_offset == 0U) {
ERROR("%s: io_read (%i)\n", __func__, result); ERROR("%s: io_read (%i)\n", __func__, result);
break; }
header->magic = 0;
} }
if ((header->magic != BOOT_API_IMAGE_HEADER_MAGIC_NB) || if ((header->magic != BOOT_API_IMAGE_HEADER_MAGIC_NB) ||
(header->binary_type != current_part->binary_type) || (header->binary_type != current_part->binary_type) ||
(header->image_length >= stm32image_dev.device_size)) { (header->image_length >= stm32image_dev.device_size)) {
WARN("%s: partition %s wrong header\n", VERBOSE("%s: partition %s not found at %x\n",
__func__, current_part->name); __func__, current_part->name, *stm32_img);
if (current_part->bkp_offset == 0U) {
result = -ENOMEM;
break;
}
/* Header not correct, check next offset for backup */ /* Header not correct, check next offset for backup */
*stm32_img += current_part->bkp_offset; *stm32_img += current_part->bkp_offset;
if (*stm32_img > stm32image_dev.device_size) { if (*stm32_img > stm32image_dev.device_size) {
/* No backup found, end of device reached */ /* No backup found, end of device reached */
WARN("Out of memory\n"); WARN("%s : partition %s not found\n",
__func__, current_part->name);
result = -ENOMEM; result = -ENOMEM;
break; break;
} }
...@@ -221,9 +231,13 @@ static int stm32image_partition_size(io_entity_t *entity, size_t *length) ...@@ -221,9 +231,13 @@ static int stm32image_partition_size(io_entity_t *entity, size_t *length)
return result; return result;
} }
if (header->image_length < stm32image_dev.lba_size) {
*length = stm32image_dev.lba_size;
} else {
*length = header->image_length; *length = header->image_length;
}
INFO("STM32 Image size : %i\n", *length); INFO("STM32 Image size : %lu\n", (unsigned long)*length);
return 0; return 0;
} }
...@@ -266,11 +280,10 @@ static int check_header(boot_api_image_header_t *header, uintptr_t buffer) ...@@ -266,11 +280,10 @@ static int check_header(boot_api_image_header_t *header, uintptr_t buffer)
static int stm32image_partition_read(io_entity_t *entity, uintptr_t buffer, static int stm32image_partition_read(io_entity_t *entity, uintptr_t buffer,
size_t length, size_t *length_read) size_t length, size_t *length_read)
{ {
int result = 0, offset, local_length = 0; int result = 0;
uint8_t *local_buffer = (uint8_t *)buffer; uint8_t *local_buffer = (uint8_t *)buffer;
boot_api_image_header_t *header = boot_api_image_header_t *header =
(boot_api_image_header_t *)first_lba_buffer; (boot_api_image_header_t *)first_lba_buffer;
uintptr_t backend_handle;
assert(entity != NULL); assert(entity != NULL);
assert(buffer != 0U); assert(buffer != 0U);
...@@ -279,8 +292,17 @@ static int stm32image_partition_read(io_entity_t *entity, uintptr_t buffer, ...@@ -279,8 +292,17 @@ static int stm32image_partition_read(io_entity_t *entity, uintptr_t buffer,
*length_read = 0U; *length_read = 0U;
while (*length_read == 0U) { while (*length_read == 0U) {
int offset;
int local_length;
uintptr_t backend_handle;
if (header->magic != BOOT_API_IMAGE_HEADER_MAGIC_NB) { if (header->magic != BOOT_API_IMAGE_HEADER_MAGIC_NB) {
/* Check for backup as image is corrupted */ /* Check for backup as image is corrupted */
if (current_part->bkp_offset == 0U) {
result = -ENOMEM;
break;
}
*stm32_img += current_part->bkp_offset; *stm32_img += current_part->bkp_offset;
if (*stm32_img >= stm32image_dev.device_size) { if (*stm32_img >= stm32image_dev.device_size) {
/* End of device reached */ /* End of device reached */
...@@ -342,8 +364,8 @@ static int stm32image_partition_read(io_entity_t *entity, uintptr_t buffer, ...@@ -342,8 +364,8 @@ static int stm32image_partition_read(io_entity_t *entity, uintptr_t buffer,
if (result != 0) { if (result != 0) {
ERROR("%s: io_read (%i)\n", __func__, result); ERROR("%s: io_read (%i)\n", __func__, result);
*length_read = 0; *length_read = 0;
io_close(backend_handle); header->magic = 0;
break; continue;
} }
result = check_header(header, buffer); result = check_header(header, buffer);
...@@ -351,8 +373,6 @@ static int stm32image_partition_read(io_entity_t *entity, uintptr_t buffer, ...@@ -351,8 +373,6 @@ static int stm32image_partition_read(io_entity_t *entity, uintptr_t buffer,
ERROR("Header check failed\n"); ERROR("Header check failed\n");
*length_read = 0; *length_read = 0;
header->magic = 0; header->magic = 0;
io_close(backend_handle);
break;
} }
io_close(backend_handle); io_close(backend_handle);
......
drivers/st/mmc/stm32_sdmmc2.c
View file @ 4156d4da
...@@ -470,12 +470,11 @@ static int stm32_sdmmc2_prepare(int lba, uintptr_t buf, size_t size) ...@@ -470,12 +470,11 @@ static int stm32_sdmmc2_prepare(int lba, uintptr_t buf, size_t size)
} }
/* Prepare CMD 16*/ /* Prepare CMD 16*/
mmio_write_32(base + SDMMC_DTIMER, UINT32_MAX); mmio_write_32(base + SDMMC_DTIMER, 0);
mmio_write_32(base + SDMMC_DLENR, 0); mmio_write_32(base + SDMMC_DLENR, 0);
mmio_clrsetbits_32(base + SDMMC_DCTRLR, mmio_write_32(base + SDMMC_DCTRLR, 0);
SDMMC_DCTRLR_CLEAR_MASK, SDMMC_DCTRLR_DTDIR);
zeromem(&cmd, sizeof(struct mmc_cmd)); zeromem(&cmd, sizeof(struct mmc_cmd));
......
include/drivers/st/stm32_gpio.h
View file @ 4156d4da
/* /*
* Copyright (c) 2015-2018, STMicroelectronics - All Rights Reserved * Copyright (c) 2015-2019, STMicroelectronics - All Rights Reserved
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -82,8 +82,8 @@ ...@@ -82,8 +82,8 @@
#define GPIO_SPEED_LOW 0x00 #define GPIO_SPEED_LOW 0x00
#define GPIO_SPEED_MEDIUM 0x01 #define GPIO_SPEED_MEDIUM 0x01
#define GPIO_SPEED_FAST 0x02 #define GPIO_SPEED_HIGH 0x02
#define GPIO_SPEED_HIGH 0x03 #define GPIO_SPEED_VERY_HIGH 0x03
#define GPIO_SPEED_MASK U(0x03) #define GPIO_SPEED_MASK U(0x03)
#define GPIO_NO_PULL 0x00 #define GPIO_NO_PULL 0x00
......
include/drivers/st/stm32mp1_ddr_regs.h
View file @ 4156d4da
/* /*
* Copyright (c) 2017-2018, STMicroelectronics - All Rights Reserved * Copyright (c) 2017-2019, STMicroelectronics - All Rights Reserved
* *
* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause * SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
*/ */
...@@ -247,11 +247,14 @@ struct stm32mp1_ddrphy { ...@@ -247,11 +247,14 @@ struct stm32mp1_ddrphy {
#define DDRCTRL_DBGSTAT 0x310 #define DDRCTRL_DBGSTAT 0x310
#define DDRCTRL_SWCTL 0x320 #define DDRCTRL_SWCTL 0x320
#define DDRCTRL_SWSTAT 0x324 #define DDRCTRL_SWSTAT 0x324
#define DDRCTRL_PSTAT 0x3FC
#define DDRCTRL_PCTRL_0 0x490 #define DDRCTRL_PCTRL_0 0x490
#define DDRCTRL_PCTRL_1 0x540 #define DDRCTRL_PCTRL_1 0x540
/* DDR Controller Register fields */ /* DDR Controller Register fields */
#define DDRCTRL_MSTR_DDR3 BIT(0) #define DDRCTRL_MSTR_DDR3 BIT(0)
#define DDRCTRL_MSTR_LPDDR2 BIT(2)
#define DDRCTRL_MSTR_LPDDR3 BIT(3)
#define DDRCTRL_MSTR_DATA_BUS_WIDTH_MASK GENMASK(13, 12) #define DDRCTRL_MSTR_DATA_BUS_WIDTH_MASK GENMASK(13, 12)
#define DDRCTRL_MSTR_DATA_BUS_WIDTH_FULL 0 #define DDRCTRL_MSTR_DATA_BUS_WIDTH_FULL 0
#define DDRCTRL_MSTR_DATA_BUS_WIDTH_HALF BIT(12) #define DDRCTRL_MSTR_DATA_BUS_WIDTH_HALF BIT(12)
...@@ -269,7 +272,7 @@ struct stm32mp1_ddrphy { ...@@ -269,7 +272,7 @@ struct stm32mp1_ddrphy {
/* Only one rank supported */ /* Only one rank supported */
#define DDRCTRL_MRCTRL0_MR_RANK_SHIFT 4 #define DDRCTRL_MRCTRL0_MR_RANK_SHIFT 4
#define DDRCTRL_MRCTRL0_MR_RANK_ALL \ #define DDRCTRL_MRCTRL0_MR_RANK_ALL \
(0x1U << DDRCTRL_MRCTRL0_MR_RANK_SHIFT) BIT(DDRCTRL_MRCTRL0_MR_RANK_SHIFT)
#define DDRCTRL_MRCTRL0_MR_ADDR_SHIFT 12 #define DDRCTRL_MRCTRL0_MR_ADDR_SHIFT 12
#define DDRCTRL_MRCTRL0_MR_ADDR_MASK GENMASK(15, 12) #define DDRCTRL_MRCTRL0_MR_ADDR_MASK GENMASK(15, 12)
#define DDRCTRL_MRCTRL0_MR_WR BIT(31) #define DDRCTRL_MRCTRL0_MR_WR BIT(31)
...@@ -367,6 +370,7 @@ struct stm32mp1_ddrphy { ...@@ -367,6 +370,7 @@ struct stm32mp1_ddrphy {
#define DDRPHYC_DLLGCR_BPS200 BIT(23) #define DDRPHYC_DLLGCR_BPS200 BIT(23)
#define DDRPHYC_ACDLLCR_DLLSRST BIT(30)
#define DDRPHYC_ACDLLCR_DLLDIS BIT(31) #define DDRPHYC_ACDLLCR_DLLDIS BIT(31)
#define DDRPHYC_PTR0_TDLLSRST_OFFSET 0 #define DDRPHYC_PTR0_TDLLSRST_OFFSET 0
......
include/drivers/st/stm32mp1_rcc.h
View file @ 4156d4da
/* /*
* Copyright (c) 2015-2018, STMicroelectronics - All Rights Reserved * Copyright (c) 2015-2019, STMicroelectronics - All Rights Reserved
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -68,6 +68,14 @@ ...@@ -68,6 +68,14 @@
#define RCC_MP_AHB6ENCLRR U(0x21C) #define RCC_MP_AHB6ENCLRR U(0x21C)
#define RCC_MP_TZAHB6ENSETR U(0x220) #define RCC_MP_TZAHB6ENSETR U(0x220)
#define RCC_MP_TZAHB6ENCLRR U(0x224) #define RCC_MP_TZAHB6ENCLRR U(0x224)
#define RCC_MC_APB4ENSETR U(0x280)
#define RCC_MC_APB4ENCLRR U(0x284)
#define RCC_MC_APB5ENSETR U(0x288)
#define RCC_MC_APB5ENCLRR U(0x28C)
#define RCC_MC_AHB5ENSETR U(0x290)
#define RCC_MC_AHB5ENCLRR U(0x294)
#define RCC_MC_AHB6ENSETR U(0x298)
#define RCC_MC_AHB6ENCLRR U(0x29C)
#define RCC_MP_APB4LPENSETR U(0x300) #define RCC_MP_APB4LPENSETR U(0x300)
#define RCC_MP_APB4LPENCLRR U(0x304) #define RCC_MP_APB4LPENCLRR U(0x304)
#define RCC_MP_APB5LPENSETR U(0x308) #define RCC_MP_APB5LPENSETR U(0x308)
...@@ -78,6 +86,14 @@ ...@@ -78,6 +86,14 @@
#define RCC_MP_AHB6LPENCLRR U(0x31C) #define RCC_MP_AHB6LPENCLRR U(0x31C)
#define RCC_MP_TZAHB6LPENSETR U(0x320) #define RCC_MP_TZAHB6LPENSETR U(0x320)
#define RCC_MP_TZAHB6LPENCLRR U(0x324) #define RCC_MP_TZAHB6LPENCLRR U(0x324)
#define RCC_MC_APB4LPENSETR U(0x380)
#define RCC_MC_APB4LPENCLRR U(0x384)
#define RCC_MC_APB5LPENSETR U(0x388)
#define RCC_MC_APB5LPENCLRR U(0x38C)
#define RCC_MC_AHB5LPENSETR U(0x390)
#define RCC_MC_AHB5LPENCLRR U(0x394)
#define RCC_MC_AHB6LPENSETR U(0x398)
#define RCC_MC_AHB6LPENCLRR U(0x39C)
#define RCC_BR_RSTSCLRR U(0x400) #define RCC_BR_RSTSCLRR U(0x400)
#define RCC_MP_GRSTCSETR U(0x404) #define RCC_MP_GRSTCSETR U(0x404)
#define RCC_MP_RSTSCLRR U(0x408) #define RCC_MP_RSTSCLRR U(0x408)
...@@ -162,6 +178,22 @@ ...@@ -162,6 +178,22 @@
#define RCC_MP_AHB4ENCLRR U(0xA2C) #define RCC_MP_AHB4ENCLRR U(0xA2C)
#define RCC_MP_MLAHBENSETR U(0xA38) #define RCC_MP_MLAHBENSETR U(0xA38)
#define RCC_MP_MLAHBENCLRR U(0xA3C) #define RCC_MP_MLAHBENCLRR U(0xA3C)
#define RCC_MC_APB1ENSETR U(0xA80)
#define RCC_MC_APB1ENCLRR U(0xA84)
#define RCC_MC_APB2ENSETR U(0xA88)
#define RCC_MC_APB2ENCLRR U(0xA8C)
#define RCC_MC_APB3ENSETR U(0xA90)
#define RCC_MC_APB3ENCLRR U(0xA94)
#define RCC_MC_AHB2ENSETR U(0xA98)
#define RCC_MC_AHB2ENCLRR U(0xA9C)
#define RCC_MC_AHB3ENSETR U(0xAA0)
#define RCC_MC_AHB3ENCLRR U(0xAA4)
#define RCC_MC_AHB4ENSETR U(0xAA8)
#define RCC_MC_AHB4ENCLRR U(0xAAC)
#define RCC_MC_AXIMENSETR U(0xAB0)
#define RCC_MC_AXIMENCLRR U(0xAB4)
#define RCC_MC_MLAHBENSETR U(0xAB8)
#define RCC_MC_MLAHBENCLRR U(0xABC)
#define RCC_MP_APB1LPENSETR U(0xB00) #define RCC_MP_APB1LPENSETR U(0xB00)
#define RCC_MP_APB1LPENCLRR U(0xB04) #define RCC_MP_APB1LPENCLRR U(0xB04)
#define RCC_MP_APB2LPENSETR U(0xB08) #define RCC_MP_APB2LPENSETR U(0xB08)
...@@ -178,10 +210,31 @@ ...@@ -178,10 +210,31 @@
#define RCC_MP_AXIMLPENCLRR U(0xB34) #define RCC_MP_AXIMLPENCLRR U(0xB34)
#define RCC_MP_MLAHBLPENSETR U(0xB38) #define RCC_MP_MLAHBLPENSETR U(0xB38)
#define RCC_MP_MLAHBLPENCLRR U(0xB3C) #define RCC_MP_MLAHBLPENCLRR U(0xB3C)
#define RCC_MC_APB1LPENSETR U(0xB80)
#define RCC_MC_APB1LPENCLRR U(0xB84)
#define RCC_MC_APB2LPENSETR U(0xB88)
#define RCC_MC_APB2LPENCLRR U(0xB8C)
#define RCC_MC_APB3LPENSETR U(0xB90)
#define RCC_MC_APB3LPENCLRR U(0xB94)
#define RCC_MC_AHB2LPENSETR U(0xB98)
#define RCC_MC_AHB2LPENCLRR U(0xB9C)
#define RCC_MC_AHB3LPENSETR U(0xBA0)
#define RCC_MC_AHB3LPENCLRR U(0xBA4)
#define RCC_MC_AHB4LPENSETR U(0xBA8)
#define RCC_MC_AHB4LPENCLRR U(0xBAC)
#define RCC_MC_AXIMLPENSETR U(0xBB0)
#define RCC_MC_AXIMLPENCLRR U(0xBB4)
#define RCC_MC_MLAHBLPENSETR U(0xBB8)
#define RCC_MC_MLAHBLPENCLRR U(0xBBC)
#define RCC_MC_RSTSCLRR U(0xC00)
#define RCC_MC_CIER U(0xC14)
#define RCC_MC_CIFR U(0xC18)
#define RCC_VERR U(0xFF4) #define RCC_VERR U(0xFF4)
#define RCC_IDR U(0xFF8) #define RCC_IDR U(0xFF8)
#define RCC_SIDR U(0xFFC) #define RCC_SIDR U(0xFFC)
#define RCC_OFFSET_MASK GENMASK(11, 0)
/* Values for RCC_TZCR register */ /* Values for RCC_TZCR register */
#define RCC_TZCR_TZEN BIT(0) #define RCC_TZCR_TZEN BIT(0)
...@@ -221,6 +274,9 @@ ...@@ -221,6 +274,9 @@
#define RCC_MPUDIV_MASK GENMASK(2, 0) #define RCC_MPUDIV_MASK GENMASK(2, 0)
#define RCC_AXIDIV_MASK GENMASK(2, 0) #define RCC_AXIDIV_MASK GENMASK(2, 0)
/* Used for TIMER Prescaler */
#define RCC_TIMGXPRER_TIMGXPRE BIT(0)
/* Offset between RCC_MP_xxxENSETR and RCC_MP_xxxENCLRR registers */ /* Offset between RCC_MP_xxxENSETR and RCC_MP_xxxENCLRR registers */
#define RCC_MP_ENCLRR_OFFSET U(4) #define RCC_MP_ENCLRR_OFFSET U(4)
...@@ -228,6 +284,7 @@ ...@@ -228,6 +284,7 @@
#define RCC_BDCR_LSEON BIT(0) #define RCC_BDCR_LSEON BIT(0)
#define RCC_BDCR_LSEBYP BIT(1) #define RCC_BDCR_LSEBYP BIT(1)
#define RCC_BDCR_LSERDY BIT(2) #define RCC_BDCR_LSERDY BIT(2)
#define RCC_BDCR_DIGBYP BIT(3)
#define RCC_BDCR_LSEDRV_MASK GENMASK(5, 4) #define RCC_BDCR_LSEDRV_MASK GENMASK(5, 4)
#define RCC_BDCR_LSEDRV_SHIFT 4 #define RCC_BDCR_LSEDRV_SHIFT 4
#define RCC_BDCR_LSECSSON BIT(8) #define RCC_BDCR_LSECSSON BIT(8)
...@@ -243,6 +300,7 @@ ...@@ -243,6 +300,7 @@
/* Used for all RCC_PLL<n>CR registers */ /* Used for all RCC_PLL<n>CR registers */
#define RCC_PLLNCR_PLLON BIT(0) #define RCC_PLLNCR_PLLON BIT(0)
#define RCC_PLLNCR_PLLRDY BIT(1) #define RCC_PLLNCR_PLLRDY BIT(1)
#define RCC_PLLNCR_SSCG_CTRL BIT(2)
#define RCC_PLLNCR_DIVPEN BIT(4) #define RCC_PLLNCR_DIVPEN BIT(4)
#define RCC_PLLNCR_DIVQEN BIT(5) #define RCC_PLLNCR_DIVQEN BIT(5)
#define RCC_PLLNCR_DIVREN BIT(6) #define RCC_PLLNCR_DIVREN BIT(6)
...@@ -281,8 +339,12 @@ ...@@ -281,8 +339,12 @@
/* Used for RCC_OCENSETR and RCC_OCENCLRR registers */ /* Used for RCC_OCENSETR and RCC_OCENCLRR registers */
#define RCC_OCENR_HSION BIT(0) #define RCC_OCENR_HSION BIT(0)
#define RCC_OCENR_HSIKERON BIT(1)
#define RCC_OCENR_CSION BIT(4) #define RCC_OCENR_CSION BIT(4)
#define RCC_OCENR_CSIKERON BIT(5)
#define RCC_OCENR_DIGBYP BIT(7)
#define RCC_OCENR_HSEON BIT(8) #define RCC_OCENR_HSEON BIT(8)
#define RCC_OCENR_HSEKERON BIT(9)
#define RCC_OCENR_HSEBYP BIT(10) #define RCC_OCENR_HSEBYP BIT(10)
#define RCC_OCENR_HSECSSON BIT(11) #define RCC_OCENR_HSECSSON BIT(11)
...@@ -319,6 +381,16 @@ ...@@ -319,6 +381,16 @@
/* Fields of RCC_HSICFGR register */ /* Fields of RCC_HSICFGR register */
#define RCC_HSICFGR_HSIDIV_MASK GENMASK(1, 0) #define RCC_HSICFGR_HSIDIV_MASK GENMASK(1, 0)
#define RCC_HSICFGR_HSITRIM_SHIFT 8
#define RCC_HSICFGR_HSITRIM_MASK GENMASK(14, 8)
#define RCC_HSICFGR_HSICAL_SHIFT 16
#define RCC_HSICFGR_HSICAL_MASK GENMASK(27, 16)
/* Fields of RCC_CSICFGR register */
#define RCC_CSICFGR_CSITRIM_SHIFT 8
#define RCC_CSICFGR_CSITRIM_MASK GENMASK(12, 8)
#define RCC_CSICFGR_CSICAL_SHIFT 16
#define RCC_CSICFGR_CSICAL_MASK GENMASK(23, 16)
/* Used for RCC_MCO related operations */ /* Used for RCC_MCO related operations */
#define RCC_MCOCFG_MCOON BIT(12) #define RCC_MCOCFG_MCOON BIT(12)
...@@ -336,16 +408,30 @@ ...@@ -336,16 +408,30 @@
#define RCC_MP_RSTSCLRR_HCSSRSTF BIT(3) #define RCC_MP_RSTSCLRR_HCSSRSTF BIT(3)
#define RCC_MP_RSTSCLRR_VCORERSTF BIT(4) #define RCC_MP_RSTSCLRR_VCORERSTF BIT(4)
#define RCC_MP_RSTSCLRR_MPSYSRSTF BIT(6) #define RCC_MP_RSTSCLRR_MPSYSRSTF BIT(6)
#define RCC_MP_RSTSCLRR_MCSYSRSTF BIT(7)
#define RCC_MP_RSTSCLRR_IWDG1RSTF BIT(8) #define RCC_MP_RSTSCLRR_IWDG1RSTF BIT(8)
#define RCC_MP_RSTSCLRR_IWDG2RSTF BIT(9) #define RCC_MP_RSTSCLRR_IWDG2RSTF BIT(9)
#define RCC_MP_RSTSCLRR_STDBYRSTF BIT(11) #define RCC_MP_RSTSCLRR_STDBYRSTF BIT(11)
#define RCC_MP_RSTSCLRR_CSTDBYRSTF BIT(12) #define RCC_MP_RSTSCLRR_CSTDBYRSTF BIT(12)
#define RCC_MP_RSTSCLRR_MPUP0RSTF BIT(13)
#define RCC_MP_RSTSCLRR_MPUP1RSTF BIT(14)
/* Global Reset Register */ /* Global Reset Register */
#define RCC_MP_GRSTCSETR_MPSYSRST BIT(0) #define RCC_MP_GRSTCSETR_MPSYSRST BIT(0)
#define RCC_MP_GRSTCSETR_MPUP0RST BIT(4)
#define RCC_MP_GRSTCSETR_MPUP1RST BIT(5)
/* Clock Source Interrupt Flag Register */ /* Clock Source Interrupt Flag Register */
#define RCC_MP_CIFR_MASK U(0x110F1F) #define RCC_MP_CIFR_MASK U(0x110F1F)
#define RCC_MP_CIFR_LSIRDYF BIT(0)
#define RCC_MP_CIFR_LSERDYF BIT(1)
#define RCC_MP_CIFR_HSIRDYF BIT(2)
#define RCC_MP_CIFR_HSERDYF BIT(3)
#define RCC_MP_CIFR_CSIRDYF BIT(4)
#define RCC_MP_CIFR_PLL1DYF BIT(8)
#define RCC_MP_CIFR_PLL2DYF BIT(9)
#define RCC_MP_CIFR_PLL3DYF BIT(10)
#define RCC_MP_CIFR_PLL4DYF BIT(11)
#define RCC_MP_CIFR_WKUPF BIT(20) #define RCC_MP_CIFR_WKUPF BIT(20)
/* Stop Request Set Register */ /* Stop Request Set Register */
...@@ -362,7 +448,29 @@ ...@@ -362,7 +448,29 @@
/* Values of RCC_MP_APB1ENSETR register */ /* Values of RCC_MP_APB1ENSETR register */
#define RCC_MP_APB1ENSETR_UART4EN BIT(16) #define RCC_MP_APB1ENSETR_UART4EN BIT(16)
/* Values of RCC_MP_APB5ENSETR register */
#define RCC_MP_APB5ENSETR_SPI6EN BIT(0)
#define RCC_MP_APB5ENSETR_I2C4EN BIT(2)
#define RCC_MP_APB5ENSETR_I2C6EN BIT(3)
#define RCC_MP_APB5ENSETR_USART1EN BIT(4)
#define RCC_MP_APB5ENSETR_RTCAPBEN BIT(8)
#define RCC_MP_APB5ENSETR_IWDG1APBEN BIT(15)
/* Values of RCC_MP_AHB4ENSETR register */ /* Values of RCC_MP_AHB4ENSETR register */
#define RCC_MP_AHB4ENSETR_GPIOGEN BIT(6) #define RCC_MP_AHB4ENSETR_GPIOGEN BIT(6)
#define RCC_MP_AHB4ENSETR_GPIOHEN BIT(7)
/* Values of RCC_MP_AHB5ENSETR register */
#define RCC_MP_AHB5ENSETR_GPIOZEN BIT(0)
#define RCC_MP_AHB5ENSETR_CRYP1EN BIT(4)
#define RCC_MP_AHB5ENSETR_HASH1EN BIT(5)
#define RCC_MP_AHB5ENSETR_RNG1EN BIT(6)
/* Values of RCC_MP_IWDGFZSETR register */
#define RCC_MP_IWDGFZSETR_IWDG1 BIT(0)
#define RCC_MP_IWDGFZSETR_IWDG2 BIT(1)
/* Values of RCC_PWRLPDLYCR register */
#define RCC_PWRLPDLYCR_PWRLP_DLY_MASK GENMASK(21, 0)
#endif /* STM32MP1_RCC_H */ #endif /* STM32MP1_RCC_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment