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

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

ARM: shmobile: r8a7791: Don't set plat_sci_port scbrr_algo_id field 



The field will be removed from the sh-sci driver. Don't set it and let
the driver handle baud rate calculation internally.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 0bb075ce

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

+4 −5
Original line number Diff line number Diff line
@@ -84,11 +84,10 @@ void __init r8a7791_pinmux_init(void) 
	r8a7791_register_gpio(7);

}



#define __R8A7791_SCIF(scif_type, algo, index, baseaddr, irq)		\

#define __R8A7791_SCIF(scif_type, index, baseaddr, irq)			\

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

	.type		= scif_type,					\

	.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP,		\

	.scbrr_algo_id	= algo,						\

	.scscr		= SCSCR_RE | SCSCR_TE,				\

};									\

									\
@@ -98,13 +97,13 @@ static struct resource scif##index##_resources[] = { \ 
}



#define R8A7791_SCIF(index, baseaddr, irq)				\

	__R8A7791_SCIF(PORT_SCIF, SCBRR_ALGO_2, index, baseaddr, irq)

	__R8A7791_SCIF(PORT_SCIF, index, baseaddr, irq)



#define R8A7791_SCIFA(index, baseaddr, irq)				\

	__R8A7791_SCIF(PORT_SCIFA, SCBRR_ALGO_4, index, baseaddr, irq)

	__R8A7791_SCIF(PORT_SCIFA, index, baseaddr, irq)



#define R8A7791_SCIFB(index, baseaddr, irq)				\

	__R8A7791_SCIF(PORT_SCIFB, SCBRR_ALGO_4, index, baseaddr, irq)

	__R8A7791_SCIF(PORT_SCIFB, index, baseaddr, irq)



R8A7791_SCIFA(0,  0xe6c40000, gic_spi(144)); /* SCIFA0 */

R8A7791_SCIFA(1,  0xe6c50000, gic_spi(145)); /* SCIFA1 */