Skip to content

Get flash clock settings from DT for STM32 #34344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 23, 2021
Merged

Get flash clock settings from DT for STM32 #34344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f97a4f5
dts/arm: STM32: Adding flash clock settings in dtsi.
ikmdani Apr 15, 2021
848406b
dts/arm: STM32: Adding flash clock settings in dtsi for stm32g0 series.
ikmdani Apr 15, 2021
19f29ca
dts/arm: STM32: Adding flash clock settings in dtsi for stm32g4 series.
ikmdani Apr 15, 2021
8825700
dts/arm: STM32: Adding flash clock settings in dtsi for stm32l1 series.
ikmdani Apr 15, 2021
5cc03fe
dts/arm: STM32: Adding flash clock settings in dtsi for stm32l4 series.
ikmdani Apr 15, 2021
782f41d
dts/arm: STM32: Adding flash clock settings in dtsi for stm32wb series.
ikmdani Apr 15, 2021
ee280d1
drivers/flash: STM32: Getting clock settings from DT.
ikmdani Apr 8, 2021
067c7a5
drivers/flash: STM32: Adding condition to enable HSI clock for L1 ser…
ikmdani Apr 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions drivers/flash/flash_stm32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,14 +348,14 @@ flash_stm32_get_parameters(const struct device *dev)

static struct flash_stm32_priv flash_data = {
.regs = (FLASH_TypeDef *) DT_INST_REG_ADDR(0),
#if defined(CONFIG_SOC_SERIES_STM32L4X) || \
defined(CONFIG_SOC_SERIES_STM32F0X) || \
defined(CONFIG_SOC_SERIES_STM32F1X) || \
defined(CONFIG_SOC_SERIES_STM32F3X) || \
defined(CONFIG_SOC_SERIES_STM32G0X) || \
defined(CONFIG_SOC_SERIES_STM32G4X)
.pclken = { .bus = STM32_CLOCK_BUS_AHB1,
.enr = LL_AHB1_GRP1_PERIPH_FLASH },
/* Getting clocks information from device tree description depending
* on the presence of 'clocks' property.
*/
#if DT_INST_NODE_HAS_PROP(0, clocks)
.pclken = {
.enr = DT_INST_CLOCKS_CELL(0, bits),
.bus = DT_INST_CLOCKS_CELL(0, bus),
}
#endif
};

Expand All @@ -372,21 +372,21 @@ static const struct flash_driver_api flash_stm32_api = {
static int stm32_flash_init(const struct device *dev)
{
int rc;
#if defined(CONFIG_SOC_SERIES_STM32L4X) || \
defined(CONFIG_SOC_SERIES_STM32F0X) || \
defined(CONFIG_SOC_SERIES_STM32F1X) || \
defined(CONFIG_SOC_SERIES_STM32F3X) || \
defined(CONFIG_SOC_SERIES_STM32G0X)
/* Below is applicable to F0, F1, F3, G0, G4, L1, L4 & WB55 series.
* For F2, F4, F7 & H7 series, this is not applicable.
*/
#if DT_INST_NODE_HAS_PROP(0, clocks)
struct flash_stm32_priv *p = FLASH_STM32_PRIV(dev);
const struct device *clk = DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE);

/*
* On STM32F0, Flash interface clock source is always HSI,
* so statically enable HSI here.
* On STM32 F0, F1, F3 & L1 series, flash interface clock source is
* always HSI, so statically enable HSI here.
*/
#if defined(CONFIG_SOC_SERIES_STM32F0X) || \
defined(CONFIG_SOC_SERIES_STM32F1X) || \
defined(CONFIG_SOC_SERIES_STM32F3X)
defined(CONFIG_SOC_SERIES_STM32F3X) || \
defined(CONFIG_SOC_SERIES_STM32L1X)
LL_RCC_HSI_Enable();

while (!LL_RCC_HSI_IsReady()) {
Expand Down
16 changes: 2 additions & 14 deletions drivers/flash/flash_stm32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,14 @@
#ifndef ZEPHYR_DRIVERS_FLASH_FLASH_STM32_H_
#define ZEPHYR_DRIVERS_FLASH_FLASH_STM32_H_

#if defined(CONFIG_SOC_SERIES_STM32L4X) || \
defined(CONFIG_SOC_SERIES_STM32F0X) || \
defined(CONFIG_SOC_SERIES_STM32F1X) || \
defined(CONFIG_SOC_SERIES_STM32F3X) || \
defined(CONFIG_SOC_SERIES_STM32G0X) || \
defined(CONFIG_SOC_SERIES_STM32G4X) || \
defined(CONFIG_SOC_SERIES_STM32H7X)
#if DT_NODE_HAS_PROP(DT_INST(0, st_stm32_flash_controller), clocks)
#include <drivers/clock_control.h>
#include <drivers/clock_control/stm32_clock_control.h>
#endif

struct flash_stm32_priv {
FLASH_TypeDef *regs;
#if defined(CONFIG_SOC_SERIES_STM32L4X) || \
defined(CONFIG_SOC_SERIES_STM32F0X) || \
defined(CONFIG_SOC_SERIES_STM32F1X) || \
defined(CONFIG_SOC_SERIES_STM32F3X) || \
defined(CONFIG_SOC_SERIES_STM32G0X) || \
defined(CONFIG_SOC_SERIES_STM32G4X) || \
defined(CONFIG_SOC_SERIES_STM32H7X)
#if DT_NODE_HAS_PROP(DT_INST(0, st_stm32_flash_controller), clocks)
/* clock subsystem driving this peripheral */
struct stm32_pclken pclken;
#endif
Expand Down
1 change: 1 addition & 0 deletions dts/arm/st/f0/stm32f0.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
label = "FLASH_CTRL";
reg = <0x40022000 0x400>;
interrupts = <3 0>;
clocks = <&rcc STM32_CLOCK_BUS_AHB1 0x00000010>;

#address-cells = <1>;
#size-cells = <1>;
Expand Down
1 change: 1 addition & 0 deletions dts/arm/st/f1/stm32f1.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
label = "FLASH_CTRL";
reg = <0x40022000 0x400>;
interrupts = <3 0>;
clocks = <&rcc STM32_CLOCK_BUS_AHB1 0x00000010>;

#address-cells = <1>;
#size-cells = <1>;
Expand Down
1 change: 1 addition & 0 deletions dts/arm/st/f3/stm32f3.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
label = "FLASH_CTRL";
reg = <0x40022000 0x400>;
interrupts = <4 0>;
clocks = <&rcc STM32_CLOCK_BUS_AHB1 0x00000010>;

#address-cells = <1>;
#size-cells = <1>;
Expand Down
1 change: 1 addition & 0 deletions dts/arm/st/g0/stm32g0.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
label = "FLASH_CTRL";
reg = <0x40022000 0x400>;
interrupts = <3 0>;
clocks = <&rcc STM32_CLOCK_BUS_AHB1 0x00000100>;

#address-cells = <1>;
#size-cells = <1>;
Expand Down
1 change: 1 addition & 0 deletions dts/arm/st/g4/stm32g4.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
label = "FLASH_CTRL";
reg = <0x40022000 0x400>;
interrupts = <3 0>;
clocks = <&rcc STM32_CLOCK_BUS_AHB1 0x00000100>;

#address-cells = <1>;
#size-cells = <1>;
Expand Down
1 change: 1 addition & 0 deletions dts/arm/st/l1/stm32l1.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
label = "FLASH_CTRL";
reg = <0x40023c00 0x400>;
interrupts = <4 0>;
clocks = <&rcc STM32_CLOCK_BUS_AHB1 0x00008000>;

#address-cells = <1>;
#size-cells = <1>;
Expand Down
1 change: 1 addition & 0 deletions dts/arm/st/l4/stm32l4.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
label = "FLASH_CTRL";
reg = <0x40022000 0x400>;
interrupts = <4 0>;
clocks = <&rcc STM32_CLOCK_BUS_AHB1 0x00000100>;

#address-cells = <1>;
#size-cells = <1>;
Expand Down
1 change: 1 addition & 0 deletions dts/arm/st/wb/stm32wb.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
label = "FLASH_CTRL";
reg = <0x58004000 0x400>;
interrupts = <4 0>;
clocks = <&rcc STM32_CLOCK_BUS_AHB3 0x02000000>;

#address-cells = <1>;
#size-cells = <1>;
Expand Down