drivers: pinmux: 👋

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:

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

doc/hardware/peripherals/index.rst

@@ -31,7 +31,6 @@ Peripherals
    kscan.rst
    led.rst
    mbox.rst
-   pinmux.rst
    pwm.rst
    ps2.rst
    peci.rst

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)

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"

drivers/gpio/gpio_stm32.h

@@ -12,8 +12,12 @@
  */
 
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
-#include <pinmux/pinmux_stm32.h>
 #include <zephyr/drivers/gpio.h>
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
+#include <zephyr/dt-bindings/pinctrl/stm32f1-pinctrl.h>
+#else
+#include <zephyr/dt-bindings/pinctrl/stm32-pinctrl.h>
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl) */
 
 /* GPIO buses definitions */
 

drivers/pinctrl/pinctrl_kinetis.c

@@ -46,7 +46,6 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
  * and handles clock init. Only bind to these nodes if pinmux driver
  * is disabled.
  */
-#ifndef CONFIG_PINMUX
 static int pinctrl_mcux_init(const struct device *dev)
 {
 	const struct pinctrl_mcux_config *config = dev->config;
@@ -79,4 +78,3 @@ static int pinctrl_mcux_init(const struct device *dev)
 			    NULL);
 
 DT_INST_FOREACH_STATUS_OKAY(PINCTRL_MCUX_INIT)
-#endif

drivers/pinctrl/pinctrl_rv32m1.c

@@ -42,11 +42,6 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 	return 0;
 }
 
-/* RV32M1 pinmux driver binds to the same DTS nodes,
- * and handles clock init. Only bind to these nodes if pinmux driver
- * is disabled.
- */
-#ifndef CONFIG_PINMUX
 static int pinctrl_rv32m1_init(const struct device *dev)
 {
 	const struct pinctrl_rv32m1_config *config = dev->config;
@@ -70,4 +65,3 @@ static int pinctrl_rv32m1_init(const struct device *dev)
 			    NULL);
 
 DT_INST_FOREACH_STATUS_OKAY(PINCTRL_RV32M1_INIT)
-#endif

drivers/pinctrl/pinctrl_stm32.c

@@ -14,6 +14,32 @@
 #include <stm32_ll_gpio.h>
 #include <stm32_ll_system.h>
 
+/** Helper to extract IO port number from STM32PIN() encoded value */
+#define STM32_PORT(__pin) \
+	((__pin) >> 4)
+
+/** Helper to extract IO pin number from STM32PIN() encoded value */
+#define STM32_PIN(__pin) \
+	((__pin) & 0xf)
+
+/** Helper to extract IO port number from STM32_PINMUX() encoded value */
+#define STM32_DT_PINMUX_PORT(__pin) \
+	(((__pin) >> STM32_PORT_SHIFT) & STM32_PORT_MASK)
+
+/** Helper to extract IO pin number from STM32_PINMUX() encoded value */
+#define STM32_DT_PINMUX_LINE(__pin) \
+	(((__pin) >> STM32_LINE_SHIFT) & STM32_LINE_MASK)
+
+/** Helper to extract IO pin func from STM32_PINMUX() encoded value */
+#define STM32_DT_PINMUX_FUNC(__pin) \
+	(((__pin) >> STM32_MODE_SHIFT) & STM32_MODE_MASK)
+
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
+/** Helper to extract IO pin remap from STM32_PINMUX() encoded value */
+#define STM32_DT_PINMUX_REMAP(__pin) \
+	(((__pin) >> STM32_REMAP_SHIFT) & STM32_REMAP_MASK)
+#endif
+
 /**
  * @brief Array containing pointers to each GPIO port.
  *