pinctrl: mediatek: mt7981: rename reg-names to upstream linux format

Rename reg-names to upstream linux format. Upstream linux drop the
"_base". To make use of upstream DTSI, align to the upstream naming.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Reviewed-by: Weijie Gao <weijie.gao@mediatek.com>
Tested-by: Weijie Gao <weijie.gao@mediatek.com>

diff --git a/arch/arm/dts/mt7981.dtsi b/arch/arm/dts/mt7981.dtsi
index 2844ab0..3c8b9ab 100644 (file)
--- a/arch/arm/dts/mt7981.dtsi
+++ b/arch/arm/dts/mt7981.dtsi
@@ -117,9 +117,9 @@
                      <0x11f00000 0x1000>,
                      <0x11f10000 0x1000>,
                      <0x1000b000 0x1000>;
-               reg-names = "gpio_base", "iocfg_rt_base", "iocfg_rm_base",
-                           "iocfg_rb_base", "iocfg_lb_base", "iocfg_bl_base",
-                           "iocfg_tm_base", "iocfg_tl_base", "eint";
+               reg-names = "gpio", "iocfg_rt", "iocfg_rm",
+                           "iocfg_rb", "iocfg_lb", "iocfg_bl",
+                           "iocfg_tm", "iocfg_tl", "eint";
                gpio: gpio-controller {
                        gpio-controller;
                        #gpio-cells = <2>;

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7981.c b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
index 047e37b..d1c8afd 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt7981.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
@@ -1012,8 +1012,9 @@ static const struct mtk_function_desc mt7981_functions[] = {
 };
 
 static const char *const mt7981_pinctrl_register_base_names[] = {
-       "gpio_base", "iocfg_rt_base", "iocfg_rm_base", "iocfg_rb_base",
-       "iocfg_lb_base", "iocfg_bl_base", "iocfg_tm_base", "iocfg_tl_base",
+       "gpio", "iocfg_rt", "iocfg_rm", "iocfg_rb",
+       "iocfg_lb", "iocfg_bl", "iocfg_tm", "iocfg_tl",
+       "eint",
 };
 
 static const struct mtk_pinctrl_soc mt7981_data = {