From 98f1a98cf5a1ed622829aa61c79788253cf3c635 Mon Sep 17 00:00:00 2001 From: Vaishnav Achath Date: Fri, 15 Apr 2022 16:29:56 +0530 Subject: [PATCH] drivers: pinmux: remove cc13xx_cc26xx pinmux driver all the consumers of the obsolete pinmux driver is updated to use pinctrl API, this commit removes the pinmux driver and assosciated sections. Signed-off-by: Vaishnav Achath --- drivers/pinmux/CMakeLists.txt | 1 - drivers/pinmux/Kconfig | 2 - drivers/pinmux/Kconfig.cc13xx_cc26xx | 10 -- drivers/pinmux/pinmux_cc13xx_cc26xx.c | 95 ------------------- .../pinctrl/ti,cc13xx-cc26xx-pinmux.yaml | 12 --- .../cc13x2_cc26x2/Kconfig.defconfig.series | 4 - 6 files changed, 124 deletions(-) delete mode 100644 drivers/pinmux/Kconfig.cc13xx_cc26xx delete mode 100644 drivers/pinmux/pinmux_cc13xx_cc26xx.c delete mode 100644 dts/bindings/pinctrl/ti,cc13xx-cc26xx-pinmux.yaml diff --git a/drivers/pinmux/CMakeLists.txt b/drivers/pinmux/CMakeLists.txt index 18516eac55c..2a6d33ed02b 100644 --- a/drivers/pinmux/CMakeLists.txt +++ b/drivers/pinmux/CMakeLists.txt @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # Board initialization -zephyr_sources_ifdef(CONFIG_PINMUX_CC13XX_CC26XX pinmux_cc13xx_cc26xx.c) zephyr_sources_ifdef(CONFIG_PINMUX_ESP32 pinmux_esp32.c) zephyr_sources_ifdef(CONFIG_PINMUX_HSDK pinmux_hsdk.c) zephyr_sources_ifdef(CONFIG_PINMUX_INTEL_S1000 pinmux_intel_s1000.c) diff --git a/drivers/pinmux/Kconfig b/drivers/pinmux/Kconfig index 0fbc52645fd..3d6fd2efaf1 100644 --- a/drivers/pinmux/Kconfig +++ b/drivers/pinmux/Kconfig @@ -26,8 +26,6 @@ config PINMUX_INIT_PRIORITY source "drivers/pinmux/Kconfig.beetle" -source "drivers/pinmux/Kconfig.cc13xx_cc26xx" - source "drivers/pinmux/Kconfig.esp32" source "drivers/pinmux/Kconfig.hsdk" diff --git a/drivers/pinmux/Kconfig.cc13xx_cc26xx b/drivers/pinmux/Kconfig.cc13xx_cc26xx deleted file mode 100644 index 39c76057d6b..00000000000 --- a/drivers/pinmux/Kconfig.cc13xx_cc26xx +++ /dev/null @@ -1,10 +0,0 @@ -# TI CC13xx / CC26xx PINMUX configuration options - -# Copyright (c) 2019 Brett Witherspoon -# SPDX-License-Identifier: Apache-2.0 - -config PINMUX_CC13XX_CC26XX - bool "TI SimpleLink CC13xx / CC26xx pinmux driver" - depends on SOC_SERIES_CC13X2_CC26X2 - help - Enable the TI SimpleLink CC13xx / CC26xx pinmux driver. diff --git a/drivers/pinmux/pinmux_cc13xx_cc26xx.c b/drivers/pinmux/pinmux_cc13xx_cc26xx.c deleted file mode 100644 index 5fc955cb733..00000000000 --- a/drivers/pinmux/pinmux_cc13xx_cc26xx.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2019 Brett Witherspoon - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#define DT_DRV_COMPAT ti_cc13xx_cc26xx_pinmux - -#include -#include -#include -#include - -#include - -static int pinmux_cc13xx_cc26xx_set(const struct device *dev, uint32_t pin, - uint32_t func) -{ - ARG_UNUSED(dev); - - __ASSERT_NO_MSG(pin < NUM_IO_MAX); - __ASSERT_NO_MSG(func < NUM_IO_PORTS); - - IOCIOPortIdSet(pin, func); - - return 0; -} - -static int pinmux_cc13xx_cc26xx_get(const struct device *dev, uint32_t pin, - uint32_t *func) -{ - ARG_UNUSED(dev); - - __ASSERT_NO_MSG(pin < NUM_IO_MAX); - - *func = IOCPortConfigureGet(pin) & IOC_IOCFG0_PORT_ID_M; - - return 0; -} - -static int pinmux_cc13xx_cc26xx_pullup(const struct device *dev, uint32_t pin, - uint8_t func) -{ - ARG_UNUSED(dev); - - __ASSERT_NO_MSG(pin < NUM_IO_MAX); - - switch (func) { - case PINMUX_PULLUP_ENABLE: - IOCIOPortPullSet(pin, IOC_IOPULL_UP); - return 0; - case PINMUX_PULLUP_DISABLE: - IOCIOPortPullSet(pin, IOC_NO_IOPULL); - return 0; - } - - return -EINVAL; -} - -static int pinmux_cc13xx_cc26xx_input(const struct device *dev, uint32_t pin, - uint8_t func) -{ - ARG_UNUSED(dev); - - __ASSERT_NO_MSG(pin < NUM_IO_MAX); - - switch (func) { - case PINMUX_INPUT_ENABLED: - IOCIOInputSet(pin, IOC_INPUT_ENABLE); - return 0; - case PINMUX_OUTPUT_ENABLED: - IOCIOInputSet(pin, IOC_INPUT_DISABLE); - return 0; - } - - return -EINVAL; -} - -static int pinmux_cc13xx_cc26xx_init(const struct device *dev) -{ - ARG_UNUSED(dev); - return 0; -} - -static const struct pinmux_driver_api pinmux_cc13xx_cc26xx_driver_api = { - .set = pinmux_cc13xx_cc26xx_set, - .get = pinmux_cc13xx_cc26xx_get, - .pullup = pinmux_cc13xx_cc26xx_pullup, - .input = pinmux_cc13xx_cc26xx_input, -}; - -DEVICE_DT_INST_DEFINE(0, &pinmux_cc13xx_cc26xx_init, NULL, - NULL, NULL, PRE_KERNEL_1, - CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, - &pinmux_cc13xx_cc26xx_driver_api); diff --git a/dts/bindings/pinctrl/ti,cc13xx-cc26xx-pinmux.yaml b/dts/bindings/pinctrl/ti,cc13xx-cc26xx-pinmux.yaml deleted file mode 100644 index a17a266795e..00000000000 --- a/dts/bindings/pinctrl/ti,cc13xx-cc26xx-pinmux.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2019 Brett Witherspoon -# SPDX-License-Identifier: Apache-2.0 - -description: TI SimpleLink CC13xx / CC26xx pinmux node - -compatible: "ti,cc13xx-cc26xx-pinmux" - -include: base.yaml - -properties: - reg: - required: true diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.series b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.series index dd359899431..67d128e1182 100644 --- a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.series +++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.series @@ -25,10 +25,6 @@ config NUM_IRQS config CC13X2_CC26X2_RTC_TIMER default y -config PINMUX_CC13XX_CC26XX - default y - depends on PINMUX - config GPIO_CC13XX_CC26XX default y depends on GPIO