merged.
Bruce
In message: [linux-yocto][linux-yocto v6.1/standard/nxp-sdk-6.1/nxp-soc &
v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc][PATCH 1/2] soc: imx: add
character 't' for SOC_DEV_IMX9
on 14/04/2024 Xiaolei Wang wrote:
> commit 75e1b1be1109 ("LF-9535 soc: imx: split i.MX93 SoC device support
> from soc-imx8m.c") is missing the character 't' during the backport
> process, so add it.
>
> Signed-off-by: Xiaolei Wang <xiaolei.w...@windriver.com>
> ---
> drivers/soc/imx/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/soc/imx/Kconfig b/drivers/soc/imx/Kconfig
> index 2445e0d0f419..4259381b8aa1 100644
> --- a/drivers/soc/imx/Kconfig
> +++ b/drivers/soc/imx/Kconfig
> @@ -28,7 +28,7 @@ config IMX8M_PM_DOMAINS
> select PM_GENERIC_DOMAINS
>
> config SOC_DEV_IMX9
> - ristate "i.MX9 SoC device support"
> + tristate "i.MX9 SoC device support"
> depends on ARCH_MXC || COMPILE_TEST
> depends on NVMEM_IMX_OCOTP_FSB_S400
> default ARCH_MXC && ARM64
> --
> 2.25.1
>
In message: [linux-yocto][linux-yocto v6.1/standard/nxp-sdk-6.1/nxp-soc &
v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc][PATCH 2/2] tty: serial:
fsl_lpuart: use del_timer_sync() instead of lpuart_del_timer_sync()
on 14/04/2024 Xiaolei Wang wrote:
> Replace lpuart_del_timer_sync() with del_timer_sync() to avoid build
> errors, which were introduced by commit b7f2b65538dd ("LF-9506-1 tty:
> serial: fsl_lpuart: clean up EOP related code in lpuart driver")
>
> Signed-off-by: Xiaolei Wang <xiaolei.w...@windriver.com>
> ---
> drivers/tty/serial/fsl_lpuart.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
> index 51112b27bb42..544bff231164 100644
> --- a/drivers/tty/serial/fsl_lpuart.c
> +++ b/drivers/tty/serial/fsl_lpuart.c
> @@ -1964,7 +1964,7 @@ static void lpuart_dma_shutdown(struct lpuart_port
> *sport)
> if (sport->dma_tx_chan)
> dma_release_channel(sport->dma_tx_chan);
> if (sport->dma_rx_chan) {
> - lpuart_del_timer_sync(sport);
> + del_timer_sync(&sport->lpuart_timer);
> dma_release_channel(sport->dma_rx_chan);
> }
> }
> --
> 2.25.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13816):
https://lists.yoctoproject.org/g/linux-yocto/message/13816
Mute This Topic: https://lists.yoctoproject.org/mt/105544894/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
