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

ARM: shmobile: r8a73a4: 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 572f2180

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

+10 −5
Original line number Diff line number Diff line
@@ -43,11 +43,14 @@ void __init r8a73a4_pinmux_init(void) 
#define R8A73A4_SCIF(scif_type, _scscr, index, baseaddr, irq)	\

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

	.type		= scif_type,				\

	.mapbase	= baseaddr,				\

	.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP,	\

	.scbrr_algo_id	= SCBRR_ALGO_4,				\

	.scscr		= _scscr,				\

	.irqs		= SCIx_IRQ_MUXED(irq),			\

};								\

								\

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

	DEFINE_RES_MEM(baseaddr, 0x100),			\

	DEFINE_RES_IRQ(irq),					\

}



#define R8A73A4_SCIFA(index, baseaddr, irq)	\
@@ -66,7 +69,9 @@ R8A73A4_SCIFB(4, 0xe6ce0000, gic_spi(150)); /* SCIFB2 */ 
R8A73A4_SCIFB(5, 0xe6cf0000, gic_spi(151)); /* SCIFB3 */



#define r8a73a4_register_scif(index)					       \

	platform_device_register_data(&platform_bus, "sh-sci", index,	       \

	platform_device_register_resndata(&platform_bus, "sh-sci", index,      \

					  scif##index##_resources,	       \

					  ARRAY_SIZE(scif##index##_resources), \

					  &scif##index##_platform_data,	       \

					  sizeof(scif##index##_platform_data))

CRA Git | Maintained and supported by SUSTech CRA and CCSE