diff options
author | Anas Nashif <anas.nashif@intel.com> | 2017-01-25 07:42:47 -0500 |
---|---|---|
committer | Anas Nashif <nashif@linux.intel.com> | 2017-01-25 20:43:18 +0000 |
commit | 42e1c9ca34421a4c80f9e8d92c78d913dbcf112c (patch) | |
tree | f8c5b81bf7ced38cb5c22df668dd64015fdc64da /drivers | |
parent | 41ffe0240df7823ec23f3145643cc8e8bb42e713 (diff) |
pinmux: make pinmux_dev the default pinmux driver for quark
Jira: ZEP-958
Change-Id: Ib6c528a103372d5084efa5ae8635803e2912e0dd
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/pinmux/Kconfig | 7 | ||||
-rw-r--r-- | drivers/pinmux/Makefile | 3 | ||||
-rw-r--r-- | drivers/pinmux/dev/Kconfig | 7 | ||||
-rw-r--r-- | drivers/pinmux/dev/Makefile | 2 | ||||
-rw-r--r-- | drivers/pinmux/pinmux_qmsi.c (renamed from drivers/pinmux/dev/pinmux_dev_qmsi.c) | 24 |
5 files changed, 22 insertions, 21 deletions
diff --git a/drivers/pinmux/Kconfig b/drivers/pinmux/Kconfig index 0897e33e2..3e5769dad 100644 --- a/drivers/pinmux/Kconfig +++ b/drivers/pinmux/Kconfig @@ -39,6 +39,13 @@ config PINMUX_INIT_PRIORITY rule for particular boards. Don't change this value unless you 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.stm32" diff --git a/drivers/pinmux/Makefile b/drivers/pinmux/Makefile index eba1b960c..6a5560c8f 100644 --- a/drivers/pinmux/Makefile +++ b/drivers/pinmux/Makefile @@ -1,5 +1,7 @@ ccflags-y +=-I$(srctree)/drivers +ccflags-$(CONFIG_PINMUX_QMSI) += -I$(CONFIG_QMSI_INSTALL_PATH)/include + # Board initialization obj-$(CONFIG_PINMUX_MCUX) += pinmux_mcux.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_OLIMEXINO_STM32) += stm32/pinmux_board_olimexino_stm32.o obj-$(CONFIG_BOARD_STM32_MINI_A15) += stm32/pinmux_board_stm32_mini_a15.o +obj-$(CONFIG_PINMUX_QMSI) += pinmux_qmsi.o # "runtime" pinmux obj-$(CONFIG_PINMUX_DEV) += dev/ diff --git a/drivers/pinmux/dev/Kconfig b/drivers/pinmux/dev/Kconfig index d2448f8fe..64a17564a 100644 --- a/drivers/pinmux/dev/Kconfig +++ b/drivers/pinmux/dev/Kconfig @@ -44,13 +44,6 @@ config PINMUX_DEV_GALILEO Enables the pinmux dev driver for the Galileo board. 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 bool "Enable pinmux dev driver for the ST STM32 family." depends on PINMUX_DEV && SOC_FAMILY_STM32 diff --git a/drivers/pinmux/dev/Makefile b/drivers/pinmux/dev/Makefile index a90933cdc..4f9d1f1c8 100644 --- a/drivers/pinmux/dev/Makefile +++ b/drivers/pinmux/dev/Makefile @@ -1,9 +1,7 @@ ccflags-$(CONFIG_PINMUX_DEV) +=-I$(srctree)/drivers 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_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_ARM_V2M_BEETLE) += pinmux_dev_arm_beetle.o diff --git a/drivers/pinmux/dev/pinmux_dev_qmsi.c b/drivers/pinmux/pinmux_qmsi.c index fd9fcdb0c..19f3fb88b 100644 --- a/drivers/pinmux/dev/pinmux_dev_qmsi.c +++ b/drivers/pinmux/pinmux_qmsi.c @@ -1,4 +1,4 @@ -/* pinmux_dev_qmsi.c - QMSI pinmux dev driver */ +/* pinmux_qmsi.c - QMSI pinmux dev driver */ /* * Copyright (c) 2016 Intel Corporation @@ -13,7 +13,7 @@ #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) { 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; } -static int pinmux_dev_get(struct device *dev, uint32_t pin, +static int pinmux_get(struct device *dev, uint32_t pin, uint32_t *func) { ARG_UNUSED(dev); @@ -55,7 +55,7 @@ static int pinmux_dev_get(struct device *dev, uint32_t pin, 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) { 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; } -static int pinmux_dev_input(struct device *dev, uint32_t pin, +static int pinmux_input(struct device *dev, uint32_t pin, uint8_t func) { 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 = { - .set = pinmux_dev_set, - .get = pinmux_dev_get, - .pullup = pinmux_dev_pullup, - .input = pinmux_dev_input + .set = pinmux_set, + .get = pinmux_get, + .pullup = pinmux_pullup, + .input = pinmux_input }; -static int pinmux_dev_initialize(struct device *port) +static int pinmux_initialize(struct device *port) { return 0; } -DEVICE_AND_API_INIT(pmux_dev, CONFIG_PINMUX_DEV_NAME, - &pinmux_dev_initialize, NULL, NULL, +DEVICE_AND_API_INIT(pmux_dev, CONFIG_PINMUX_NAME, + &pinmux_initialize, NULL, NULL, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &api_funcs); |