[rb532] update 2.6.27 patches with upstream fixes from git repository and mailing...
[openwrt.git] / target / linux / rb532 / patches-2.6.24 / 100-rb5xx_support.patch
1 diff -urN linux-2.6.24.7/arch/mips/Kconfig linux-2.6.24.7.new/arch/mips/Kconfig
2 --- linux-2.6.24.7/arch/mips/Kconfig    2008-05-07 01:22:34.000000000 +0200
3 +++ linux-2.6.24.7.new/arch/mips/Kconfig        2008-07-15 15:29:51.000000000 +0200
4 @@ -687,6 +687,23 @@
5           This enables support for the Wind River MIPS32 4KC PPMC evaluation
6           board, which is based on GT64120 bridge chip.
7  
8 +config MIKROTIK_RB500
9 +       bool "Support for RB5xx boards"
10 +       select HW_HAS_PCI
11 +       select CEVT_R4K
12 +       select CSRC_R4K
13 +       select IRQ_CPU
14 +       select SYS_HAS_CPU_MIPS32_R1
15 +       select SYS_SUPPORTS_LITTLE_ENDIAN
16 +       select SYS_SUPPORTS_32BIT_KERNEL
17 +       select SWAP_IO_SPACE
18 +       select DMA_NONCOHERENT
19 +       select GENERIC_GPIO
20 +       help
21 +         Support the Mikrotik(tm) Routerboard 500 series,
22 +         such as the RB532.
23 +
24 +
25  endchoice
26  
27  source "arch/mips/au1000/Kconfig"
28 @@ -967,6 +982,7 @@
29         default "4" if MACH_DECSTATION
30         default "7" if SGI_IP27 || SNI_RM
31         default "4" if PMC_MSP4200_EVAL
32 +       default "4" if MIKROTIK_RB500
33         default "5"
34  
35  config HAVE_STD_PC_SERIAL_PORT
36 diff -urN linux-2.6.24.7/arch/mips/Makefile linux-2.6.24.7.new/arch/mips/Makefile
37 --- linux-2.6.24.7/arch/mips/Makefile   2008-07-15 15:27:55.000000000 +0200
38 +++ linux-2.6.24.7.new/arch/mips/Makefile       2008-07-15 15:30:21.000000000 +0200
39 @@ -297,6 +297,13 @@
40  cflags-$(CONFIG_LEMOTE_FULONG) += -Iinclude/asm-mips/mach-lemote
41  
42  #
43 +# Routerboard 532 board
44 +#
45 +core-$(CONFIG_MIKROTIK_RB500)  += arch/mips/rb500/
46 +cflags-$(CONFIG_MIKROTIK_RB500)        += -Iinclude/asm-mips/rc32434
47 +load-$(CONFIG_MIKROTIK_RB500)  += 0xffffffff80101000
48 +
49 +#
50  # For all MIPS, Inc. eval boards
51  #
52  core-$(CONFIG_MIPS_BOARDS_GEN) += arch/mips/mips-boards/generic/
53 diff -urN linux-2.6.24.7/arch/mips/pci/Makefile linux-2.6.24.7.new/arch/mips/pci/Makefile
54 --- linux-2.6.24.7/arch/mips/pci/Makefile       2008-05-07 01:22:34.000000000 +0200
55 +++ linux-2.6.24.7.new/arch/mips/pci/Makefile   2008-07-15 15:30:46.000000000 +0200
56 @@ -48,3 +48,4 @@
57  obj-$(CONFIG_VICTOR_MPC30X)    += fixup-mpc30x.o
58  obj-$(CONFIG_ZAO_CAPCELLA)     += fixup-capcella.o
59  obj-$(CONFIG_WR_PPMC)          += fixup-wrppmc.o
60 +obj-$(CONFIG_MIKROTIK_RB500)   += pci-rc32434.o ops-rc32434.o fixup-rb500.o
61 diff -urN linux-2.6.24.7/drivers/pci/Makefile linux-2.6.24.7.new/drivers/pci/Makefile
62 --- linux-2.6.24.7/drivers/pci/Makefile 2008-05-07 01:22:34.000000000 +0200
63 +++ linux-2.6.24.7.new/drivers/pci/Makefile     2008-07-15 15:31:20.000000000 +0200
64 @@ -35,6 +35,7 @@
65  obj-$(CONFIG_PPC64) += setup-bus.o
66  obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
67  obj-$(CONFIG_X86_VISWS) += setup-irq.o
68 +obj-$(CONFIG_MIKROTIK_RB500) += setup-irq.o
69  
70  #
71  # ACPI Related PCI FW Functions
72 diff -urN linux-2.6.24.7/include/asm-mips/bootinfo.h linux-2.6.24.7.new/include/asm-mips/bootinfo.h
73 --- linux-2.6.24.7/include/asm-mips/bootinfo.h  2008-05-07 01:22:34.000000000 +0200
74 +++ linux-2.6.24.7.new/include/asm-mips/bootinfo.h      2008-07-15 15:32:06.000000000 +0200
75 @@ -198,6 +198,14 @@
76  #define MACH_GROUP_BRCM                23      /* Broadcom                     */
77  #define  MACH_BCM47XX          1       /* Broadcom BCM47XX             */
78  
79 +
80 +/*
81 + * Valid machtype for group Mikrotik
82 + */
83 +#define MACH_GROUP_MIKROTIK    29      /* Mikrotik Boards                       */
84 +#define  MACH_MIKROTIK_RB532   0       /* Mikrotik RouterBoard 532 */
85 +#define  MACH_MIKROTIK_RB532A  1       /* Mikrotik RouterBoard 532A */
86 +
87  #define CL_SIZE                        COMMAND_LINE_SIZE
88  
89  const char *get_system_type(void);
90 diff -urN linux-2.6.24.7/include/asm-mips/cpu.h linux-2.6.24.7.new/include/asm-mips/cpu.h
91 --- linux-2.6.24.7/include/asm-mips/cpu.h       2008-05-07 01:22:34.000000000 +0200
92 +++ linux-2.6.24.7.new/include/asm-mips/cpu.h   2008-07-15 15:32:22.000000000 +0200
93 @@ -196,7 +196,7 @@
94          */
95         CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_74K, CPU_AU1000,
96         CPU_AU1100, CPU_AU1200, CPU_AU1500, CPU_AU1550, CPU_PR4450,
97 -       CPU_BCM3302, CPU_BCM4710,
98 +       CPU_BCM3302, CPU_BCM4710, CPU_RC32300,
99  
100         /*
101          * MIPS64 class processors