Changeset 7917


Ignore:
Timestamp:
2007-07-11T15:13:26+02:00 (11 years ago)
Author:
kaloz
Message:

mostly cosmetic sync with the mainline bubinga code

Location:
trunk/target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.c

    r7336 r7917  
    1414 */ 
    1515 
    16 #include <linux/autoconf.h> 
    1716#include <linux/init.h> 
    1817#include <linux/smp.h> 
     
    5251extern bd_t __res; 
    5352 
    54 /* Some IRQs unique to board 
     53/* Some IRQs unique to the board 
    5554 * Used by the generic 405 PCI setup functions in ppc4xx_pci.c 
    5655 */ 
     
    7473}; 
    7574 
    76  
    7775/* The serial clock for the chip is an internal clock determined by 
    7876 * different clock speeds/dividers. 
     
    10199        port.uartclk = uart_clock; 
    102100        port.regshift = 0; 
    103         port.iotype = SERIAL_IO_MEM; 
    104         port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; 
     101        port.iotype = UPIO_MEM; 
     102        port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; 
    105103        port.line = 0; 
    106104 
     
    121119bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) 
    122120{ 
     121#ifdef CONFIG_PCI 
     122 
    123123        unsigned int bar_response, bar; 
    124124        /* 
     
    200200                    PCI_FUNC(hose->first_busno), bar, bar_response); 
    201201        } 
    202         /* end work arround */ 
     202        /* end workaround */ 
    203203 
    204204#ifdef DEBUG 
     
    215215        printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la))); 
    216216 
    217 #endif /* DEBUG */ 
     217#endif 
     218#endif 
    218219} 
    219220 
     
    293294        ppc_md.early_serial_map = bubinga_early_serial_map; 
    294295#endif 
    295  
    296 } 
     296} 
     297 
  • trunk/target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.h

    r7328 r7917  
    1818#define __MAGICBOX_H__ 
    1919 
    20 #include <linux/autoconf.h> 
    2120#include <platforms/4xx/ibm405ep.h> 
    2221#include <asm/ppcboot.h> 
     
    3130 * The base baud is calculated as (FWDA / EXT UART DIV / 16) 
    3231 */ 
    33 #define BASE_BAUD       0 
     32#define BASE_BAUD               0 
    3433 
    3534/* Flash */ 
Note: See TracChangeset for help on using the changeset viewer.