mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
ARM: shmobile: r8a7740: Declare SCIF register base and IRQ as resources
Passing the register base address and IRQ through platform data is deprecated. Use resources instead. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
parent
8826478e11
commit
8bf2f8c5cc
1 changed files with 7 additions and 2 deletions
|
@ -207,16 +207,21 @@ static struct platform_device irqpin3_device = {
|
||||||
#define R8A7740_SCIF(scif_type, index, baseaddr, irq) \
|
#define R8A7740_SCIF(scif_type, index, baseaddr, irq) \
|
||||||
static struct plat_sci_port scif##index##_platform_data = { \
|
static struct plat_sci_port scif##index##_platform_data = { \
|
||||||
.type = scif_type, \
|
.type = scif_type, \
|
||||||
.mapbase = baseaddr, \
|
|
||||||
.flags = UPF_BOOT_AUTOCONF, \
|
.flags = UPF_BOOT_AUTOCONF, \
|
||||||
.irqs = SCIx_IRQ_MUXED(irq), \
|
|
||||||
.scbrr_algo_id = SCBRR_ALGO_4, \
|
.scbrr_algo_id = SCBRR_ALGO_4, \
|
||||||
.scscr = SCSCR_RE | SCSCR_TE, \
|
.scscr = SCSCR_RE | SCSCR_TE, \
|
||||||
}; \
|
}; \
|
||||||
\
|
\
|
||||||
|
static struct resource scif##index##_resources[] = { \
|
||||||
|
DEFINE_RES_MEM(baseaddr, 0x100), \
|
||||||
|
DEFINE_RES_IRQ(irq), \
|
||||||
|
}; \
|
||||||
|
\
|
||||||
static struct platform_device scif##index##_device = { \
|
static struct platform_device scif##index##_device = { \
|
||||||
.name = "sh-sci", \
|
.name = "sh-sci", \
|
||||||
.id = index, \
|
.id = index, \
|
||||||
|
.resource = scif##index##_resources, \
|
||||||
|
.num_resources = ARRAY_SIZE(scif##index##_resources), \
|
||||||
.dev = { \
|
.dev = { \
|
||||||
.platform_data = &scif##index##_platform_data, \
|
.platform_data = &scif##index##_platform_data, \
|
||||||
}, \
|
}, \
|
||||||
|
|
Loading…
Reference in a new issue