michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: memc: mcux_flexspi_hyperram: use DEVICE_DT_GET

Browse source 
The controller device can be obtained at compile time, so use
DEVICE_DT_GET.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2022-02-01 10:49:00 +01:00 • committed by Anas Nashif
commit d6c2c9eb9e
1 changed files with 9 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

29
drivers/memc/memc_mcux_flexspi_hyperram.c
View file

@ -33,15 +33,10 @@ enum {
}; };
struct memc_flexspi_hyperram_config { struct memc_flexspi_hyperram_config {
char *controller_label;
flexspi_port_t port; flexspi_port_t port;
flexspi_device_config_t config; flexspi_device_config_t config;
}; };
struct memc_flexspi_hyperram_data {
const struct device *controller;
};
static const uint32_t memc_flexspi_hyperram_lut[][4] = { static const uint32_t memc_flexspi_hyperram_lut[][4] = {
/* Read Data */ /* Read Data */
[READ_DATA] = { [READ_DATA] = {
@ -88,7 +83,6 @@ static int memc_flexspi_hyperram_get_vendor_id(const struct device *dev,
uint16_t *vendor_id) uint16_t *vendor_id)
{ {
const struct memc_flexspi_hyperram_config *config = dev->config; const struct memc_flexspi_hyperram_config *config = dev->config;
struct memc_flexspi_hyperram_data *data = dev->data;
uint32_t buffer = 0; uint32_t buffer = 0;
int ret; int ret;
@ -104,7 +98,7 @@ static int memc_flexspi_hyperram_get_vendor_id(const struct device *dev,
LOG_DBG("Reading id"); LOG_DBG("Reading id");
ret = memc_flexspi_transfer(data->controller, &transfer); ret = memc_flexspi_transfer(config->controller, &transfer);
*vendor_id = buffer & 0xffff; *vendor_id = buffer & 0xffff;
return ret; return ret;
@ -113,29 +107,27 @@ static int memc_flexspi_hyperram_get_vendor_id(const struct device *dev,
static int memc_flexspi_hyperram_init(const struct device *dev) static int memc_flexspi_hyperram_init(const struct device *dev)
{ {
const struct memc_flexspi_hyperram_config *config = dev->config; const struct memc_flexspi_hyperram_config *config = dev->config;
struct memc_flexspi_hyperram_data *data = dev->data;
uint16_t vendor_id; uint16_t vendor_id;
data->controller = device_get_binding(config->controller_label); if (!device_is_ready(config->controller)) {
if (data->controller == NULL) { LOG_ERR("Controller device not ready");
LOG_ERR("Could not find controller"); return -ENODEV;
return -EINVAL;
} }
if (memc_flexspi_set_device_config(data->controller, &config->config, if (memc_flexspi_set_device_config(config->controller, &config->config,
config->port)) { config->port)) {
LOG_ERR("Could not set device configuration"); LOG_ERR("Could not set device configuration");
return -EINVAL; return -EINVAL;
} }
if (memc_flexspi_update_lut(data->controller, 0, if (memc_flexspi_update_lut(config->controller, 0,
(const uint32_t *) memc_flexspi_hyperram_lut, (const uint32_t *) memc_flexspi_hyperram_lut,
sizeof(memc_flexspi_hyperram_lut) / 4)) { sizeof(memc_flexspi_hyperram_lut) / 4)) {
LOG_ERR("Could not update lut"); LOG_ERR("Could not update lut");
return -EINVAL; return -EINVAL;
} }
memc_flexspi_reset(data->controller); memc_flexspi_reset(config->controller);
if (memc_flexspi_hyperram_get_vendor_id(dev, &vendor_id)) { if (memc_flexspi_hyperram_get_vendor_id(dev, &vendor_id)) {
LOG_ERR("Could not read vendor id"); LOG_ERR("Could not read vendor id");
@ -183,18 +175,15 @@ static int memc_flexspi_hyperram_init(const struct device *dev)
#define MEMC_FLEXSPI_HYPERRAM(n) \ #define MEMC_FLEXSPI_HYPERRAM(n) \
static const struct memc_flexspi_hyperram_config \ static const struct memc_flexspi_hyperram_config \
memc_flexspi_hyperram_config_##n = { \ memc_flexspi_hyperram_config_##n = { \
.controller_label = DT_INST_BUS_LABEL(n), \ .controller = DEVICE_DT_GET(DT_INST_BUS(n)), \
.port = DT_INST_REG_ADDR(n), \ .port = DT_INST_REG_ADDR(n), \
.config = MEMC_FLEXSPI_DEVICE_CONFIG(n), \ .config = MEMC_FLEXSPI_DEVICE_CONFIG(n), \
}; \ }; \
\ \
static struct memc_flexspi_hyperram_data \
memc_flexspi_hyperram_data_##n; \
\
DEVICE_DT_INST_DEFINE(n, \ DEVICE_DT_INST_DEFINE(n, \
memc_flexspi_hyperram_init, \ memc_flexspi_hyperram_init, \
NULL, \ NULL, \
&memc_flexspi_hyperram_data_##n, \ NULL, \
&memc_flexspi_hyperram_config_##n, \ &memc_flexspi_hyperram_config_##n, \
POST_KERNEL, \ POST_KERNEL, \
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \