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

Commit 43f4b8c7 authored by Aoi Shinkai's avatar Aoi Shinkai Committed by Paul Mundt
Browse files

sh: rts7751r2d cf_ide rework 



Support CF IDE on R2D-1 boards.

Signed-off-by: default avatarAoi Shinkai <shinkoi2005@gmail.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent d04a0f79

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

+33 −12
Original line number Original line Diff line number Diff line
@@ -45,12 +45,12 @@ static void __init voyagergx_serial_init(void) 
static struct resource cf_ide_resources[] = {

static struct resource cf_ide_resources[] = {

	[0] = {

	[0] = {

		.start	= PA_AREA5_IO + 0x1000,

		.start	= PA_AREA5_IO + 0x1000,

		.end	= PA_AREA5_IO + 0x1000 + 0x08 - 1,

		.end	= PA_AREA5_IO + 0x1000 + 0x10 - 0x2,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,

	},

	},

	[1] = {

	[1] = {

		.start	= PA_AREA5_IO + 0x80c,

		.start	= PA_AREA5_IO + 0x80c,

		.end	= PA_AREA5_IO + 0x80c + 0x16 - 1,

		.end	= PA_AREA5_IO + 0x80c,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,

	},

	},

	[2] = {

	[2] = {
@@ -141,19 +141,12 @@ static struct platform_device *rts7751r2d_devices[] __initdata = { 
	&uart_device,

	&uart_device,

	&sm501_device,

	&sm501_device,

#endif

#endif

	&cf_ide_device,

	&heartbeat_device,

	&heartbeat_device,

};

};





static int __init rts7751r2d_devices_setup(void)

static int __init rts7751r2d_devices_setup(void)

{

{

	int ret;



	if (ctrl_inw(PA_BVERREG) == 0x10) { /* R2D-PLUS */

		ret = platform_device_register(&cf_ide_device);

		if (ret)

			return ret;

	}



	return platform_add_devices(rts7751r2d_devices,

	return platform_add_devices(rts7751r2d_devices,

				    ARRAY_SIZE(rts7751r2d_devices));

				    ARRAY_SIZE(rts7751r2d_devices));

}

}
@@ -164,6 +157,34 @@ static void rts7751r2d_power_off(void) 
	ctrl_outw(0x0001, PA_POWOFF);

	ctrl_outw(0x0001, PA_POWOFF);

}

}





static inline unsigned char is_ide_ioaddr(unsigned long addr)

{

	return ((cf_ide_resources[0].start <= addr &&

		 addr <= cf_ide_resources[0].end) ||

		(cf_ide_resources[1].start <= addr &&

		 addr <= cf_ide_resources[1].end));

}



static void rts7751r2d_writeb(u8 b, void __iomem *addr)

{

	unsigned long tmp = (unsigned long __force)addr;



	if (is_ide_ioaddr(tmp))

		ctrl_outw((u16)b, tmp);

	else

		ctrl_outb(b, tmp);

}



static u8 rts7751r2d_readb(void __iomem *addr)

{

	unsigned long tmp = (unsigned long __force)addr;



	if (is_ide_ioaddr(tmp))

		return ctrl_inw(tmp) & 0xff;

	else

		return ctrl_inb(tmp);

}



/*

/*

 * Initialize the board

 * Initialize the board

 */

 */
@@ -188,10 +209,10 @@ static void __init rts7751r2d_setup(char **cmdline_p) 
static struct sh_machine_vector mv_rts7751r2d __initmv = {

static struct sh_machine_vector mv_rts7751r2d __initmv = {

	.mv_name		= "RTS7751R2D",

	.mv_name		= "RTS7751R2D",

	.mv_setup		= rts7751r2d_setup,

	.mv_setup		= rts7751r2d_setup,



	.mv_init_irq		= init_rts7751r2d_IRQ,

	.mv_init_irq		= init_rts7751r2d_IRQ,

	.mv_irq_demux		= rts7751r2d_irq_demux,

	.mv_irq_demux		= rts7751r2d_irq_demux,



	.mv_writeb		= rts7751r2d_writeb,

	.mv_readb		= rts7751r2d_readb,

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

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

	.mv_consistent_alloc	= voyagergx_consistent_alloc,

	.mv_consistent_alloc	= voyagergx_consistent_alloc,

	.mv_consistent_free	= voyagergx_consistent_free,

	.mv_consistent_free	= voyagergx_consistent_free,