From eb0a2f8516eeeaaaaf1c3318e936ffc1027a134f Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Sat, 7 Jan 2017 09:54:08 -0600 Subject: [PATCH] k64: Remove port clock enables from the soc init The mcux pinmux driver enables the port clocks, so the soc init no longer needs to enable them. Also removes some soc defines that were used only by the legacy k64 pinmux driver. Change-Id: I63174bef4024b5a09a73f941cea0aec691c759d3 Signed-off-by: Maureen Helm --- arch/arm/soc/nxp_kinetis/k6x/soc.c | 5 ----- arch/arm/soc/nxp_kinetis/k6x/soc.h | 15 --------------- 2 files changed, 20 deletions(-) diff --git a/arch/arm/soc/nxp_kinetis/k6x/soc.c b/arch/arm/soc/nxp_kinetis/k6x/soc.c index 0ce944ea2a9..889072edf2f 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/soc.c +++ b/arch/arm/soc/nxp_kinetis/k6x/soc.c @@ -168,11 +168,6 @@ static int fsl_frdm_k64f_init(struct device *arg) /* disable interrupts */ oldLevel = irq_lock(); - /* enable the port clocks */ - SIM->SCGC5 |= (SIM_SCGC5_PORTA(1) | SIM_SCGC5_PORTB(1) | - SIM_SCGC5_PORTC(1) | SIM_SCGC5_PORTD(1) | - SIM_SCGC5_PORTE(1)); - /* release I/O power hold to allow normal run state */ PMC->REGSC |= PMC_REGSC_ACKISO_MASK; diff --git a/arch/arm/soc/nxp_kinetis/k6x/soc.h b/arch/arm/soc/nxp_kinetis/k6x/soc.h index f261aa0c3eb..6fc7df9619d 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/soc.h +++ b/arch/arm/soc/nxp_kinetis/k6x/soc.h @@ -179,12 +179,6 @@ extern "C" { #endif /* CONFIG_UART_K20 */ -#define PORT_K64_A_BASE_ADDR 0x40049000 -#define PORT_K64_B_BASE_ADDR 0x4004A000 -#define PORT_K64_C_BASE_ADDR 0x4004B000 -#define PORT_K64_D_BASE_ADDR 0x4004C000 -#define PORT_K64_E_BASE_ADDR 0x4004D000 - /* * PWM/FTM configuration settings */ @@ -218,15 +212,6 @@ extern "C" { #endif /* CONFIG_SPI_K64 */ -/* - * PINMUX configuration settings - */ -#if defined(CONFIG_PINMUX) - -#define PINMUX_NUM_PINS 160 - -#endif /* CONFIG_PINMUX */ - #endif /* !_ASMLANGUAGE */ #ifdef __cplusplus