michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: cc13xx_cc26xx: pinctrl: fix header conflict

Browse source 
CC13/26xx's pinctrl_cc13xx_cc26xx.c driver included ioc.h and
(indirectly) pinctrl_soc.h which contained duplicate defines.

This change removes the header conflict and redundant definitions.

This prepares for subsequent changes in this change set that add
additional flags to the pinctrl driver which would otherwise trigger the
header conflict.

Signed-off-by: Florian Grandel <fgrandel@code-for-humans.de>
This commit is contained in:
Florian Grandel 2023-07-25 12:35:29 +02:00 • committed by Carles Cufí
commit 31fb5f53d2
2 changed files with 1 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/pinctrl/pinctrl_cc13xx_cc26xx.c
View file

@ -8,8 +8,6 @@
#include <zephyr/drivers/pinctrl.h>
#include <driverlib/ioc.h>
static int pinctrl_c13xx_cc26xx_set(uint32_t pin, uint32_t func, uint32_t mode)
{
if (pin >= NUM_IO_MAX || func >= NUM_IO_PORTS) {

21
soc/arm/ti_simplelink/cc13x2_cc26x2/pinctrl_soc.h
View file

@ -9,26 +9,7 @@
#include <zephyr/types.h>
/* Defines for enabling/disabling an IO */
#define IOC_SLEW_ENABLE 0x00001000
#define IOC_SLEW_DISABLE 0x00000000
#define IOC_INPUT_ENABLE 0x20000000
#define IOC_INPUT_DISABLE 0x00000000
#define IOC_HYST_ENABLE 0x40000000
#define IOC_HYST_DISABLE 0x00000000
/* Defines that can be used to set the IO Mode of an IO */
#define IOC_IOMODE_NORMAL 0x00000000
#define IOC_IOMODE_INV 0x01000000
#define IOC_IOMODE_OPEN_DRAIN_NORMAL 0x04000000
#define IOC_IOMODE_OPEN_DRAIN_INV 0x05000000
#define IOC_IOMODE_OPEN_SRC_NORMAL 0x06000000
#define IOC_IOMODE_OPEN_SRC_INV 0x07000000
/* Defines that can be used to set pull on an IO */
#define IOC_NO_IOPULL 0x00006000
#define IOC_IOPULL_UP 0x00004000
#define IOC_IOPULL_DOWN 0x00002000
#include <driverlib/ioc.h>
typedef struct pinctrl_soc_pin {
uint32_t pin;