From 14e0aa396f1600ddee38e54059e4af03cbf6db0b Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sun, 8 May 2016 14:47:10 -0400 Subject: [PATCH] pinmux: move galileo pinmuxing to board/galileo Change-Id: I46da8ee9d9ec807c5a797ae3311519353d54e6c6 Signed-off-by: Anas Nashif --- {drivers/pinmux => boards}/galileo/Kconfig | 2 ++ boards/galileo/Makefile | 2 ++ .../pinmux_board_galileo.c => boards/galileo/pinmux.c | 0 .../pinmux_dev_galileo.c => boards/galileo/pinmux_dev.c | 0 {drivers/pinmux => boards}/galileo/pinmux_galileo.c | 9 ++++----- {drivers/pinmux => boards}/galileo/pinmux_galileo.h | 0 drivers/pinmux/Makefile | 1 - drivers/pinmux/dev/Makefile | 2 -- 8 files changed, 8 insertions(+), 8 deletions(-) rename {drivers/pinmux => boards}/galileo/Kconfig (99%) rename drivers/pinmux/galileo/pinmux_board_galileo.c => boards/galileo/pinmux.c (100%) rename drivers/pinmux/dev/pinmux_dev_galileo.c => boards/galileo/pinmux_dev.c (100%) rename {drivers/pinmux => boards}/galileo/pinmux_galileo.c (99%) rename {drivers/pinmux => boards}/galileo/pinmux_galileo.h (100%) diff --git a/drivers/pinmux/galileo/Kconfig b/boards/galileo/Kconfig similarity index 99% rename from drivers/pinmux/galileo/Kconfig rename to boards/galileo/Kconfig index e4e4c69b43d..23592823fca 100644 --- a/drivers/pinmux/galileo/Kconfig +++ b/boards/galileo/Kconfig @@ -16,6 +16,7 @@ # limitations under the License. # +if PINMUX comment "Galileo Pinmux Options" config PINMUX_GALILEO_EXP0_NAME @@ -68,3 +69,4 @@ config PINMUX_GALILEO_GPIO_INTEL_RW_NAME help The name of the Legacy Bridge Resume Well GPIO with GPIO_SUS<0>..GPIO_SUS<5> in the schematic. +endif diff --git a/boards/galileo/Makefile b/boards/galileo/Makefile index 9c255466e43..6595b5c5bd9 100644 --- a/boards/galileo/Makefile +++ b/boards/galileo/Makefile @@ -3,3 +3,5 @@ ccflags-y += -I$(srctree)/drivers asflags-y := ${ccflags-y} obj-y += board.o +obj-$(CONFIG_PINMUX) += pinmux.o pinmux_galileo.o +obj-$(CONFIG_PINMUX_DEV_GALILEO) += pinmux_dev.o diff --git a/drivers/pinmux/galileo/pinmux_board_galileo.c b/boards/galileo/pinmux.c similarity index 100% rename from drivers/pinmux/galileo/pinmux_board_galileo.c rename to boards/galileo/pinmux.c diff --git a/drivers/pinmux/dev/pinmux_dev_galileo.c b/boards/galileo/pinmux_dev.c similarity index 100% rename from drivers/pinmux/dev/pinmux_dev_galileo.c rename to boards/galileo/pinmux_dev.c diff --git a/drivers/pinmux/galileo/pinmux_galileo.c b/boards/galileo/pinmux_galileo.c similarity index 99% rename from drivers/pinmux/galileo/pinmux_galileo.c rename to boards/galileo/pinmux_galileo.c index 603fcd389a5..62e396b01ca 100644 --- a/drivers/pinmux/galileo/pinmux_galileo.c +++ b/boards/galileo/pinmux_galileo.c @@ -16,12 +16,11 @@ * limitations under the License. */ -#include -#include -#include -#include -#include #include +#include +#include +#include +#include #include #include diff --git a/drivers/pinmux/galileo/pinmux_galileo.h b/boards/galileo/pinmux_galileo.h similarity index 100% rename from drivers/pinmux/galileo/pinmux_galileo.h rename to boards/galileo/pinmux_galileo.h diff --git a/drivers/pinmux/Makefile b/drivers/pinmux/Makefile index cc6aa0c935e..c6dd85164e8 100644 --- a/drivers/pinmux/Makefile +++ b/drivers/pinmux/Makefile @@ -7,7 +7,6 @@ obj-$(CONFIG_BOARD_NUCLEO_F103RB) += stm32/pinmux_board_nucleo_f103rb.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_ARDUINO_DUE) += sam3x/pinmux_board_arduino_due.o -obj-$(CONFIG_BOARD_GALILEO) += galileo/pinmux_board_galileo.o galileo/pinmux_galileo.o # "runtime" pinmux obj-$(CONFIG_PINMUX_DEV) += dev/ diff --git a/drivers/pinmux/dev/Makefile b/drivers/pinmux/dev/Makefile index ca398a2f733..a29085dd526 100644 --- a/drivers/pinmux/dev/Makefile +++ b/drivers/pinmux/dev/Makefile @@ -1,11 +1,9 @@ ccflags-$(CONFIG_PINMUX_DEV) +=-I$(srctree)/drivers ccflags-$(CONFIG_PINMUX_DEV_FRDM_K64F) +=-I$(srctree)/drivers/pinmux/frdm_k64f/ -ccflags-$(CONFIG_PINMUX_DEV_GALILEO) +=-I$(srctree)/drivers/pinmux/galileo/ ccflags-$(CONFIG_PINMUX_DEV_QMSI) += -I$(CONFIG_QMSI_INSTALL_PATH)/include ccflags-$(CONFIG_PINMUX_DEV_QUARK_MCU) +=-I$(srctree)/drivers/pinmux/quark_mcu/ 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_GALILEO) += pinmux_dev_galileo.o obj-$(CONFIG_PINMUX_DEV_QMSI) += pinmux_dev_qmsi.o obj-$(CONFIG_PINMUX_DEV_STM32) += pinmux_dev_stm32.o