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

Commit d45b21c9 authored by Wolfram Sang's avatar Wolfram Sang Committed by Simon Horman
Browse files

ARM: shmobile: r7s72100: genmai: platform scif devices only for legacy support 



We have now DT support for SCIF, so use the platform_device
initialization only for the legacy support.

Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarMagnus Damm <damm+renesas@opensource.se>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 5be13fef

arch/arm/mach-shmobile/board-genmai.c

+44 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/serial_sci.h>

#include <linux/sh_eth.h>

#include <linux/spi/rspi.h>

#include <linux/spi/spi.h>
@@ -89,6 +90,40 @@ static const struct spi_board_info spi_info[] __initconst = { 
	},

};



/* SCIF */

#define R7S72100_SCIF(index, baseaddr, irq)				\

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

	.type		= PORT_SCIF,					\

	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,		\

	.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP,		\

	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |	\

			  SCSCR_REIE,					\

};									\

									\

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

	DEFINE_RES_MEM(baseaddr, 0x100),				\

	DEFINE_RES_IRQ(irq + 1),					\

	DEFINE_RES_IRQ(irq + 2),					\

	DEFINE_RES_IRQ(irq + 3),					\

	DEFINE_RES_IRQ(irq),						\

}									\



R7S72100_SCIF(0, 0xe8007000, gic_iid(221));

R7S72100_SCIF(1, 0xe8007800, gic_iid(225));

R7S72100_SCIF(2, 0xe8008000, gic_iid(229));

R7S72100_SCIF(3, 0xe8008800, gic_iid(233));

R7S72100_SCIF(4, 0xe8009000, gic_iid(237));

R7S72100_SCIF(5, 0xe8009800, gic_iid(241));

R7S72100_SCIF(6, 0xe800a000, gic_iid(245));

R7S72100_SCIF(7, 0xe800a800, gic_iid(249));



#define r7s72100_register_scif(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))



static void __init genmai_add_standard_devices(void)

{

	r7s72100_clock_init();
@@ -102,6 +137,15 @@ static void __init genmai_add_standard_devices(void) 
	r7s72100_register_rspi(3);

	r7s72100_register_rspi(4);

	spi_register_board_info(spi_info, ARRAY_SIZE(spi_info));



	r7s72100_register_scif(0);

	r7s72100_register_scif(1);

	r7s72100_register_scif(2);

	r7s72100_register_scif(3);

	r7s72100_register_scif(4);

	r7s72100_register_scif(5);

	r7s72100_register_scif(6);

	r7s72100_register_scif(7);

}



static const char * const genmai_boards_compat_dt[] __initconst = {

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

+0 −43
Original line number Diff line number Diff line
@@ -21,47 +21,12 @@ 
#include <linux/irq.h>

#include <linux/kernel.h>

#include <linux/of_platform.h>

#include <linux/serial_sci.h>

#include <linux/sh_timer.h>

#include <mach/common.h>

#include <mach/irqs.h>

#include <mach/r7s72100.h>

#include <asm/mach/arch.h>



#define R7S72100_SCIF(index, baseaddr, irq)				\

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

	.type		= PORT_SCIF,					\

	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,		\

	.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP,		\

	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |	\

			  SCSCR_REIE,					\

};									\

									\

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

	DEFINE_RES_MEM(baseaddr, 0x100),				\

	DEFINE_RES_IRQ(irq + 1),					\

	DEFINE_RES_IRQ(irq + 2),					\

	DEFINE_RES_IRQ(irq + 3),					\

	DEFINE_RES_IRQ(irq),						\

}									\



R7S72100_SCIF(0, 0xe8007000, gic_iid(221));

R7S72100_SCIF(1, 0xe8007800, gic_iid(225));

R7S72100_SCIF(2, 0xe8008000, gic_iid(229));

R7S72100_SCIF(3, 0xe8008800, gic_iid(233));

R7S72100_SCIF(4, 0xe8009000, gic_iid(237));

R7S72100_SCIF(5, 0xe8009800, gic_iid(241));

R7S72100_SCIF(6, 0xe800a000, gic_iid(245));

R7S72100_SCIF(7, 0xe800a800, gic_iid(249));



#define r7s72100_register_scif(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))





static struct resource mtu2_resources[] __initdata = {

	DEFINE_RES_MEM(0xfcff0000, 0x400),

	DEFINE_RES_IRQ_NAMED(gic_iid(139), "tgi0a"),
@@ -75,14 +40,6 @@ static struct resource mtu2_resources[] __initdata = { 


void __init r7s72100_add_dt_devices(void)

{

	r7s72100_register_scif(0);

	r7s72100_register_scif(1);

	r7s72100_register_scif(2);

	r7s72100_register_scif(3);

	r7s72100_register_scif(4);

	r7s72100_register_scif(5);

	r7s72100_register_scif(6);

	r7s72100_register_scif(7);

	r7s72100_register_mtu2();

}