8942679000805628e131bc82d7191fb93eab5562
[openwrt.git] / target / linux / xscale-2.6 / patches / 001-gateway_7001.patch
1 diff -Nur linux-2.6.16.4/arch/arm/boot/compressed/head-xscale.S linux-2.6.16.4-owrt/arch/arm/boot/compressed/head-xscale.S
2 --- linux-2.6.16.4/arch/arm/boot/compressed/head-xscale.S       2006-04-11 19:19:28.000000000 +0200
3 +++ linux-2.6.16.4-owrt/arch/arm/boot/compressed/head-xscale.S  2006-04-16 16:51:05.000000000 +0200
4 @@ -47,6 +47,11 @@
5                 orr     r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00)
6  #endif
7  
8 +#ifdef  CONFIG_MACH_GATEWAY7001
9 +               mov     r7, #(MACH_TYPE_GATEWAY7001 & 0xff)
10 +               orr     r7, r7, #(MACH_TYPE_GATEWAY7001 & 0xff00)
11 +#endif
12 +
13  #ifdef CONFIG_ARCH_IXP2000
14                 mov     r1, #-1
15                 mov     r0, #0xd6000000
16 diff -Nur linux-2.6.16.4/arch/arm/mach-ixp4xx/gateway7001-pci.c linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/gateway7001-pci.c
17 --- linux-2.6.16.4/arch/arm/mach-ixp4xx/gateway7001-pci.c       1970-01-01 01:00:00.000000000 +0100
18 +++ linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/gateway7001-pci.c  2006-04-17 19:21:55.000000000 +0200
19 @@ -0,0 +1,67 @@
20 +/*
21 + * arch/arch/mach-ixp4xx/gateway7001-pci.c
22 + *
23 + * PCI setup routines for Gateway 7001
24 + *
25 + * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
26 + *
27 + * based on coyote-pci.c:
28 + *     Copyright (C) 2002 Jungo Software Technologies.
29 + *     Copyright (C) 2003 MontaVista Softwrae, Inc.
30 + *
31 + * Maintainer: Imre Kaloz <kaloz@openwrt.org>
32 + *
33 + * This program is free software; you can redistribute it and/or modify
34 + * it under the terms of the GNU General Public License version 2 as
35 + * published by the Free Software Foundation.
36 + *
37 + */
38 +
39 +#include <linux/kernel.h>
40 +#include <linux/pci.h>
41 +#include <linux/init.h>
42 +
43 +#include <asm/mach-types.h>
44 +#include <asm/hardware.h>
45 +#include <asm/irq.h>
46 +
47 +#include <asm/mach/pci.h>
48 +
49 +extern void ixp4xx_pci_preinit(void);
50 +extern int ixp4xx_setup(int nr, struct pci_sys_data *sys);
51 +extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys);
52 +
53 +void __init gateway7001_pci_preinit(void)
54 +{
55 +       set_irq_type(IRQ_IXP4XX_GPIO10, IRQT_LOW);
56 +       set_irq_type(IRQ_IXP4XX_GPIO11, IRQT_LOW);
57 +
58 +       ixp4xx_pci_preinit();
59 +}
60 +
61 +static int __init gateway7001_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
62 +{
63 +       if (slot == 0)
64 +               return IRQ_IXP4XX_GPIO10;
65 +       else if (slot == 1)
66 +               return IRQ_IXP4XX_GPIO11;
67 +       else return -1;
68 +}
69 +
70 +struct hw_pci gateway7001_pci __initdata = {
71 +       .nr_controllers = 1,
72 +       .preinit =        gateway7001_pci_preinit,
73 +       .swizzle =        pci_std_swizzle,
74 +       .setup =          ixp4xx_setup,
75 +       .scan =           ixp4xx_scan_bus,
76 +       .map_irq =        gateway7001_map_irq,
77 +};
78 +
79 +int __init gateway7001_pci_init(void)
80 +{
81 +       if (machine_is_gateway7001())
82 +               pci_common_init(&gateway7001_pci);
83 +       return 0;
84 +}
85 +
86 +subsys_initcall(gateway7001_pci_init);
87 diff -Nur linux-2.6.16.4/arch/arm/mach-ixp4xx/Kconfig linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/Kconfig
88 --- linux-2.6.16.4/arch/arm/mach-ixp4xx/Kconfig 2006-04-11 19:19:28.000000000 +0200
89 +++ linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/Kconfig    2006-04-16 15:58:37.000000000 +0200
90 @@ -30,6 +30,13 @@
91           Engineering Coyote Gateway Reference Platform. For more
92           information on this platform, see <file:Documentation/arm/IXP4xx>.
93  
94 +config MACH_GATEWAY7001
95 +       bool "Gateway 7001"
96 +       help
97 +         Say 'Y' here if you want your kernel to support Gateway's 
98 +         7001 Access Point. For more information on this platform,
99 +         see http://openwrt.org
100 +
101  config ARCH_IXDP425
102         bool "IXDP425"
103         help
104 diff -Nur linux-2.6.16.4/arch/arm/mach-ixp4xx/Makefile linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/Makefile
105 --- linux-2.6.16.4/arch/arm/mach-ixp4xx/Makefile        2006-04-11 19:19:28.000000000 +0200
106 +++ linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/Makefile   2006-04-16 16:03:42.000000000 +0200
107 @@ -10,4 +10,5 @@
108  obj-$(CONFIG_MACH_GTWX5715)    += gtwx5715-pci.o gtwx5715-setup.o
109  obj-$(CONFIG_MACH_NSLU2)       += nslu2-pci.o nslu2-setup.o nslu2-power.o
110  obj-$(CONFIG_MACH_NAS100D)     += nas100d-pci.o nas100d-setup.o nas100d-power.o
111 +obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o coyote-setup.o
112  
113 diff -Nur linux-2.6.16.4/include/asm-arm/arch-ixp4xx/uncompress.h linux-2.6.16.4-owrt/include/asm-arm/arch-ixp4xx/uncompress.h
114 --- linux-2.6.16.4/include/asm-arm/arch-ixp4xx/uncompress.h     2006-04-11 19:19:28.000000000 +0200
115 +++ linux-2.6.16.4-owrt/include/asm-arm/arch-ixp4xx/uncompress.h        2006-04-16 16:25:34.000000000 +0200
116 @@ -48,7 +48,7 @@
117         /*
118          * Coyote and gtwx5715 only have UART2 connected
119          */
120 -       if (machine_is_adi_coyote() || machine_is_gtwx5715())
121 +       if (machine_is_adi_coyote() || machine_is_gtwx5715() || machine_is_gateway7001())
122                 uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
123         else
124                 uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
125 diff -Nur linux-2.6.16.4/arch/arm/mach-ixp4xx/coyote-setup.c linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/coyote-setup.c
126 --- linux-2.6.16.4/arch/arm/mach-ixp4xx/coyote-setup.c  2006-04-11 19:19:28.000000000 +0200
127 +++ linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/coyote-setup.c     2006-04-16 16:03:23.000000000 +0200
128 @@ -1,9 +1,10 @@
129  /*
130   * arch/arm/mach-ixp4xx/coyote-setup.c
131   *
132 - * Board setup for ADI Engineering and IXDGP425 boards
133 + * Board setup for ADI Engineering, IXDGP425 and Gateway 7001 boards
134   *
135   * Copyright (C) 2003-2005 MontaVista Software, Inc.
136 + * Copyright (C) 2006 Imre Kaloz <Kaloz@openwrt.org>
137   *
138   * Author: Deepak Saxena <dsaxena@plexity.net>
139   */
140 @@ -111,6 +112,19 @@
141  MACHINE_END
142  #endif
143  
144 +#ifdef CONFIG_MACH_GATEWAY7001
145 +MACHINE_START(GATEWAY7001, "Gateway 7001")
146 +       /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
147 +       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
148 +       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
149 +       .map_io         = ixp4xx_map_io,
150 +       .init_irq       = ixp4xx_init_irq,
151 +       .timer          = &ixp4xx_timer,
152 +       .boot_params    = 0x0100,
153 +       .init_machine   = coyote_init,
154 +MACHINE_END
155 +#endif
156 +
157  /*
158   * IXDPG425 is identical to Coyote except for which serial port
159   * is connected.