Skip to content
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.

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

drivers: spi: esp32: Fix clock initialization #73807

Merged
merged 2 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
575 changes: 227 additions & 348 deletions drivers/clock_control/clock_control_esp32.c

Large diffs are not rendered by default.

31 changes: 18 additions & 13 deletions drivers/spi/spi_esp32_spim.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,16 +216,34 @@ static int spi_esp32_init(const struct device *dev)
int err;
const struct spi_esp32_config *cfg = dev->config;
struct spi_esp32_data *data = dev->data;
spi_hal_context_t *hal = &data->hal;

if (!cfg->clock_dev) {
return -EINVAL;
}

if (!device_is_ready(cfg->clock_dev)) {
LOG_ERR("clock control device not ready");
return -ENODEV;
}

/* Enables SPI peripheral */
err = clock_control_on(cfg->clock_dev, cfg->clock_subsys);
if (err < 0) {
LOG_ERR("Error enabling SPI clock");
return err;
}

spi_ll_master_init(hal->hw);

if (cfg->dma_enabled) {
spi_esp32_init_dma(dev);
}

#ifdef CONFIG_SPI_ESP32_INTERRUPT
spi_ll_disable_int(cfg->spi);
spi_ll_clear_int_stat(cfg->spi);

data->irq_line = esp_intr_alloc(cfg->irq_source,
0,
(ISR_HANDLER)spi_esp32_isr,
Expand Down Expand Up @@ -285,19 +303,6 @@ static int IRAM_ATTR spi_esp32_configure(const struct device *dev,
return 0;
}

if (!device_is_ready(cfg->clock_dev)) {
LOG_ERR("clock control device not ready");
return -ENODEV;
}

/* enables SPI peripheral */
if (clock_control_on(cfg->clock_dev, cfg->clock_subsys)) {
LOG_ERR("Could not enable SPI clock");
return -EIO;
}

spi_ll_master_init(hal->hw);

ctx->config = spi_cfg;

if (spi_cfg->operation & SPI_HALF_DUPLEX) {
Expand Down

This file was deleted.

40 changes: 0 additions & 40 deletions tests/drivers/spi/spi_loopback/boards/esp32c3_luatos_core.overlay

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion tests/drivers/spi/spi_loopback/boards/yd_esp32_procpu.conf

This file was deleted.

41 changes: 0 additions & 41 deletions tests/drivers/spi/spi_loopback/boards/yd_esp32_procpu.overlay

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@
};

&spi3 {
#address-cells = <1>;
#size-cells = <0>;
dma-enabled;
pinctrl-0 = <&spim3_loopback>;

pinctrl-names = "default";
status = "okay";
};
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
};

&spi2 {
#address-cells = <1>;
#size-cells = <0>;
dma-enabled;
pinctrl-0 = <&spim2_loopback>;
pinctrl-names = "default";
status = "okay";
};
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
};

&spi3 {
#address-cells = <1>;
#size-cells = <0>;
dma-enabled;
pinctrl-0 = <&spim3_loopback>;
pinctrl-names = "default";
status = "okay";
};
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
};

&spi3 {
#address-cells = <1>;
#size-cells = <0>;
dma-enabled;
pinctrl-0 = <&spim3_loopback>;
pinctrl-names = "default";
status = "okay";
};
Loading