Merge git://git.infradead.org/intel-iommu

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinctrl-adi2.h

diff --git a/drivers/pinctrl/pinctrl-adi2.h b/drivers/pinctrl/pinctrl-adi2.h
index 1f06f8df1fa380c6d0e832d24bdf28dd428aed1e..3ca29738213f7ba5895a886dfbf7977195acd043 100644 (file)
--- a/drivers/pinctrl/pinctrl-adi2.h
+++ b/drivers/pinctrl/pinctrl-adi2.h
@@ -21,13 +21,15 @@ struct adi_pin_group {
        const char *name;
        const unsigned *pins;
        const unsigned num;
+       const unsigned short *mux;
 };
 
-#define ADI_PIN_GROUP(n, p)  \
+#define ADI_PIN_GROUP(n, p, m)  \
        {                       \
                .name = n,      \
                .pins = p,      \
                .num = ARRAY_SIZE(p),   \
+               .mux = m,                       \
        }
 
  /**
@@ -41,15 +43,13 @@ struct adi_pmx_func {
        const char *name;
        const char * const *groups;
        const unsigned num_groups;
-       const unsigned short *mux;
 };
 
-#define ADI_PMX_FUNCTION(n, g, m)              \
+#define ADI_PMX_FUNCTION(n, g)         \
        {                                       \
                .name = n,                      \
                .groups = g,                    \
                .num_groups = ARRAY_SIZE(g),    \
-               .mux = m,                       \
        }
 
 /**