hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: amba: u300: use common amba device initializers 

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2011-12-18 15:26:38 +00:00
parent e78b68ae76
commit 6db2a457dd
1 changed files with 16 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
arch/arm/mach-u300/core.c
View File

@ -94,19 +94,9 @@ static struct amba_pl011_data uart0_plat_data = {
#endif #endif
}; };
static struct amba_device uart0_device = { /* Slow device at 0x3000 offset */
.dev = { static AMBA_APB_DEVICE(uart0, "uart0", 0, U300_UART0_BASE,
.coherent_dma_mask = ~0, { IRQ_U300_UART0 }, &uart0_plat_data);
.init_name = "uart0", /* Slow device at 0x3000 offset */
.platform_data = &uart0_plat_data,
},
.res = {
.start = U300_UART0_BASE,
.end = U300_UART0_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
.irq = { IRQ_U300_UART0 },
};
/* The U335 have an additional UART1 on the APP CPU */ /* The U335 have an additional UART1 on the APP CPU */
#ifdef CONFIG_MACH_U300_BS335 #ifdef CONFIG_MACH_U300_BS335
@ -118,71 +108,28 @@ static struct amba_pl011_data uart1_plat_data = {
#endif #endif
}; };
static struct amba_device uart1_device = { /* Fast device at 0x7000 offset */
.dev = { static AMBA_APB_DEVICE(uart1, "uart1", 0, U300_UART1_BASE,
.coherent_dma_mask = ~0, { IRQ_U300_UART1 }, &uart1_plat_data);
.init_name = "uart1", /* Fast device at 0x7000 offset */
.platform_data = &uart1_plat_data,
},
.res = {
.start = U300_UART1_BASE,
.end = U300_UART1_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
.irq = { IRQ_U300_UART1 },
};
#endif #endif
static struct amba_device pl172_device = { /* AHB device at 0x4000 offset */
.dev = { static AMBA_APB_DEVICE(pl172, "pl172", 0, U300_EMIF_CFG_BASE, { }, NULL);
.init_name = "pl172", /* AHB device at 0x4000 offset */
.platform_data = NULL,
},
.res = {
.start = U300_EMIF_CFG_BASE,
.end = U300_EMIF_CFG_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
};
/* /*
* Everything within this next ifdef deals with external devices connected to * Everything within this next ifdef deals with external devices connected to
* the APP SPI bus. * the APP SPI bus.
*/ */
static struct amba_device pl022_device = { /* Fast device at 0x6000 offset */
.dev = { static AMBA_APB_DEVICE(pl022, "pl022", 0, U300_SPI_BASE,
.coherent_dma_mask = ~0, { IRQ_U300_SPI }, NULL);
.init_name = "pl022", /* Fast device at 0x6000 offset */
},
.res = {
.start = U300_SPI_BASE,
.end = U300_SPI_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
.irq = {IRQ_U300_SPI },
/*
* This device has a DMA channel but the Linux driver does not use
* it currently.
*/
};
static struct amba_device mmcsd_device = { /* Fast device at 0x1000 offset */
.dev = { #define U300_MMCSD_IRQS { IRQ_U300_MMCSD_MCIINTR0, IRQ_U300_MMCSD_MCIINTR1 }
.init_name = "mmci", /* Fast device at 0x1000 offset */
.platform_data = NULL, /* Added later */ static AMBA_APB_DEVICE(mmcsd, "mmci", 0, U300_MMCSD_BASE,
}, U300_MMCSD_IRQS, NULL);
.res = {
.start = U300_MMCSD_BASE,
.end = U300_MMCSD_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
.irq = {IRQ_U300_MMCSD_MCIINTR0, IRQ_U300_MMCSD_MCIINTR1 },
/*
* This device has a DMA channel but the Linux driver does not use
* it currently.
*/
};
/* /*
* The order of device declaration may be important, since some devices * The order of device declaration may be important, since some devices