pinctrl: mediatek: fix the pinconf definition of some GPIO pins

Remove pin definitions that do not support the R0 & R1 pinconfig property.

Signed-off-by: Guodong Liu <guodong.liu@mediatek.com>
Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Link: https://lore.kernel.org/r/20220624133700.15487-6-guodong.liu@mediatek.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8192.c b/drivers/pinctrl/mediatek/pinctrl-mt8192.c
index 2fe51fb..a66394c 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8192.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8192.c
@@ -1107,24 +1107,10 @@ static const struct mtk_pin_field_calc mt8192_pin_pupd_range[] = {
        PIN_FIELD_BASE(54, 54, 1, 0x0060, 0x10, 2, 1),
        PIN_FIELD_BASE(55, 55, 1, 0x0060, 0x10, 4, 1),
        PIN_FIELD_BASE(56, 56, 1, 0x0060, 0x10, 3, 1),
-       PIN_FIELD_BASE(118, 118, 4, 0x00e0, 0x10, 31, 1),
-       PIN_FIELD_BASE(119, 119, 4, 0x00e0, 0x10, 31, 1),
-       PIN_FIELD_BASE(120, 120, 4, 0x00e0, 0x10, 31, 1),
-       PIN_FIELD_BASE(121, 121, 4, 0x00e0, 0x10, 31, 1),
-       PIN_FIELD_BASE(122, 122, 4, 0x00e0, 0x10, 31, 1),
-       PIN_FIELD_BASE(123, 123, 4, 0x00e0, 0x10, 31, 1),
-       PIN_FIELD_BASE(124, 124, 4, 0x00e0, 0x10, 31, 1),
-       PIN_FIELD_BASE(125, 125, 4, 0x00e0, 0x10, 31, 1),
-       PIN_FIELD_BASE(139, 139, 4, 0x00e0, 0x10, 31, 1),
-       PIN_FIELD_BASE(140, 140, 4, 0x00e0, 0x10, 31, 1),
-       PIN_FIELD_BASE(141, 141, 4, 0x00e0, 0x10, 31, 1),
-       PIN_FIELD_BASE(142, 142, 4, 0x00e0, 0x10, 31, 1),
        PIN_FIELD_BASE(152, 152, 7, 0x0090, 0x10, 3, 1),
        PIN_FIELD_BASE(153, 153, 7, 0x0090, 0x10, 2, 1),
        PIN_FIELD_BASE(154, 154, 7, 0x0090, 0x10, 0, 1),
        PIN_FIELD_BASE(155, 155, 7, 0x0090, 0x10, 1, 1),
-       PIN_FIELD_BASE(160, 160, 7, 0x00f0, 0x10, 31, 1),
-       PIN_FIELD_BASE(161, 161, 7, 0x00f0, 0x10, 31, 1),
        PIN_FIELD_BASE(183, 183, 9, 0x0030, 0x10, 1, 1),
        PIN_FIELD_BASE(184, 184, 9, 0x0030, 0x10, 2, 1),
        PIN_FIELD_BASE(185, 185, 9, 0x0030, 0x10, 4, 1),
@@ -1137,12 +1123,6 @@ static const struct mtk_pin_field_calc mt8192_pin_pupd_range[] = {
        PIN_FIELD_BASE(192, 192, 9, 0x0030, 0x10, 0, 1),
        PIN_FIELD_BASE(193, 193, 9, 0x0030, 0x10, 5, 1),
        PIN_FIELD_BASE(194, 194, 9, 0x0030, 0x10, 11, 1),
-       PIN_FIELD_BASE(200, 200, 8, 0x0070, 0x10, 31, 1),
-       PIN_FIELD_BASE(201, 201, 8, 0x0070, 0x10, 31, 1),
-       PIN_FIELD_BASE(202, 202, 5, 0x0070, 0x10, 31, 1),
-       PIN_FIELD_BASE(203, 203, 5, 0x0070, 0x10, 31, 1),
-       PIN_FIELD_BASE(204, 204, 8, 0x0070, 0x10, 31, 1),
-       PIN_FIELD_BASE(205, 205, 8, 0x0070, 0x10, 31, 1),
 };
 
 static const struct mtk_pin_field_calc mt8192_pin_r0_range[] = {
@@ -1164,24 +1144,10 @@ static const struct mtk_pin_field_calc mt8192_pin_r0_range[] = {
        PIN_FIELD_BASE(54, 54, 1, 0x0080, 0x10, 2, 1),
        PIN_FIELD_BASE(55, 55, 1, 0x0080, 0x10, 4, 1),
        PIN_FIELD_BASE(56, 56, 1, 0x0080, 0x10, 3, 1),
-       PIN_FIELD_BASE(118, 118, 4, 0x00e0, 0x10, 0, 1),
-       PIN_FIELD_BASE(119, 119, 4, 0x00e0, 0x10, 12, 1),
-       PIN_FIELD_BASE(120, 120, 4, 0x00e0, 0x10, 10, 1),
-       PIN_FIELD_BASE(121, 121, 4, 0x00e0, 0x10, 22, 1),
-       PIN_FIELD_BASE(122, 122, 4, 0x00e0, 0x10, 8, 1),
-       PIN_FIELD_BASE(123, 123, 4, 0x00e0, 0x10, 20, 1),
-       PIN_FIELD_BASE(124, 124, 4, 0x00e0, 0x10, 6, 1),
-       PIN_FIELD_BASE(125, 125, 4, 0x00e0, 0x10, 18, 1),
-       PIN_FIELD_BASE(139, 139, 4, 0x00e0, 0x10, 4, 1),
-       PIN_FIELD_BASE(140, 140, 4, 0x00e0, 0x10, 16, 1),
-       PIN_FIELD_BASE(141, 141, 4, 0x00e0, 0x10, 2, 1),
-       PIN_FIELD_BASE(142, 142, 4, 0x00e0, 0x10, 14, 1),
        PIN_FIELD_BASE(152, 152, 7, 0x00c0, 0x10, 3, 1),
        PIN_FIELD_BASE(153, 153, 7, 0x00c0, 0x10, 2, 1),
        PIN_FIELD_BASE(154, 154, 7, 0x00c0, 0x10, 0, 1),
        PIN_FIELD_BASE(155, 155, 7, 0x00c0, 0x10, 1, 1),
-       PIN_FIELD_BASE(160, 160, 7, 0x00f0, 0x10, 0, 1),
-       PIN_FIELD_BASE(161, 161, 7, 0x00f0, 0x10, 2, 1),
        PIN_FIELD_BASE(183, 183, 9, 0x0040, 0x10, 1, 1),
        PIN_FIELD_BASE(184, 184, 9, 0x0040, 0x10, 2, 1),
        PIN_FIELD_BASE(185, 185, 9, 0x0040, 0x10, 4, 1),
@@ -1194,12 +1160,6 @@ static const struct mtk_pin_field_calc mt8192_pin_r0_range[] = {
        PIN_FIELD_BASE(192, 192, 9, 0x0040, 0x10, 0, 1),
        PIN_FIELD_BASE(193, 193, 9, 0x0040, 0x10, 5, 1),
        PIN_FIELD_BASE(194, 194, 9, 0x0040, 0x10, 11, 1),
-       PIN_FIELD_BASE(200, 200, 8, 0x0070, 0x10, 2, 1),
-       PIN_FIELD_BASE(201, 201, 8, 0x0070, 0x10, 6, 1),
-       PIN_FIELD_BASE(202, 202, 5, 0x0070, 0x10, 0, 1),
-       PIN_FIELD_BASE(203, 203, 5, 0x0070, 0x10, 2, 1),
-       PIN_FIELD_BASE(204, 204, 8, 0x0070, 0x10, 0, 1),
-       PIN_FIELD_BASE(205, 205, 8, 0x0070, 0x10, 4, 1),
 };
 
 static const struct mtk_pin_field_calc mt8192_pin_r1_range[] = {
@@ -1221,24 +1181,10 @@ static const struct mtk_pin_field_calc mt8192_pin_r1_range[] = {
        PIN_FIELD_BASE(54, 54, 1, 0x0090, 0x10, 2, 1),
        PIN_FIELD_BASE(55, 55, 1, 0x0090, 0x10, 4, 1),
        PIN_FIELD_BASE(56, 56, 1, 0x0090, 0x10, 3, 1),
-       PIN_FIELD_BASE(118, 118, 4, 0x00e0, 0x10, 1, 1),
-       PIN_FIELD_BASE(119, 119, 4, 0x00e0, 0x10, 13, 1),
-       PIN_FIELD_BASE(120, 120, 4, 0x00e0, 0x10, 11, 1),
-       PIN_FIELD_BASE(121, 121, 4, 0x00e0, 0x10, 23, 1),
-       PIN_FIELD_BASE(122, 122, 4, 0x00e0, 0x10, 9, 1),
-       PIN_FIELD_BASE(123, 123, 4, 0x00e0, 0x10, 21, 1),
-       PIN_FIELD_BASE(124, 124, 4, 0x00e0, 0x10, 7, 1),
-       PIN_FIELD_BASE(125, 125, 4, 0x00e0, 0x10, 19, 1),
-       PIN_FIELD_BASE(139, 139, 4, 0x00e0, 0x10, 5, 1),
-       PIN_FIELD_BASE(140, 140, 4, 0x00e0, 0x10, 17, 1),
-       PIN_FIELD_BASE(141, 141, 4, 0x00e0, 0x10, 3, 1),
-       PIN_FIELD_BASE(142, 142, 4, 0x00e0, 0x10, 15, 1),
        PIN_FIELD_BASE(152, 152, 7, 0x00d0, 0x10, 3, 1),
        PIN_FIELD_BASE(153, 153, 7, 0x00d0, 0x10, 2, 1),
        PIN_FIELD_BASE(154, 154, 7, 0x00d0, 0x10, 0, 1),
        PIN_FIELD_BASE(155, 155, 7, 0x00d0, 0x10, 1, 1),
-       PIN_FIELD_BASE(160, 160, 7, 0x00f0, 0x10, 1, 1),
-       PIN_FIELD_BASE(161, 161, 7, 0x00f0, 0x10, 3, 1),
        PIN_FIELD_BASE(183, 183, 9, 0x0050, 0x10, 1, 1),
        PIN_FIELD_BASE(184, 184, 9, 0x0050, 0x10, 2, 1),
        PIN_FIELD_BASE(185, 185, 9, 0x0050, 0x10, 4, 1),
@@ -1251,12 +1197,6 @@ static const struct mtk_pin_field_calc mt8192_pin_r1_range[] = {
        PIN_FIELD_BASE(192, 192, 9, 0x0050, 0x10, 0, 1),
        PIN_FIELD_BASE(193, 193, 9, 0x0050, 0x10, 5, 1),
        PIN_FIELD_BASE(194, 194, 9, 0x0050, 0x10, 11, 1),
-       PIN_FIELD_BASE(200, 200, 8, 0x0070, 0x10, 3, 1),
-       PIN_FIELD_BASE(201, 201, 8, 0x0070, 0x10, 7, 1),
-       PIN_FIELD_BASE(202, 202, 5, 0x0070, 0x10, 1, 1),
-       PIN_FIELD_BASE(203, 203, 5, 0x0070, 0x10, 3, 1),
-       PIN_FIELD_BASE(204, 204, 8, 0x0070, 0x10, 1, 1),
-       PIN_FIELD_BASE(205, 205, 8, 0x0070, 0x10, 5, 1),
 };
 
 static const struct mtk_pin_field_calc mt8192_pin_drv_adv_range[] = {