target/linux/ixp4xx/patches-2.6.28/180-tw5334_support.patch

   1 --- a/arch/arm/mach-ixp4xx/Kconfig
   2 +++ b/arch/arm/mach-ixp4xx/Kconfig
   3 @@ -158,6 +158,14 @@ config ARCH_PRPMC1100
   4           PrPCM1100 Processor Mezanine Module. For more information on
   5           this platform, see <file:Documentation/arm/IXP4xx>.
   6
   7 +config MACH_TW5334
   8 +       bool "Titan Wireless TW-533-4"
   9 +       select PCI
  10 +       help
  11 +         Say 'Y' here if you want your kernel to support the Titan
  12 +         Wireless TW533-4. For more information on this platform,
  13 +         see http://openwrt.org
  14 +
  15  config MACH_NAS100D
  16         bool
  17         prompt "NAS100D"
  18 --- a/arch/arm/mach-ixp4xx/Makefile
  19 +++ b/arch/arm/mach-ixp4xx/Makefile
  20 @@ -22,6 +22,7 @@ obj-pci-$(CONFIG_MACH_SIDEWINDER)     += sid
  21  obj-pci-$(CONFIG_MACH_COMPEX)          += ixdp425-pci.o
  22  obj-pci-$(CONFIG_MACH_WRT300NV2)               += wrt300nv2-pci.o
  23  obj-pci-$(CONFIG_MACH_AP1000)          += ixdp425-pci.o
  24 +obj-pci-$(CONFIG_MACH_TW5334)          += tw5334-pci.o
  25
  26  obj-y  += common.o
  27
  28 @@ -42,6 +43,7 @@ obj-$(CONFIG_MACH_SIDEWINDER) += sidewin
  29  obj-$(CONFIG_MACH_COMPEX)      += compex-setup.o
  30  obj-$(CONFIG_MACH_WRT300NV2)   += wrt300nv2-setup.o
  31  obj-$(CONFIG_MACH_AP1000)      += ap1000-setup.o
  32 +obj-$(CONFIG_MACH_TW5334)      += tw5334-setup.o
  33
  34  obj-$(CONFIG_PCI)              += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  35  obj-$(CONFIG_IXP4XX_QMGR)      += ixp4xx_qmgr.o
  36 --- /dev/null
  37 +++ b/arch/arm/mach-ixp4xx/tw5334-setup.c
  38 @@ -0,0 +1,162 @@
  39 +/*
  40 + * arch/arm/mach-ixp4xx/tw5334-setup.c
  41 + *
  42 + * Board setup for the Titan Wireless TW-533-4
  43 + *
  44 + * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  45 + *
  46 + * based on coyote-setup.c:
  47 + *      Copyright (C) 2003-2005 MontaVista Software, Inc.
  48 + *
  49 + * Author: Imre Kaloz <Kaloz@openwrt.org>
  50 + */
  51 +
  52 +#include <linux/if_ether.h>
  53 +#include <linux/kernel.h>
  54 +#include <linux/init.h>
  55 +#include <linux/device.h>
  56 +#include <linux/serial.h>
  57 +#include <linux/tty.h>
  58 +#include <linux/serial_8250.h>
  59 +#include <linux/slab.h>
  60 +
  61 +#include <asm/types.h>
  62 +#include <asm/setup.h>
  63 +#include <asm/memory.h>
  64 +#include <mach/hardware.h>
  65 +#include <asm/irq.h>
  66 +#include <asm/mach-types.h>
  67 +#include <asm/mach/arch.h>
  68 +#include <asm/mach/flash.h>
  69 +
  70 +static struct flash_platform_data tw5334_flash_data = {
  71 +       .map_name       = "cfi_probe",
  72 +       .width          = 2,
  73 +};
  74 +
  75 +static struct resource tw5334_flash_resource = {
  76 +       .flags          = IORESOURCE_MEM,
  77 +};
  78 +
  79 +static struct platform_device tw5334_flash = {
  80 +       .name           = "IXP4XX-Flash",
  81 +       .id             = 0,
  82 +       .dev            = {
  83 +               .platform_data = &tw5334_flash_data,
  84 +       },
  85 +       .num_resources  = 1,
  86 +       .resource       = &tw5334_flash_resource,
  87 +};
  88 +
  89 +static struct resource tw5334_uart_resource = {
  90 +       .start  = IXP4XX_UART2_BASE_PHYS,
  91 +       .end    = IXP4XX_UART2_BASE_PHYS + 0x0fff,
  92 +       .flags  = IORESOURCE_MEM,
  93 +};
  94 +
  95 +static struct plat_serial8250_port tw5334_uart_data[] = {
  96 +       {
  97 +               .mapbase        = IXP4XX_UART2_BASE_PHYS,
  98 +               .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
  99 +               .irq            = IRQ_IXP4XX_UART2,
 100 +               .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
 101 +               .iotype         = UPIO_MEM,
 102 +               .regshift       = 2,
 103 +               .uartclk        = IXP4XX_UART_XTAL,
 104 +       },
 105 +       { },
 106 +};
 107 +
 108 +static struct platform_device tw5334_uart = {
 109 +       .name           = "serial8250",
 110 +       .id             = PLAT8250_DEV_PLATFORM,
 111 +       .dev                    = {
 112 +               .platform_data  = tw5334_uart_data,
 113 +       },
 114 +       .num_resources  = 1,
 115 +       .resource       = &tw5334_uart_resource,
 116 +};
 117 +
 118 +/* Built-in 10/100 Ethernet MAC interfaces */
 119 +static struct eth_plat_info tw5334_plat_eth[] = {
 120 +        {
 121 +                .phy            = 0,
 122 +                .rxq            = 3,
 123 +               .txreadyq       = 20,
 124 +        }, {
 125 +                .phy            = 1,
 126 +                .rxq            = 4,
 127 +               .txreadyq       = 21,
 128 +       }
 129 +};
 130 +
 131 +static struct platform_device tw5334_eth[] = {
 132 +        {
 133 +                .name                   = "ixp4xx_eth",
 134 +                .id                     = IXP4XX_ETH_NPEB,
 135 +                .dev.platform_data      = tw5334_plat_eth,
 136 +        }, {
 137 +                .name                   = "ixp4xx_eth",
 138 +                .id                     = IXP4XX_ETH_NPEC,
 139 +                .dev.platform_data      = tw5334_plat_eth + 1,
 140 +       }
 141 +};
 142 +
 143 +static struct platform_device *tw5334_devices[] __initdata = {
 144 +       &tw5334_flash,
 145 +       &tw5334_uart,
 146 +       &tw5334_eth[0],
 147 +       &tw5334_eth[1],
 148 +};
 149 +
 150 +static void __init tw5334_init(void)
 151 +{
 152 +       DECLARE_MAC_BUF(mac_buf);
 153 +       uint8_t __iomem *f;
 154 +       int i;
 155 +
 156 +       ixp4xx_sys_init();
 157 +
 158 +       tw5334_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
 159 +       tw5334_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
 160 +
 161 +       *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
 162 +       *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
 163 +
 164 +       platform_add_devices(tw5334_devices, ARRAY_SIZE(tw5334_devices));
 165 +
 166 +       /*
 167 +        * Map in a portion of the flash and read the MAC addresses.
 168 +        * Since it is stored in BE in the flash itself, we need to
 169 +        * byteswap it if we're in LE mode.
 170 +        */
 171 +       f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x1000000);
 172 +       if (f) {
 173 +               for (i = 0; i < 6; i++)
 174 +#ifdef __ARMEB__
 175 +               tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + i);
 176 +               tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + i);
 177 +#else
 178 +               tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + (i^3));
 179 +               tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + (i^3));
 180 +#endif
 181 +               iounmap(f);
 182 +       }
 183 +       printk(KERN_INFO "TW-533-4: Using MAC address %s for port 0\n",
 184 +               print_mac(mac_buf, tw5334_plat_eth[0].hwaddr));
 185 +       printk(KERN_INFO "TW-533-4: Using MAC address %s for port 1\n",
 186 +               print_mac(mac_buf, tw5334_plat_eth[1].hwaddr));
 187 +}
 188 +
 189 +#ifdef CONFIG_MACH_TW5334
 190 +MACHINE_START(TW5334, "Titan Wireless TW-533-4")
 191 +       /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
 192 +       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
 193 +       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
 194 +       .map_io         = ixp4xx_map_io,
 195 +       .init_irq       = ixp4xx_init_irq,
 196 +       .timer          = &ixp4xx_timer,
 197 +       .boot_params    = 0x0100,
 198 +       .init_machine   = tw5334_init,
 199 +MACHINE_END
 200 +#endif
 201 --- /dev/null
 202 +++ b/arch/arm/mach-ixp4xx/tw5334-pci.c
 203 @@ -0,0 +1,69 @@
 204 +/*
 205 + * arch/arch/mach-ixp4xx/tw5334-pci.c
 206 + *
 207 + * PCI setup routines for the Titan Wireless TW-533-4
 208 + *
 209 + * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
 210 + *
 211 + * based on coyote-pci.c:
 212 + *     Copyright (C) 2002 Jungo Software Technologies.
 213 + *     Copyright (C) 2003 MontaVista Softwrae, Inc.
 214 + *
 215 + * Maintainer: Imre Kaloz <kaloz@openwrt.org>
 216 + *
 217 + * This program is free software; you can redistribute it and/or modify
 218 + * it under the terms of the GNU General Public License version 2 as
 219 + * published by the Free Software Foundation.
 220 + *
 221 + */
 222 +
 223 +#include <linux/kernel.h>
 224 +#include <linux/pci.h>
 225 +#include <linux/init.h>
 226 +#include <linux/irq.h>
 227 +
 228 +#include <asm/mach-types.h>
 229 +#include <mach/hardware.h>
 230 +
 231 +#include <asm/mach/pci.h>
 232 +
 233 +void __init tw5334_pci_preinit(void)
 234 +{
 235 +       set_irq_type(IRQ_IXP4XX_GPIO6, IRQ_TYPE_LEVEL_LOW);
 236 +       set_irq_type(IRQ_IXP4XX_GPIO2, IRQ_TYPE_LEVEL_LOW);
 237 +       set_irq_type(IRQ_IXP4XX_GPIO1, IRQ_TYPE_LEVEL_LOW);
 238 +       set_irq_type(IRQ_IXP4XX_GPIO0, IRQ_TYPE_LEVEL_LOW);
 239 +
 240 +       ixp4xx_pci_preinit();
 241 +}
 242 +
 243 +static int __init tw5334_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 244 +{
 245 +       if (slot == 12)
 246 +               return IRQ_IXP4XX_GPIO6;
 247 +       else if (slot == 13)
 248 +               return IRQ_IXP4XX_GPIO2;
 249 +       else if (slot == 14)
 250 +               return IRQ_IXP4XX_GPIO1;
 251 +       else if (slot == 15)
 252 +               return IRQ_IXP4XX_GPIO0;
 253 +       else return -1;
 254 +}
 255 +
 256 +struct hw_pci tw5334_pci __initdata = {
 257 +       .nr_controllers = 1,
 258 +       .preinit =        tw5334_pci_preinit,
 259 +       .swizzle =        pci_std_swizzle,
 260 +       .setup =          ixp4xx_setup,
 261 +       .scan =           ixp4xx_scan_bus,
 262 +       .map_irq =        tw5334_map_irq,
 263 +};
 264 +
 265 +int __init tw5334_pci_init(void)
 266 +{
 267 +       if (machine_is_tw5334())
 268 +               pci_common_init(&tw5334_pci);
 269 +       return 0;
 270 +}
 271 +
 272 +subsys_initcall(tw5334_pci_init);
 273 --- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
 274 +++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
 275 @@ -42,7 +42,8 @@ static __inline__ void __arch_decomp_set
 276          */
 277         if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
 278                          machine_is_gateway7001() || machine_is_wg302v2() ||
 279 -                        machine_is_pronghorn() || machine_is_pronghorn_metro() || machine_is_wrt300nv2())
 280 +                        machine_is_pronghorn() || machine_is_pronghorn_metro() || machine_is_wrt300nv2() ||
 281 +                        machine_is_tw5334())
 282                 uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
 283         else
 284                 uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;