diff options
| author | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-04-13 21:27:01 -0700 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-04-17 21:56:05 +0200 |
| commit | fa6f57f66c1286c7b649de01de0b994e4e27626e (patch) | |
| tree | e8c438ef2d01f658fd4de9896cf3b7db032587a6 /target/linux/ramips/patches-5.10/323-mt7621-memory-detect.patch | |
| parent | 17e690017d76c49070bc99d6a376b1926259c5ff (diff) | |
| download | upstream-fa6f57f66c1286c7b649de01de0b994e4e27626e.tar.gz upstream-fa6f57f66c1286c7b649de01de0b994e4e27626e.tar.bz2 upstream-fa6f57f66c1286c7b649de01de0b994e4e27626e.zip | |
ramips: replace mt7621s hack with upstream patch
Refresh patches.
Tested on a dual-core MT7621 device (Ubiquiti ER-X) and a single-core
MT7621 device (Netgear R6220).
This change will make future kernel upgrades easier (avoids conflicts
with upstream).
Link: https://lore.kernel.org/lkml/20210407200738.149207-1-ilya.lipnitskiy@gmail.com/
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Cc: Chuanhong Guo <gch981213@gmail.com>
Diffstat (limited to 'target/linux/ramips/patches-5.10/323-mt7621-memory-detect.patch')
| -rw-r--r-- | target/linux/ramips/patches-5.10/323-mt7621-memory-detect.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ramips/patches-5.10/323-mt7621-memory-detect.patch b/target/linux/ramips/patches-5.10/323-mt7621-memory-detect.patch index 6dd4a1daa9..e87263d3c9 100644 --- a/target/linux/ramips/patches-5.10/323-mt7621-memory-detect.patch +++ b/target/linux/ramips/patches-5.10/323-mt7621-memory-detect.patch @@ -58,7 +58,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com> #include <asm/mipsregs.h> #include <asm/smp-ops.h> #include <asm/mips-cps.h> -@@ -55,6 +57,8 @@ +@@ -54,6 +56,8 @@ #define MT7621_GPIO_MODE_SDHCI_SHIFT 18 #define MT7621_GPIO_MODE_SDHCI_GPIO 1 @@ -67,7 +67,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com> static struct rt2880_pmx_func uart1_grp[] = { FUNC("uart1", 0, 1, 2) }; static struct rt2880_pmx_func i2c_grp[] = { FUNC("i2c", 0, 3, 2) }; static struct rt2880_pmx_func uart3_grp[] = { -@@ -139,6 +143,26 @@ static struct clk *__init mt7621_add_sys +@@ -138,6 +142,26 @@ static struct clk *__init mt7621_add_sys return clk; } @@ -94,7 +94,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com> void __init ralink_clk_init(void) { u32 syscfg, xtal_sel, clkcfg, clk_sel, curclk, ffiv, ffrac; -@@ -292,10 +316,7 @@ void prom_soc_init(struct ralink_soc_inf +@@ -277,10 +301,7 @@ void prom_soc_init(struct ralink_soc_inf (rev >> CHIP_REV_VER_SHIFT) & CHIP_REV_VER_MASK, (rev & CHIP_REV_ECO_MASK)); |