Changeset 36326


Ignore:
Timestamp:
2013-04-12T20:56:53+02:00 (5 years ago)
Author:
blogic
Message:

[ramips] fix up the rt2880 patches

Signed-off-by: John Crispin <blogic@…>

Location:
trunk/target/linux/ramips/patches-3.8
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ramips/patches-3.8/0107-MIPS-ralink-adds-support-for-RT2880-SoC-family.patch

    r36215 r36326  
    1 From f63a0ea6c115e7b78bce70d78aaa813615e3d434 Mon Sep 17 00:00:00 2001 
     1From c4429f19cc66951962c171dba90b8747f95a654e Mon Sep 17 00:00:00 2001 
    22From: John Crispin <blogic@openwrt.org> 
    33Date: Sun, 27 Jan 2013 09:17:20 +0100 
    4 Subject: [PATCH 107/121] MIPS: ralink: adds support for RT2880 SoC family 
     4Subject: [PATCH V2 09/16] MIPS: ralink: adds support for RT2880 SoC family 
    55 
    66Add support code for rt2880 SOC. 
     
    1515 arch/mips/ralink/Makefile                  |    1 + 
    1616 arch/mips/ralink/Platform                  |    5 + 
    17  arch/mips/ralink/rt288x.c                  |  141 ++++++++++++++++++++++++++++ 
    18  6 files changed, 200 insertions(+), 1 deletion(-) 
     17 arch/mips/ralink/rt288x.c                  |  143 ++++++++++++++++++++++++++++ 
     18 6 files changed, 202 insertions(+), 1 deletion(-) 
    1919 create mode 100644 arch/mips/include/asm/mach-ralink/rt288x.h 
    2020 create mode 100644 arch/mips/ralink/rt288x.c 
    2121 
     22diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig 
     23index 27a4bfa..c1997db 100644 
    2224--- a/arch/mips/Kconfig 
    2325+++ b/arch/mips/Kconfig 
    24 @@ -1189,7 +1189,7 @@ config BOOT_ELF32 
     26@@ -1144,7 +1144,7 @@ config BOOT_ELF32 
    2527  
    2628 config MIPS_L1_CACHE_SHIFT 
    2729        int 
    2830-       default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL 
    29 +       default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL || SOC_RT288X  
     31+       default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL || SOC_RT288X 
    3032        default "6" if MIPS_CPU_SCACHE 
    3133        default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM || CPU_CAVIUM_OCTEON 
    3234        default "5" 
     35diff --git a/arch/mips/include/asm/mach-ralink/rt288x.h b/arch/mips/include/asm/mach-ralink/rt288x.h 
     36new file mode 100644 
     37index 0000000..ad8b42d 
    3338--- /dev/null 
    3439+++ b/arch/mips/include/asm/mach-ralink/rt288x.h 
     
    8388+ 
    8489+#endif 
     90diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig 
     91index a0b0197..6723b94 100644 
    8592--- a/arch/mips/ralink/Kconfig 
    8693+++ b/arch/mips/ralink/Kconfig 
     
    95102                bool "RT305x" 
    96103                select USB_ARCH_HAS_HCD 
     104diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile 
     105index 939757f..6d826f2 100644 
    97106--- a/arch/mips/ralink/Makefile 
    98107+++ b/arch/mips/ralink/Makefile 
    99108@@ -8,6 +8,7 @@ 
    100109  
    101  obj-y := prom.o of.o reset.o clk.o irq.o pinmux.o 
     110 obj-y := prom.o of.o reset.o clk.o irq.o 
    102111  
    103112+obj-$(CONFIG_SOC_RT288X) += rt288x.o 
     
    105114  
    106115 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 
     116diff --git a/arch/mips/ralink/Platform b/arch/mips/ralink/Platform 
     117index 6babd65..3f49e51 100644 
    107118--- a/arch/mips/ralink/Platform 
    108119+++ b/arch/mips/ralink/Platform 
    109 @@ -5,6 +5,11 @@ core-$(CONFIG_RALINK)          += arch/mips/rali 
     120@@ -5,6 +5,11 @@ core-$(CONFIG_RALINK)          += arch/mips/ralink/ 
    110121 cflags-$(CONFIG_RALINK)                += -I$(srctree)/arch/mips/include/asm/mach-ralink 
    111122  
     
    119130 # 
    120131 load-$(CONFIG_SOC_RT305X)      += 0xffffffff80000000 
     132diff --git a/arch/mips/ralink/rt288x.c b/arch/mips/ralink/rt288x.c 
     133new file mode 100644 
     134index 0000000..8f3a0fa 
    121135--- /dev/null 
    122136+++ b/arch/mips/ralink/rt288x.c 
    123 @@ -0,0 +1,141 @@ 
     137@@ -0,0 +1,143 @@ 
    124138+/* 
    125139+ * This program is free software; you can redistribute it and/or modify it 
     
    224238+ 
    225239+       ralink_clk_add("cpu", cpu_rate); 
    226 +       ralink_clk_add("10000100.timer", cpu_rate / 2); 
    227 +       ralink_clk_add("10000500.uart", cpu_rate / 2); 
    228 +       ralink_clk_add("10000c00.uartlite", cpu_rate / 2); 
     240+       ralink_clk_add("300100.timer", cpu_rate / 2); 
     241+       ralink_clk_add("300120.watchdog", cpu_rate / 2); 
     242+       ralink_clk_add("300500.uart", cpu_rate / 2); 
     243+       ralink_clk_add("300c00.uartlite", cpu_rate / 2); 
     244+       ralink_clk_add("400000.ethernet", cpu_rate / 2); 
    229245+} 
    230246+ 
    231247+void __init ralink_of_remap(void) 
    232248+{ 
    233 +       rt_sysc_membase = plat_of_remap_node("ralink,rt288x-sysc"); 
    234 +       rt_memc_membase = plat_of_remap_node("ralink,rt288x-memc"); 
     249+       rt_sysc_membase = plat_of_remap_node("ralink,rt2880-sysc"); 
     250+       rt_memc_membase = plat_of_remap_node("ralink,rt2880-memc"); 
    235251+ 
    236252+       if (!rt_sysc_membase || !rt_memc_membase) 
     
    263279+               (id & CHIP_ID_REV_MASK)); 
    264280+} 
     281--  
     2821.7.10.4 
     283 
Note: See TracChangeset for help on using the changeset viewer.