pinctrl: intel: Convert capability list to features

Communities can have features provided in the capability list.
Traverse the list and convert to respective features.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 1a479112ed8537f21a8d48f69febf4287b6a730d..8085782cd8f91d0bd048a9475f897966e0e78c57 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -29,6 +29,16 @@
 #define REVID_SHIFT                    16
 #define REVID_MASK                     GENMASK(31, 16)
 
+#define CAPLIST                                0x004
+#define CAPLIST_ID_SHIFT               16
+#define CAPLIST_ID_MASK                        GENMASK(23, 16)
+#define CAPLIST_ID_GPIO_HW_INFO                1
+#define CAPLIST_ID_PWM                 2
+#define CAPLIST_ID_BLINK               3
+#define CAPLIST_ID_EXP                 4
+#define CAPLIST_NEXT_SHIFT             0
+#define CAPLIST_NEXT_MASK              GENMASK(15, 0)
+
 #define PADBAR                         0x00c
 
 #define PADOWN_BITS                    4
@@ -1472,7 +1482,7 @@ static int intel_pinctrl_probe(struct platform_device *pdev,
        for (i = 0; i < pctrl->ncommunities; i++) {
                struct intel_community *community = &pctrl->communities[i];
                void __iomem *regs;
-               u32 padbar;
+               u32 offset;
                u32 value;
 
                *community = pctrl->soc->communities[i];
@@ -1488,11 +1498,36 @@ static int intel_pinctrl_probe(struct platform_device *pdev,
                        community->features |= PINCTRL_FEATURE_1K_PD;
                }
 
+               /* Determine community features based on the capabilities */
+               offset = CAPLIST;
+               do {
+                       value = readl(regs + offset);
+                       switch ((value & CAPLIST_ID_MASK) >> CAPLIST_ID_SHIFT) {
+                       case CAPLIST_ID_GPIO_HW_INFO:
+                               community->features |= PINCTRL_FEATURE_GPIO_HW_INFO;
+                               break;
+                       case CAPLIST_ID_PWM:
+                               community->features |= PINCTRL_FEATURE_PWM;
+                               break;
+                       case CAPLIST_ID_BLINK:
+                               community->features |= PINCTRL_FEATURE_BLINK;
+                               break;
+                       case CAPLIST_ID_EXP:
+                               community->features |= PINCTRL_FEATURE_EXP;
+                               break;
+                       default:
+                               break;
+                       }
+                       offset = (value & CAPLIST_NEXT_MASK) >> CAPLIST_NEXT_SHIFT;
+               } while (offset);
+
+               dev_dbg(&pdev->dev, "Community%d features: %#08x\n", i, community->features);
+
                /* Read offset of the pad configuration registers */
-               padbar = readl(regs + PADBAR);
+               offset = readl(regs + PADBAR);
 
                community->regs = regs;
-               community->pad_regs = regs + padbar;
+               community->pad_regs = regs + offset;
 
                if (community->gpps)
                        ret = intel_pinctrl_add_padgroups_by_gpps(pctrl, community);

diff --git a/drivers/pinctrl/intel/pinctrl-intel.h b/drivers/pinctrl/intel/pinctrl-intel.h
index ad34b7a3f6ed876668d51518a4c28fb12b6bb6eb..c4fef03b663f7b30fd018efde4d53711b1b8b108 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-intel.h
+++ b/drivers/pinctrl/intel/pinctrl-intel.h
@@ -143,6 +143,10 @@ struct intel_community {
 /* Additional features supported by the hardware */
 #define PINCTRL_FEATURE_DEBOUNCE       BIT(0)
 #define PINCTRL_FEATURE_1K_PD          BIT(1)
+#define PINCTRL_FEATURE_GPIO_HW_INFO   BIT(2)
+#define PINCTRL_FEATURE_PWM            BIT(3)
+#define PINCTRL_FEATURE_BLINK          BIT(4)
+#define PINCTRL_FEATURE_EXP            BIT(5)
 
 /**
  * PIN_GROUP - Declare a pin group