Anubis: Change to using pata_platform driver for IDE Change from the (as yet un-submitted) simtec-ide driver to the pata_platform driver for the IDE ports on the Anubis. Signed-off-by: Ben Dooks diff -urpN -X linux-2.6.22-rc3/Documentation/dontdiff linux-2.6.22-rc3/arch/arm/mach-s3c2440/mach-anubis.c linux-2.6.22-rc3-pata/arch/arm/mach-s3c2440/mach-anubis.c --- linux-2.6.22-rc3/arch/arm/mach-s3c2440/mach-anubis.c 2007-05-27 18:54:18.000000000 +0100 +++ linux-2.6.22-rc3-pata/arch/arm/mach-s3c2440/mach-anubis.c 2007-05-28 13:38:11.000000000 +0100 @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -213,14 +214,18 @@ static struct s3c2410_platform_nand anub /* IDE channels */ +struct pata_platform_info anubis_ide_platdata = { + .ioport_shift = 5, +}; + static struct resource anubis_ide0_resource[] = { { .start = S3C2410_CS3, .end = S3C2410_CS3 + (8*32) - 1, .flags = IORESOURCE_MEM, }, { - .start = S3C2410_CS3 + (1<<26), - .end = S3C2410_CS3 + (1<<26) + (8*32) - 1, + .start = S3C2410_CS3 + (1<<26) + (6*32), + .end = S3C2410_CS3 + (1<<26) + (7*32) - 1, .flags = IORESOURCE_MEM, }, { .start = IRQ_IDE0, @@ -230,10 +235,14 @@ static struct resource anubis_ide0_resou }; static struct platform_device anubis_device_ide0 = { - .name = "simtec-ide", + .name = "pata_platform", .id = 0, .num_resources = ARRAY_SIZE(anubis_ide0_resource), .resource = anubis_ide0_resource, + .dev = { + .platform_data = &anubis_ide_platdata, + .coherent_dma_mask = ~0, + }, }; static struct resource anubis_ide1_resource[] = { @@ -242,8 +251,8 @@ static struct resource anubis_ide1_resou .end = S3C2410_CS4 + (8*32) - 1, .flags = IORESOURCE_MEM, }, { - .start = S3C2410_CS4 + (1<<26), - .end = S3C2410_CS4 + (1<<26) + (8*32) - 1, + .start = S3C2410_CS4 + (1<<26) + (6*32), + .end = S3C2410_CS4 + (1<<26) + (7*32) - 1, .flags = IORESOURCE_MEM, }, { .start = IRQ_IDE0, @@ -252,12 +261,15 @@ static struct resource anubis_ide1_resou }, }; - static struct platform_device anubis_device_ide1 = { - .name = "simtec-ide", + .name = "pata_platform", .id = 1, .num_resources = ARRAY_SIZE(anubis_ide1_resource), .resource = anubis_ide1_resource, + .dev = { + .platform_data = &anubis_ide_platdata, + .coherent_dma_mask = ~0, + }, }; /* Standard Anubis devices */