frdm_k64f: hexiwear_k64: Remove defaults for the uart_k20 driver

Jira: ZEP-719
Change-Id: If1d3e1d450f582d6d3d500385e7fc15afe00b79f
Signed-off-by: Maureen Helm <maureen.helm@nxp.com>

4 files changed, 4 insertions, 104 deletions

diff --git a/boards/arm/frdm_k64f/Kconfig.defconfig b/boards/arm/frdm_k64f/Kconfig.defconfig
index 645eadf97..d90a0f60d 100644
--- a/boards/arm/frdm_k64f/Kconfig.defconfig
+++ b/boards/arm/frdm_k64f/Kconfig.defconfig
@@ -28,55 +28,6 @@ config MCG_VDIV0
 config MCG_FCRDIV
 	default 1
 
-if UART_K20
-
-config UART_K20_PORT_0
-	def_bool y
-if UART_K20_PORT_0
-config UART_K20_PORT_0_IRQ_PRI
-	default 3
-config UART_K20_PORT_0_BAUD_RATE
-	default 115200
-endif
-
-config UART_K20_PORT_1
-	def_bool y
-if UART_K20_PORT_1
-config UART_K20_PORT_1_IRQ_PRI
-	default 3
-config UART_K20_PORT_1_BAUD_RATE
-	default 115200
-endif
-
-config UART_K20_PORT_2
-	def_bool y
-if UART_K20_PORT_2
-config UART_K20_PORT_2_IRQ_PRI
-	default 3
-config UART_K20_PORT_2_BAUD_RATE
-	default 115200
-endif
-
-config UART_K20_PORT_3
-	def_bool y
-if UART_K20_PORT_3
-config UART_K20_PORT_3_IRQ_PRI
-	default 3
-config UART_K20_PORT_3_BAUD_RATE
-	default 115200
-endif
-
-config UART_K20_PORT_4
-	def_bool y
-if UART_K20_PORT_4
-config UART_K20_PORT_4_IRQ_PRI
-	default 3
-config UART_K20_PORT_4_BAUD_RATE
-	default 115200
-endif
-
-endif # UART_K20
-
 if UART_MCUX
 
 config UART_MCUX_0
diff --git a/boards/arm/frdm_k64f/pinmux.c b/boards/arm/frdm_k64f/pinmux.c
index f5a86ad66..e7d7e1aae 100644
--- a/boards/arm/frdm_k64f/pinmux.c
+++ b/boards/arm/frdm_k64f/pinmux.c
@@ -33,13 +33,13 @@ static int frdm_k64f_pinmux_init(struct device *dev)
 		device_get_binding(CONFIG_PINMUX_MCUX_PORTE_NAME);
 #endif
 
-#if defined(CONFIG_UART_K20_PORT_0) || defined(CONFIG_UART_MCUX_0)
+#ifdef CONFIG_UART_MCUX_0
 	/* UART0 RX, TX */
 	pinmux_pin_set(portb, 16, PORT_PCR_MUX(kPORT_MuxAlt3));
 	pinmux_pin_set(portb, 17, PORT_PCR_MUX(kPORT_MuxAlt3));
 #endif
 
-#if defined(CONFIG_UART_K20_PORT_3) || defined(CONFIG_UART_MCUX_3)
+#ifdef CONFIG_UART_MCUX_3
 	/* UART3 RX, TX */
 	pinmux_pin_set(portc, 16, PORT_PCR_MUX(kPORT_MuxAlt3));
 	pinmux_pin_set(portc, 17, PORT_PCR_MUX(kPORT_MuxAlt3));
diff --git a/boards/arm/hexiwear_k64/Kconfig.defconfig b/boards/arm/hexiwear_k64/Kconfig.defconfig
index a42a68be1..bf40e8637 100644
--- a/boards/arm/hexiwear_k64/Kconfig.defconfig
+++ b/boards/arm/hexiwear_k64/Kconfig.defconfig
@@ -28,55 +28,6 @@ config MCG_VDIV0
 config MCG_FCRDIV
 	default 1
 
-if UART_K20
-
-config UART_K20_PORT_0
-	def_bool y
-if UART_K20_PORT_0
-config UART_K20_PORT_0_IRQ_PRI
-	default 3
-config UART_K20_PORT_0_BAUD_RATE
-	default 115200
-endif
-
-config UART_K20_PORT_1
-	def_bool y
-if UART_K20_PORT_1
-config UART_K20_PORT_1_IRQ_PRI
-	default 3
-config UART_K20_PORT_1_BAUD_RATE
-	default 115200
-endif
-
-config UART_K20_PORT_2
-	def_bool y
-if UART_K20_PORT_2
-config UART_K20_PORT_2_IRQ_PRI
-	default 3
-config UART_K20_PORT_2_BAUD_RATE
-	default 115200
-endif
-
-config UART_K20_PORT_3
-	def_bool y
-if UART_K20_PORT_3
-config UART_K20_PORT_3_IRQ_PRI
-	default 3
-config UART_K20_PORT_3_BAUD_RATE
-	default 115200
-endif
-
-config UART_K20_PORT_4
-	def_bool y
-if UART_K20_PORT_4
-config UART_K20_PORT_4_IRQ_PRI
-	default 3
-config UART_K20_PORT_4_BAUD_RATE
-	default 115200
-endif
-
-endif # UART_K20
-
 if UART_MCUX
 
 config UART_MCUX_0
@@ -99,7 +50,6 @@ config PINMUX_MCUX_PORTA
 	def_bool n
 
 config PINMUX_MCUX_PORTB
-	def_bool y if UART_K20_PORT_0
 	def_bool y if UART_MCUX_0
 
 config PINMUX_MCUX_PORTC
@@ -109,7 +59,6 @@ config PINMUX_MCUX_PORTD
 	def_bool y
 
 config PINMUX_MCUX_PORTE
-	def_bool y if UART_K20_PORT_4
 	def_bool y if UART_MCUX_4
 
 endif # PINMUX_MCUX
diff --git a/boards/arm/hexiwear_k64/pinmux.c b/boards/arm/hexiwear_k64/pinmux.c
index 052bb193d..78b2acefb 100644
--- a/boards/arm/hexiwear_k64/pinmux.c
+++ b/boards/arm/hexiwear_k64/pinmux.c
@@ -48,13 +48,13 @@ static int hexiwear_k64_pinmux_init(struct device *dev)
 	/* FXOS8700 INT2 */
 	pinmux_pin_set(portd, 13, PORT_PCR_MUX(kPORT_MuxAsGpio));
 
-#if defined(CONFIG_UART_K20_PORT_0) || defined(CONFIG_UART_MCUX_0)
+#ifdef CONFIG_UART_MCUX_0
 	/* UART0 RX, TX */
 	pinmux_pin_set(portb, 16, PORT_PCR_MUX(kPORT_MuxAlt3));
 	pinmux_pin_set(portb, 17, PORT_PCR_MUX(kPORT_MuxAlt3));
 #endif
 
-#if defined(CONFIG_UART_K20_PORT_4) || defined(CONFIG_UART_MCUX_4)
+#ifdef CONFIG_UART_MCUX_4
 	/* UART4 RX, TX - BLE */
 	pinmux_pin_set(porte, 24, PORT_PCR_MUX(kPORT_MuxAlt3));
 	pinmux_pin_set(porte, 25, PORT_PCR_MUX(kPORT_MuxAlt3));