pinctrl: mvebu: dove: consolidate auto-numbered pmu mpp ranges

Passing a NULL name for pin ranges will auto-generate standard names
for each pin. With common pinctrl driver now checking NULL name correctly,
consolidate mpp pins 0-15.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c
index 95a306d64523fb201ef97f4cd6762194f54a30b4..89fd3a5a1df1857c334c8c3f12d96a47d322587e 100644 (file)
--- a/drivers/pinctrl/mvebu/pinctrl-dove.c
+++ b/drivers/pinctrl/mvebu/pinctrl-dove.c
@@ -351,22 +351,7 @@ static int dove_twsi_ctrl_set(unsigned pid, unsigned long config)
 }
 
 static struct mvebu_mpp_ctrl dove_mpp_controls[] = {
-       MPP_FUNC_CTRL(0, 0, "mpp0", dove_pmu_mpp_ctrl),
-       MPP_FUNC_CTRL(1, 1, "mpp1", dove_pmu_mpp_ctrl),
-       MPP_FUNC_CTRL(2, 2, "mpp2", dove_pmu_mpp_ctrl),
-       MPP_FUNC_CTRL(3, 3, "mpp3", dove_pmu_mpp_ctrl),
-       MPP_FUNC_CTRL(4, 4, "mpp4", dove_pmu_mpp_ctrl),
-       MPP_FUNC_CTRL(5, 5, "mpp5", dove_pmu_mpp_ctrl),
-       MPP_FUNC_CTRL(6, 6, "mpp6", dove_pmu_mpp_ctrl),
-       MPP_FUNC_CTRL(7, 7, "mpp7", dove_pmu_mpp_ctrl),
-       MPP_FUNC_CTRL(8, 8, "mpp8", dove_pmu_mpp_ctrl),
-       MPP_FUNC_CTRL(9, 9, "mpp9", dove_pmu_mpp_ctrl),
-       MPP_FUNC_CTRL(10, 10, "mpp10", dove_pmu_mpp_ctrl),
-       MPP_FUNC_CTRL(11, 11, "mpp11", dove_pmu_mpp_ctrl),
-       MPP_FUNC_CTRL(12, 12, "mpp12", dove_pmu_mpp_ctrl),
-       MPP_FUNC_CTRL(13, 13, "mpp13", dove_pmu_mpp_ctrl),
-       MPP_FUNC_CTRL(14, 14, "mpp14", dove_pmu_mpp_ctrl),
-       MPP_FUNC_CTRL(15, 15, "mpp15", dove_pmu_mpp_ctrl),
+       MPP_FUNC_CTRL(0, 15, NULL, dove_pmu_mpp_ctrl),
        MPP_FUNC_CTRL(16, 23, NULL, dove_mpp_ctrl),
        MPP_FUNC_CTRL(24, 39, "mpp_camera", dove_mpp4_ctrl),
        MPP_FUNC_CTRL(40, 45, "mpp_sdio0", dove_mpp4_ctrl),