forked from openwrt/openwrt
-
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
mediatek: backport upstream patches related to mt7629 support
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
- Loading branch information
Showing
5 changed files
with
17,403 additions
and
0 deletions.
There are no files selected for viewing
51 changes: 51 additions & 0 deletions
51
...t/linux/mediatek/patches-4.19/0002-Revert-ARM-mediatek-add-MT7623a-smp-bringup-code.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
From 2663146427cedb9d7582cfa481d5d5611fb3138a Mon Sep 17 00:00:00 2001 | ||
From: Ryder Lee <ryder.lee@mediatek.com> | ||
Date: Tue, 29 Jan 2019 12:28:48 +0800 | ||
Subject: [PATCH] Revert "ARM: mediatek: add MT7623a smp bringup code" | ||
|
||
This reverts commit 3b99ab7deca1e5f4229b4bdecd005d71e22cfc60. | ||
|
||
The compatible "mediatek,mt7623a" is useless, so remove it. | ||
|
||
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> | ||
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> | ||
--- | ||
arch/arm/mach-mediatek/mediatek.c | 2 -- | ||
arch/arm/mach-mediatek/platsmp.c | 1 - | ||
2 files changed, 3 deletions(-) | ||
|
||
diff --git a/arch/arm/mach-mediatek/mediatek.c b/arch/arm/mach-mediatek/mediatek.c | ||
index 6910b4e0d913..c3cf215773b2 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,6 @@ static const char * const mediatek_board_dt_compat[] = { | ||
"mediatek,mt6589", | ||
"mediatek,mt6592", | ||
"mediatek,mt7623", | ||
- "mediatek,mt7623a", | ||
"mediatek,mt8127", | ||
"mediatek,mt8135", | ||
NULL, | ||
diff --git a/arch/arm/mach-mediatek/platsmp.c b/arch/arm/mach-mediatek/platsmp.c | ||
index 6882ff07aaa6..51e85562098c 100644 | ||
--- a/arch/arm/mach-mediatek/platsmp.c | ||
+++ b/arch/arm/mach-mediatek/platsmp.c | ||
@@ -60,7 +60,6 @@ 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 }, | ||
{}, | ||
}; | ||
|
||
-- | ||
2.21.0 | ||
|
57 changes: 57 additions & 0 deletions
57
target/linux/mediatek/patches-4.19/0003-arm-mediatek-add-MT7629-smp-bring-up-code.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
From a43379dddf1ba14b6a9d50d95175117bbdf52ed2 Mon Sep 17 00:00:00 2001 | ||
From: Ryder Lee <ryder.lee@mediatek.com> | ||
Date: Tue, 29 Jan 2019 12:31:18 +0800 | ||
Subject: [PATCH] arm: mediatek: add MT7629 smp bring up code | ||
|
||
Add support for booting secondary CPUs on MT7629. | ||
|
||
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> | ||
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> | ||
--- | ||
arch/arm/mach-mediatek/Kconfig | 4 ++++ | ||
arch/arm/mach-mediatek/mediatek.c | 1 + | ||
arch/arm/mach-mediatek/platsmp.c | 1 + | ||
3 files changed, 6 insertions(+) | ||
|
||
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 c3cf215773b2..b6a81ba1ce32 100644 | ||
--- a/arch/arm/mach-mediatek/mediatek.c | ||
+++ b/arch/arm/mach-mediatek/mediatek.c | ||
@@ -49,6 +49,7 @@ static const char * const mediatek_board_dt_compat[] = { | ||
"mediatek,mt6589", | ||
"mediatek,mt6592", | ||
"mediatek,mt7623", | ||
+ "mediatek,mt7629", | ||
"mediatek,mt8127", | ||
"mediatek,mt8135", | ||
NULL, | ||
diff --git a/arch/arm/mach-mediatek/platsmp.c b/arch/arm/mach-mediatek/platsmp.c | ||
index 51e85562098c..c9d7c0458452 100644 | ||
--- a/arch/arm/mach-mediatek/platsmp.c | ||
+++ b/arch/arm/mach-mediatek/platsmp.c | ||
@@ -60,6 +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,mt7629", .data = &mtk_mt7623_boot }, | ||
{}, | ||
}; | ||
|
||
-- | ||
2.21.0 | ||
|
Oops, something went wrong.