ramips: refresh patches
Removed upstreamed/solved elsewhere upstream: - 0001-MIPS-ralink-Add-rt3352-SPI_CS1-pinmux.patch - 0002-MIPS-pci-rt2880-set-pci-controller-of_node.patch - 0004-MIPS-ralink-add-MT7621-pcie-driver.patch - 0009-PCI-MIPS-enable-PCIe-on-MT7688.patch - 0025-pinctrl-ralink-add-pinctrl-driver.patch - 0028-GPIO-ralink-add-mt7621-gpio-controller.patch - 0043-spi-add-mt7621-support.patch - 0045-i2c-add-mt7621-driver.patch - 0047-DMA-ralink-add-rt2880-dma-engine.patch - 0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch - 0054-mtd-spi-nor-w25q256-respect-default-mode.patch - 0099-pci-mt7620.patch - 304-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch Removed because of the new NAND driver: - 0038-Revert-mtd-nand-Remove-unused-chip-write_page-hook.patch - 0039-mtd-add-mt7621-nand-support.patch - 0040-nand-hack.patch Remove patch that no longer applies (needs rework): - 0034-NET-multi-phy-support.patch Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
This commit is contained in:
		
				
					committed by
					
						
						Chuanhong Guo
					
				
			
			
				
	
			
			
			
						parent
						
							d75c9b8f81
						
					
				
				
					commit
					6be0da90a1
				
			@@ -28,7 +28,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
 | 
			
		||||
 | 
			
		||||
--- a/arch/mips/include/asm/mach-ralink/mt7621.h
 | 
			
		||||
+++ b/arch/mips/include/asm/mach-ralink/mt7621.h
 | 
			
		||||
@@ -46,9 +46,10 @@
 | 
			
		||||
@@ -44,9 +44,10 @@
 | 
			
		||||
 #define CPU_PLL_FBDIV_MASK		0x7f
 | 
			
		||||
 #define CPU_PLL_FBDIV_SHIFT		4
 | 
			
		||||
 
 | 
			
		||||
@@ -44,7 +44,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
 | 
			
		||||
 #define MT7621_CHIP_NAME1		0x20203132
 | 
			
		||||
--- a/arch/mips/ralink/mt7621.c
 | 
			
		||||
+++ b/arch/mips/ralink/mt7621.c
 | 
			
		||||
@@ -15,6 +15,7 @@
 | 
			
		||||
@@ -13,6 +13,7 @@
 | 
			
		||||
 #include <linux/clk-provider.h>
 | 
			
		||||
 #include <dt-bindings/clock/mt7621-clk.h>
 | 
			
		||||
 
 | 
			
		||||
@@ -52,7 +52,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
 | 
			
		||||
 #include <asm/mipsregs.h>
 | 
			
		||||
 #include <asm/smp-ops.h>
 | 
			
		||||
 #include <asm/mips-cps.h>
 | 
			
		||||
@@ -57,6 +58,8 @@
 | 
			
		||||
@@ -55,6 +56,8 @@
 | 
			
		||||
 #define MT7621_GPIO_MODE_SDHCI_SHIFT	18
 | 
			
		||||
 #define MT7621_GPIO_MODE_SDHCI_GPIO	1
 | 
			
		||||
 
 | 
			
		||||
@@ -61,7 +61,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[] = {
 | 
			
		||||
@@ -141,6 +144,28 @@ static struct clk *__init mt7621_add_sys
 | 
			
		||||
@@ -139,6 +142,28 @@ static struct clk *__init mt7621_add_sys
 | 
			
		||||
 	return clk;
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
@@ -90,7 +90,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;
 | 
			
		||||
@@ -319,10 +344,7 @@ void prom_soc_init(struct ralink_soc_inf
 | 
			
		||||
@@ -317,10 +342,7 @@ void prom_soc_init(struct ralink_soc_inf
 | 
			
		||||
 		(rev >> CHIP_REV_VER_SHIFT) & CHIP_REV_VER_MASK,
 | 
			
		||||
 		(rev & CHIP_REV_ECO_MASK));
 | 
			
		||||
 
 | 
			
		||||
@@ -104,7 +104,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
 | 
			
		||||
 
 | 
			
		||||
--- a/arch/mips/ralink/common.h
 | 
			
		||||
+++ b/arch/mips/ralink/common.h
 | 
			
		||||
@@ -19,6 +19,7 @@ struct ralink_soc_info {
 | 
			
		||||
@@ -17,6 +17,7 @@ struct ralink_soc_info {
 | 
			
		||||
 	unsigned long mem_size;
 | 
			
		||||
 	unsigned long mem_size_min;
 | 
			
		||||
 	unsigned long mem_size_max;
 | 
			
		||||
@@ -114,7 +114,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
 | 
			
		||||
 
 | 
			
		||||
--- a/arch/mips/ralink/of.c
 | 
			
		||||
+++ b/arch/mips/ralink/of.c
 | 
			
		||||
@@ -89,6 +89,8 @@ void __init plat_mem_setup(void)
 | 
			
		||||
@@ -87,6 +87,8 @@ void __init plat_mem_setup(void)
 | 
			
		||||
 	of_scan_flat_dt(early_init_dt_find_memory, NULL);
 | 
			
		||||
 	if (memory_dtb)
 | 
			
		||||
 		of_scan_flat_dt(early_init_dt_scan_memory, NULL);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user