michaelh/zephyr
1
0
Fork 0
Code Releases Activity

pinmux: Rename frdm_k64f pinmux driver to k64

Browse source 
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 <maureen.helm@nxp.com>
This commit is contained in:
Maureen Helm 2016-10-09 09:56:23 -05:00 • committed by Anas Nashif
commit 342e09c463
9 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpio/gpio_k64.c
View file

@ -26,8 +26,7 @@
#include <gpio.h>
#include <soc.h>
#include <sys_io.h>
#include <pinmux/frdm_k64f/pinmux_k64.h>
#include <pinmux/k64/pinmux.h>
#include "gpio_k64.h"
#include "gpio_utils.h"

3
drivers/pinmux/Makefile
View file

@ -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

6
drivers/pinmux/dev/Kconfig
View file

@ -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

4
drivers/pinmux/dev/Makefile
View file

@ -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

5
drivers/pinmux/dev/pinmux_dev_frdm_k64f.c → drivers/pinmux/dev/pinmux_dev_k64.c
View file

@ -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 <pinmux.h>
#include <soc.h>
#include <sys_io.h>
#include "pinmux_k64.h"
#include <pinmux/k64/pinmux.h>
static int fsl_k64_dev_set(struct device *dev, uint32_t pin,
uint32_t func)

5
drivers/pinmux/frdm_k64f/pinmux_k64.c → drivers/pinmux/k64/pinmux.c
View file

@ -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 <sys_io.h>
#include <pinmux.h>
#include <pinmux/pinmux.h>
#include "pinmux_k64.h"
#include <pinmux/k64/pinmux.h>
/* port pin number conversion from pin ID */
#define PIN_FROM_ID(pin_id) (pin_id % K64_PINMUX_NUM_PINS)

2
drivers/pinmux/frdm_k64f/pinmux_k64.h → drivers/pinmux/k64/pinmux.h
View file

@ -1,4 +1,4 @@
/* pinmux_k64.h - Freescale K64 pinmux header */
/* pinmux.h - Freescale K64 pinmux header */
/*
* Copyright (c) 2016, Wind River Systems, Inc.

3
drivers/pinmux/frdm_k64f/pinmux_board_frdm_k64f.c → drivers/pinmux/k64/pinmux_board_frdm_k64f.c
View file

@ -22,8 +22,7 @@
#include <sys_io.h>
#include <pinmux.h>
#include <pinmux/pinmux.h>
#include "pinmux_k64.h"
#include <pinmux/k64/pinmux.h>
/*
* I/O pin configuration

2
tests/drivers/pinmux/prj_frdm_k64f.conf
View file

@ -1,2 +1,2 @@
CONFIG_PINMUX_DEV=y
CONFIG_PINMUX_DEV_FRDM_K64F=y
CONFIG_PINMUX_DEV_K64=y