Changeset 12239


Ignore:
Timestamp:
2008-08-07T15:50:02+02:00 (8 years ago)
Author:
juhosg
Message:

[adm5120] add 2.6.26 specific files

Location:
trunk
Files:
52 added
15 deleted
53 edited
4 copied

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/modules/other.mk

    r12133 r12239  
    325325  SUBMENU:=$(OTHER_MENU) 
    326326  TITLE:=ADM5120 LED support 
    327   DEPENDS:=@TARGET_adm5120 +kmod-leds-gpio 
     327  DEPENDS:=@TARGET_adm5120 +kmod-leds-gpio @LINUX_2_6_25 
    328328  KCONFIG:=CONFIG_LEDS_ADM5120 
    329329  FILES:=$(LINUX_DIR)/drivers/leds/leds-adm5120.$(LINUX_KMOD_SUFFIX) 
  • trunk/target/linux/adm5120/Makefile

    r11933 r12239  
    1010BOARD:=adm5120 
    1111BOARDNAME:=Infineon/ADMtek ADM5120 
    12 LINUX_VERSION:=2.6.25.12 
     12#LINUX_VERSION:=2.6.25.12 
     13LINUX_VERSION:=2.6.26 
    1314SUBTARGETS:=router_le router_be 
    1415INITRAMFS_EXTRA_FILES:= 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/Kconfig

    r8493 r12239  
    1 if MIPS_ADM5120 
     1if ADM5120 
    22 
    3 menu "ADM5120 Implementation Options" 
     3menu "ADM5120 Board selection" 
    44 
    5 config ADM5120_CPU_OVERRIDES 
    6         bool "Enable CPU feature overrides" 
     5config ADM5120_MACH_CAS_771 
     6        bool "Cellvision CAS-771 support" 
     7        depends on CPU_LITTLE_ENDIAN 
     8        select ADM5120_SOC_BGA 
     9        select ADM5120_OEM_CELLVISION 
    710        default y 
    811 
    9 config PCI_ADM5120 
    10         bool "Enable PCI support" 
    11         select PCI 
     12config ADM5120_MACH_NP27G 
     13        bool "Compex NP27G support" 
     14        depends on CPU_LITTLE_ENDIAN 
     15        select ADM5120_SOC_BGA 
     16        select ADM5120_OEM_COMPEX 
     17        default y 
     18 
     19config ADM5120_MACH_NP28G 
     20        bool "Compex NP28G support" 
     21        depends on CPU_LITTLE_ENDIAN 
     22        select ADM5120_SOC_BGA 
     23        select ADM5120_OEM_COMPEX 
     24        default y 
     25 
     26config ADM5120_MACH_WP54 
     27        bool "Compex WP54 family support" 
     28        depends on CPU_LITTLE_ENDIAN 
     29        select ADM5120_SOC_BGA 
     30        select ADM5120_OEM_COMPEX 
     31        default y 
     32 
     33config ADM5120_MACH_BR_6104K 
     34        bool "Edimax BR-6104K support" 
     35        depends on CPU_LITTLE_ENDIAN 
     36        select ADM5120_OEM_EDIMAX 
     37        default y 
     38 
     39config ADM5120_MACH_BR_6104KP 
     40        bool "Edimax BR-6104KP support" 
     41        depends on CPU_LITTLE_ENDIAN 
     42        select ADM5120_OEM_EDIMAX 
     43        default y 
     44 
     45config ADM5120_MACH_BR_61X4WG 
     46        bool "Edimax BR-6104WG/6114WG support" 
     47        depends on CPU_LITTLE_ENDIAN 
     48        select ADM5120_SOC_BGA 
     49        select ADM5120_OEM_EDIMAX 
     50        default y 
     51 
     52config ADM5120_MACH_EASY5120_RT 
     53        bool "Infineon EASY 5120-RT Reference Board support" 
     54        depends on CPU_LITTLE_ENDIAN 
     55        select ADM5120_SOC_BGA 
     56        select ADM5120_OEM_INFINEON 
     57        default y 
     58 
     59config ADM5120_MACH_EASY5120_WVOIP 
     60        bool "Infineon EASY 5120-WVoIP Reference Board support" 
     61        depends on CPU_LITTLE_ENDIAN 
     62        select ADM5120_SOC_BGA 
     63        select ADM5120_OEM_INFINEON 
     64        default y 
     65 
     66config ADM5120_MACH_EASY5120P_ATA 
     67        bool "Infineon EASY 5120P-ATA Reference Board support" 
     68        depends on CPU_LITTLE_ENDIAN 
     69        select ADM5120_OEM_INFINEON 
     70        default y 
     71 
     72config ADM5120_MACH_EASY83000 
     73        bool "Infineon EASY 83000 Reference Board support" 
     74        depends on CPU_LITTLE_ENDIAN 
     75        select ADM5120_OEM_INFINEON 
     76        default y 
     77 
     78config ADM5120_MACH_RB_11X 
     79        bool "MikroTik RouterBOARD 111/112 support" 
     80        depends on CPU_LITTLE_ENDIAN 
     81        select ADM5120_SOC_BGA 
     82        select ADM5120_OEM_MIKROTIK 
     83        default y 
     84 
     85config ADM5120_MACH_RB_133 
     86        bool "MikroTik RouterBOARD 133 support" 
     87        depends on CPU_LITTLE_ENDIAN 
     88        select ADM5120_SOC_BGA 
     89        select ADM5120_OEM_MIKROTIK 
     90        default y 
     91 
     92config ADM5120_MACH_RB_133C 
     93        bool "MikroTik RouterBOARD 133C support" 
     94        depends on CPU_LITTLE_ENDIAN 
     95        select ADM5120_SOC_BGA 
     96        select ADM5120_OEM_MIKROTIK 
     97        default y 
     98 
     99config ADM5120_MACH_RB_150 
     100        bool "MikroTik RouterBOARD 150 support" 
     101        depends on CPU_LITTLE_ENDIAN 
     102        select ADM5120_OEM_MIKROTIK 
     103        default y 
     104 
     105config ADM5120_MACH_RB_153 
     106        bool "MikroTik RouterBOARD 153 support" 
     107        depends on CPU_LITTLE_ENDIAN 
     108        select ADM5120_SOC_BGA 
     109        select ADM5120_OEM_MIKROTIK 
     110        default y 
     111 
     112config ADM5120_MACH_RB_192 
     113        bool "MikroTik RouterBOARD 192 support" 
     114        depends on CPU_LITTLE_ENDIAN 
     115        select ADM5120_SOC_BGA 
     116        select ADM5120_OEM_MIKROTIK 
     117        default y 
     118 
     119config ADM5120_MACH_P_334WT 
     120        bool "ZyXEL Prestige 334WT" 
     121        depends on CPU_BIG_ENDIAN 
     122        select ADM5120_SOC_BGA 
     123        select ADM5120_OEM_ZYXEL 
     124        default y 
     125 
     126config ADM5120_MACH_P_335 
     127        bool "ZyXEL Prestige 335/335WT" 
     128        depends on CPU_BIG_ENDIAN 
     129        select ADM5120_SOC_BGA 
     130        select ADM5120_OEM_ZYXEL 
    12131        default y 
    13132 
    14133endmenu 
    15134 
     135config ADM5120_SOC_BGA 
     136        select HW_HAS_PCI 
     137        def_bool n 
     138 
     139config ADM5120_OEM_CELLVISION 
     140        def_bool n 
     141 
     142config ADM5120_OEM_COMPEX 
     143        def_bool n 
     144 
     145config ADM5120_OEM_EDIMAX 
     146        def_bool n 
     147 
     148config ADM5120_OEM_INFINEON 
     149        def_bool n 
     150 
     151config ADM5120_OEM_MIKROTIK 
     152        def_bool n 
     153 
     154config ADM5120_OEM_ZYXEL 
     155        def_bool n 
     156 
    16157config ARM_AMBA 
    17         bool 
    18         default y 
     158        def_bool y 
    19159 
    20160endif 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/prom/bootbase.c

    r10305 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  ZyXEL's Bootbase specific prom routines 
    53 * 
    6  *  Copyright (C) 2007 OpenWrt.org 
    7  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
     
    2320#include <asm/byteorder.h> 
    2421 
    25 #include <adm5120_defs.h> 
     22#include <asm/mach-adm5120/adm5120_defs.h> 
    2623#include <prom/zynos.h> 
    2724#include "prom_read.h" 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/prom/cfe.c

    r10305 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  Broadcom's CFE specific prom routines 
    53 * 
    6  *  Copyright (C) 2007 OpenWrt.org 
    7  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/prom/generic.c

    r10305 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  Generic PROM routines 
    53 * 
    6  *  Copyright (C) 2007 OpenWrt.org 
    7  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/prom/myloader.c

    r10305 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  Compex's MyLoader specific prom routines 
    53 * 
    6  *  Copyright (C) 2007 OpenWrt.org 
    7  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
     
    2320#include <asm/byteorder.h> 
    2421 
    25 #include <adm5120_defs.h> 
     22#include <asm/mach-adm5120/adm5120_defs.h> 
    2623#include <prom/myloader.h> 
    2724#include "prom_read.h" 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/prom/prom_read.h

    r10305 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  Generic prom definitions 
    53 * 
    6  *  Copyright (C) 2007 OpenWrt.org 
    7  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/prom/routerboot.c

    r10305 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  Mikrotik's RouterBOOT specific prom routines 
    53 * 
    6  *  Copyright (C) 2007 OpenWrt.org 
    7  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
     
    2320#include <asm/addrspace.h> 
    2421 
    25 #include <adm5120_defs.h> 
     22#include <asm/mach-adm5120/adm5120_defs.h> 
    2623#include <prom/routerboot.h> 
    2724#include "prom_read.h" 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/pci/pci-adm5120.c

    r10313 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  ADM5120 PCI Host Controller driver 
    53 * 
    6  *  Copyright (C) 2007 OpenWrt.org 
    7  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This code was based on the ADM5120 specific port of the Linux 2.6.10 kernel 
     
    3330#include <asm/bootinfo.h> 
    3431 
    35 #include <adm5120_defs.h> 
    36 #include <adm5120_info.h> 
    37 #include <adm5120_defs.h> 
    38 #include <adm5120_platform.h> 
     32#include <asm/mach-adm5120/adm5120_defs.h> 
     33#include <asm/mach-adm5120/adm5120_info.h> 
     34#include <asm/mach-adm5120/adm5120_defs.h> 
     35#include <asm/mach-adm5120/adm5120_platform.h> 
    3936 
    4037#undef DEBUG 
     
    261258static int __init adm5120_pci_setup(void) 
    262259{ 
    263         int pci_bios; 
    264  
    265         pci_bios = adm5120_has_pci(); 
    266  
    267         printk(KERN_INFO "adm5120: system has %sPCI BIOS\n", 
    268                 pci_bios ? "" : "no "); 
    269         if (pci_bios == 0) 
     260        if (adm5120_package_pqfp()) { 
     261                printk(KERN_INFO "PCI: not available on ADM5120P\n"); 
    270262                return -1; 
     263        } 
    271264 
    272265        /* Avoid ISA compat ranges.  */ 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/ata/pata_rb153_cf.c

    r11526 r12239  
    33 *  Mikrotik's RouterBoard 153 board. 
    44 * 
    5  *  Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org> 
     5 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    66 * 
    77 *  This file was based on: drivers/ata/pata_ixp4xx_cf.c 
     
    2121#include <linux/kernel.h> 
    2222#include <linux/module.h> 
    23 #include <linux/platform_device.h> 
    24  
    2523#include <linux/io.h> 
    2624#include <linux/interrupt.h> 
    2725#include <linux/irq.h> 
     26#include <linux/gpio.h> 
     27#include <linux/platform_device.h> 
    2828 
    2929#include <linux/libata.h> 
    3030#include <scsi/scsi_host.h> 
    3131 
    32 #include <asm/gpio.h> 
    33  
    3432#define DRV_NAME        "pata-rb153-cf" 
    35 #define DRV_VERSION     "0.4.0" 
     33#define DRV_VERSION     "0.5.0" 
    3634#define DRV_DESC        "PATA driver for RouterBOARD 153 Compact Flash" 
    3735 
     
    4442 
    4543struct rb153_cf_info { 
    46         unsigned int    irq; 
    4744        void __iomem    *iobase; 
    4845        unsigned int    gpio_line; 
    4946        int             frozen; 
    50 }; 
    51  
    52 /* ------------------------------------------------------------------------ */ 
     47        unsigned int    irq; 
     48}; 
    5349 
    5450static inline void rb153_pata_finish_io(struct ata_port *ap) 
     
    5652        struct rb153_cf_info *info = ap->host->private_data; 
    5753 
    58         ata_altstatus(ap); 
     54        /* FIXME: Keep previous delay. If this is merely a fence then 
     55         * ata_sff_sync might be sufficient. */ 
     56        ata_sff_dma_pause(ap); 
    5957        ndelay(RB153_CF_IO_DELAY); 
    6058 
     
    6361 
    6462static void rb153_pata_exec_command(struct ata_port *ap, 
    65                                 const struct ata_taskfile *tf) 
     63                                        const struct ata_taskfile *tf) 
    6664{ 
    6765        writeb(tf->command, ap->ioaddr.command_addr); 
     
    6967} 
    7068 
    71 static unsigned int rb153_pata_data_xfer(struct ata_device *adev, unsigned char *buf, 
    72                                 unsigned int buflen, int write_data) 
     69static unsigned int rb153_pata_data_xfer(struct ata_device *adev, 
     70                                        unsigned char *buf, 
     71                                        unsigned int buflen, 
     72                                        int write_data) 
    7373{ 
    7474        void __iomem *ioaddr = adev->link->ap->ioaddr.data_addr; 
    7575        unsigned int t; 
    76          
    77         t = buflen;      
     76 
     77        t = buflen; 
    7878        if (write_data) { 
    7979                for (; t > 0; t--, buf++) 
     
    110110                set_irq_type(info->irq, IRQ_TYPE_LEVEL_LOW); 
    111111                if (!info->frozen) 
    112                         ata_interrupt(irq, dev_instance); 
     112                        ata_sff_interrupt(irq, dev_instance); 
    113113        } else { 
    114114                set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH); 
     
    118118} 
    119119 
    120 static void rb153_pata_irq_clear(struct ata_port *ap) 
    121 { 
    122 } 
    123  
    124 static int rb153_pata_port_start(struct ata_port *ap) 
    125 { 
    126         return 0; 
    127 } 
    128  
    129120static struct ata_port_operations rb153_pata_port_ops = { 
    130         .tf_load                = ata_tf_load, 
    131         .tf_read                = ata_tf_read, 
    132  
    133         .exec_command           = rb153_pata_exec_command, 
    134         .check_status           = ata_check_status, 
    135         .dev_select             = ata_std_dev_select, 
    136  
    137         .data_xfer              = rb153_pata_data_xfer, 
    138  
    139         .qc_prep                = ata_qc_prep, 
    140         .qc_issue               = ata_qc_issue_prot, 
    141  
     121        .inherits               = &ata_sff_port_ops, 
     122        .sff_exec_command       = rb153_pata_exec_command, 
     123        .sff_data_xfer          = rb153_pata_data_xfer, 
    142124        .freeze                 = rb153_pata_freeze, 
    143125        .thaw                   = rb153_pata_thaw, 
    144         .error_handler          = ata_bmdma_error_handler, 
    145         .cable_detect           = ata_cable_40wire, 
    146  
    147         .irq_handler            = rb153_pata_irq_handler, 
    148         .irq_clear              = rb153_pata_irq_clear, 
    149         .irq_on                 = ata_irq_on, 
    150  
    151         .port_start             = rb153_pata_port_start, 
    152 }; 
    153  
    154 /* ------------------------------------------------------------------------ */ 
     126}; 
    155127 
    156128static struct scsi_host_template rb153_pata_sht = { 
    157         .module                 = THIS_MODULE, 
    158         .name                   = DRV_NAME, 
    159         .ioctl                  = ata_scsi_ioctl, 
    160         .queuecommand           = ata_scsi_queuecmd, 
    161         .slave_configure        = ata_scsi_slave_config, 
    162         .slave_destroy          = ata_scsi_slave_destroy, 
    163         .bios_param             = ata_std_bios_param, 
    164         .proc_name              = DRV_NAME, 
    165  
    166         .can_queue              = ATA_DEF_QUEUE, 
    167         .this_id                = ATA_SHT_THIS_ID, 
    168         .sg_tablesize           = LIBATA_MAX_PRD, 
    169         .dma_boundary           = ATA_DMA_BOUNDARY, 
    170         .cmd_per_lun            = ATA_SHT_CMD_PER_LUN, 
    171         .emulated               = ATA_SHT_EMULATED, 
    172         .use_clustering         = ATA_SHT_USE_CLUSTERING, 
    173 }; 
    174  
    175 /* ------------------------------------------------------------------------ */ 
    176  
    177 static void rb153_pata_setup_port(struct ata_port *ap, 
    178                         struct rb153_cf_info *info, unsigned long raw_cmd) 
    179 { 
    180         ap->ioaddr.cmd_addr     = info->iobase + RB153_CF_REG_CMD; 
     129        ATA_PIO_SHT(DRV_NAME), 
     130}; 
     131 
     132static void rb153_pata_setup_port(struct ata_host *ah) 
     133{ 
     134        struct rb153_cf_info *info = ah->private_data; 
     135        struct ata_port *ap; 
     136 
     137        ap = ah->ports[0]; 
     138 
     139        ap->ops         = &rb153_pata_port_ops; 
     140        ap->pio_mask    = 0x1f; /* PIO4 */ 
     141        ap->flags       = ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO; 
     142 
     143        ap->ioaddr.cmd_addr     = info->iobase + RB153_CF_REG_CMD; 
    181144        ap->ioaddr.ctl_addr     = info->iobase + RB153_CF_REG_CTRL; 
    182145        ap->ioaddr.altstatus_addr = info->iobase + RB153_CF_REG_CTRL; 
    183146 
    184         ata_std_ports(&ap->ioaddr); 
    185  
    186         ap->ioaddr.data_addr    = info->iobase + RB153_CF_REG_DATA; 
    187  
    188         ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", raw_cmd, 
    189                                 raw_cmd + RB153_CF_REG_CTRL); 
     147        ata_sff_std_ports(&ap->ioaddr); 
     148 
     149        ap->ioaddr.data_addr = info->iobase + RB153_CF_REG_DATA; 
    190150} 
    191151 
     
    196156        struct resource *res; 
    197157        struct ata_host *ah; 
    198         struct ata_port *ap; 
    199158        struct rb153_cf_info *info; 
    200159        int ret; 
     
    224183        } 
    225184 
    226         /* allocate host */ 
    227185        ah = ata_host_alloc(&pdev->dev, RB153_CF_MAXPORTS); 
    228186        if (!ah) 
     
    251209        } 
    252210 
    253         ap = ah->ports[0]; 
    254  
    255         ap->ops         = &rb153_pata_port_ops; 
    256         ap->pio_mask    = 0x1f; /* PIO4 */ 
    257         ap->flags       = ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO; 
    258  
    259         rb153_pata_setup_port(ap, info, res->start); 
     211        rb153_pata_setup_port(ah); 
    260212 
    261213        ret = ata_host_activate(ah, irq, rb153_pata_irq_handler, 
     
    308260} 
    309261 
    310 MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>"); 
     262MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>"); 
    311263MODULE_DESCRIPTION(DRV_DESC); 
    312264MODULE_VERSION(DRV_VERSION); 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/leds/ledtrig-adm5120-switch.c

    r10305 r12239  
    33 * 
    44 * Copyright (C) 2007 Bernhard Held <bernhard at bernhardheld.de> 
    5  * Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     5 * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    66 * 
    77 * This file was based on: drivers/leds/ledtrig-timer.c 
     
    2020#include <linux/device.h> 
    2121 
    22 #include <asm/gpio.h> 
     22#include <linux/gpio.h> 
    2323 
    2424#include "leds.h" 
     
    145145 
    146146MODULE_AUTHOR("Bernhard Held <bernhard at bernhardheld.de>, " 
    147                 "Gabor Juhos <juhosg at openwrt.org>"); 
     147                "Gabor Juhos <juhosg@openwrt.org>"); 
    148148MODULE_DESCRIPTION(DRV_DESC); 
    149149MODULE_LICENSE("GPL v2"); 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/mtd/maps/adm5120-flash.c

    r10305 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  Platform driver for NOR flash devices on ADM5120 based boards 
    53 * 
    6  *  Copyright (C) 2007 OpenWrt.org 
    7  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This file was derived from: drivers/mtd/map/physmap.c 
     
    3027#include <linux/mtd/partitions.h> 
    3128 
    32 #include <adm5120_defs.h> 
    33 #include <adm5120_switch.h> 
    34 #include <adm5120_mpmc.h> 
    35 #include <adm5120_platform.h> 
     29#include <asm/mach-adm5120/adm5120_defs.h> 
     30#include <asm/mach-adm5120/adm5120_switch.h> 
     31#include <asm/mach-adm5120/adm5120_mpmc.h> 
     32#include <asm/mach-adm5120/adm5120_platform.h> 
    3633 
    3734#define DRV_NAME        "adm5120-flash" 
     
    568565 
    569566MODULE_LICENSE("GPL v2"); 
    570 MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>"); 
     567MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>"); 
    571568MODULE_DESCRIPTION(DRV_DESC); 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/mtd/myloader.c

    r10305 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  Parse MyLoader-style flash partition tables and produce a Linux partition 
    53 *  array to match. 
    64 * 
    7  *  Copyright (C) 2007 OpenWrt.org 
    8  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     5 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    96 * 
    107 *  This file was based on drivers/mtd/redboot.c 
     
    163160module_exit(mylo_mtd_parser_exit); 
    164161 
    165 MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>"); 
     162MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>"); 
    166163MODULE_DESCRIPTION("Parsing code for MyLoader partition tables"); 
    167164MODULE_LICENSE("GPL v2"); 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/mtd/trxsplit.c

    r10305 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    4  *  Copyright (C) 2007 OpenWrt.org 
    5  *  Copyright (C) Gabor Juhos <juhosg at openwrt.org> 
     2 *  Copyright (C) Gabor Juhos <juhosg@openwrt.org> 
    63 * 
    74 *  This program is free software; you can redistribute it and/or modify it 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/net/adm5120sw.c

    r10427 r12239  
    22 *  ADM5120 built-in ethernet switch driver 
    33 * 
    4  *  Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    55 * 
    66 *  This code was based on a driver for Linux 2.6.xx by Jeroen Vreeken. 
     
    3535#include <asm/mipsregs.h> 
    3636 
    37 #include <adm5120_info.h> 
    38 #include <adm5120_defs.h> 
    39 #include <adm5120_irq.h> 
    40 #include <adm5120_switch.h> 
     37#include <asm/mach-adm5120/adm5120_info.h> 
     38#include <asm/mach-adm5120/adm5120_defs.h> 
     39#include <asm/mach-adm5120/adm5120_irq.h> 
     40#include <asm/mach-adm5120/adm5120_switch.h> 
    4141 
    4242#include "adm5120sw.h" 
     
    12011201 
    12021202MODULE_LICENSE("GPL v2"); 
    1203 MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>"); 
     1203MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>"); 
    12041204MODULE_DESCRIPTION(DRV_DESC); 
    12051205MODULE_VERSION(DRV_VERSION); 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/usb/host/adm5120-dbg.c

    r11961 r12239  
    22 * ADM5120 HCD (Host Controller Driver) for USB 
    33 * 
    4  * Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org> 
     4 * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    55 * 
    66 * This file was derived from: drivers/usb/host/ohci-dbg.c 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/usb/host/adm5120-drv.c

    r10328 r12239  
    22 * ADM5120 HCD (Host Controller Driver) for USB 
    33 * 
    4  * Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org> 
     4 * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    55 * 
    66 * This file was derived from: drivers/usb/host/ohci-au1xxx.c 
     
    2727 
    2828#include <asm/bootinfo.h> 
    29 #include <adm5120_defs.h> 
     29#include <asm/mach-adm5120/adm5120_defs.h> 
    3030 
    3131#ifdef DEBUG 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/usb/host/adm5120-hcd.c

    r11526 r12239  
    22 * ADM5120 HCD (Host Controller Driver) for USB 
    33 * 
    4  * Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org> 
     4 * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    55 * 
    66 * This file was derived from: drivers/usb/host/ohci-hcd.c 
     
    4848 
    4949#define DRIVER_VERSION  "0.25.0" 
    50 #define DRIVER_AUTHOR   "Gabor Juhos <juhosg at openwrt.org>" 
     50#define DRIVER_AUTHOR   "Gabor Juhos <juhosg@openwrt.org>" 
    5151#define DRIVER_DESC     "ADMtek USB 1.1 Host Controller Driver" 
    5252 
     
    779779/*-------------------------------------------------------------------------*/ 
    780780 
    781 #ifdef CONFIG_MIPS_ADM5120 
     781#ifdef CONFIG_ADM5120 
    782782#include "adm5120-drv.c" 
    783783#define PLATFORM_DRIVER         usb_hcd_adm5120_driver 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/usb/host/adm5120-hub.c

    r10077 r12239  
    22 * ADM5120 HCD (Host Controller Driver) for USB 
    33 * 
    4  * Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org> 
     4 * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    55 * 
    66 * This file was derived from: drivers/usb/host/ohci-hub.c 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/usb/host/adm5120-mem.c

    r10077 r12239  
    22 * ADM5120 HCD (Host Controller Driver) for USB 
    33 * 
    4  * Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org> 
     4 * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    55 * 
    66 * This file was derived from: drivers/usb/host/ohci-mem.c 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/usb/host/adm5120-pm.c

    r10427 r12239  
    22 * ADM5120 HCD (Host Controller Driver) for USB 
    33 * 
    4  * Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org> 
     4 * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    55 * 
    66 * This file was derived from fragments of the OHCI driver. 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/usb/host/adm5120-q.c

    r10427 r12239  
    22 * ADM5120 HCD (Host Controller Driver) for USB 
    33 * 
    4  * Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org> 
     4 * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    55 * 
    66 * This file was derived from: drivers/usb/host/ohci-q.c 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/usb/host/adm5120.h

    r11526 r12239  
    22 * ADM5120 HCD (Host Controller Driver) for USB 
    33 * 
    4  * Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org> 
     4 * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    55 * 
    66 * This file was derived from: drivers/usb/host/ohci.h 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/watchdog/adm5120_wdt.c

    r10329 r12239  
    2222#include <asm/bootinfo.h> 
    2323 
    24 #include <adm5120_info.h> 
    25 #include <adm5120_defs.h> 
    26 #include <adm5120_irq.h> 
    27 #include <adm5120_switch.h> 
     24#include <asm/mach-adm5120/adm5120_info.h> 
     25#include <asm/mach-adm5120/adm5120_defs.h> 
     26#include <asm/mach-adm5120/adm5120_irq.h> 
     27#include <asm/mach-adm5120/adm5120_switch.h> 
    2828 
    2929 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/adm5120_board.h

    r10327 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  ADM5120 board definitions 
    53 * 
    6  *  Copyright (C) 2007 OpenWrt.org 
    7  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
     
    1310 */ 
    1411 
    15 #ifndef _ADM5120_BOARD_H_ 
    16 #define _ADM5120_BOARD_H_ 
     12#ifndef _ASM_MIPS_MACH_ADM5120_BOARD_H 
     13#define _ASM_MIPS_MACH_ADM5120_BOARD_H 
    1714 
    1815#include <linux/init.h> 
     
    2623 
    2724        void                    (*board_setup)(void); 
    28         void                    (*board_reset)(void); 
    29  
    30         unsigned int            eth_num_ports; 
    31         unsigned char           *eth_vlans; 
    32         unsigned int            num_devices; 
    33         struct platform_device  **devices; 
    34         unsigned int            pci_nr_irqs; 
    35         struct adm5120_pci_irq  *pci_irq_map; 
    36  
    3725        struct list_head        list; 
    3826}; 
     
    4028extern void adm5120_board_register(struct adm5120_board *) __init; 
    4129 
    42 #define ADM5120_BOARD_START(_type, _name)                               \ 
    43 static struct adm5120_board adm5120_board_##_type __initdata;           \ 
     30#define ADM5120_BOARD(_type, _name, _setup)                             \ 
     31static struct adm5120_board adm5120_board_##_type __initdata = {        \ 
     32        .mach_type      = _type,                                        \ 
     33        .name           = _name,                                        \ 
     34        .board_setup    = _setup,                                       \ 
     35};                                                                      \ 
    4436                                                                        \ 
    4537static __init int adm5120_board_##_type##_register(void)                \ 
     
    4840        return 0;                                                       \ 
    4941}                                                                       \ 
    50 pure_initcall(adm5120_board_##_type##_register);                        \ 
    51                                                                         \ 
    52 static struct adm5120_board adm5120_board_##_type __initdata = {        \ 
    53         .mach_type      = MACH_ADM5120_##_type,                         \ 
    54         .name           = _name, 
     42pure_initcall(adm5120_board_##_type##_register) 
    5543 
    56 #define ADM5120_BOARD_END                                               \ 
    57 }; 
    58  
    59 #endif /* _ADM5120_BOARD_H_ */ 
     44#endif /* _ASM_MIPS_MACH_ADM5120_BOARD_H */ 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/adm5120_defs.h

    r10327 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  ADM5120 SoC definitions 
    53 * 
    64 *  This file defines some constants specific to the ADM5120 SoC 
    75 * 
    8  *  Copyright (C) 2007 OpenWrt.org 
    9  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     6 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    107 * 
    118 *  This program is free software; you can redistribute it and/or modify it 
     
    1411 * 
    1512 */ 
    16 #ifndef _ADM5120_DEFS_H 
    17 #define _ADM5120_DEFS_H 
     13#ifndef _ASM_MIPS_MACH_ADM5120_DEFS_H 
     14#define _ASM_MIPS_MACH_ADM5120_DEFS_H 
    1815 
    1916#define ADM5120_SDRAM0_BASE     0x00000000 
     
    5451#define ADM5120_UART_CLOCK      62500000 
    5552 
    56 #endif /* _ADM5120_DEFS_H */ 
     53#endif /* _ASM_MIPS_MACH_ADM5120_DEFS_H */ 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/adm5120_info.h

    r10329 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    4  *  Copyright (C) 2007 OpenWrt.org 
    5  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     2 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    63 * 
    74 *  This program is free software; you can redistribute it and/or modify it 
     
    118 */ 
    129 
    13 #ifndef _ADM5120_INFO_H 
    14 #define _ADM5120_INFO_H 
     10#ifndef _MACH_ADM5120_INFO_H 
     11#define _MACH_ADM5120_INFO_H 
    1512 
    1613#include <linux/types.h> 
     
    5350extern void adm5120_ndelay(u32 ns); 
    5451 
    55 extern void adm5120_restart(char *command); 
    56 extern void adm5120_halt(void); 
    57  
    5852extern void (*adm5120_board_reset)(void); 
    5953 
     
    8377} 
    8478 
    85 #endif /* _ADM5120_INFO_H */ 
     79#endif /* _MACH_ADM5120_INFO_H */ 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/adm5120_intc.h

    r10327 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  ADM5120 interrupt controller definitions 
    53 * 
     
    75 *  built-in interrupt controller. 
    86 * 
    9  *  Copyright (C) 2007 OpenWrt.org 
    10  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     7 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    118 * 
    129 *  This program is free software; you can redistribute it and/or modify it 
     
    1613 */ 
    1714 
    18 #ifndef _ADM5120_INTC_H_ 
    19 #define _ADM5120_INTC_H_ 
     15#ifndef _MACH_ADM5120_INTC_H 
     16#define _MACH_ADM5120_INTC_H 
    2017 
    2118/* 
     
    6461#define INTC_INT_ALL    (( 1 << INTC_IRQ_COUNT)-1) 
    6562 
    66 #endif /* _ADM5120_INTC_H_ */ 
     63#endif /* _MACH_ADM5120_INTC_H */ 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/adm5120_irq.h

    r10327 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  ADM5120 specific IRQ numbers 
    53 * 
    6  *  Copyright (C) 2007 OpenWrt.org 
    7  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
     
    129 * 
    1310 */ 
    14 #ifndef _ADM5120_IRQ_H_ 
    15 #define _ADM5120_IRQ_H_ 
     11#ifndef _MACH_ADM5120_IRQ_H 
     12#define _MACH_ADM5120_IRQ_H 
    1613 
    1714#include <asm/mach-adm5120/adm5120_intc.h> 
     
    2219 
    2320#define ADM5120_CPU_IRQ_BASE    0 
    24 #define ADM5120_INTC_IRQ_BASE   (ADM5120_CPU_IRQ_BASE+MIPS_IRQ_COUNT) 
    25 #define ADM5120_SWITCH_IRQ_BASE (ADM5120_INTC_IRQ_BASE+INTC_IRQ_COUNT) 
     21#define ADM5120_INTC_IRQ_BASE   (ADM5120_CPU_IRQ_BASE + MIPS_IRQ_COUNT) 
     22#define ADM5120_SWITCH_IRQ_BASE (ADM5120_INTC_IRQ_BASE + INTC_IRQ_COUNT) 
    2623 
    2724#define ADM5120_CPU_IRQ(x)      (ADM5120_CPU_IRQ_BASE + (x)) 
     
    4239#define ADM5120_IRQ_SWITCH      ADM5120_INTC_IRQ(INTC_IRQ_SWITCH) 
    4340 
    44 #endif 
     41#endif /* _MACH_ADM5120_IRQ_H */ 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/adm5120_mpmc.h

    r10327 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  ADM5120 MPMC (Multiport Memory Controller) register definitions 
    53 * 
    6  *  Copyright (C) 2007 OpenWrt.org 
    7  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
     
    1310 */ 
    1411 
    15 #ifndef _ADM5120_MPMC_H_ 
    16 #define _ADM5120_MPMC_H_ 
     12#ifndef _MACH_ADM5120_MPMC_H 
     13#define _MACH_ADM5120_MPMC_H 
    1714 
    1815#define MPMC_READ_REG(r)        __raw_readl( \ 
     
    9390#define SC_MW_32        0x02    /* 32 bit memory width */ 
    9491 
    95 #endif /* _ADM5120_MPMC_H_ */ 
     92#endif /* _MACH_ADM5120_MPMC_H */ 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/adm5120_nand.h

    r10327 r12239  
    55 *  built-in NAND interface. 
    66 * 
    7  *  Copyright (C) 2007 OpenWrt.org 
    8  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     7 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    98 * 
    109 *  NAND interface routines was based on a driver for Linux 2.6.19+ which 
     
    1312 *    Copyright (C) 2007 David Goodenough <david.goodenough@linkchoose.co.uk> 
    1413 *    Copyright (C) 2007 Florian Fainelli <florian@openwrt.org> 
    15  *    The original Mikrotik code seems not to have a license. 
    1614 * 
    1715 *  This program is free software; you can redistribute it and/or modify it 
     
    2119 */ 
    2220 
    23 #ifndef _ADM5120_NAND_H_ 
    24 #define _ADM5120_NAND_H_ 
     21#ifndef _MACH_ADM5120_NAND_H 
     22#define _MACH_ADM5120_NAND_H 
    2523 
    2624#include <linux/types.h> 
    2725#include <linux/io.h> 
    2826 
    29 #include <adm5120_defs.h> 
    30 #include <adm5120_switch.h> 
     27#include <asm/mach-adm5120/adm5120_defs.h> 
     28#include <asm/mach-adm5120/adm5120_switch.h> 
    3129 
    3230/* NAND control registers */ 
     
    8987} 
    9088 
    91 #endif /* _ADM5120_NAND_H_ */ 
     89#endif /* _MACH_ADM5120_NAND_H */ 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/adm5120_platform.h

    r12134 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  ADM5120 specific platform definitions 
    53 * 
    6  *  Copyright (C) 2007-2008 OpenWrt.org 
    7  *  Copyright (C) 2007-2008 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
     
    1310 */ 
    1411 
    15 #ifndef _ADM5120_PLATFORM_H_ 
    16 #define _ADM5120_PLATFORM_H_ 
     12#ifndef _ASM_MIPS_MACH_ADM5120_PLATFORM_H 
     13#define _ASM_MIPS_MACH_ADM5120_PLATFORM_H 
    1714 
    1815#include <linux/device.h> 
    1916#include <linux/platform_device.h> 
    20  
     17#include <linux/input.h> 
     18#include <linux/leds.h> 
    2119#include <linux/mtd/mtd.h> 
    2220#include <linux/mtd/map.h> 
    2321#include <linux/mtd/partitions.h> 
    2422#include <linux/mtd/nand.h> 
    25  
    26 #include <linux/input.h> 
    2723#include <linux/gpio_buttons.h> 
    28  
    2924#include <linux/amba/bus.h> 
    3025#include <linux/amba/serial.h> 
     
    6358#endif 
    6459 
    65 #define ADM5120_NUM_BUTTONS     5 
    66  
    67 extern struct resource adm5120_gpiodev_resource; 
    68  
    6960extern struct adm5120_flash_platform_data adm5120_flash0_data; 
    7061extern struct adm5120_flash_platform_data adm5120_flash1_data; 
    71 extern struct platform_nand_data adm5120_nand_data; 
    72 extern struct adm5120_switch_platform_data adm5120_switch_data; 
    73 extern struct gpio_button adm5120_buttons[ADM5120_NUM_BUTTONS]; 
    74 extern struct gpio_buttons_platform_data adm5120_buttons_data; 
    75 extern struct amba_pl010_data adm5120_uart0_data; 
    76 extern struct amba_pl010_data adm5120_uart1_data; 
    7762 
    78 extern struct platform_device adm5120_flash0_device; 
    79 extern struct platform_device adm5120_flash1_device; 
    80 extern struct platform_device adm5120_nand_device; 
    81 extern struct platform_device adm5120_hcd_device; 
    82 extern struct platform_device adm5120_switch_device; 
    83 extern struct platform_device adm5120_buttons_device; 
    84 extern struct platform_device adm5120_gpiodev_device; 
    85 extern struct amba_device adm5120_uart0_device; 
    86 extern struct amba_device adm5120_uart1_device; 
     63extern void adm5120_add_device_flash(unsigned id) __init; 
     64extern void adm5120_add_device_usb(void) __init; 
     65extern void adm5120_add_device_uart(unsigned id) __init; 
     66extern void adm5120_add_device_nand(struct platform_nand_data *pdata) __init; 
     67extern void adm5120_add_device_switch(unsigned num_ports, u8 *vlan_map) __init; 
     68extern void adm5120_add_device_gpio(u32 disable_mask) __init; 
     69extern void adm5120_add_device_gpio_buttons(unsigned nbuttons, 
     70                                        struct gpio_button *buttons) __init; 
    8771 
    88 extern void adm5120_uart_set_mctrl(struct amba_device *dev, void __iomem *base, 
    89                 unsigned int mctrl); 
     72#define GPIO_LED_DEF(g, n, t, a) {      \ 
     73        .name = (n),                    \ 
     74        .default_trigger = (t),         \ 
     75        .gpio = (g),                    \ 
     76        .active_low = (a)               \ 
     77} 
    9078 
    91 extern void adm5120_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, 
    92                 unsigned int ctrl); 
    93 extern int adm5120_nand_ready(struct mtd_info *mtd); 
     79#define GPIO_LED_STD(g, n, t)   GPIO_LED_DEF((g), (n), (t), 0) 
     80#define GPIO_LED_INV(g, n, t)   GPIO_LED_DEF((g), (n), (t), 1) 
    9481 
    95 #endif /* _ADM5120_PLATFORM_H_ */ 
     82extern void adm5120_add_device_gpio_leds(unsigned num_leds, 
     83                                        struct gpio_led *leds) __init; 
     84 
     85#endif /* _ASM_MIPS_MACH_ADM5120_PLATFORM_H */ 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/adm5120_switch.h

    r10329 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  ADM5120 ethernet switch definitions 
    53 * 
     
    75 *  built-in Ethernet switch. 
    86 * 
    9  *  Copyright (C) 2007 OpenWrt.org 
    10  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     7 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    118 * 
    129 *  This program is free software; you can redistribute it and/or modify it 
     
    1613 */ 
    1714 
    18 #ifndef _ADM5120_SWITCH_H_ 
    19 #define _ADM5120_SWITCH_H_ 
     15#ifndef _MACH_ADM5120_SWITCH_H 
     16#define _MACH_ADM5120_SWITCH_H 
    2017 
    2118#ifndef BIT 
     
    301298#define LED2_IV_SHIFT           14      /* LED2 input value shift */ 
    302299 
    303 #endif /* _ADM5120_SWITCH_H_ */ 
     300#endif /* _MACH_ADM5120_SWITCH_H */ 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/adm5120_uart.h

    r10327 r12239  
    55 *  built-in UARTs. 
    66 * 
    7  *  Copyright (C) 2007 OpenWrt.org 
    8  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     7 *  Copyright (C) 2007 Gabor Juhos <juhosg@openwrt.org> 
    98 * 
    109 *  This program is free software; you can redistribute it and/or modify it 
     
    1413 */ 
    1514 
    16 #ifndef _ADM5120_UART_H_ 
    17 #define _ADM5120_UART_H_ 
     15#ifndef _MACH_ADM5120_UART_H 
     16#define _MACH_ADM5120_UART_H 
    1817 
    1918#define UART_BAUDDIV(clk, baud) ((clk/(16 * (baud)))-1) 
     
    6362#define UART_FLAG_TXFE  ( 1 << 7 ) 
    6463 
    65 #endif /* _ADM5120_UART_H_ */ 
     64#endif /* _MACH_ADM5120_UART_H */ 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/cpu-feature-overrides.h

    r10327 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  ADM5120 specific CPU feature overrides 
    53 * 
    6  *  Copyright (C) 2007 OpenWrt.org 
    7  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This file was derived from: include/asm-mips/cpu-features.h 
     
    1815#ifndef __ASM_MACH_ADM5120_CPU_FEATURE_OVERRIDES_H 
    1916#define __ASM_MACH_ADM5120_CPU_FEATURE_OVERRIDES_H 
    20  
    21 #ifdef CONFIG_ADM5120_CPU_OVERRIDES 
    2217 
    2318/* 
     
    7469#define cpu_icache_line_size()          16 
    7570 
    76 #endif  /* CONFIG_ADM5120_CPU_OVERRIDES */ 
    77  
    78  
    7971#endif /* __ASM_MACH_ADM5120_CPU_FEATURE_OVERRIDES_H */ 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/gpio.h

    r10327 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  ADM5120 GPIO wrappers for arch-neutral GPIO calls 
    53 * 
    6  *  Copyright (C) 2007 OpenWrt.org 
    7  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
     
    1310 */ 
    1411 
    15 #ifndef _ADM5120_GPIO_H_ 
    16 #define _ADM5120_GPIO_H_ 
     12#ifndef _ASM_MACH_ADM5120_GPIO_H 
     13#define _ASM_MACH_ADM5120_GPIO_H 
    1714 
    1815#include <asm/mach-adm5120/adm5120_switch.h> 
     
    113110#include <asm-generic/gpio.h> /* cansleep wrappers */ 
    114111 
    115 #endif 
     112#endif /* _ASM_MACH_ADM5120_GPIO_H */ 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/prom/cfe.h

    r10305 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  Broadcom's CFE definitions 
    53 * 
    6  *  Copyright (C) 2006,2007 Gabor Juhos <juhosg at openwrt.org> 
    7  *  Copyright (C) 2007 OpenWrt.org 
     4 *  Copyright (C) 2006-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/prom/generic.h

    r10305 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  Generic prom definitions 
    53 * 
    6  *  Copyright (C) 2006,2007 Gabor Juhos <juhosg at openwrt.org> 
    7  *  Copyright (C) 2007 OpenWrt.org 
     4 *  Copyright (C) 2006-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/prom/myloader.h

    r10305 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  Compex's MyLoader specific definitions 
    53 * 
    6  *  Copyright (C) 2006,2007 Gabor Juhos <juhosg at openwrt.org> 
    7  *  Copyright (C) 2007 OpenWrt.org 
     4 *  Copyright (C) 2006-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/prom/routerboot.h

    r10305 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  Mikrotik's RouterBOOT definitions 
    53 * 
    6  *  Copyright (C) 2007 OpenWrt.org 
    7  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
  • trunk/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/prom/zynos.h

    r12232 r12239  
    11/* 
    2  *  $Id$ 
    3  * 
    42 *  ZyNOS (ZyXEL's Networking OS) definitions 
    53 * 
    6  *  Copyright (C) 2007 OpenWrt.org 
    7  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
     4 *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> 
    85 * 
    96 *  This program is free software; you can redistribute it and/or modify it 
     
    6764#define ZYNOS_BOARD_P334WHD     0x00E1  /* Prestige 334WHD */ 
    6865#define ZYNOS_BOARD_P334WT      0x9FEF  /* Prestige 334WT */ 
    69 #define ZYNOS_BOARD_P334WT_ALT  0x9F02  /* Prestige 334WT alternative */ 
     66#define ZYNOS_BOARD_P334WT_ALT  0x9F02  /* Prestige 334WT alternative*/ 
    7067#define ZYNOS_BOARD_P335        0x9FED  /* Prestige 335/335WT */ 
    7168#define ZYNOS_BOARD_P335PLUS    0x0025  /* Prestige 335Plus */ 
  • trunk/target/linux/adm5120/patches-2.6.26/001-adm5120.patch

    r11946 r12239  
    11--- a/arch/mips/Kconfig 
    22+++ b/arch/mips/Kconfig 
    3 @@ -18,6 +18,21 @@ 
     3@@ -18,6 +18,20 @@ 
    44        prompt "System type" 
    55        default SGI_IP22 
    66  
    7 +config MIPS_ADM5120 
    8 +       bool "ADM5120 SoC based machines" 
     7+config ADM5120 
     8+       bool "Infineon/ADMtek ADM5120 SoC based machines" 
    99+       select CEVT_R4K 
    1010+       select CSRC_R4K 
     
    1212+       select SYS_HAS_EARLY_PRINTK 
    1313+       select DMA_NONCOHERENT 
    14 +       select HW_HAS_PCI 
    1514+       select IRQ_CPU 
    1615+       select SYS_SUPPORTS_LITTLE_ENDIAN 
     
    2322        bool "Alchemy processor based machines" 
    2423  
    25 @@ -687,6 +702,7 @@ 
     24@@ -687,6 +701,7 @@ 
    2625  
    2726 endchoice 
     
    3332--- a/arch/mips/Makefile 
    3433+++ b/arch/mips/Makefile 
    35 @@ -174,6 +174,16 @@ 
     34@@ -174,6 +174,20 @@ 
    3635 load-$(CONFIG_MACH_JAZZ)       += 0xffffffff80080000 
    3736  
    3837 # 
    39 +# ADMtek 5120 
     38+# Infineon/ADMtek ADM5120 
    4039+# 
    41 + 
    42 +libs-$(CONFIG_MIPS_ADM5120)    += arch/mips/adm5120/prom/ 
    43 +core-$(CONFIG_MIPS_ADM5120)    += arch/mips/adm5120/ 
    44 +core-$(CONFIG_MIPS_ADM5120)    += arch/mips/adm5120/boards/ 
    45 +cflags-$(CONFIG_MIPS_ADM5120)  += -Iinclude/asm-mips/mach-adm5120 
    46 +load-$(CONFIG_MIPS_ADM5120)    += 0xffffffff80001000 
     40+libs-$(CONFIG_ADM5120)                 += arch/mips/adm5120/prom/ 
     41+core-$(CONFIG_ADM5120)                 += arch/mips/adm5120/common/ 
     42+core-$(CONFIG_ADM5120_OEM_CELLVISION)  += arch/mips/adm5120/cellvision/ 
     43+core-$(CONFIG_ADM5120_OEM_COMPEX)      += arch/mips/adm5120/compex/ 
     44+core-$(CONFIG_ADM5120_OEM_EDIMAX)      += arch/mips/adm5120/edimax/ 
     45+core-$(CONFIG_ADM5120_OEM_INFINEON)    += arch/mips/adm5120/infineon/ 
     46+core-$(CONFIG_ADM5120_OEM_MIKROTIK)    += arch/mips/adm5120/mikrotik/ 
     47+core-$(CONFIG_ADM5120_OEM_ZYXEL)       += arch/mips/adm5120/zyxel/ 
     48+cflags-$(CONFIG_ADM5120)               += -Iinclude/asm-mips/mach-adm5120 
     49+load-$(CONFIG_ADM5120)                 += 0xffffffff80001000 
    4750+ 
    4851+# 
     
    5255--- a/include/asm-mips/bootinfo.h 
    5356+++ b/include/asm-mips/bootinfo.h 
    54 @@ -94,6 +94,58 @@ 
     57@@ -94,6 +94,54 @@ 
    5558 #define MACH_MSP7120_FPGA       5      /* PMC-Sierra MSP7120 Emulation */ 
    5659 #define MACH_MSP_OTHER        255      /* PMC-Sierra unknown board type */ 
    5760  
    5861+/* 
    59 + * Valid machtype for group ADMtek ADM5120 
     62+ * Valid machtype for group ADM5120 
    6063+ */ 
    6164+#define MACH_ADM5120_GENERIC   0       /* Generic board */ 
    6265+#define MACH_ADM5120_WP54G_WRT 1       /* Compex WP54G-WRT */ 
    63 +#define MACH_ADM5120_WP54G     2       /* Compex WP54G */ 
    64 +#define MACH_ADM5120_WP54AG    3       /* Compex WP54AG */ 
    65 +#define MACH_ADM5120_WPP54G    4       /* Compex WPP54G */ 
    66 +#define MACH_ADM5120_WPP54AG   5       /* Compex WPP54AG */ 
    67 +#define MACH_ADM5120_NP28G     6       /* Compex NP28G */ 
    68 +#define MACH_ADM5120_NP28GHS   7       /* Compex NP28G HotSpot */ 
    69 +#define MACH_ADM5120_NP27G     8       /* Compex NP27G */ 
    70 +#define MACH_ADM5120_WP54Gv1C  9       /* Compex WP54G version 1C */ 
    71 +#define MACH_ADM5120_RB_111    10      /* Mikrotik RouterBOARD 111 */ 
    72 +#define MACH_ADM5120_RB_112    11      /* Mikrotik RouterBOARD 112 */ 
    73 +#define MACH_ADM5120_RB_133    12      /* Mikrotik RouterBOARD 133 */ 
    74 +#define MACH_ADM5120_RB_133C   13      /* Mikrotik RouterBOARD 133c */ 
    75 +#define MACH_ADM5120_RB_150    14      /* Mikrotik RouterBOARD 150 */ 
    76 +#define MACH_ADM5120_RB_153    15      /* Mikrotik RouterBOARD 153 */ 
    77 +#define MACH_ADM5120_HS100     16      /* ZyXEL HomeSafe 100/100W */ 
    78 +#define MACH_ADM5120_P334      17      /* ZyXEL Prestige 334 */ 
    79 +#define MACH_ADM5120_P334U     18      /* ZyXEL Prestige 334U */ 
    80 +#define MACH_ADM5120_P334W     19      /* ZyXEL Prestige 334W */ 
    81 +#define MACH_ADM5120_P334WH    20      /* ZyXEL Prestige 334WH */ 
    82 +#define MACH_ADM5120_P334WHD   21      /* ZyXEL Prestige 334WHD */ 
    83 +#define MACH_ADM5120_P334WT    22      /* ZyXEL Prestige 334WT */ 
    84 +#define MACH_ADM5120_P335      23      /* ZyXEL Prestige 335/335WT */ 
    85 +#define MACH_ADM5120_P335PLUS  24      /* ZyXEL Prestige 335Plus */ 
    86 +#define MACH_ADM5120_P335U     25      /* ZyXEL Prestige 335U */ 
    87 +#define MACH_ADM5120_ES2108    26      /* ZyXEL Ethernet Switch 2108 */ 
    88 +#define MACH_ADM5120_ES2108F   27      /* ZyXEL Ethernet Switch 2108-F */ 
    89 +#define MACH_ADM5120_ES2108G   28      /* ZyXEL Ethernet Switch 2108-G */ 
    90 +#define MACH_ADM5120_ES2108LC  29      /* ZyXEL Ethernet Switch 2108-LC */ 
    91 +#define MACH_ADM5120_ES2108PWR 30      /* ZyXEL Ethernet Switch 2108-PWR */ 
    92 +#define MACH_ADM5120_ES2024A   31      /* ZyXEL Ethernet Switch 2024A */ 
    93 +#define MACH_ADM5120_ES2024PWR 32      /* ZyXEL Ethernet Switch 2024PWR */ 
    94 +#define MACH_ADM5120_CAS630    33      /* Cellvision CAS-630/630W */ 
    95 +#define MACH_ADM5120_CAS670    34      /* Cellvision CAS-670/670W */ 
    96 +#define MACH_ADM5120_CAS700    36      /* Cellvision CAS-700/700W */ 
    97 +#define MACH_ADM5120_CAS771    37      /* Cellvision CAS-771/771W */ 
    98 +#define MACH_ADM5120_CAS790    38      /* Cellvision CAS-790 */ 
    99 +#define MACH_ADM5120_CAS861    39      /* Cellvision CAS-861/861W */ 
    100 +#define MACH_ADM5120_NFS101U   40      /* Cellvision NFS-101U/101WU */ 
    101 +#define MACH_ADM5120_NFS202U   41      /* Cellvision NFS-202U/202WU */ 
    102 +#define MACH_ADM5120_EASY5120PATA 42   /* Infineon EASY 5120P-ATA */ 
    103 +#define MACH_ADM5120_EASY5120RT 43     /* Infineon EASY 5120-RT */ 
    104 +#define MACH_ADM5120_EASY5120WVOIP 44  /* Infineon EASY 5120-WVoIP */ 
    105 +#define MACH_ADM5120_EASY83000 45      /* Infineon EASY-83000 */ 
    106 +#define MACH_ADM5120_BR6104K   46      /* Edimax BR-6104K/BR-6104KP */ 
    107 +#define MACH_ADM5120_RB_192    47      /* Mikrotik RouterBOARD 192 */ 
    108 +#define MACH_ADM5120_BR61x4WG  48      /* Edimax BR-6104Wg/BR-6114WG */ 
     66+#define MACH_ADM5120_WP54      2       /* Compex WP54G/WP54AG/WPP54G/WPP54AG */ 
     67+#define MACH_ADM5120_NP28G     3       /* Compex NP28G */ 
     68+#define MACH_ADM5120_NP28GHS   4       /* Compex NP28G HotSpot */ 
     69+#define MACH_ADM5120_NP27G     5       /* Compex NP27G */ 
     70+#define MACH_ADM5120_WP54Gv1C  6       /* Compex WP54G version 1C */ 
     71+#define MACH_ADM5120_RB_11X    7       /* Mikrotik RouterBOARD 111/112 */ 
     72+#define MACH_ADM5120_RB_133    8       /* Mikrotik RouterBOARD 133 */ 
     73+#define MACH_ADM5120_RB_133C   9       /* Mikrotik RouterBOARD 133c */ 
     74+#define MACH_ADM5120_RB_150    10      /* Mikrotik RouterBOARD 150 */ 
     75+#define MACH_ADM5120_RB_153    11      /* Mikrotik RouterBOARD 153 */ 
     76+#define MACH_ADM5120_RB_192    12      /* Mikrotik RouterBOARD 192 */ 
     77+#define MACH_ADM5120_HS100     13      /* ZyXEL HomeSafe 100/100W */ 
     78+#define MACH_ADM5120_P334U     14      /* ZyXEL Prestige 334U */ 
     79+#define MACH_ADM5120_P334W     15      /* ZyXEL Prestige 334W */ 
     80+#define MACH_ADM5120_P334WH    16      /* ZyXEL Prestige 334WH */ 
     81+#define MACH_ADM5120_P334WHD   17      /* ZyXEL Prestige 334WHD */ 
     82+#define MACH_ADM5120_P334WT    18      /* ZyXEL Prestige 334WT */ 
     83+#define MACH_ADM5120_P335      19      /* ZyXEL Prestige 335/335WT */ 
     84+#define MACH_ADM5120_P335PLUS  20      /* ZyXEL Prestige 335Plus */ 
     85+#define MACH_ADM5120_P335U     21      /* ZyXEL Prestige 335U */ 
     86+#define MACH_ADM5120_ES2108    22      /* ZyXEL Ethernet Switch 2108 */ 
     87+#define MACH_ADM5120_ES2108F   23      /* ZyXEL Ethernet Switch 2108-F */ 
     88+#define MACH_ADM5120_ES2108G   24      /* ZyXEL Ethernet Switch 2108-G */ 
     89+#define MACH_ADM5120_ES2108LC  25      /* ZyXEL Ethernet Switch 2108-LC */ 
     90+#define MACH_ADM5120_ES2108PWR 26      /* ZyXEL Ethernet Switch 2108-PWR */ 
     91+#define MACH_ADM5120_ES2024A   27      /* ZyXEL Ethernet Switch 2024A */ 
     92+#define MACH_ADM5120_ES2024PWR 28      /* ZyXEL Ethernet Switch 2024PWR */ 
     93+#define MACH_ADM5120_CAS630    29      /* Cellvision CAS-630/630W */ 
     94+#define MACH_ADM5120_CAS670    30      /* Cellvision CAS-670/670W */ 
     95+#define MACH_ADM5120_CAS700    31      /* Cellvision CAS-700/700W */ 
     96+#define MACH_ADM5120_CAS771    32      /* Cellvision CAS-771/771W */ 
     97+#define MACH_ADM5120_CAS790    33      /* Cellvision CAS-790 */ 
     98+#define MACH_ADM5120_CAS861    34      /* Cellvision CAS-861/861W */ 
     99+#define MACH_ADM5120_NFS101U   35      /* Cellvision NFS-101U/101WU */ 
     100+#define MACH_ADM5120_NFS202U   36      /* Cellvision NFS-202U/202WU */ 
     101+#define MACH_ADM5120_EASY5120PATA 37   /* Infineon EASY 5120P-ATA */ 
     102+#define MACH_ADM5120_EASY5120RT 38     /* Infineon EASY 5120-RT */ 
     103+#define MACH_ADM5120_EASY5120WVOIP 39  /* Infineon EASY 5120-WVoIP */ 
     104+#define MACH_ADM5120_EASY83000 40      /* Infineon EASY-83000 */ 
     105+#define MACH_ADM5120_BR6104K   41      /* Edimax BR-6104K */ 
     106+#define MACH_ADM5120_BR6104KP  42      /* Edimax BR-6104KP */ 
     107+#define MACH_ADM5120_BR61X4WG  43      /* Edimax BR-6104Wg/BR-6114WG */ 
    109108+ 
    110109 #define CL_SIZE                        COMMAND_LINE_SIZE 
  • trunk/target/linux/adm5120/patches-2.6.26/002-adm5120_flash.patch

    r11946 r12239  
    77+config MTD_ADM5120 
    88+       tristate "Map driver for ADM5120 based boards" 
    9 +       depends on MIPS_ADM5120 
     9+       depends on ADM5120 
    1010+ 
    1111 endmenu 
  • trunk/target/linux/adm5120/patches-2.6.26/003-adm5120_switch.patch

    r11946 r12239  
    55          say Y.  Otherwise, say N. 
    66  
    7 +config MIPS_ADM5120_ENET 
    8 +       tristate "MIPS ADM5120 Ethernet switch support" 
    9 +       depends on MIPS_ADM5120 
     7+config ADM5120_ENET 
     8+       tristate "ADM5120 Ethernet switch support" 
     9+       depends on ADM5120 
    1010+ 
    1111 config SGI_IOC3_ETH 
     
    1818 obj-$(CONFIG_LP486E) += lp486e.o 
    1919  
    20 +obj-$(CONFIG_MIPS_ADM5120_ENET) += adm5120sw.o 
     20+obj-$(CONFIG_ADM5120_ENET) += adm5120sw.o 
    2121 obj-$(CONFIG_ETH16I) += eth16i.o 
    2222 obj-$(CONFIG_ZORRO8390) += zorro8390.o 
  • trunk/target/linux/adm5120/patches-2.6.26/005-adm5120_usb.patch

    r11946 r12239  
    77+config USB_ADM5120_HCD 
    88+       tristate "ADM5120 HCD support (EXPERIMENTAL)" 
    9 +       depends on USB && MIPS_ADM5120 && EXPERIMENTAL 
     9+       depends on USB && ADM5120 && EXPERIMENTAL 
    1010+ 
    1111 config USB_C67X00_HCD 
  • trunk/target/linux/adm5120/patches-2.6.26/007-adm5120_pci.patch

    r11946 r12239  
    55 obj-$(CONFIG_ZAO_CAPCELLA)     += fixup-capcella.o 
    66 obj-$(CONFIG_WR_PPMC)          += fixup-wrppmc.o 
    7 +obj-$(CONFIG_PCI_ADM5120)      += pci-adm5120.o 
     7+obj-$(CONFIG_ADM5120)          += pci-adm5120.o 
    88--- a/include/linux/pci_ids.h 
    99+++ b/include/linux/pci_ids.h 
  • trunk/target/linux/adm5120/patches-2.6.26/009-adm5120_leds_switch_trigger.patch

    r11946 r12239  
    11--- a/drivers/leds/Kconfig 
    22+++ b/drivers/leds/Kconfig 
    3 @@ -215,4 +215,12 @@ 
    4         tristate "LED Morse Trigger" 
    5         depends on LEDS_TRIGGERS 
     3@@ -207,4 +207,12 @@ 
     4          This allows LEDs to be controlled by network device activity. 
     5          If unsure, say Y. 
    66  
    77+config LEDS_TRIGGER_ADM5120_SWITCH 
    88+       tristate "LED ADM5120 Switch Port Status Trigger" 
    9 +       depends on LEDS_TRIGGERS && LEDS_ADM5120 
     9+       depends on LEDS_TRIGGERS && ADM5120 
    1010+       help 
    1111+         This allows LEDs to be controlled by the port states of 
     
    1717+++ b/drivers/leds/Makefile 
    1818@@ -30,3 +30,4 @@ 
    19  obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)   += ledtrig-heartbeat.o 
    2019 obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)  += ledtrig-default-on.o 
    2120 obj-$(CONFIG_LEDS_TRIGGER_MORSE)       += ledtrig-morse.o 
     21 obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o 
    2222+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o 
  • trunk/target/linux/adm5120/patches-2.6.26/100-mtd_myloder_partition_parser.patch

    r11946 r12239  
    77+config MTD_MYLOADER_PARTS 
    88+       tristate "MyLoader partition parsing" 
    9 +       depends on MIPS_ADM5120 && MTD_PARTITIONS 
     9+       depends on ADM5120 && MTD_PARTITIONS 
    1010+       ---help--- 
    1111+         MyLoader is a bootloader which allows the user to define partitions 
  • trunk/target/linux/adm5120/patches-2.6.26/120-rb153_cf_driver.patch

    r11946 r12239  
    1717+config PATA_RB153_CF 
    1818+       tristate "RouterBOARD 153 Compact Flash support" 
    19 +       depends on MIPS_ADM5120 
     19+       depends on ADM5120_MACH_RB_153 
    2020+       help 
    2121+         This option enables support for a Compact Flash connected on 
  • trunk/target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch

    r11946 r12239  
    77+config ADM5120_WDT 
    88+       tristate "Infineon ADM5120 SoC hardware watchdog" 
    9 +       depends on WATCHDOG && MIPS_ADM5120 
     9+       depends on WATCHDOG && ADM5120 
    1010+       help 
    1111+         This is a driver for hardware watchdog integrated in Infineon 
  • trunk/target/linux/adm5120/router_be/config-2.6.26

    r12007 r12239  
    11CONFIG_32BIT=y 
    22# CONFIG_64BIT is not set 
    3 # CONFIG_ACCESSIBILITY is not set 
    4 CONFIG_ADM5120_CPU_OVERRIDES=y 
     3CONFIG_ADM5120=y 
     4CONFIG_ADM5120_ENET=y 
     5CONFIG_ADM5120_MACH_P_334WT=y 
     6CONFIG_ADM5120_MACH_P_335=y 
     7# CONFIG_ADM5120_OEM_CELLVISION is not set 
     8# CONFIG_ADM5120_OEM_COMPEX is not set 
     9# CONFIG_ADM5120_OEM_EDIMAX is not set 
     10# CONFIG_ADM5120_OEM_INFINEON is not set 
     11# CONFIG_ADM5120_OEM_MIKROTIK is not set 
     12CONFIG_ADM5120_OEM_ZYXEL=y 
     13CONFIG_ADM5120_SOC_BGA=y 
    514CONFIG_ADM5120_WDT=y 
    615# CONFIG_ARCH_HAS_ILOG2_U32 is not set 
     
    114123# CONFIG_IWLWIFI_LEDS is not set 
    115124# CONFIG_JOLIET is not set 
    116 CONFIG_LEDS_ADM5120=m 
    117 # CONFIG_LEDS_ADM5120_DIAG is not set 
    118 # CONFIG_LEDS_ADM5120_EXPERIMENTAL is not set 
    119125# CONFIG_LEDS_ALIX is not set 
    120126CONFIG_LEDS_GPIO=m 
     
    130136# CONFIG_MACH_VR41XX is not set 
    131137# CONFIG_MEDIA_ATTACH is not set 
    132 # CONFIG_MEMSTICK is not set 
    133138CONFIG_MII=m 
    134139# CONFIG_MINIX_FS is not set 
    135140CONFIG_MIPS=y 
    136 CONFIG_MIPS_ADM5120=y 
    137 CONFIG_MIPS_ADM5120_ENET=y 
    138141# CONFIG_MIPS_ATLAS is not set 
    139142# CONFIG_MIPS_COBALT is not set 
     
    206209CONFIG_PCI=y 
    207210# CONFIG_PCIPCWATCHDOG is not set 
    208 CONFIG_PCI_ADM5120=y 
    209211CONFIG_PCI_DISABLE_COMMON_QUIRKS=y 
    210212CONFIG_PCI_DOMAINS=y 
     
    244246# CONFIG_SIBYTE_SENTOSA is not set 
    245247# CONFIG_SIBYTE_SWARM is not set 
    246 CONFIG_SLABINFO=y 
    247 # CONFIG_SND_AW2 is not set 
    248248CONFIG_SOFT_WATCHDOG=m 
    249249# CONFIG_SPARSEMEM_STATIC is not set 
  • trunk/target/linux/adm5120/router_le/config-2.6.26

    r12007 r12239  
    11CONFIG_32BIT=y 
    22# CONFIG_64BIT is not set 
    3 # CONFIG_ACCESSIBILITY is not set 
    4 CONFIG_ADM5120_CPU_OVERRIDES=y 
     3# CONFIG_8139TOO is not set 
     4CONFIG_ADM5120=y 
     5CONFIG_ADM5120_ENET=y 
     6CONFIG_ADM5120_MACH_BR_6104K=y 
     7CONFIG_ADM5120_MACH_BR_6104KP=y 
     8CONFIG_ADM5120_MACH_BR_61X4WG=y 
     9CONFIG_ADM5120_MACH_CAS_771=y 
     10CONFIG_ADM5120_MACH_EASY5120P_ATA=y 
     11CONFIG_ADM5120_MACH_EASY5120_RT=y 
     12CONFIG_ADM5120_MACH_EASY5120_WVOIP=y 
     13CONFIG_ADM5120_MACH_EASY83000=y 
     14CONFIG_ADM5120_MACH_NP27G=y 
     15CONFIG_ADM5120_MACH_NP28G=y 
     16CONFIG_ADM5120_MACH_RB_11X=y 
     17CONFIG_ADM5120_MACH_RB_133=y 
     18CONFIG_ADM5120_MACH_RB_133C=y 
     19CONFIG_ADM5120_MACH_RB_150=y 
     20CONFIG_ADM5120_MACH_RB_153=y 
     21CONFIG_ADM5120_MACH_RB_192=y 
     22CONFIG_ADM5120_MACH_WP54=y 
     23CONFIG_ADM5120_OEM_CELLVISION=y 
     24CONFIG_ADM5120_OEM_COMPEX=y 
     25CONFIG_ADM5120_OEM_EDIMAX=y 
     26CONFIG_ADM5120_OEM_INFINEON=y 
     27CONFIG_ADM5120_OEM_MIKROTIK=y 
     28# CONFIG_ADM5120_OEM_ZYXEL is not set 
     29CONFIG_ADM5120_SOC_BGA=y 
    530CONFIG_ADM5120_WDT=y 
    631# CONFIG_ARCH_HAS_ILOG2_U32 is not set 
     
    1136CONFIG_ARCH_SUSPEND_POSSIBLE=y 
    1237CONFIG_ARM_AMBA=y 
     38CONFIG_ATA=m 
     39# CONFIG_ATA_NONSTANDARD is not set 
     40# CONFIG_ATA_PIIX is not set 
     41CONFIG_ATA_SFF=y 
    1342CONFIG_BASE_SMALL=0 
    1443CONFIG_BAYCOM_SER_FDX=m 
     
    114143# CONFIG_IWLWIFI_LEDS is not set 
    115144# CONFIG_JOLIET is not set 
    116 CONFIG_LEDS_ADM5120=m 
    117 # CONFIG_LEDS_ADM5120_DIAG is not set 
    118 # CONFIG_LEDS_ADM5120_EXPERIMENTAL is not set 
    119145# CONFIG_LEDS_ALIX is not set 
    120146CONFIG_LEDS_GPIO=m 
     
    130156# CONFIG_MACH_VR41XX is not set 
    131157# CONFIG_MEDIA_ATTACH is not set 
    132 # CONFIG_MEMSTICK is not set 
    133158CONFIG_MII=m 
    134159# CONFIG_MINIX_FS is not set 
    135160CONFIG_MIPS=y 
    136 CONFIG_MIPS_ADM5120=y 
    137 CONFIG_MIPS_ADM5120_ENET=y 
    138161# CONFIG_MIPS_ATLAS is not set 
    139162# CONFIG_MIPS_COBALT is not set 
     
    203226# CONFIG_MTD_SLRAM is not set 
    204227CONFIG_MTD_TRXSPLIT=y 
     228# CONFIG_NATSEMI is not set 
     229# CONFIG_NE2K_PCI is not set 
    205230# CONFIG_NETFILTER_XT_TARGET_TARPIT is not set 
    206 # CONFIG_NET_PCI is not set 
    207231# CONFIG_NET_PKTGEN is not set 
    208232# CONFIG_NET_VENDOR_3COM is not set 
     
    215239# CONFIG_PAGE_SIZE_8KB is not set 
    216240# CONFIG_PARTITION_ADVANCED is not set 
     241# CONFIG_PATA_PLATFORM is not set 
     242CONFIG_PATA_RB153_CF=m 
     243# CONFIG_PATA_SCH is not set 
    217244CONFIG_PCI=y 
    218245# CONFIG_PCIPCWATCHDOG is not set 
    219 CONFIG_PCI_ADM5120=y 
    220246CONFIG_PCI_DISABLE_COMMON_QUIRKS=y 
    221247CONFIG_PCI_DOMAINS=y 
     
    225251# CONFIG_PNX8550_JBS is not set 
    226252# CONFIG_PNX8550_STB810 is not set 
     253# CONFIG_R6040 is not set 
    227254CONFIG_RFKILL_LEDS=y 
    228255CONFIG_RTC_LIB=y 
     
    255282# CONFIG_SIBYTE_SENTOSA is not set 
    256283# CONFIG_SIBYTE_SWARM is not set 
    257 CONFIG_SLABINFO=y 
    258 # CONFIG_SND_AW2 is not set 
    259284CONFIG_SOFT_WATCHDOG=m 
    260285# CONFIG_SPARSEMEM_STATIC is not set 
     
    268293CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 
    269294CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 
     295# CONFIG_TC35815 is not set 
    270296# CONFIG_THERMAL is not set 
    271297# CONFIG_THERMAL_HWMON is not set 
     
    278304CONFIG_USB=m 
    279305CONFIG_USB_ADM5120_HCD=m 
    280 CONFIG_USB_DEBUG=y 
    281306CONFIG_USB_EHCI_HCD=m 
    282307# CONFIG_USB_ISIGHTFW is not set 
     
    286311# CONFIG_USB_UHCI_HCD is not set 
    287312# CONFIG_VGASTATE is not set 
     313# CONFIG_VIA_RHINE is not set 
    288314# CONFIG_VIDEO_ALLOW_V4L1 is not set 
    289315CONFIG_VIDEO_MEDIA=m 
Note: See TracChangeset for help on using the changeset viewer.