drivers: gpio_cc13xx_cc26xx: Update for latest sdk

- It seems that the mask variants of GPIO functions are not present in the latest sdk, so replace those with direct register access. Signed-off-by: Ayush Singh <[email protected]>
zephyrproject-rtos · Dec 26, 2024 · 55b87b3 · 55b87b3
1 parent 229c257
commit 55b87b3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/drivers/gpio/gpio_cc13xx_cc26xx.c b/drivers/gpio/gpio_cc13xx_cc26xx.c
@@ -32,6 +32,9 @@
 /* the rest are for general (non-interrupt) config */
 #define IOCFG_GEN_MASK    (~IOCFG_INT_MASK)
 
+/* GPIO all DIOs mask */
+#define GPIO_DIO_ALL_MASK       0xFFFFFFFF
+
 struct gpio_cc13xx_cc26xx_data {
 	/* gpio_driver_data needs to be first */
 	struct gpio_driver_data common;
@@ -128,41 +131,43 @@ static int gpio_cc13xx_cc26xx_port_get_raw(const struct device *port,
 {
 	__ASSERT_NO_MSG(value != NULL);
 
-	*value = GPIO_readMultiDio(GPIO_DIO_ALL_MASK);
+	*value = HWREG( GPIO_BASE + GPIO_O_DIN31_0 ) & GPIO_DIO_ALL_MASK;
 
 	return 0;
 }
 
-static int gpio_cc13xx_cc26xx_port_set_masked_raw(const struct device *port,
-						  uint32_t mask,
-						  uint32_t value)
+static int gpio_cc13xx_cc26xx_port_set_bits_raw(const struct device *port,
+						uint32_t mask)
 {
-	GPIO_setMultiDio(mask & value);
-	GPIO_clearMultiDio(mask & ~value);
+	HWREG( GPIO_BASE + GPIO_O_DOUTSET31_0 ) = mask;
 
 	return 0;
 }
 
-static int gpio_cc13xx_cc26xx_port_set_bits_raw(const struct device *port,
-						uint32_t mask)
+static int gpio_cc13xx_cc26xx_port_clear_bits_raw(const struct device *port,
+						  uint32_t mask)
 {
-	GPIO_setMultiDio(mask);
+	HWREG( GPIO_BASE + GPIO_O_DOUTCLR31_0 ) = mask;
 
 	return 0;
 }
 
-static int gpio_cc13xx_cc26xx_port_clear_bits_raw(const struct device *port,
-						  uint32_t mask)
+static int gpio_cc13xx_cc26xx_port_set_masked_raw(const struct device *port,
+						  uint32_t mask,
+						  uint32_t value)
 {
-	GPIO_clearMultiDio(mask);
+	gpio_cc13xx_cc26xx_port_set_bits_raw(port, mask & value);
+	gpio_cc13xx_cc26xx_port_clear_bits_raw(port, mask & ~value);
 
 	return 0;
 }
 
+
+
 static int gpio_cc13xx_cc26xx_port_toggle_bits(const struct device *port,
 					       uint32_t mask)
 {
-	GPIO_toggleMultiDio(mask);
+	HWREG( GPIO_BASE + GPIO_O_DOUTTGL31_0 ) = mask;
 
 	return 0;
 }
@@ -209,16 +214,16 @@ static int gpio_cc13xx_cc26xx_manage_callback(const struct device *port,
 
 static uint32_t gpio_cc13xx_cc26xx_get_pending_int(const struct device *dev)
 {
-	return GPIO_getEventMultiDio(GPIO_DIO_ALL_MASK);
+	return HWREG( GPIO_BASE + GPIO_O_EVFLAGS31_0 ) & GPIO_DIO_ALL_MASK;
 }
 
 static void gpio_cc13xx_cc26xx_isr(const struct device *dev)
 {
 	struct gpio_cc13xx_cc26xx_data *data = dev->data;
 
-	uint32_t status = GPIO_getEventMultiDio(GPIO_DIO_ALL_MASK);
+	uint32_t status = HWREG( GPIO_BASE + GPIO_O_EVFLAGS31_0 ) & GPIO_DIO_ALL_MASK;
 
-	GPIO_clearEventMultiDio(status);
+	HWREG( GPIO_BASE + GPIO_O_EVFLAGS31_0 ) = status;
 
 	gpio_fire_callbacks(&data->callbacks, dev, status);
 }

diff --git a/west.yml b/west.yml
@@ -253,7 +253,7 @@ manifest:
       groups:
         - hal
     - name: hal_ti
-      revision: 2e7b95ad079e9f636884eedc6853e6ad98b85f65
+      revision: pull/56/head
       path: modules/hal/ti
       groups:
         - hal