diff --git a/boards/nxp/mimxrt700_evk/Kconfig.mimxrt700_evk b/boards/nxp/mimxrt700_evk/Kconfig.mimxrt700_evk index 1e27338890b5f..d7c3b6be7c797 100644 --- a/boards/nxp/mimxrt700_evk/Kconfig.mimxrt700_evk +++ b/boards/nxp/mimxrt700_evk/Kconfig.mimxrt700_evk @@ -6,4 +6,4 @@ config BOARD_MIMXRT700_EVK select SOC_MIMXRT798S_CM33_CPU1 if BOARD_MIMXRT700_EVK_MIMXRT798S_CM33_CPU1 select SOC_MIMXRT798S_HIFI4 if BOARD_MIMXRT700_EVK_MIMXRT798S_HIFI4 select SOC_MIMXRT798S_HIFI1 if BOARD_MIMXRT700_EVK_MIMXRT798S_HIFI1 - select SOC_PART_NUMBER_MIMXRT798SGFOA + select SOC_PART_NUMBER_MIMXRT798SGFOB diff --git a/drivers/mipi_dsi/dsi_mcux.c b/drivers/mipi_dsi/dsi_mcux.c index 7dc0944690bad..81ba91045348c 100644 --- a/drivers/mipi_dsi/dsi_mcux.c +++ b/drivers/mipi_dsi/dsi_mcux.c @@ -236,18 +236,18 @@ static ssize_t dsi_mcux_transfer(const struct device *dev, uint8_t channel, LOG_ERR("DCS Read not yet implemented or used"); return -ENOTSUP; case MIPI_DSI_DCS_SHORT_WRITE: - dsi_xfer.sendDscCmd = true; - dsi_xfer.dscCmd = msg->cmd; + dsi_xfer.sendDcsCmd = true; + dsi_xfer.dcsCmd = msg->cmd; dsi_xfer.txDataType = kDSI_TxDataDcsShortWrNoParam; break; case MIPI_DSI_DCS_SHORT_WRITE_PARAM: - dsi_xfer.sendDscCmd = true; - dsi_xfer.dscCmd = msg->cmd; + dsi_xfer.sendDcsCmd = true; + dsi_xfer.dcsCmd = msg->cmd; dsi_xfer.txDataType = kDSI_TxDataDcsShortWrOneParam; break; case MIPI_DSI_DCS_LONG_WRITE: - dsi_xfer.sendDscCmd = true; - dsi_xfer.dscCmd = msg->cmd; + dsi_xfer.sendDcsCmd = true; + dsi_xfer.dcsCmd = msg->cmd; dsi_xfer.flags = kDSI_TransferUseHighSpeed; dsi_xfer.txDataType = kDSI_TxDataDcsLongWr; /* diff --git a/drivers/mipi_dsi/dsi_mcux_2l.c b/drivers/mipi_dsi/dsi_mcux_2l.c index 14ec387960178..c4615f32ec803 100644 --- a/drivers/mipi_dsi/dsi_mcux_2l.c +++ b/drivers/mipi_dsi/dsi_mcux_2l.c @@ -325,8 +325,8 @@ static int dsi_mcux_tx_color(const struct device *dev, uint8_t channel, .txData = msg->tx_buf, .rxDataSize = (uint16_t)msg->rx_len, .rxData = msg->rx_buf, - .sendDscCmd = true, - .dscCmd = msg->cmd, + .sendDcsCmd = true, + .dcsCmd = msg->cmd, .txDataType = kDSI_TxDataDcsLongWr, /* default to high speed unless told to use low power */ .flags = (msg->flags & MIPI_DSI_MSG_USE_LPM) ? 0 : kDSI_TransferUseHighSpeed, @@ -680,18 +680,18 @@ static ssize_t dsi_mcux_transfer(const struct device *dev, uint8_t channel, LOG_ERR("DCS Read not yet implemented or used"); return -ENOTSUP; case MIPI_DSI_DCS_SHORT_WRITE: - dsi_xfer.sendDscCmd = true; - dsi_xfer.dscCmd = msg->cmd; + dsi_xfer.sendDcsCmd = true; + dsi_xfer.dcsCmd = msg->cmd; dsi_xfer.txDataType = kDSI_TxDataDcsShortWrNoParam; break; case MIPI_DSI_DCS_SHORT_WRITE_PARAM: - dsi_xfer.sendDscCmd = true; - dsi_xfer.dscCmd = msg->cmd; + dsi_xfer.sendDcsCmd = true; + dsi_xfer.dcsCmd = msg->cmd; dsi_xfer.txDataType = kDSI_TxDataDcsShortWrOneParam; break; case MIPI_DSI_DCS_LONG_WRITE: - dsi_xfer.sendDscCmd = true; - dsi_xfer.dscCmd = msg->cmd; + dsi_xfer.sendDcsCmd = true; + dsi_xfer.dcsCmd = msg->cmd; dsi_xfer.txDataType = kDSI_TxDataDcsLongWr; #ifndef CONFIG_MIPI_DSI_MCUX_NXP_DCNANO_LCDIF int ret; diff --git a/soc/nxp/imxrt/imxrt118x/soc.c b/soc/nxp/imxrt/imxrt118x/soc.c index 6ad681759c74d..2129b59cbb9ca 100644 --- a/soc/nxp/imxrt/imxrt118x/soc.c +++ b/soc/nxp/imxrt/imxrt118x/soc.c @@ -145,7 +145,6 @@ __weak void clock_init(void) /* Init OSC RC 400M */ CLOCK_OSC_EnableOscRc400M(); - CLOCK_OSC_GateOscRc400M(false); #if CONFIG_CPU_CORTEX_M7 /* Switch both core to OscRC400M first */ diff --git a/soc/nxp/imxrt/imxrt7xx/Kconfig.soc b/soc/nxp/imxrt/imxrt7xx/Kconfig.soc index 384f99cdb6aba..fe0c261d3e02c 100644 --- a/soc/nxp/imxrt/imxrt7xx/Kconfig.soc +++ b/soc/nxp/imxrt/imxrt7xx/Kconfig.soc @@ -40,28 +40,28 @@ config SOC_TOOLCHAIN_NAME default "nxp_rt700_hifi4" if SOC_MIMXRT798S_HIFI4 default "nxp_rt700_hifi1" if SOC_MIMXRT798S_HIFI1 -config SOC_PART_NUMBER_MIMXRT798SGAWAR +config SOC_PART_NUMBER_MIMXRT798SGAWBR bool -config SOC_PART_NUMBER_MIMXRT798SGFOA +config SOC_PART_NUMBER_MIMXRT798SGFOB bool -config SOC_PART_NUMBER_MIMXRT758SGAWAR +config SOC_PART_NUMBER_MIMXRT758SGAWBR bool -config SOC_PART_NUMBER_MIMXRT758SGFOA +config SOC_PART_NUMBER_MIMXRT758SGFOB bool -config SOC_PART_NUMBER_MIMXRT735SGAWAR +config SOC_PART_NUMBER_MIMXRT735SGAWBR bool -config SOC_PART_NUMBER_MIMXRT735SGFOA +config SOC_PART_NUMBER_MIMXRT735SGFOB bool config SOC_PART_NUMBER - default "MIMXRT798SGFOA" if SOC_PART_NUMBER_MIMXRT798SGFOA - default "MIMXRT798SGAWAR" if SOC_PART_NUMBER_MIMXRT798SGAWAR - default "MIMXRT758SGFOA" if SOC_PART_NUMBER_MIMXRT758SGFOA - default "MIMXRT758SGAWAR" if SOC_PART_NUMBER_MIMXRT758SGAWAR - default "MIMXRT735SGFOA" if SOC_PART_NUMBER_MIMXRT735SGFOA - default "MIMXRT735SGAWAR" if SOC_PART_NUMBER_MIMXRT735SGAWAR + default "MIMXRT798SGFOB" if SOC_PART_NUMBER_MIMXRT798SGFOB + default "MIMXRT798SGAWBR" if SOC_PART_NUMBER_MIMXRT798SGAWBR + default "MIMXRT758SGFOB" if SOC_PART_NUMBER_MIMXRT758SGFOB + default "MIMXRT758SGAWBR" if SOC_PART_NUMBER_MIMXRT758SGAWBR + default "MIMXRT735SGFOB" if SOC_PART_NUMBER_MIMXRT735SGFOB + default "MIMXRT735SGAWBR" if SOC_PART_NUMBER_MIMXRT735SGAWBR diff --git a/west.yml b/west.yml index a5154435a3cdf..232bf0d6cb38d 100644 --- a/west.yml +++ b/west.yml @@ -210,7 +210,7 @@ manifest: groups: - hal - name: hal_nxp - revision: 4377ecfba52fe0ff7352eadf426b523ed3e1d27f + revision: pull/612/head path: modules/hal/nxp groups: - hal