From 342e09c46322eddbc56ff46e3ee073a75f2fd094 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Sun, 9 Oct 2016 09:56:23 -0500 Subject: [PATCH] pinmux: Rename frdm_k64f pinmux driver to k64 The k64 pinmux driver can be used for any k64 board, not just frdm_k64f, therefore renaming the driver accordingly. Change-Id: I45e96d4a5ff6aa859d0f57fe098e44a8ae5283d1 Signed-off-by: Maureen Helm --- drivers/gpio/gpio_k64.c | 3 +-- drivers/pinmux/Makefile | 3 ++- drivers/pinmux/dev/Kconfig | 6 +++--- drivers/pinmux/dev/Makefile | 4 ++-- .../pinmux/dev/{pinmux_dev_frdm_k64f.c => pinmux_dev_k64.c} | 5 ++--- drivers/pinmux/{frdm_k64f/pinmux_k64.c => k64/pinmux.c} | 5 ++--- drivers/pinmux/{frdm_k64f/pinmux_k64.h => k64/pinmux.h} | 2 +- drivers/pinmux/{frdm_k64f => k64}/pinmux_board_frdm_k64f.c | 3 +-- tests/drivers/pinmux/prj_frdm_k64f.conf | 2 +- 9 files changed, 15 insertions(+), 18 deletions(-) rename drivers/pinmux/dev/{pinmux_dev_frdm_k64f.c => pinmux_dev_k64.c} (93%) rename drivers/pinmux/{frdm_k64f/pinmux_k64.c => k64/pinmux.c} (97%) rename drivers/pinmux/{frdm_k64f/pinmux_k64.h => k64/pinmux.h} (99%) rename drivers/pinmux/{frdm_k64f => k64}/pinmux_board_frdm_k64f.c (99%) diff --git a/drivers/gpio/gpio_k64.c b/drivers/gpio/gpio_k64.c index 8ed0a89f567..51e03dee8ed 100644 --- a/drivers/gpio/gpio_k64.c +++ b/drivers/gpio/gpio_k64.c @@ -26,8 +26,7 @@ #include #include #include - -#include +#include #include "gpio_k64.h" #include "gpio_utils.h" diff --git a/drivers/pinmux/Makefile b/drivers/pinmux/Makefile index 99758c09902..9e2202d7463 100644 --- a/drivers/pinmux/Makefile +++ b/drivers/pinmux/Makefile @@ -1,7 +1,8 @@ ccflags-y +=-I$(srctree)/drivers # Board initialization -obj-$(CONFIG_PINMUX_K64) += frdm_k64f/pinmux_k64.o frdm_k64f/pinmux_board_frdm_k64f.o +obj-$(CONFIG_PINMUX_K64) += k64/pinmux.o +obj-$(CONFIG_BOARD_FRDM_K64F) += k64/pinmux_board_frdm_k64f.o obj-$(CONFIG_PINMUX_STM32) += stm32/pinmux_stm32.o obj-$(CONFIG_BOARD_NUCLEO_F103RB) += stm32/pinmux_board_nucleo_f103rb.o obj-$(CONFIG_BOARD_OLIMEXINO_STM32) += stm32/pinmux_board_olimexino_stm32.o diff --git a/drivers/pinmux/dev/Kconfig b/drivers/pinmux/dev/Kconfig index 450128721a6..ede0cbad19e 100644 --- a/drivers/pinmux/dev/Kconfig +++ b/drivers/pinmux/dev/Kconfig @@ -40,11 +40,11 @@ config PINMUX_DEV_ATMEL_SAM3X Atmel SAM3X family of microcontrollers. default n -config PINMUX_DEV_FRDM_K64F - bool "Enable the pinmux dev driver for Freescale FRDM K64F" +config PINMUX_DEV_K64 + bool "Enable the pinmux dev driver for Freescale K64" depends on PINMUX_DEV && SOC_MK64F12 help - Enables the pinmux dev driver for Freescale FRDM K64F. + Enables the pinmux dev driver for Freescale K64. default n config PINMUX_DEV_GALILEO diff --git a/drivers/pinmux/dev/Makefile b/drivers/pinmux/dev/Makefile index cd3c2e011ee..6bcde7e251d 100644 --- a/drivers/pinmux/dev/Makefile +++ b/drivers/pinmux/dev/Makefile @@ -1,8 +1,8 @@ ccflags-$(CONFIG_PINMUX_DEV) +=-I$(srctree)/drivers -ccflags-$(CONFIG_PINMUX_DEV_FRDM_K64F) +=-I$(srctree)/drivers/pinmux/frdm_k64f/ +ccflags-$(CONFIG_PINMUX_DEV_K64) +=-I$(srctree)/drivers/pinmux/k64/ ccflags-$(CONFIG_PINMUX_DEV_QMSI) += -I$(CONFIG_QMSI_INSTALL_PATH)/include obj-$(CONFIG_PINMUX_DEV_ATMEL_SAM3X) += pinmux_dev_atmel_sam3x.o -obj-$(CONFIG_PINMUX_DEV_FRDM_K64F) += pinmux_dev_frdm_k64f.o +obj-$(CONFIG_PINMUX_DEV_K64) += pinmux_dev_k64.o obj-$(CONFIG_PINMUX_DEV_QMSI) += pinmux_dev_qmsi.o obj-$(CONFIG_PINMUX_DEV_STM32) += pinmux_dev_stm32.o diff --git a/drivers/pinmux/dev/pinmux_dev_frdm_k64f.c b/drivers/pinmux/dev/pinmux_dev_k64.c similarity index 93% rename from drivers/pinmux/dev/pinmux_dev_frdm_k64f.c rename to drivers/pinmux/dev/pinmux_dev_k64.c index c00ce862939..c88d3389df5 100644 --- a/drivers/pinmux/dev/pinmux_dev_frdm_k64f.c +++ b/drivers/pinmux/dev/pinmux_dev_k64.c @@ -1,4 +1,4 @@ -/* pinmux_dev_frdm_k64f.c - Pinmux dev driver for Freescale FRDM-K64F */ +/* pinmux_dev_k64.c - Pinmux dev driver for Freescale K64 */ /* * Copyright (c) 2016 Intel Corporation @@ -22,8 +22,7 @@ #include #include #include - -#include "pinmux_k64.h" +#include static int fsl_k64_dev_set(struct device *dev, uint32_t pin, uint32_t func) diff --git a/drivers/pinmux/frdm_k64f/pinmux_k64.c b/drivers/pinmux/k64/pinmux.c similarity index 97% rename from drivers/pinmux/frdm_k64f/pinmux_k64.c rename to drivers/pinmux/k64/pinmux.c index 64f464a61e7..d56811b7201 100644 --- a/drivers/pinmux/frdm_k64f/pinmux_k64.c +++ b/drivers/pinmux/k64/pinmux.c @@ -1,4 +1,4 @@ -/* pinmux_k64.c - pin out mapping for the Freescale FRDM-K64F board */ +/* pinmux.c - pin out mapping for the Freescale K64 SoC */ /* * Copyright (c) 2016, Wind River Systems, Inc. @@ -25,8 +25,7 @@ #include #include #include - -#include "pinmux_k64.h" +#include /* port pin number conversion from pin ID */ #define PIN_FROM_ID(pin_id) (pin_id % K64_PINMUX_NUM_PINS) diff --git a/drivers/pinmux/frdm_k64f/pinmux_k64.h b/drivers/pinmux/k64/pinmux.h similarity index 99% rename from drivers/pinmux/frdm_k64f/pinmux_k64.h rename to drivers/pinmux/k64/pinmux.h index f51373026f0..9e4254d2b62 100644 --- a/drivers/pinmux/frdm_k64f/pinmux_k64.h +++ b/drivers/pinmux/k64/pinmux.h @@ -1,4 +1,4 @@ -/* pinmux_k64.h - Freescale K64 pinmux header */ +/* pinmux.h - Freescale K64 pinmux header */ /* * Copyright (c) 2016, Wind River Systems, Inc. diff --git a/drivers/pinmux/frdm_k64f/pinmux_board_frdm_k64f.c b/drivers/pinmux/k64/pinmux_board_frdm_k64f.c similarity index 99% rename from drivers/pinmux/frdm_k64f/pinmux_board_frdm_k64f.c rename to drivers/pinmux/k64/pinmux_board_frdm_k64f.c index 9a1b486e0e6..c5701ee654d 100644 --- a/drivers/pinmux/frdm_k64f/pinmux_board_frdm_k64f.c +++ b/drivers/pinmux/k64/pinmux_board_frdm_k64f.c @@ -22,8 +22,7 @@ #include #include #include - -#include "pinmux_k64.h" +#include /* * I/O pin configuration diff --git a/tests/drivers/pinmux/prj_frdm_k64f.conf b/tests/drivers/pinmux/prj_frdm_k64f.conf index 7f82833adbc..f9362ec9d07 100644 --- a/tests/drivers/pinmux/prj_frdm_k64f.conf +++ b/tests/drivers/pinmux/prj_frdm_k64f.conf @@ -1,2 +1,2 @@ CONFIG_PINMUX_DEV=y -CONFIG_PINMUX_DEV_FRDM_K64F=y +CONFIG_PINMUX_DEV_K64=y