michaelh/zephyr
1
0
Fork 0
Code Releases Activity

pinmux: make pinmux_dev the default pinmux driver for quark

Browse source 
Jira: ZEP-958
Change-Id: Ib6c528a103372d5084efa5ae8635803e2912e0dd
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2017-01-25 07:42:47 -05:00 • committed by Anas Nashif
commit 42e1c9ca34
12 changed files with 34 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
arch/x86/soc/intel_quark/quark_d2000/Kconfig.defconfig.series
View file

@ -52,6 +52,11 @@ config QMSI
config QMSI_BUILTIN config QMSI_BUILTIN
def_bool y def_bool y
if PINMUX
config PINMUX_QMSI
def_bool y
endif
if UART_QMSI if UART_QMSI
config UART_QMSI_0 config UART_QMSI_0
def_bool y def_bool y

5
arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series
View file

@ -48,6 +48,11 @@ config PWM_QMSI
def_bool y def_bool y
endif endif
if PINMUX
config PINMUX_QMSI
def_bool y
endif
if GPIO if GPIO
config GPIO_QMSI config GPIO_QMSI
def_bool y def_bool y

7
drivers/pinmux/Kconfig
View file

@ -39,6 +39,13 @@ config PINMUX_INIT_PRIORITY
rule for particular boards. Don't change this value unless you rule for particular boards. Don't change this value unless you
know what you are doing. know what you are doing.
config PINMUX_QMSI
bool "Enable QMSI pinmux dev driver"
depends on PINMUX && QMSI
default n
help
Enables the pinmux dev driver for QMSI supported boards.
source "drivers/pinmux/Kconfig.mcux" source "drivers/pinmux/Kconfig.mcux"
source "drivers/pinmux/Kconfig.stm32" source "drivers/pinmux/Kconfig.stm32"

3
drivers/pinmux/Makefile
View file

@ -1,5 +1,7 @@
ccflags-y +=-I$(srctree)/drivers ccflags-y +=-I$(srctree)/drivers
ccflags-$(CONFIG_PINMUX_QMSI) += -I$(CONFIG_QMSI_INSTALL_PATH)/include
# Board initialization # Board initialization
obj-$(CONFIG_PINMUX_MCUX) += pinmux_mcux.o obj-$(CONFIG_PINMUX_MCUX) += pinmux_mcux.o
obj-$(CONFIG_PINMUX_STM32) += stm32/pinmux_stm32.o obj-$(CONFIG_PINMUX_STM32) += stm32/pinmux_stm32.o
@ -14,6 +16,7 @@ obj-$(CONFIG_BOARD_96B_CARBON) += stm32/pinmux_board_carbon.o
obj-$(CONFIG_BOARD_NUCLEO_L476RG) += stm32/pinmux_board_nucleo_l476rg.o obj-$(CONFIG_BOARD_NUCLEO_L476RG) += stm32/pinmux_board_nucleo_l476rg.o
obj-$(CONFIG_BOARD_OLIMEXINO_STM32) += stm32/pinmux_board_olimexino_stm32.o obj-$(CONFIG_BOARD_OLIMEXINO_STM32) += stm32/pinmux_board_olimexino_stm32.o
obj-$(CONFIG_BOARD_STM32_MINI_A15) += stm32/pinmux_board_stm32_mini_a15.o obj-$(CONFIG_BOARD_STM32_MINI_A15) += stm32/pinmux_board_stm32_mini_a15.o
obj-$(CONFIG_PINMUX_QMSI) += pinmux_qmsi.o
# "runtime" pinmux # "runtime" pinmux
obj-$(CONFIG_PINMUX_DEV) += dev/ obj-$(CONFIG_PINMUX_DEV) += dev/

7
drivers/pinmux/dev/Kconfig
View file

@ -44,13 +44,6 @@ config PINMUX_DEV_GALILEO
Enables the pinmux dev driver for the Galileo board. Enables the pinmux dev driver for the Galileo board.
default n default n
config PINMUX_DEV_QMSI
bool "Enable QMSI pinmux dev driver"
depends on PINMUX_DEV && QMSI
help
Enables the pinmux dev driver for QMSI supported boards.
default n
config PINMUX_DEV_STM32 config PINMUX_DEV_STM32
bool "Enable pinmux dev driver for the ST STM32 family." bool "Enable pinmux dev driver for the ST STM32 family."
depends on PINMUX_DEV && SOC_FAMILY_STM32 depends on PINMUX_DEV && SOC_FAMILY_STM32

2
drivers/pinmux/dev/Makefile
View file

@ -1,9 +1,7 @@
ccflags-$(CONFIG_PINMUX_DEV) +=-I$(srctree)/drivers ccflags-$(CONFIG_PINMUX_DEV) +=-I$(srctree)/drivers
ccflags-$(CONFIG_PINMUX_DEV_K64) +=-I$(srctree)/drivers/pinmux/k64/ 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_ATMEL_SAM3X) += pinmux_dev_atmel_sam3x.o
obj-$(CONFIG_PINMUX_DEV_K64) += pinmux_dev_k64.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 obj-$(CONFIG_PINMUX_DEV_STM32) += pinmux_dev_stm32.o
obj-$(CONFIG_PINMUX_DEV_ARM_V2M_BEETLE) += pinmux_dev_arm_beetle.o obj-$(CONFIG_PINMUX_DEV_ARM_V2M_BEETLE) += pinmux_dev_arm_beetle.o

24
drivers/pinmux/dev/pinmux_dev_qmsi.c → drivers/pinmux/pinmux_qmsi.c
View file

@ -1,4 +1,4 @@
/* pinmux_dev_qmsi.c - QMSI pinmux dev driver */ /* pinmux_qmsi.c - QMSI pinmux dev driver */
/* /*
* Copyright (c) 2016 Intel Corporation * Copyright (c) 2016 Intel Corporation
@ -13,7 +13,7 @@
#define MASK_2_BITS 0x3 #define MASK_2_BITS 0x3
static int pinmux_dev_set(struct device *dev, uint32_t pin, static int pinmux_set(struct device *dev, uint32_t pin,
uint32_t func) uint32_t func)
{ {
ARG_UNUSED(dev); ARG_UNUSED(dev);
@ -21,7 +21,7 @@ static int pinmux_dev_set(struct device *dev, uint32_t pin,
return qm_pmux_select(pin, func) == 0 ? 0 : -EIO; return qm_pmux_select(pin, func) == 0 ? 0 : -EIO;
} }
static int pinmux_dev_get(struct device *dev, uint32_t pin, static int pinmux_get(struct device *dev, uint32_t pin,
uint32_t *func) uint32_t *func)
{ {
ARG_UNUSED(dev); ARG_UNUSED(dev);
@ -55,7 +55,7 @@ static int pinmux_dev_get(struct device *dev, uint32_t pin,
return 0; return 0;
} }
static int pinmux_dev_pullup(struct device *dev, uint32_t pin, static int pinmux_pullup(struct device *dev, uint32_t pin,
uint8_t func) uint8_t func)
{ {
ARG_UNUSED(dev); ARG_UNUSED(dev);
@ -63,7 +63,7 @@ static int pinmux_dev_pullup(struct device *dev, uint32_t pin,
return qm_pmux_pullup_en(pin, func) == 0 ? 0 : -EIO; return qm_pmux_pullup_en(pin, func) == 0 ? 0 : -EIO;
} }
static int pinmux_dev_input(struct device *dev, uint32_t pin, static int pinmux_input(struct device *dev, uint32_t pin,
uint8_t func) uint8_t func)
{ {
ARG_UNUSED(dev); ARG_UNUSED(dev);
@ -72,18 +72,18 @@ static int pinmux_dev_input(struct device *dev, uint32_t pin,
} }
static struct pinmux_driver_api api_funcs = { static struct pinmux_driver_api api_funcs = {
.set = pinmux_dev_set, .set = pinmux_set,
.get = pinmux_dev_get, .get = pinmux_get,
.pullup = pinmux_dev_pullup, .pullup = pinmux_pullup,
.input = pinmux_dev_input .input = pinmux_input
}; };
static int pinmux_dev_initialize(struct device *port) static int pinmux_initialize(struct device *port)
{ {
return 0; return 0;
} }
DEVICE_AND_API_INIT(pmux_dev, CONFIG_PINMUX_DEV_NAME, DEVICE_AND_API_INIT(pmux_dev, CONFIG_PINMUX_NAME,
&pinmux_dev_initialize, NULL, NULL, &pinmux_initialize, NULL, NULL,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
&api_funcs); &api_funcs);

2
ext/hal/qmsi/Kbuild
View file

@ -21,7 +21,7 @@ obj-$(CONFIG_UART_QMSI) += drivers/uart/qm_uart.o
obj-$(CONFIG_DMA_QMSI) += drivers/dma/qm_dma.o obj-$(CONFIG_DMA_QMSI) += drivers/dma/qm_dma.o
obj-$(CONFIG_SPI_QMSI) += drivers/spi/qm_spi.o obj-$(CONFIG_SPI_QMSI) += drivers/spi/qm_spi.o
obj-$(CONFIG_SOC_FLASH_QMSI) += drivers/flash/qm_flash.o obj-$(CONFIG_SOC_FLASH_QMSI) += drivers/flash/qm_flash.o
obj-$(CONFIG_PINMUX_DEV_QMSI) += drivers/pinmux/qm_pinmux.o obj-$(CONFIG_PINMUX_QMSI) += drivers/pinmux/qm_pinmux.o
obj-$(CONFIG_SPI_QMSI_SS) += drivers/spi/qm_ss_spi.o obj-$(CONFIG_SPI_QMSI_SS) += drivers/spi/qm_ss_spi.o
obj-$(CONFIG_GPIO_QMSI_SS) += drivers/gpio/qm_ss_gpio.o obj-$(CONFIG_GPIO_QMSI_SS) += drivers/gpio/qm_ss_gpio.o
obj-$(CONFIG_I2C_QMSI_SS) += drivers/i2c/qm_ss_i2c.o obj-$(CONFIG_I2C_QMSI_SS) += drivers/i2c/qm_ss_i2c.o

1
tests/drivers/pinmux/prj_arduino_101.conf
View file

@ -1 +0,0 @@
CONFIG_PINMUX_DEV=y

1
tests/drivers/pinmux/prj_quark_d2000_crb.conf
View file

@ -1 +0,0 @@
CONFIG_PINMUX_DEV=y

1
tests/drivers/pinmux/prj_quark_se_c1000_devboard.conf
View file

@ -1 +0,0 @@
CONFIG_PINMUX_DEV=y

2
tests/drivers/pinmux/testcase.ini
View file

@ -1,4 +1,4 @@
[test_pinmux_dev] [test_pinmux_dev]
build_only = true build_only = true
tags = drivers tags = drivers
platform_whitelist = quark_se_c1000_devboard arduino_101 arduino_due galileo nucleo_f103rb stm32_mini_a15 olimexino_stm32 quark_d2000_crb platform_whitelist = arduino_due galileo nucleo_f103rb stm32_mini_a15 olimexino_stm32