Changeset 8159


Ignore:
Timestamp:
2007-07-25T16:47:16+02:00 (11 years ago)
Author:
juhosg
Message:

[adm5120] uses AMBA PL010 driver for the serial ports from now

Location:
trunk/target/linux
Files:
5 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/adm5120-2.6/config/default

    r8144 r8159  
    22# CONFIG_64BIT is not set 
    33# CONFIG_64BIT_PHYS_ADDR is not set 
    4 CONFIG_ADM5120_NR_UARTS=2 
    54# CONFIG_ARCH_HAS_ILOG2_U32 is not set 
    65# CONFIG_ARCH_HAS_ILOG2_U64 is not set 
    76# CONFIG_ARCH_SUPPORTS_MSI is not set 
     7CONFIG_ARM_AMBA=y 
    88# CONFIG_ATM_DRIVERS is not set 
    99CONFIG_BASE_SMALL=0 
     
    208208CONFIG_SCSI_WAIT_SCAN=m 
    209209# CONFIG_SERIAL_8250 is not set 
    210 CONFIG_SERIAL_ADM5120=y 
     210# CONFIG_SERIAL_ADM5120 is not set 
     211CONFIG_SERIAL_AMBA_PL010=y 
     212CONFIG_SERIAL_AMBA_PL010_CONSOLE=y 
     213CONFIG_SERIAL_AMBA_PL010_NUMPORTS=2 
     214CONFIG_SERIAL_AMBA_PL010_PORTNAME="ttyS" 
     215# CONFIG_SERIAL_AMBA_PL011 is not set 
    211216CONFIG_SERIO=y 
     217# CONFIG_SERIO_AMBAKMI is not set 
    212218# CONFIG_SERIO_I8042 is not set 
    213219# CONFIG_SERIO_LIBPS2 is not set 
  • trunk/target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig

    r7924 r8159  
    1010endmenu 
    1111 
     12config ARM_AMBA 
     13        bool 
     14        default y 
     15 
    1216endif 
  • trunk/target/linux/adm5120-2.6/files/arch/mips/adm5120/Makefile

    r7916 r8159  
    44 
    55obj-y   := setup.o prom.o irq.o memory.o adm5120_info.o 
     6obj-y   += board.o 
     7obj-y   += clock.o 
    68obj-y   += gpio.o 
     9obj-y   += platform.o 
     10obj-y   += reset.o 
    711obj-y   += time.o 
    8 obj-y   += reset.o 
    9 obj-y   += board.o 
    10 obj-y   += platform.o 
     12 
    1113obj-y   += trxsplit.o 
    1214 
  • trunk/target/linux/adm5120-2.6/files/arch/mips/adm5120/board.c

    r7916 r8159  
    3434#include <asm/mach-adm5120/adm5120_info.h> 
    3535#include <asm/mach-adm5120/adm5120_defs.h> 
     36#include <asm/mach-adm5120/adm5120_irq.h> 
    3637#include <asm/mach-adm5120/adm5120_board.h> 
    3738#include <asm/mach-adm5120/adm5120_platform.h> 
     
    8889                board->board_setup(); 
    8990 
     91        /* register UARTs */ 
     92        amba_device_register(&adm5120_uart0_device, &iomem_resource); 
     93        amba_device_register(&adm5120_uart1_device, &iomem_resource); 
     94 
    9095        /* register PCI controller */ 
    9196        if (adm5120_package_bga()) 
  • trunk/target/linux/adm5120-2.6/files/arch/mips/adm5120/platform.c

    r8046 r8159  
    3838#include <asm/mach-adm5120/adm5120_switch.h> 
    3939#include <asm/mach-adm5120/adm5120_platform.h> 
     40 
     41static void adm5120_uart_set_mctrl(struct amba_device *dev, void __iomem *base, 
     42                unsigned int mctrl); 
    4043 
    4144#if 1 
     
    129132        .resource       = adm5120_nand_resource, 
    130133}; 
     134 
     135/* built-in UARTs */ 
     136struct amba_pl010_data adm5120_uart0_data = { 
     137        .set_mctrl = adm5120_uart_set_mctrl 
     138}; 
     139 
     140struct amba_device adm5120_uart0_device = { 
     141        .dev            = { 
     142                .bus_id = "APB:UART0", 
     143                .platform_data = &adm5120_uart0_data, 
     144        }, 
     145        .res            = { 
     146                .start  = ADM5120_UART0_BASE, 
     147                .end    = ADM5120_UART0_BASE + ADM5120_UART_SIZE - 1, 
     148                .flags  = IORESOURCE_MEM, 
     149        }, 
     150        .irq            = { ADM5120_IRQ_UART0, -1 }, 
     151        .periphid       = 0x0041010, 
     152}; 
     153 
     154struct amba_pl010_data adm5120_uart1_data = { 
     155        .set_mctrl = adm5120_uart_set_mctrl 
     156}; 
     157 
     158struct amba_device adm5120_uart1_device = { 
     159        .dev            = { 
     160                .bus_id = "APB:UART1", 
     161                .platform_data = &adm5120_uart1_data, 
     162        }, 
     163        .res            = { 
     164                .start  = ADM5120_UART1_BASE, 
     165                .end    = ADM5120_UART1_BASE + ADM5120_UART_SIZE - 1, 
     166                .flags  = IORESOURCE_MEM, 
     167        }, 
     168        .irq            = { ADM5120_IRQ_UART1, -1 }, 
     169        .periphid       = 0x0041010, 
     170}; 
     171 
     172static void adm5120_uart_set_mctrl(struct amba_device *dev, void __iomem *base, 
     173                unsigned int mctrl) 
     174{ 
     175} 
  • trunk/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_platform.h

    r8045 r8159  
    2626#define _ADM5120_PLATFORM_H_ 
    2727 
     28#include <linux/device.h> 
     29#include <linux/platform_device.h> 
     30 
    2831#include <linux/mtd/mtd.h> 
    2932#include <linux/mtd/map.h> 
    3033#include <linux/mtd/partitions.h> 
     34 
     35#include <linux/amba/bus.h> 
     36#include <linux/amba/serial.h> 
    3137 
    3238struct adm5120_flash_platform_data { 
     
    6470extern struct adm5120_pci_platform_data adm5120_pci_data; 
    6571extern struct adm5120_switch_platform_data adm5120_switch_data; 
     72extern struct amba_pl010_data adm5120_uart0_data; 
     73extern struct amba_pl010_data adm5120_uart1_data; 
    6674 
    6775extern struct platform_device adm5120_flash0_device; 
     
    7179extern struct platform_device adm5120_pci_device; 
    7280extern struct platform_device adm5120_switch_device; 
     81extern struct amba_device adm5120_uart0_device; 
     82extern struct amba_device adm5120_uart1_device; 
     83 
    7384 
    7485#endif /* _ADM5120_PLATFORM_H_ */ 
  • trunk/target/linux/adm5120eb-2.6/config/default

    r8144 r8159  
    22# CONFIG_64BIT is not set 
    33# CONFIG_64BIT_PHYS_ADDR is not set 
    4 CONFIG_ADM5120_NR_UARTS=2 
    54# CONFIG_ARCH_HAS_ILOG2_U32 is not set 
    65# CONFIG_ARCH_HAS_ILOG2_U64 is not set 
    76# CONFIG_ARCH_SUPPORTS_MSI is not set 
     7CONFIG_ARM_AMBA=y 
    88# CONFIG_ATM_DRIVERS is not set 
    99CONFIG_BASE_SMALL=0 
     
    201201CONFIG_SCSI_WAIT_SCAN=m 
    202202# CONFIG_SERIAL_8250 is not set 
    203 CONFIG_SERIAL_ADM5120=y 
     203# CONFIG_SERIAL_ADM5120 is not set 
     204CONFIG_SERIAL_AMBA_PL010=y 
     205CONFIG_SERIAL_AMBA_PL010_CONSOLE=y 
     206CONFIG_SERIAL_AMBA_PL010_NUMPORTS=2 
     207CONFIG_SERIAL_AMBA_PL010_PORTNAME="ttyS" 
     208# CONFIG_SERIAL_AMBA_PL011 is not set 
    204209CONFIG_SERIO=y 
     210# CONFIG_SERIO_AMBAKMI is not set 
    205211# CONFIG_SERIO_I8042 is not set 
    206212# CONFIG_SERIO_LIBPS2 is not set 
Note: See TracChangeset for help on using the changeset viewer.