pinmux: fix naming inconsistency Jira: ZEP-288 Change-Id: Ie9bfd3ac95305a35c96453448d13d6b4cd6c0f0b Signed-off-by: Anas Nashif <anas.nashif@intel.com>
diff --git a/boards/galileo/pinmux.c b/boards/galileo/pinmux.c index e5b546f..76fc301 100644 --- a/boards/galileo/pinmux.c +++ b/boards/galileo/pinmux.c
@@ -695,6 +695,6 @@ * 1 - PCA9535 and PCAL9685 * 2 - pinmux */ -DEVICE_INIT(pmux, PINMUX_NAME, &pinmux_galileo_initialize, +DEVICE_INIT(pmux, CONFIG_PINMUX_NAME, &pinmux_galileo_initialize, &galileo_pinmux_driver, NULL, SECONDARY, CONFIG_PINMUX_INIT_PRIORITY);
diff --git a/drivers/pinmux/Kconfig b/drivers/pinmux/Kconfig index ed4efa2..5c6114b 100644 --- a/drivers/pinmux/Kconfig +++ b/drivers/pinmux/Kconfig
@@ -27,6 +27,13 @@ source "drivers/pinmux/dev/Kconfig" +config PINMUX_NAME + string "Pinmux driver name" + depends on PINMUX + default "PINMUX" + help + The name of the pinmux driver. + config PINMUX_INIT_PRIORITY int prompt "Init priority"
diff --git a/drivers/pinmux/dev/Kconfig b/drivers/pinmux/dev/Kconfig index 07de514..2084b59 100644 --- a/drivers/pinmux/dev/Kconfig +++ b/drivers/pinmux/dev/Kconfig
@@ -28,7 +28,7 @@ config PINMUX_DEV_NAME string "Configure pinmux for early board testing" depends on PINMUX - default "pmux_dev" + default "PINMUX_DEV" help The name of the pinmux dev driver.
diff --git a/drivers/pinmux/dev/pinmux_dev_frdm_k64f.c b/drivers/pinmux/dev/pinmux_dev_frdm_k64f.c index 31e0ecd..c00ce86 100644 --- a/drivers/pinmux/dev/pinmux_dev_frdm_k64f.c +++ b/drivers/pinmux/dev/pinmux_dev_frdm_k64f.c
@@ -52,7 +52,7 @@ } /* must be initialized after GPIO */ -DEVICE_AND_API_INIT(pmux, PINMUX_NAME, &pinmux_fsl_k64_initialize, +DEVICE_AND_API_INIT(pmux, CONFIG_PINMUX_DEV_NAME, &pinmux_fsl_k64_initialize, NULL, NULL, SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &api_funcs);
diff --git a/include/pinmux.h b/include/pinmux.h index 6e7b0f8..db9065e 100644 --- a/include/pinmux.h +++ b/include/pinmux.h
@@ -36,8 +36,6 @@ extern "C" { #endif -#define PINMUX_NAME "pinmux" - #define PINMUX_FUNC_A 0 #define PINMUX_FUNC_B 1 #define PINMUX_FUNC_C 2