4 files changed, 33 insertions, 14 deletions

diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c b/arch/blackfin/mach-bf527/boards/ad7160eval.c
index beb011b6d2b3..029a0506b669 100644
--- a/arch/blackfin/mach-bf527/boards/ad7160eval.c
+++ b/arch/blackfin/mach-bf527/boards/ad7160eval.c
@@ -668,6 +668,13 @@ static struct platform_device bfin_sport1_uart_device = {
 #if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
 #include <linux/platform_data/bfin_rotary.h>
 
+static const u16 per_cnt[] = {
+        P_CNT_CUD,
+        P_CNT_CDG,
+        P_CNT_CZM,
+        0
+};
+
 static struct bfin_rotary_platform_data bfin_rotary_data = {
         /*.rotary_up_key     = KEY_UP,*/
         /*.rotary_down_key   = KEY_DOWN,*/
@@ -676,6 +683,7 @@ static struct bfin_rotary_platform_data bfin_rotary_data = {
         .debounce          = 10,        /* 0..17 */
         .mode              = ROT_QUAD_ENC | ROT_DEBE,
         .pm_wakeup         = 1,
+        .pin_list          = per_cnt,
 };
 
 static struct resource bfin_rotary_resources[] = {
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index 728cda469952..cc80c5ba9f67 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -1094,6 +1094,13 @@ static struct platform_device bfin_device_gpiokeys = {
 #if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
 #include <linux/platform_data/bfin_rotary.h>
 
+static const u16 per_cnt[] = {
+        P_CNT_CUD,
+        P_CNT_CDG,
+        P_CNT_CZM,
+        0
+};
+
 static struct bfin_rotary_platform_data bfin_rotary_data = {
         /*.rotary_up_key     = KEY_UP,*/
         /*.rotary_down_key   = KEY_DOWN,*/
@@ -1102,6 +1109,7 @@ static struct bfin_rotary_platform_data bfin_rotary_data = {
         .debounce          = 10,        /* 0..17 */
         .mode              = ROT_QUAD_ENC | ROT_DEBE,
         .pm_wakeup         = 1,
+        .pin_list          = per_cnt,
 };
 
 static struct resource bfin_rotary_resources[] = {
diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c
index 35ead69521a0..8312b29ab18d 100644
--- a/drivers/input/misc/bfin_rotary.c
+++ b/drivers/input/misc/bfin_rotary.c
@@ -16,13 +16,6 @@
 
 #include <asm/portmux.h>
 
-static const u16 per_cnt[] = {
-        P_CNT_CUD,
-        P_CNT_CDG,
-        P_CNT_CZM,
-        0
-};
-
 struct bfin_rot {
         struct input_dev *input;
         int irq;
@@ -90,7 +83,8 @@ static irqreturn_t bfin_rotary_isr(int irq, void *dev_id)
 
 static int bfin_rotary_probe(struct platform_device *pdev)
 {
-        struct bfin_rotary_platform_data *pdata = dev_get_platdata(&pdev->dev);
+        const struct bfin_rotary_platform_data *pdata =
+                                        dev_get_platdata(&pdev->dev);
         struct bfin_rot *rotary;
         struct input_dev *input;
         int error;
@@ -101,10 +95,13 @@ static int bfin_rotary_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        error = peripheral_request_list(per_cnt, dev_name(&pdev->dev));
-        if (error) {
-                dev_err(&pdev->dev, "requesting peripherals failed\n");
-                return error;
+        if (pdata->pin_list) {
+                error = peripheral_request_list(pdata->pin_list,
+                                                dev_name(&pdev->dev));
+                if (error) {
+                        dev_err(&pdev->dev, "requesting peripherals failed\n");
+                        return error;
+                }
         }
 
         rotary = kzalloc(sizeof(struct bfin_rot), GFP_KERNEL);
@@ -189,13 +186,16 @@ out2:
 out1:
         input_free_device(input);
         kfree(rotary);
-        peripheral_free_list(per_cnt);
+        if (pdata->pin_list)
+                peripheral_free_list(pdata->pin_list);
 
         return error;
 }
 
 static int bfin_rotary_remove(struct platform_device *pdev)
 {
+        const struct bfin_rotary_platform_data *pdata =
+                                        dev_get_platdata(&pdev->dev);
         struct bfin_rot *rotary = platform_get_drvdata(pdev);
 
         bfin_write_CNT_CONFIG(0);
@@ -203,7 +203,9 @@ static int bfin_rotary_remove(struct platform_device *pdev)
 
         free_irq(rotary->irq, rotary);
         input_unregister_device(rotary->input);
-        peripheral_free_list(per_cnt);
+
+        if (pdata->pin_list)
+                peripheral_free_list(pdata->pin_list);
 
         kfree(rotary);
 
diff --git a/include/linux/platform_data/bfin_rotary.h b/include/linux/platform_data/bfin_rotary.h
index 8895a750c70c..98829370fee2 100644
--- a/include/linux/platform_data/bfin_rotary.h
+++ b/include/linux/platform_data/bfin_rotary.h
@@ -40,6 +40,7 @@ struct bfin_rotary_platform_data {
         unsigned short debounce;        /* 0..17 */
         unsigned short mode;
         unsigned short pm_wakeup;
+        unsigned short *pin_list;
 };
 
 /* CNT_CONFIG bitmasks */