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

Commit b7a12d19 authored by Ben Dooks's avatar Ben Dooks
Browse files

[ARM] BAST/VR1000: Move to using ata_platform (libata) 



Use the pata_platform driver to provide the IDE port
drivers on the Simntec BAST and Thorcom VR1000 machines
as a precursor to removing drivers/ide/arm/bast-ide.c

This will mean that the system will need SCSI and SCSI disc
support as a minimum, and any references to hdX will be
changed to sdX.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent dd1086f4

arch/arm/mach-s3c2410/Kconfig

+8 −1
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ config S3C2410_CLOCK 
	help

	  Clock code for the S3C2410, and similar processors



config MACH_BAST_IDE

	bool

	select HAVE_PATA_PLATFORM

	help

	  Internal node for machines with an BAST style IDE

	  interface



menu "S3C2410 Machines"
@@ -70,6 +76,7 @@ config ARCH_BAST 
	bool "Simtec Electronics BAST (EB2410ITX)"

	select CPU_S3C2410

	select PM_SIMTEC if PM

	select MACH_BAST_IDE

	select ISA

	help

	  Say Y here if you are using the Simtec Electronics EB2410ITX
@@ -107,6 +114,7 @@ config MACH_TCT_HAMMER 
config MACH_VR1000

	bool "Thorcom VR1000"

	select PM_SIMTEC if PM

	select MACH_BAST_IDE

	select CPU_S3C2410

	help

	  Say Y here if you are using the Thorcom VR1000 board.
@@ -118,4 +126,3 @@ config MACH_QT2410 
	   Say Y here if you are using the Armzone QT2410



endmenu

arch/arm/mach-s3c2410/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -30,3 +30,7 @@ obj-$(CONFIG_BAST_PC104_IRQ) += bast-irq.o 
obj-$(CONFIG_MACH_TCT_HAMMER)	+= mach-tct_hammer.o

obj-$(CONFIG_MACH_VR1000)	+= mach-vr1000.o usb-simtec.o

obj-$(CONFIG_MACH_QT2410)	+= mach-qt2410.o



# machine additions



obj-$(CONFIG_MACH_BAST_IDE)	+= bast-ide.o

arch/arm/mach-s3c2410/bast-ide.c

0 → 100644
+112 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s3c2410/bast-ide.c

 *

 * Copyright 2007 Simtec Electronics

 *	http://www.simtec.co.uk/products/EB2410ITX/

 *	http://armlinux.simtec.co.uk/

 *	Ben Dooks <ben@simtec.co.uk>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/init.h>

#include <linux/interrupt.h>



#include <linux/platform_device.h>

#include <linux/ata_platform.h>



#include <asm/mach-types.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/irq.h>



#include <asm/arch/map.h>

#include <asm/arch/bast-map.h>

#include <asm/arch/bast-irq.h>



/* IDE ports */



static struct pata_platform_info bast_ide_platdata = {

	.ioport_shift	= 5,

};



#define IDE_CS	S3C2410_CS5



static struct resource bast_ide0_resource[] = {

	[0]	= {

		.start	= IDE_CS + BAST_PA_IDEPRI,

		.end	= IDE_CS + BAST_PA_IDEPRI + (8 * 0x20) - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1]	= {

		.start	= IDE_CS + BAST_PA_IDEPRIAUX + (6 * 0x20) ,

		.end	= IDE_CS + BAST_PA_IDEPRIAUX + (7 * 0x20) - 1,

		.flags	= IORESOURCE_MEM,

	},

	[2]	= {

		.start	= IRQ_IDE0,

		.end	= IRQ_IDE0,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device bast_device_ide0 = {

	.name		= "pata_platform",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(bast_ide0_resource),

	.resource	= bast_ide0_resource,

	.dev		= {

		.platform_data = &bast_ide_platdata,

		.coherent_dma_mask = ~0,

	}



};



static struct resource bast_ide1_resource[] = {

	[0]	= {

		.start	= IDE_CS + BAST_PA_IDESEC,

		.end	= IDE_CS + BAST_PA_IDESEC + (8 * 0x20) - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1]	= {

		.start	= IDE_CS + BAST_PA_IDESECAUX + (6 * 0x20),

		.end	= IDE_CS + BAST_PA_IDESECAUX + (7 * 0x20) - 1,

		.flags	= IORESOURCE_MEM,

	},

	[2]	= {

		.start	= IRQ_IDE1,

		.end	= IRQ_IDE1,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device bast_device_ide1 = {

	.name		= "pata_platform",

	.id		= 1,

	.num_resources	= ARRAY_SIZE(bast_ide1_resource),

	.resource	= bast_ide1_resource,

	.dev		= {

		.platform_data = &bast_ide_platdata,

		.coherent_dma_mask = ~0,

	}

};



static struct platform_device *bast_ide_devices[] __initdata = {

	&bast_device_ide0,

	&bast_device_ide1,

};



static __init int bast_ide_init(void)

{

	if (machine_is_bast() || machine_is_vr1000())

		return platform_add_devices(bast_ide_devices,

					    ARRAY_SIZE(bast_ide_devices));



	return 0;

}



fs_initcall(bast_ide_init);

arch/arm/mach-s3c2410/mach-bast.c

+2 −16
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/serial_core.h>

#include <linux/platform_device.h>

#include <linux/dm9000.h>

#include <linux/ata_platform.h>



#include <net/ax88796.h>
@@ -134,37 +135,21 @@ static struct map_desc bast_iodesc[] __initdata = { 
  { VA_C2(BAST_VA_ISAIO),   PA_CS2(BAST_PA_ISAIO),    SZ_16M, MT_DEVICE },

  { VA_C2(BAST_VA_ISAMEM),  PA_CS2(BAST_PA_ISAMEM),   SZ_16M, MT_DEVICE },

  { VA_C2(BAST_VA_SUPERIO), PA_CS2(BAST_PA_SUPERIO),  SZ_1M,  MT_DEVICE },

  { VA_C2(BAST_VA_IDEPRI),  PA_CS3(BAST_PA_IDEPRI),   SZ_1M,  MT_DEVICE },

  { VA_C2(BAST_VA_IDESEC),  PA_CS3(BAST_PA_IDESEC),   SZ_1M,  MT_DEVICE },

  { VA_C2(BAST_VA_IDEPRIAUX), PA_CS3(BAST_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },

  { VA_C2(BAST_VA_IDESECAUX), PA_CS3(BAST_PA_IDESECAUX), SZ_1M, MT_DEVICE },



  /* slow, word */

  { VA_C3(BAST_VA_ISAIO),   PA_CS3(BAST_PA_ISAIO),    SZ_16M, MT_DEVICE },

  { VA_C3(BAST_VA_ISAMEM),  PA_CS3(BAST_PA_ISAMEM),   SZ_16M, MT_DEVICE },

  { VA_C3(BAST_VA_SUPERIO), PA_CS3(BAST_PA_SUPERIO),  SZ_1M,  MT_DEVICE },

  { VA_C3(BAST_VA_IDEPRI),  PA_CS3(BAST_PA_IDEPRI),   SZ_1M,  MT_DEVICE },

  { VA_C3(BAST_VA_IDESEC),  PA_CS3(BAST_PA_IDESEC),   SZ_1M,  MT_DEVICE },

  { VA_C3(BAST_VA_IDEPRIAUX), PA_CS3(BAST_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },

  { VA_C3(BAST_VA_IDESECAUX), PA_CS3(BAST_PA_IDESECAUX), SZ_1M, MT_DEVICE },



  /* fast, byte */

  { VA_C4(BAST_VA_ISAIO),   PA_CS4(BAST_PA_ISAIO),    SZ_16M, MT_DEVICE },

  { VA_C4(BAST_VA_ISAMEM),  PA_CS4(BAST_PA_ISAMEM),   SZ_16M, MT_DEVICE },

  { VA_C4(BAST_VA_SUPERIO), PA_CS4(BAST_PA_SUPERIO),  SZ_1M,  MT_DEVICE },

  { VA_C4(BAST_VA_IDEPRI),  PA_CS5(BAST_PA_IDEPRI),   SZ_1M,  MT_DEVICE },

  { VA_C4(BAST_VA_IDESEC),  PA_CS5(BAST_PA_IDESEC),   SZ_1M,  MT_DEVICE },

  { VA_C4(BAST_VA_IDEPRIAUX), PA_CS5(BAST_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },

  { VA_C4(BAST_VA_IDESECAUX), PA_CS5(BAST_PA_IDESECAUX), SZ_1M, MT_DEVICE },



  /* fast, word */

  { VA_C5(BAST_VA_ISAIO),   PA_CS5(BAST_PA_ISAIO),    SZ_16M, MT_DEVICE },

  { VA_C5(BAST_VA_ISAMEM),  PA_CS5(BAST_PA_ISAMEM),   SZ_16M, MT_DEVICE },

  { VA_C5(BAST_VA_SUPERIO), PA_CS5(BAST_PA_SUPERIO),  SZ_1M,  MT_DEVICE },

  { VA_C5(BAST_VA_IDEPRI),  PA_CS5(BAST_PA_IDEPRI),   SZ_1M,  MT_DEVICE },

  { VA_C5(BAST_VA_IDESEC),  PA_CS5(BAST_PA_IDESEC),   SZ_1M,  MT_DEVICE },

  { VA_C5(BAST_VA_IDEPRIAUX), PA_CS5(BAST_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },

  { VA_C5(BAST_VA_IDESECAUX), PA_CS5(BAST_PA_IDESECAUX), SZ_1M, MT_DEVICE },

};



#define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK
@@ -564,6 +549,7 @@ static struct s3c2410fb_mach_info __initdata bast_fb_info = { 
	.default_display = 1,

};





/* Standard BAST devices */



static struct platform_device *bast_devices[] __initdata = {

arch/arm/mach-s3c2410/mach-vr1000.c

+0 −28
Original line number Diff line number Diff line
@@ -97,34 +97,6 @@ static struct map_desc vr1000_iodesc[] __initdata = { 
	  .length	= SZ_1M,

	  .type		= MT_DEVICE,

  },



  /* peripheral space... one for each of fast/slow/byte/16bit */

  /* note, ide is only decoded in word space, even though some registers

   * are only 8bit */



  /* slow, byte */

  { VA_C2(VR1000_VA_IDEPRI),  PA_CS3(VR1000_PA_IDEPRI),	  SZ_1M,  MT_DEVICE },

  { VA_C2(VR1000_VA_IDESEC),  PA_CS3(VR1000_PA_IDESEC),	  SZ_1M,  MT_DEVICE },

  { VA_C2(VR1000_VA_IDEPRIAUX), PA_CS3(VR1000_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },

  { VA_C2(VR1000_VA_IDESECAUX), PA_CS3(VR1000_PA_IDESECAUX), SZ_1M, MT_DEVICE },



  /* slow, word */

  { VA_C3(VR1000_VA_IDEPRI),  PA_CS3(VR1000_PA_IDEPRI),	  SZ_1M,  MT_DEVICE },

  { VA_C3(VR1000_VA_IDESEC),  PA_CS3(VR1000_PA_IDESEC),	  SZ_1M,  MT_DEVICE },

  { VA_C3(VR1000_VA_IDEPRIAUX), PA_CS3(VR1000_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },

  { VA_C3(VR1000_VA_IDESECAUX), PA_CS3(VR1000_PA_IDESECAUX), SZ_1M, MT_DEVICE },



  /* fast, byte */

  { VA_C4(VR1000_VA_IDEPRI),  PA_CS5(VR1000_PA_IDEPRI),	  SZ_1M,  MT_DEVICE },

  { VA_C4(VR1000_VA_IDESEC),  PA_CS5(VR1000_PA_IDESEC),	  SZ_1M,  MT_DEVICE },

  { VA_C4(VR1000_VA_IDEPRIAUX), PA_CS5(VR1000_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },

  { VA_C4(VR1000_VA_IDESECAUX), PA_CS5(VR1000_PA_IDESECAUX), SZ_1M, MT_DEVICE },



  /* fast, word */

  { VA_C5(VR1000_VA_IDEPRI),  PA_CS5(VR1000_PA_IDEPRI),	  SZ_1M,  MT_DEVICE },

  { VA_C5(VR1000_VA_IDESEC),  PA_CS5(VR1000_PA_IDESEC),	  SZ_1M,  MT_DEVICE },

  { VA_C5(VR1000_VA_IDEPRIAUX), PA_CS5(VR1000_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },

  { VA_C5(VR1000_VA_IDESECAUX), PA_CS5(VR1000_PA_IDESECAUX), SZ_1M, MT_DEVICE },

};



#define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK