Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0e1f79a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.0-next-soc' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 5f6efe31 a43379dd

arch/arm/mach-mediatek/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-mediatek/mediatek.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

arch/arm/mach-mediatek/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -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 },

	{},

};

include/dt-bindings/power/mt8173-power.h

+3 −3
Original line number Diff line number Diff line 
/* 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 */