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

Commit f8b40d8c authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

sh: replace sh specific CONFIG_VOYAGERGX with CONFIG_MFD_SM501 



This patch replaces all instances of CONFIG_VOYAGERGX with
CONFIG_MFD_SM501. While at it we make sure the r2d code compiles
both with and without SM501.

Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 2eeec856

arch/sh/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ endif 


# Companion chips

core-$(CONFIG_HD6446X_SERIES)	+= arch/sh/cchips/hd6446x/

core-$(CONFIG_VOYAGERGX)	+= arch/sh/cchips/voyagergx/

core-$(CONFIG_MFD_SM501)	+= arch/sh/cchips/voyagergx/



cpuincdir-$(CONFIG_CPU_SH2)	:= cpu-sh2

cpuincdir-$(CONFIG_CPU_SH2A)	:= cpu-sh2a

arch/sh/boards/renesas/rts7751r2d/irq.c

+2 −0
Original line number Diff line number Diff line
@@ -153,5 +153,7 @@ void __init init_rts7751r2d_IRQ(void) 
	}



	register_intc_controller(d);

#ifdef CONFIG_MFD_SM501

	setup_voyagergx_irq();

#endif

}

arch/sh/boards/renesas/rts7751r2d/setup.c

+22 −17
Original line number Diff line number Diff line
@@ -73,6 +73,22 @@ static struct platform_device cf_ide_device = { 
	},

};



static struct resource heartbeat_resources[] = {

	[0] = {

		.start	= PA_OUTPORT,

		.end	= PA_OUTPORT + 8 - 1,

		.flags	= IORESOURCE_MEM,

	},

};



static struct platform_device heartbeat_device = {

	.name		= "heartbeat",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(heartbeat_resources),

	.resource	= heartbeat_resources,

};



#ifdef CONFIG_MFD_SM501

static struct plat_serial8250_port uart_platform_data[] = {

	{

		.membase	= (void __iomem *)VOYAGER_UART_BASE,
@@ -94,21 +110,6 @@ static struct platform_device uart_device = { 
	},

};



static struct resource heartbeat_resources[] = {

	[0] = {

		.start	= PA_OUTPORT,

		.end	= PA_OUTPORT + 8 - 1,

		.flags	= IORESOURCE_MEM,

	},

};



static struct platform_device heartbeat_device = {

	.name		= "heartbeat",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(heartbeat_resources),

	.resource	= heartbeat_resources,

};



static struct resource sm501_resources[] = {

	[0]	= {

		.start	= 0x10000000,
@@ -133,10 +134,14 @@ static struct platform_device sm501_device = { 
	.resource	= sm501_resources,

};



#endif /* CONFIG_MFD_SM501 */



static struct platform_device *rts7751r2d_devices[] __initdata = {

#ifdef CONFIG_MFD_SM501

	&uart_device,

	&heartbeat_device,

	&sm501_device,

#endif

	&heartbeat_device,

};



static int __init rts7751r2d_devices_setup(void)
@@ -187,7 +192,7 @@ static struct sh_machine_vector mv_rts7751r2d __initmv = { 
	.mv_init_irq		= init_rts7751r2d_IRQ,

	.mv_irq_demux		= rts7751r2d_irq_demux,



#ifdef CONFIG_USB_SM501

#if defined(CONFIG_MFD_SM501) && defined(CONFIG_USB_OHCI_HCD)

	.mv_consistent_alloc	= voyagergx_consistent_alloc,

	.mv_consistent_free	= voyagergx_consistent_free,

#endif

arch/sh/cchips/Kconfig

+0 −13
Original line number Diff line number Diff line 
menu "Companion Chips"



config VOYAGERGX

	bool "VoyagerGX chip support"

	depends on SH_RTS7751R2D

	help

	  Selecting this option will support Silicon Motion, Inc. SM501.

	  Designed to complement needs for the embedded industry, it

	  provides video and 2D capability. To reduce system cost a

	  wide variety of include I/O is supported, including analog RGB

	  and digital LCD Panel interface, 8-bit parallel interface, USB,

	  UART, IrDA, Zoom Video, AC97 or I2S, SSP, PWM, and I2C. There

	  are additional GPIO bits that can be used to interface to

	  external as well.



config HD6446X_SERIES

	bool