Merge tag 'v5.0-next-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/fixes

mt8173: minor typo in scpsys header file
mt7629: add smp bringup code
mt7623a: delete unused smp bringup code

* tag 'v5.0-next-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  arm: mediatek: add MT7629 smp bring up code
  Revert "ARM: mediatek: add MT7623a smp bringup code"
  dt-bindings: soc: fix typo of MT8173 power dt-bindings

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

4 files changed, 9 insertions, 6 deletions

diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig
index 91cc461f7b04..11ed264f0731 100644
--- a/arch/arm/mach-mediatek/Kconfig
+++ b/arch/arm/mach-mediatek/Kconfig
@@ -26,6 +26,10 @@ config MACH_MT7623
         bool "MediaTek MT7623 SoCs support"
         default ARCH_MEDIATEK
 
+config MACH_MT7629
+        bool "MediaTek MT7629 SoCs support"
+        default ARCH_MEDIATEK
+
 config MACH_MT8127
         bool "MediaTek MT8127 SoCs support"
         default ARCH_MEDIATEK
diff --git a/arch/arm/mach-mediatek/mediatek.c b/arch/arm/mach-mediatek/mediatek.c
index 6910b4e0d913..b6a81ba1ce32 100644
--- a/arch/arm/mach-mediatek/mediatek.c
+++ b/arch/arm/mach-mediatek/mediatek.c
@@ -30,7 +30,6 @@ static void __init mediatek_timer_init(void)
 
         if (of_machine_is_compatible("mediatek,mt6589") ||
             of_machine_is_compatible("mediatek,mt7623") ||
-            of_machine_is_compatible("mediatek,mt7623a") ||
             of_machine_is_compatible("mediatek,mt8135") ||
             of_machine_is_compatible("mediatek,mt8127")) {
                 /* turn on GPT6 which ungates arch timer clocks */
@@ -50,7 +49,7 @@ static const char * const mediatek_board_dt_compat[] = {
         "mediatek,mt6589",
         "mediatek,mt6592",
         "mediatek,mt7623",
-        "mediatek,mt7623a",
+        "mediatek,mt7629",
         "mediatek,mt8127",
         "mediatek,mt8135",
         NULL,
diff --git a/arch/arm/mach-mediatek/platsmp.c b/arch/arm/mach-mediatek/platsmp.c
index 6882ff07aaa6..c9d7c0458452 100644
--- a/arch/arm/mach-mediatek/platsmp.c
+++ b/arch/arm/mach-mediatek/platsmp.c
@@ -60,7 +60,7 @@ static const struct of_device_id mtk_tz_smp_boot_infos[] __initconst = {
 static const struct of_device_id mtk_smp_boot_infos[] __initconst = {
         { .compatible   = "mediatek,mt6589", .data = &mtk_mt6589_boot },
         { .compatible   = "mediatek,mt7623", .data = &mtk_mt7623_boot },
-        { .compatible   = "mediatek,mt7623a", .data = &mtk_mt7623_boot },
+        { .compatible   = "mediatek,mt7629", .data = &mtk_mt7623_boot },
         {},
 };
 
diff --git a/include/dt-bindings/power/mt8173-power.h b/include/dt-bindings/power/mt8173-power.h
index 15d531aa6e78..ef4a7f944848 100644
--- a/include/dt-bindings/power/mt8173-power.h
+++ b/include/dt-bindings/power/mt8173-power.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _DT_BINDINGS_POWER_MT8183_POWER_H
-#define _DT_BINDINGS_POWER_MT8183_POWER_H
+#ifndef _DT_BINDINGS_POWER_MT8173_POWER_H
+#define _DT_BINDINGS_POWER_MT8173_POWER_H
 
 #define MT8173_POWER_DOMAIN_VDEC        0
 #define MT8173_POWER_DOMAIN_VENC        1
@@ -13,4 +13,4 @@
 #define MT8173_POWER_DOMAIN_MFG_2D      8
 #define MT8173_POWER_DOMAIN_MFG         9
 
-#endif /* _DT_BINDINGS_POWER_MT8183_POWER_H */
+#endif /* _DT_BINDINGS_POWER_MT8173_POWER_H */