From a1e983fef0496e929acf8300a55ec6460a3e6570 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 21 Feb 2023 11:14:47 +0100 Subject: [PATCH] drivers: pinmux: drop driver class Pinctrl is the new pinmux. Signed-off-by: Gerard Marull-Paretas --- MAINTAINERS.yml | 13 --- doc/develop/api/overview.rst | 4 - doc/hardware/peripherals/index.rst | 1 - doc/hardware/peripherals/pinmux.rst | 13 --- drivers/CMakeLists.txt | 1 - drivers/Kconfig | 1 - drivers/pinmux/CMakeLists.txt | 3 - drivers/pinmux/Kconfig | 27 ------ include/zephyr/drivers/pinmux.h | 134 ---------------------------- 9 files changed, 197 deletions(-) delete mode 100644 doc/hardware/peripherals/pinmux.rst delete mode 100644 drivers/pinmux/CMakeLists.txt delete mode 100644 drivers/pinmux/Kconfig delete mode 100644 include/zephyr/drivers/pinmux.h diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index 3f086d2e07f..16091f586b0 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -1109,19 +1109,6 @@ Release Notes: labels: - "area: Pinctrl" -"Drivers: Pinmux": - status: maintained - maintainers: - - mnkp - collaborators: - - gmarull - files: - - doc/hardware/peripherals/pinmux.rst - - drivers/pinmux/ - - include/zephyr/drivers/pinmux.h - labels: - - "area: Pinmux" - "Drivers: PTP Clock": status: maintained maintainers: diff --git a/doc/develop/api/overview.rst b/doc/develop/api/overview.rst index 0d86c0d9516..07dc5e8a8b8 100644 --- a/doc/develop/api/overview.rst +++ b/doc/develop/api/overview.rst @@ -221,10 +221,6 @@ between major releases are available in the :ref:`zephyr_release_notes`. - Experimental - 3.0 - * - :ref:`pinmux_api` - - Stable - - 1.0 - * - :ref:`pm_api` - Experimental - 1.2 diff --git a/doc/hardware/peripherals/index.rst b/doc/hardware/peripherals/index.rst index 2f39e1c85fb..8fad9f6bad6 100644 --- a/doc/hardware/peripherals/index.rst +++ b/doc/hardware/peripherals/index.rst @@ -31,7 +31,6 @@ Peripherals kscan.rst led.rst mbox.rst - pinmux.rst pwm.rst ps2.rst peci.rst diff --git a/doc/hardware/peripherals/pinmux.rst b/doc/hardware/peripherals/pinmux.rst deleted file mode 100644 index 1aef9ae4328..00000000000 --- a/doc/hardware/peripherals/pinmux.rst +++ /dev/null @@ -1,13 +0,0 @@ -.. _pinmux_api: - -Pinmux -###### - -Overview -******** - - -API Reference -************* - -.. doxygengroup:: pinmux_interface diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt index 45800bdc9f0..1194ef03362 100644 --- a/drivers/CMakeLists.txt +++ b/drivers/CMakeLists.txt @@ -55,7 +55,6 @@ add_subdirectory_ifdef(CONFIG_NET_L2_ETHERNET ethernet) add_subdirectory_ifdef(CONFIG_NEURAL_NET_ACCEL neural_net) add_subdirectory_ifdef(CONFIG_PECI peci) add_subdirectory_ifdef(CONFIG_PINCTRL pinctrl) -add_subdirectory_ifdef(CONFIG_PINMUX pinmux) add_subdirectory_ifdef(CONFIG_PM_CPU_OPS pm_cpu_ops) add_subdirectory_ifdef(CONFIG_POWER_DOMAIN power_domain) add_subdirectory_ifdef(CONFIG_PS2 ps2) diff --git a/drivers/Kconfig b/drivers/Kconfig index 8baa3399296..f8db418a1a5 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -56,7 +56,6 @@ source "drivers/neural_net/Kconfig" source "drivers/pcie/Kconfig" source "drivers/peci/Kconfig" source "drivers/pinctrl/Kconfig" -source "drivers/pinmux/Kconfig" source "drivers/pm_cpu_ops/Kconfig" source "drivers/power_domain/Kconfig" source "drivers/ps2/Kconfig" diff --git a/drivers/pinmux/CMakeLists.txt b/drivers/pinmux/CMakeLists.txt deleted file mode 100644 index 57271891715..00000000000 --- a/drivers/pinmux/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -# Board initialization diff --git a/drivers/pinmux/Kconfig b/drivers/pinmux/Kconfig deleted file mode 100644 index ca2becaf4f7..00000000000 --- a/drivers/pinmux/Kconfig +++ /dev/null @@ -1,27 +0,0 @@ -# Pinmux configuration options - -# Copyright (c) 2015 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# -# PinMux options -# -menuconfig PINMUX - bool "Board pinmux driver" - -if PINMUX - -config PINMUX_INIT_PRIORITY - int "Init priority" - default 45 - help - Pinmux driver initialization priority. - Pinmux driver almost certainly should be initialized before the - rest of hardware devices (which may need specific pins already - configured for them), and usually after generic GPIO drivers. - Thus, its priority should be between KERNEL_INIT_PRIORITY_DEFAULT - and KERNEL_INIT_PRIORITY_DEVICE. There are exceptions to this - rule for particular boards. Don't change this value unless you - know what you are doing. - -endif # PINMUX diff --git a/include/zephyr/drivers/pinmux.h b/include/zephyr/drivers/pinmux.h deleted file mode 100644 index de80bcd0f16..00000000000 --- a/include/zephyr/drivers/pinmux.h +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (c) 2015 Intel Corporation - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/** - * @file - * Public APIs for Pinmux drivers - */ - -#ifndef ZEPHYR_INCLUDE_DRIVERS_PINMUX_H_ -#define ZEPHYR_INCLUDE_DRIVERS_PINMUX_H_ - -/** - * @brief Pinmux Interface - * @defgroup pinmux_interface Pinmux Interface - * @ingroup io_interfaces - * @{ - */ - -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#define PINMUX_FUNC_A 0 -#define PINMUX_FUNC_B 1 -#define PINMUX_FUNC_C 2 -#define PINMUX_FUNC_D 3 -#define PINMUX_FUNC_E 4 -#define PINMUX_FUNC_F 5 -#define PINMUX_FUNC_G 6 -#define PINMUX_FUNC_H 7 -#define PINMUX_FUNC_I 8 -#define PINMUX_FUNC_J 9 -#define PINMUX_FUNC_K 10 -#define PINMUX_FUNC_L 11 -#define PINMUX_FUNC_M 12 -#define PINMUX_FUNC_N 13 -#define PINMUX_FUNC_O 14 -#define PINMUX_FUNC_P 15 - -#define PINMUX_PULLUP_ENABLE (0x1) -#define PINMUX_PULLUP_DISABLE (0x0) - -#define PINMUX_INPUT_ENABLED (0x1) -#define PINMUX_OUTPUT_ENABLED (0x0) - -/** - * @typedef pmux_set - * @brief Callback API upon setting a PIN's function - * See pinmux_pin_set() for argument description - */ -typedef int (*pmux_set)(const struct device *dev, uint32_t pin, uint32_t func); -/** - * @typedef pmux_get - * @brief Callback API upon getting a PIN's function - * See pinmux_pin_get() for argument description - */ -typedef int (*pmux_get)(const struct device *dev, uint32_t pin, - uint32_t *func); -/** - * @typedef pmux_pullup - * @brief Callback API upon setting a PIN's pullup - * See pinmix_pin_pullup() for argument description - */ -typedef int (*pmux_pullup)(const struct device *dev, uint32_t pin, - uint8_t func); -/** - * @typedef pmux_input - * @brief Callback API upon setting a PIN's input function - * See pinmux_input() for argument description - */ -typedef int (*pmux_input)(const struct device *dev, uint32_t pin, - uint8_t func); - -__subsystem struct pinmux_driver_api { - pmux_set set; - pmux_get get; - pmux_pullup pullup; - pmux_input input; -}; - -__deprecated static inline int pinmux_pin_set(const struct device *dev, - uint32_t pin, uint32_t func) -{ - const struct pinmux_driver_api *api = - (const struct pinmux_driver_api *)dev->api; - - return api->set(dev, pin, func); -} - -__deprecated static inline int pinmux_pin_get(const struct device *dev, - uint32_t pin, uint32_t *func) -{ - const struct pinmux_driver_api *api = - (const struct pinmux_driver_api *)dev->api; - - return api->get(dev, pin, func); -} - -__deprecated static inline int pinmux_pin_pullup(const struct device *dev, - uint32_t pin, uint8_t func) -{ - const struct pinmux_driver_api *api = - (const struct pinmux_driver_api *)dev->api; - - return api->pullup(dev, pin, func); -} - -__deprecated static inline int pinmux_pin_input_enable(const struct device *dev, - uint32_t pin, - uint8_t func) -{ - const struct pinmux_driver_api *api = - (const struct pinmux_driver_api *)dev->api; - - return api->input(dev, pin, func); -} - -#ifdef __cplusplus -} -#endif - -/** - * - * @} - */ - -#endif /* ZEPHYR_INCLUDE_DRIVERS_PINMUX_H_ */