target/linux/ixp4xx-2.6/patches/200-gateway_7001.patch

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