platsupportports: Fix MUX and GPIO driver types

This commit is related to the change in libplatsupport to allow
platforms to not include GPIO and MUX public headers when they do not
have MUX or GPIO drivers. We fix up the definitions so that they align
with those changes.

libplatsupportports/src/plat/tx2/gpio.c

diff --git a/libplatsupportports/src/plat/tx2/gpio.c b/libplatsupportports/src/plat/tx2/gpio.c
index 0f58e66..cd107b1 100644
--- a/libplatsupportports/src/plat/tx2/gpio.c
+++ b/libplatsupportports/src/plat/tx2/gpio.c
@@ -24,6 +24,8 @@
 #include <utils/attribute.h>
 #include <platsupport/gpio.h>
 
+#include <platsupportports/plat/gpio.h>
+
 #define TX2_GPIO_PIN_STRIDE 0x20
 
 #define TX2_GPIO_ENABLE_CONFIG_ENABLE BIT(0)

libplatsupportports/src/plat/tx2/mux.c

diff --git a/libplatsupportports/src/plat/tx2/mux.c b/libplatsupportports/src/plat/tx2/mux.c
index 8340a73..b84563a 100644
--- a/libplatsupportports/src/plat/tx2/mux.c
+++ b/libplatsupportports/src/plat/tx2/mux.c
@@ -26,7 +26,9 @@
 #include <platsupport/io.h>
 #include <platsupport/mux.h>
 #include <platsupport/gpio.h>
-#include <platsupport/plat/gpio.h>
+
+#include <platsupportports/plat/gpio.h>
+#include <platsupportports/plat/mux.h>
 
 #define MUX_REG_SCHMT_SHIFT         (12)
 #define MUX_REG_SF_SHIFT            (10)
@@ -326,7 +328,7 @@
 
 }
 
-static int tx2_mux_feature_enable(mux_sys_t *mux, enum mux_feature feature, enum mux_gpio_dir dir)
+static int tx2_mux_feature_enable(mux_sys_t *mux, mux_feature_t feature, enum mux_gpio_dir dir)
 {
     int error = 0;
 
@@ -380,7 +382,7 @@
     assert(*pin_reg == (MUX_REG_TRISTATE_TRISTATE << MUX_REG_TRISTATE_SHIFT));
 }
 
-static int tx2_mux_feature_disable(mux_sys_t *mux, enum mux_feature feature)
+static int tx2_mux_feature_disable(mux_sys_t *mux, mux_feature_t feature)
 {
     int error = 0;