Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa61ee2e authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

ARM: shmobile: r8a7779: 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: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 8bf2f8c5

arch/arm/mach-shmobile/setup-r8a7779.c

+7 −2
Original line number Diff line number Diff line
@@ -192,16 +192,21 @@ void __init r8a7779_pinmux_init(void) 
#define R8A7779_SCIF(index, baseaddr, irq)			\

static struct plat_sci_port scif##index##_platform_data = {	\

	.type		= PORT_SCIF,				\

	.mapbase	= baseaddr,				\

	.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP,	\

	.irqs		= SCIx_IRQ_MUXED(irq),			\

	.scbrr_algo_id	= SCBRR_ALGO_2,				\

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,	\

};								\

								\

static struct resource scif##index##_resources[] = {		\

	DEFINE_RES_MEM(baseaddr, 0x100),			\

	DEFINE_RES_IRQ(irq),					\

};								\

								\

static struct platform_device scif##index##_device = {		\

	.name		= "sh-sci",				\

	.id		= index,				\

	.resource	= scif##index##_resources,		\

	.num_resources	= ARRAY_SIZE(scif##index##_resources),	\

	.dev		= {					\

		.platform_data	= &scif##index##_platform_data,	\

	},							\