From 294fdab7bd583cedc16f7748ac627de3ecf0211c Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Wed, 11 Jan 2017 16:20:06 -0600 Subject: serial: k64: Remove the uart_k20 driver Now that we have a more generic mcux serial driver, remove the uart_k20 driver. Jira: ZEP-719 Change-Id: I51a3237454140feabbfe18ac2c8ee451e572c7be Signed-off-by: Maureen Helm --- arch/arm/soc/nxp_kinetis/k6x/Makefile | 1 - arch/arm/soc/nxp_kinetis/k6x/soc.c | 3 +- arch/arm/soc/nxp_kinetis/k6x/soc.h | 31 ------------- arch/arm/soc/nxp_kinetis/k6x/soc_config.c | 73 ------------------------------- 4 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 arch/arm/soc/nxp_kinetis/k6x/soc_config.c (limited to 'arch') diff --git a/arch/arm/soc/nxp_kinetis/k6x/Makefile b/arch/arm/soc/nxp_kinetis/k6x/Makefile index 58aa4be2d..5a808ab1e 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/Makefile +++ b/arch/arm/soc/nxp_kinetis/k6x/Makefile @@ -1,3 +1,2 @@ -obj-y += soc_config.o obj-y += soc.o obj-y += wdog.o diff --git a/arch/arm/soc/nxp_kinetis/k6x/soc.c b/arch/arm/soc/nxp_kinetis/k6x/soc.c index d0f0da439..b404f6cbf 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/soc.c +++ b/arch/arm/soc/nxp_kinetis/k6x/soc.c @@ -141,8 +141,7 @@ static ALWAYS_INLINE void clkInit(void) * * @brief Perform basic hardware initialization * - * Initialize the interrupt controller device drivers and the - * Kinetis UART device driver. + * Initialize the interrupt controller device drivers. * Also initialize the timer device driver, if required. * * @return 0 diff --git a/arch/arm/soc/nxp_kinetis/k6x/soc.h b/arch/arm/soc/nxp_kinetis/k6x/soc.h index ab9cab3f2..4b0ff67a2 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/soc.h +++ b/arch/arm/soc/nxp_kinetis/k6x/soc.h @@ -138,37 +138,6 @@ extern "C" { #include #include -/* - * UART configuration settings - */ -#if defined(CONFIG_UART_K20) - -#include - -#define UART_IRQ_FLAGS 0 - -#define UART_K20_PORT_0_CLK_FREQ SYSCLK_DEFAULT_IOSC_HZ -#define UART_K20_PORT_0_BASE_ADDR 0x4006A000 -#define UART_K20_PORT_0_IRQ IRQ_UART0_STATUS - -#define UART_K20_PORT_1_CLK_FREQ SYSCLK_DEFAULT_IOSC_HZ -#define UART_K20_PORT_1_BASE_ADDR 0x4006B000 -#define UART_K20_PORT_1_IRQ IRQ_UART1_STATUS - -#define UART_K20_PORT_2_CLK_FREQ BUSCLK_DEFAULT_IOSC_HZ -#define UART_K20_PORT_2_BASE_ADDR 0x4006C000 -#define UART_K20_PORT_2_IRQ IRQ_UART2_STATUS - -#define UART_K20_PORT_3_CLK_FREQ BUSCLK_DEFAULT_IOSC_HZ -#define UART_K20_PORT_3_BASE_ADDR 0x4006D000 -#define UART_K20_PORT_3_IRQ IRQ_UART3_STATUS - -#define UART_K20_PORT_4_CLK_FREQ BUSCLK_DEFAULT_IOSC_HZ -#define UART_K20_PORT_4_BASE_ADDR 0x400EA000 -#define UART_K20_PORT_4_IRQ IRQ_UART4_STATUS - -#endif /* CONFIG_UART_K20 */ - /* * PWM/FTM configuration settings */ diff --git a/arch/arm/soc/nxp_kinetis/k6x/soc_config.c b/arch/arm/soc/nxp_kinetis/k6x/soc_config.c deleted file mode 100644 index e97c7c9ed..000000000 --- a/arch/arm/soc/nxp_kinetis/k6x/soc_config.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2015 Intel Corporation. - * Copyright (c) 2016, Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/** - * @file Board config file - */ - -#include -#include - -#include - -#include "soc.h" -#include - -#ifdef CONFIG_UART_K20 -#include -#include -#include -#endif /* CONFIG_UART_K20 */ - -/* - * UART configuration - */ - -#ifdef CONFIG_UART_K20 - -static int uart_k20_init(struct device *dev) -{ - uint32_t scgc4; - - ARG_UNUSED(dev); - - /* Although it is possible to modify the bits through - * *sim directly, the following code saves about 20 bytes - * of ROM space, compared to direct modification. - */ - scgc4 = SIM->SCGC4; - -#ifdef CONFIG_UART_K20_PORT_0 - scgc4 |= SIM_SCGC4_UART0(1); -#endif - -#ifdef CONFIG_UART_K20_PORT_1 - scgc4 |= SIM_SCGC4_UART1(1); -#endif - -#ifdef CONFIG_UART_K20_PORT_2 - scgc4 |= SIM_SCGC4_UART2(1); -#endif - -#ifdef CONFIG_UART_K20_PORT_3 - scgc4 |= SIM_SCGC4_UART3(1); -#endif - - SIM->SCGC4 = scgc4; - -#ifdef CONFIG_UART_K20_PORT_4 - SIM->SCGC1 |= SIM_SCGC1_UART4(1); -#endif - - return 0; -} - -DEVICE_INIT(_uart_k20_init, "", uart_k20_init, - NULL, NULL, - PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); - -#endif /* CONFIG_UART_K20 */ -- cgit v1.2.3