Skip to content

Commit fa3a51b

Browse files
decsnykartben
authored andcommitted
spi_nxp_lpspi: Remove SDK items from header file
Remove SDK types and defines from header file. And since now the common file is the only consumer of SDK header, move that include there. Also rename the tristate boolean to be more clean about what it does rather than trying to be similar to the SDK config name. Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
1 parent ef60f88 commit fa3a51b

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_common.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
LOG_MODULE_REGISTER(spi_mcux_lpspi_common, CONFIG_SPI_LOG_LEVEL);
99

1010
#include "spi_nxp_lpspi_priv.h"
11+
#include <fsl_lpspi.h>
1112

1213
#if defined(LPSPI_RSTS) || defined(LPSPI_CLOCKS)
1314
static LPSPI_Type *const lpspi_bases[] = LPSPI_BASE_PTRS;
@@ -170,8 +171,8 @@ int spi_mcux_configure(const struct device *dev, const struct spi_config *spi_cf
170171
master_config.pcsActiveHighOrLow = (spi_cfg->operation & SPI_CS_ACTIVE_HIGH)
171172
? kLPSPI_PcsActiveHigh : kLPSPI_PcsActiveLow;
172173
master_config.pinCfg = config->data_pin_config;
173-
master_config.dataOutConfig = config->output_config ? kLpspiDataOutTristate :
174-
kLpspiDataOutRetained;
174+
master_config.dataOutConfig = config->tristate_output ? kLpspiDataOutTristate :
175+
kLpspiDataOutRetained;
175176

176177
LPSPI_MasterInit(base, &master_config, clock_freq);
177178
LPSPI_SetDummyData(base, 0);

drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_priv.h

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <zephyr/drivers/spi/rtio.h>
99
#include <zephyr/drivers/pinctrl.h>
1010
#include <zephyr/drivers/clock_control.h>
11+
#include <zephyr/sys/__assert.h>
1112
#include <zephyr/irq.h>
1213

1314
#include "../spi_context.h"
@@ -16,8 +17,6 @@
1617
#include <zephyr/drivers/mfd/nxp_lp_flexcomm.h>
1718
#endif
1819

19-
#include <fsl_lpspi.h>
20-
2120
/* If any hardware revisions change this, make it into a DT property.
2221
* DONT'T make #ifdefs here by platform.
2322
*/
@@ -30,10 +29,6 @@
3029
#define DEV_CFG(_dev) ((const struct spi_mcux_config *)(_dev)->config)
3130
#define DEV_DATA(_dev) ((struct spi_mcux_data *)(_dev)->data)
3231

33-
/* flag for SDK API for master transfers */
34-
#define LPSPI_MASTER_XFER_CFG_FLAGS(slave) \
35-
kLPSPI_MasterPcsContinuous | (slave << LPSPI_MASTER_PCS_SHIFT)
36-
3732
struct spi_mcux_config {
3833
DEVICE_MMIO_NAMED_ROM(reg_base);
3934
const struct device *clock_dev;
@@ -43,8 +38,8 @@ struct spi_mcux_config {
4338
uint32_t sck_pcs_delay;
4439
uint32_t transfer_delay;
4540
const struct pinctrl_dev_config *pincfg;
46-
lpspi_pin_config_t data_pin_config;
47-
bool output_config;
41+
uint8_t data_pin_config;
42+
bool tristate_output;
4843
uint8_t tx_fifo_size;
4944
uint8_t rx_fifo_size;
5045
uint8_t irqn;
@@ -58,7 +53,7 @@ struct spi_mcux_data {
5853
size_t transfer_len;
5954
};
6055

61-
/* common configure function that verifies spi_cfg validity and set up configuration parameters */
56+
/* verifies spi_cfg validity and set up configuration of hardware for xfer */
6257
int spi_mcux_configure(const struct device *dev, const struct spi_config *spi_cfg);
6358

6459
/* Does these things:
@@ -75,9 +70,6 @@ int spi_mcux_release(const struct device *dev, const struct spi_config *spi_cfg)
7570

7671
void lpspi_wait_tx_fifo_empty(const struct device *dev);
7772

78-
/* Argument to MCUX SDK IRQ handler */
79-
#define LPSPI_IRQ_HANDLE_ARG COND_CODE_1(CONFIG_NXP_LP_FLEXCOMM, (LPSPI_GetInstance(base)), (base))
80-
8173
#define SPI_MCUX_LPSPI_IRQ_FUNC_LP_FLEXCOMM(n) \
8274
nxp_lp_flexcomm_setirqhandler(DEVICE_DT_GET(DT_INST_PARENT(n)), DEVICE_DT_INST_GET(n), \
8375
LP_FLEXCOMM_PERIPH_LPSPI, lpspi_isr);
@@ -108,8 +100,8 @@ void lpspi_wait_tx_fifo_empty(const struct device *dev);
108100
.transfer_delay = UTIL_AND(DT_INST_NODE_HAS_PROP(n, transfer_delay), \
109101
DT_INST_PROP(n, transfer_delay)), \
110102
.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n), \
111-
.data_pin_config = DT_INST_ENUM_IDX(n, data_pin_config), \
112-
.output_config = DT_INST_PROP(n, tristate_output), \
103+
.data_pin_config = (uint8_t)DT_INST_ENUM_IDX(n, data_pin_config), \
104+
.tristate_output = DT_INST_PROP(n, tristate_output), \
113105
.rx_fifo_size = (uint8_t)DT_INST_PROP(n, rx_fifo_size), \
114106
.tx_fifo_size = (uint8_t)DT_INST_PROP(n, tx_fifo_size), \
115107
.irqn = (uint8_t)LPSPI_IRQN(n), \

0 commit comments

Comments
 (0)