Skip to content

L
linux
Commit 2123e979 authored by Russell King's avatar Russell King
Browse files
Options

[MTD] sa1100: remove static partitioning information. 

Use partitioning information passed in via the platform device
instead.  This means that individual machine files in
arch/arm/mach-sa1100 can contain their partitioning information.
parent 6748bfdd
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 868 deletions
drivers/mtd/maps/sa1100-flash.c
View file @ 2123e979
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/sizes.h> #include <asm/sizes.h>
#include <asm/mach/flash.h>
#include <asm/arch/h3600.h> #include <asm/arch/h3600.h>
...@@ -31,160 +32,11 @@ ...@@ -31,160 +32,11 @@
#error This is for SA1100 architecture only #error This is for SA1100 architecture only
#endif #endif
#if 0
/* /*
* This isnt complete yet, so... * This is here for documentation purposes only - until these people
* submit their machine types. It will be gone January 2005.
*/ */
#define CONFIG_MTD_SA1100_STATICMAP 1
#ifdef CONFIG_MTD_SA1100_STATICMAP
/*
* Here are partition information for all known SA1100-based devices.
* See include/linux/mtd/partitions.h for definition of the mtd_partition
* structure.
*
* Please note:
* 1. We no longer support static flash mappings via the machine io_desc
* structure.
* 2. The flash size given should be the largest flash size that can
* be accommodated.
*
* The MTD layer will detect flash chip aliasing and reduce the size of
* the map accordingly.
*
* Please keep these in alphabetical order, and formatted as per existing
* entries. Thanks.
*/
#ifdef CONFIG_SA1100_ADSBITSY
static struct mtd_partition adsbitsy_partitions[] = {
{
.name = "bootROM",
.size = 0x80000,
.offset = 0,
.mask_flags = MTD_WRITEABLE, /* force read-only */
}, {
.name = "zImage",
.size = 0x100000,
.offset = MTDPART_OFS_APPEND,
.mask_flags = MTD_WRITEABLE, /* force read-only */
}, {
.name = "ramdisk.gz",
.size = 0x300000,
.offset = MTDPART_OFS_APPEND,
.mask_flags = MTD_WRITEABLE, /* force read-only */
}, {
.name = "User FS",
.size = MTDPART_SIZ_FULL,
.offset = MTDPART_OFS_APPEND,
}
};
#endif
#ifdef CONFIG_SA1100_ASSABET
/* Phase 4 Assabet has two 28F160B3 flash parts in bank 0: */
static struct mtd_partition assabet4_partitions[] = {
{
.name = "bootloader",
.size = 0x00020000,
.offset = 0,
.mask_flags = MTD_WRITEABLE,
}, {
.name = "bootloader params",
.size = 0x00020000,
.offset = MTDPART_OFS_APPEND,
.mask_flags = MTD_WRITEABLE,
}, {
.name = "jffs",
.size = MTDPART_SIZ_FULL,
.offset = MTDPART_OFS_APPEND,
}
};
/* Phase 5 Assabet has two 28F128J3A flash parts in bank 0: */
static struct mtd_partition assabet5_partitions[] = {
{
.name = "bootloader",
.size = 0x00040000,
.offset = 0,
.mask_flags = MTD_WRITEABLE,
}, {
.name = "bootloader params",
.size = 0x00040000,
.offset = MTDPART_OFS_APPEND,
.mask_flags = MTD_WRITEABLE,
}, {
.name = "jffs",
.size = MTDPART_SIZ_FULL,
.offset = MTDPART_OFS_APPEND,
}
};
#define assabet_partitions assabet5_partitions
#endif
#ifdef CONFIG_SA1100_BADGE4
/*
* 1 x Intel 28F320C3 Advanced+ Boot Block Flash (32 Mi bit)
* Eight 4 KiW Parameter Bottom Blocks (64 KiB)
* Sixty-three 32 KiW Main Blocks (4032 Ki b)
*
* <or>
*
* 1 x Intel 28F640C3 Advanced+ Boot Block Flash (64 Mi bit)
* Eight 4 KiW Parameter Bottom Blocks (64 KiB)
* One-hundred-twenty-seven 32 KiW Main Blocks (8128 Ki b)
*/
static struct mtd_partition badge4_partitions[] = {
{
.name = "BLOB boot loader",
.offset = 0,
.size = 0x0000A000
}, {
.name = "params",
.offset = MTDPART_OFS_APPEND,
.size = 0x00006000
}, {
.name = "root",
.offset = MTDPART_OFS_APPEND,
.size = MTDPART_SIZ_FULL
}
};
#endif
#ifdef CONFIG_SA1100_CERF
#ifdef CONFIG_SA1100_CERF_FLASH_32MB
# define CERF_FLASH_SIZE 0x02000000
#elif defined CONFIG_SA1100_CERF_FLASH_16MB
# define CERF_FLASH_SIZE 0x01000000
#elif defined CONFIG_SA1100_CERF_FLASH_8MB
# define CERF_FLASH_SIZE 0x00800000
#else
# error "Undefined flash size for CERF in sa1100-flash.c"
#endif
static struct mtd_partition cerf_partitions[] = {
{
.name = "Bootloader",
.size = 0x00020000,
.offset = 0x00000000,
}, {
.name = "Params",
.size = 0x00040000,
.offset = 0x00020000,
}, {
.name = "Kernel",
.size = 0x00100000,
.offset = 0x00060000,
}, {
.name = "Filesystem",
.size = CERF_FLASH_SIZE-0x00160000,
.offset = 0x00160000,
}
};
#endif
#ifdef CONFIG_SA1100_CONSUS
static struct mtd_partition consus_partitions[] = { static struct mtd_partition consus_partitions[] = {
{ {
.name = "Consus boot firmware", .name = "Consus boot firmware",
...@@ -219,108 +71,7 @@ static struct mtd_partition consus_partitions[] = { ...@@ -219,108 +71,7 @@ static struct mtd_partition consus_partitions[] = {
.mask_flags = 0, .mask_flags = 0,
} }
}; };
#endif
#ifdef CONFIG_SA1100_FLEXANET
/* Flexanet has two 28F128J3A flash parts in bank 0: */
#define FLEXANET_FLASH_SIZE 0x02000000
static struct mtd_partition flexanet_partitions[] = {
{
.name = "bootloader",
.size = 0x00040000,
.offset = 0,
.mask_flags = MTD_WRITEABLE,
}, {
.name = "bootloader params",
.size = 0x00040000,
.offset = MTDPART_OFS_APPEND,
.mask_flags = MTD_WRITEABLE,
}, {
.name = "kernel",
.size = 0x000C0000,
.offset = MTDPART_OFS_APPEND,
.mask_flags = MTD_WRITEABLE,
}, {
.name = "altkernel",
.size = 0x000C0000,
.offset = MTDPART_OFS_APPEND,
.mask_flags = MTD_WRITEABLE,
}, {
.name = "root",
.size = 0x00400000,
.offset = MTDPART_OFS_APPEND,
.mask_flags = MTD_WRITEABLE,
}, {
.name = "free1",
.size = 0x00300000,
.offset = MTDPART_OFS_APPEND,
.mask_flags = MTD_WRITEABLE,
}, {
.name = "free2",
.size = 0x00300000,
.offset = MTDPART_OFS_APPEND,
.mask_flags = MTD_WRITEABLE,
}, {
.name = "free3",
.size = MTDPART_SIZ_FULL,
.offset = MTDPART_OFS_APPEND,
.mask_flags = MTD_WRITEABLE,
}
};
#endif
#ifdef CONFIG_SA1100_FREEBIRD
static struct mtd_partition freebird_partitions[] = {
#ifdef CONFIG_SA1100_FREEBIRD_NEW
{
.name = "firmware",
.size = 0x00040000,
.offset = 0,
.mask_flags = MTD_WRITEABLE, /* force read-only */
}, {
.name = "kernel",
.size = 0x00080000,
.offset = 0x00040000,
}, {
.name = "params",
.size = 0x00040000,
.offset = 0x000C0000,
}, {
.name = "initrd",
.size = 0x00100000,
.offset = 0x00100000,
}, {
.name = "root cramfs",
.size = 0x00300000,
.offset = 0x00200000,
}, {
.name = "usr cramfs",
.size = 0x00C00000,
.offset = 0x00500000,
}, {
.name = "local",
.size = MTDPART_SIZ_FULL,
.offset = 0x01100000,
}
#else
{
.size = 0x00040000,
.offset = 0,
}, {
.size = 0x000c0000,
.offset = MTDPART_OFS_APPEND,
}, {
.size = 0x00400000,
.offset = MTDPART_OFS_APPEND,
}, {
.size = MTDPART_SIZ_FULL,
.offset = MTDPART_OFS_APPEND,
}
#endif
};
#endif
#ifdef CONFIG_SA1100_FRODO
/* Frodo has 2 x 16M 28F128J3A flash chips in bank 0: */ /* Frodo has 2 x 16M 28F128J3A flash chips in bank 0: */
static struct mtd_partition frodo_partitions[] = static struct mtd_partition frodo_partitions[] =
{ {
...@@ -350,153 +101,7 @@ static struct mtd_partition frodo_partitions[] = ...@@ -350,153 +101,7 @@ static struct mtd_partition frodo_partitions[] =
.offset = MTDPART_OFS_APPEND .offset = MTDPART_OFS_APPEND
} }
}; };
#endif
#ifdef CONFIG_SA1100_GRAPHICSCLIENT
static struct mtd_partition graphicsclient_partitions[] = {
{
.name = "zImage",
.size = 0x100000,
.offset = 0,
.mask_flags = MTD_WRITEABLE, /* force read-only */
}, {
.name = "ramdisk.gz",
.size = 0x300000,
.offset = MTDPART_OFS_APPEND,
.mask_flags = MTD_WRITEABLE, /* force read-only */
}, {
.name = "User FS",
.size = MTDPART_SIZ_FULL,
.offset = MTDPART_OFS_APPEND,
}
};
#endif
#ifdef CONFIG_SA1100_GRAPHICSMASTER
static struct mtd_partition graphicsmaster_partitions[] = {
{
.name = "zImage",
.size = 0x100000,
.offset = 0,
.mask_flags = MTD_WRITEABLE, /* force read-only */
},
{
.name = "ramdisk.gz",
.size = 0x300000,
.offset = MTDPART_OFS_APPEND,
.mask_flags = MTD_WRITEABLE, /* force read-only */
},
{
.name = "User FS",
.size = MTDPART_SIZ_FULL,
.offset = MTDPART_OFS_APPEND,
}
};
#endif
#ifdef CONFIG_SA1100_H3XXX
static struct mtd_partition h3xxx_partitions[] = {
{
.name = "H3XXX boot firmware",
.size = 0x00040000,
.offset = 0,
.mask_flags = MTD_WRITEABLE, /* force read-only */
}, {
#ifdef CONFIG_MTD_2PARTS_IPAQ
.name = "H3XXX root jffs2",
.size = MTDPART_SIZ_FULL,
.offset = 0x00040000,
#else
.name = "H3XXX kernel",
.size = 0x00080000,
.offset = 0x00040000,
}, {
.name = "H3XXX params",
.size = 0x00040000,
.offset = 0x000C0000,
}, {
#ifdef CONFIG_JFFS2_FS
.name = "H3XXX root jffs2",
.size = MTDPART_SIZ_FULL,
.offset = 0x00100000,
#else
.name = "H3XXX initrd",
.size = 0x00100000,
.offset = 0x00100000,
}, {
.name = "H3XXX root cramfs",
.size = 0x00300000,
.offset = 0x00200000,
}, {
.name = "H3XXX usr cramfs",
.size = 0x00800000,
.offset = 0x00500000,
}, {
.name = "H3XXX usr local",
.size = MTDPART_SIZ_FULL,
.offset = 0x00d00000,
#endif
#endif
}
};
static void h3xxx_set_vpp(struct map_info *map, int vpp)
{
assign_h3600_egpio(IPAQ_EGPIO_VPP_ON, vpp);
}
#else
#define h3xxx_set_vpp NULL
#endif
#ifdef CONFIG_SA1100_HACKKIT
static struct mtd_partition hackkit_partitions[] = {
{
.name = "BLOB",
.size = 0x00040000,
.offset = 0x00000000,
.mask_flags = MTD_WRITEABLE, /* force read-only */
}, {
.name = "config",
.size = 0x00040000,
.offset = MTDPART_OFS_APPEND,
}, {
.name = "kernel",
.size = 0x00100000,
.offset = MTDPART_OFS_APPEND,
}, {
.name = "initrd",
.size = 0x00180000,
.offset = MTDPART_OFS_APPEND,
}, {
.name = "rootfs",
.size = 0x700000,
.offset = MTDPART_OFS_APPEND,
}, {
.name = "data",
.size = MTDPART_SIZ_FULL,
.offset = MTDPART_OFS_APPEND,
}
};
#endif
#ifdef CONFIG_SA1100_HUW_WEBPANEL
static struct mtd_partition huw_webpanel_partitions[] = {
{
.name = "Loader",
.size = 0x00040000,
.offset = 0,
}, {
.name = "Sector 1",
.size = 0x00040000,
.offset = MTDPART_OFS_APPEND,
}, {
.size = MTDPART_SIZ_FULL,
.offset = MTDPART_OFS_APPEND,
}
};
#endif
#ifdef CONFIG_SA1100_JORNADA56X
static struct mtd_partition jornada56x_partitions[] = { static struct mtd_partition jornada56x_partitions[] = {
{ {
.name = "bootldr", .name = "bootldr",
...@@ -510,7 +115,7 @@ static struct mtd_partition jornada56x_partitions[] = { ...@@ -510,7 +115,7 @@ static struct mtd_partition jornada56x_partitions[] = {
} }
}; };
static void jornada56x_set_vpp(struct map_info *map, int vpp) static void jornada56x_set_vpp(int vpp)
{ {
if (vpp) if (vpp)
GPSR = GPIO_GPIO26; GPSR = GPIO_GPIO26;
...@@ -518,44 +123,25 @@ static void jornada56x_set_vpp(struct map_info *map, int vpp) ...@@ -518,44 +123,25 @@ static void jornada56x_set_vpp(struct map_info *map, int vpp)
GPCR = GPIO_GPIO26; GPCR = GPIO_GPIO26;
GPDR |= GPIO_GPIO26; GPDR |= GPIO_GPIO26;
} }
/*
* Machine Phys Size set_vpp
* Consus : SA1100_CS0_PHYS SZ_32M
* Frodo : SA1100_CS0_PHYS SZ_32M
* Jornada56x: SA1100_CS0_PHYS SZ_32M jornada56x_set_vpp
*/
#endif
#ifdef CONFIG_SA1100_H3XXX
static void h3xxx_set_vpp(struct map_info *map, int vpp)
{
assign_h3600_egpio(IPAQ_EGPIO_VPP_ON, vpp);
}
#else #else
#define jornada56x_set_vpp NULL #define h3xxx_set_vpp NULL
#endif #endif
#ifdef CONFIG_SA1100_JORNADA720 #ifdef CONFIG_SA1100_JORNADA720
static struct mtd_partition jornada720_partitions[] = {
{
.name = "JORNADA720 boot firmware",
.size = 0x00040000,
.offset = 0,
.mask_flags = MTD_WRITEABLE, /* force read-only */
}, {
.name = "JORNADA720 kernel",
.size = 0x000c0000,
.offset = 0x00040000,
}, {
.name = "JORNADA720 params",
.size = 0x00040000,
.offset = 0x00100000,
}, {
.name = "JORNADA720 initrd",
.size = 0x00100000,
.offset = 0x00140000,
}, {
.name = "JORNADA720 root cramfs",
.size = 0x00300000,
.offset = 0x00240000,
}, {
.name = "JORNADA720 usr cramfs",
.size = 0x00800000,
.offset = 0x00540000,
}, {
.name = "JORNADA720 usr local",
.size = 0, /* will expand to the end of the flash */
.offset = 0x00d00000,
}
};
static void jornada720_set_vpp(struct map_info *map, int vpp) static void jornada720_set_vpp(struct map_info *map, int vpp)
{ {
if (vpp) if (vpp)
...@@ -568,355 +154,9 @@ static void jornada720_set_vpp(struct map_info *map, int vpp) ...@@ -568,355 +154,9 @@ static void jornada720_set_vpp(struct map_info *map, int vpp)
#define jornada720_set_vpp NULL #define jornada720_set_vpp NULL
#endif #endif
#ifdef CONFIG_SA1100_PANGOLIN
static struct mtd_partition pangolin_partitions[] = {
{
.name = "boot firmware",
.size = 0x00080000,
.offset = 0x00000000,
.mask_flags = MTD_WRITEABLE, /* force read-only */
}, {
.name = "kernel",
.size = 0x00100000,
.offset = 0x00080000,
}, {
.name = "initrd",
.size = 0x00280000,
.offset = 0x00180000,
}, {
.name = "initrd-test",
.size = 0x03C00000,
.offset = 0x00400000,
}
};
#endif
#ifdef CONFIG_SA1100_PT_SYSTEM3
/* erase size is 0x40000 == 256k partitions have to have this boundary */
static struct mtd_partition system3_partitions[] = {
{
.name = "BLOB",
.size = 0x00040000,
.offset = 0x00000000,
.mask_flags = MTD_WRITEABLE, /* force read-only */
}, {
.name = "config",
.size = 0x00040000,
.offset = MTDPART_OFS_APPEND,
}, {
.name = "kernel",
.size = 0x00100000,
.offset = MTDPART_OFS_APPEND,
}, {
.name = "root",
.size = MTDPART_SIZ_FULL,
.offset = MTDPART_OFS_APPEND,
}
};
#endif
#ifdef CONFIG_SA1100_SHANNON
static struct mtd_partition shannon_partitions[] = {
{
.name = "BLOB boot loader",
.offset = 0,
.size = 0x20000
},
{
.name = "kernel",
.offset = MTDPART_OFS_APPEND,
.size = 0xe0000
},
{
.name = "initrd",
.offset = MTDPART_OFS_APPEND,
.size = MTDPART_SIZ_FULL
}
};
#endif
#ifdef CONFIG_SA1100_SHERMAN
static struct mtd_partition sherman_partitions[] = {
{
.size = 0x50000,
.offset = 0,
}, {
.size = 0x70000,
.offset = MTDPART_OFS_APPEND,
}, {
.size = 0x600000,
.offset = MTDPART_OFS_APPEND,
}, {
.size = 0xA0000,
.offset = MTDPART_OFS_APPEND,
}
};
#endif
#ifdef CONFIG_SA1100_SIMPAD
static struct mtd_partition simpad_partitions[] = {
{
.name = "SIMpad boot firmware",
.size = 0x00080000,
.offset = 0,
.mask_flags = MTD_WRITEABLE, /* force read-only */
}, {
.name = "SIMpad kernel",
.size = 0x00100000,
.offset = MTDPART_OFS_APPEND,
}, {
#ifdef CONFIG_ROOT_CRAMFS
.name = "SIMpad root cramfs",
.size =0x00D80000,
.offset = MTDPART_OFS_APPEND
}, {
.name = "SIMpad local jffs2",
.size = MTDPART_SIZ_FULL,
.offset = MTDPART_OFS_APPEND
#else
.name = "SIMpad root jffs2",
.size = MTDPART_SIZ_FULL,
.offset = MTDPART_OFS_APPEND
#endif
}
};
#endif /* CONFIG_SA1100_SIMPAD */
#ifdef CONFIG_SA1100_STORK
static struct mtd_partition stork_partitions[] = {
{
.name = "STORK boot firmware",
.size = 0x00040000,
.offset = 0,
.mask_flags = MTD_WRITEABLE, /* force read-only */
}, {
.name = "STORK params",
.size = 0x00040000,
.offset = 0x00040000,
}, {
.name = "STORK kernel",
.size = 0x00100000,
.offset = 0x00080000,
}, {
#ifdef CONFIG_JFFS2_FS
.name = "STORK root jffs2",
.offset = 0x00180000,
.size = MTDPART_SIZ_FULL,
#else
.name = "STORK initrd",
.size = 0x00100000,
.offset = 0x00180000,
}, {
.name = "STORK root cramfs",
.size = 0x00300000,
.offset = 0x00280000,
}, {
.name = "STORK usr cramfs",
.size = 0x00800000,
.offset = 0x00580000,
}, {
.name = "STORK usr local",
.offset = 0x00d80000,
.size = MTDPART_SIZ_FULL,
#endif
}
};
#endif
#ifdef CONFIG_SA1100_TRIZEPS
static struct mtd_partition trizeps_partitions[] = {
{
.name = "Bootloader",
.size = 0x00100000,
.offset = 0,
}, {
.name = "Kernel",
.size = 0x00100000,
.offset = MTDPART_OFS_APPEND,
}, {
.name = "root",
.size = MTDPART_SIZ_FULL,
.offset = MTDPART_OFS_APPEND,
}
};
#endif
#ifdef CONFIG_SA1100_YOPY
static struct mtd_partition yopy_partitions[] = {
{
.name = "boot firmware",
.size = 0x00040000,
.offset = 0x00000000,
.mask_flags = MTD_WRITEABLE, /* force read-only */
}, {
.name = "kernel",
.size = 0x00080000,
.offset = 0x00080000,
}, {
.name = "initrd",
.size = 0x00300000,
.offset = 0x00100000,
}, {
.name = "root",
.size = 0x01000000,
.offset = 0x00400000,
}
};
#endif
static int __init sa1100_static_partitions(struct mtd_partition **parts)
{
int nb_parts = 0;
#ifdef CONFIG_SA1100_ADSBITSY
if (machine_is_adsbitsy()) {
*parts = adsbitsy_partitions;
nb_parts = ARRAY_SIZE(adsbitsy_partitions);
}
#endif
#ifdef CONFIG_SA1100_ASSABET
if (machine_is_assabet()) {
*parts = assabet_partitions;
nb_parts = ARRAY_SIZE(assabet_partitions);
}
#endif
#ifdef CONFIG_SA1100_BADGE4
if (machine_is_badge4()) {
*parts = badge4_partitions;
nb_parts = ARRAY_SIZE(badge4_partitions);
}
#endif
#ifdef CONFIG_SA1100_CERF
if (machine_is_cerf()) {
*parts = cerf_partitions;
nb_parts = ARRAY_SIZE(cerf_partitions);
}
#endif
#ifdef CONFIG_SA1100_CONSUS
if (machine_is_consus()) {
*parts = consus_partitions;
nb_parts = ARRAY_SIZE(consus_partitions);
}
#endif
#ifdef CONFIG_SA1100_FLEXANET
if (machine_is_flexanet()) {
*parts = flexanet_partitions;
nb_parts = ARRAY_SIZE(flexanet_partitions);
}
#endif
#ifdef CONFIG_SA1100_FREEBIRD
if (machine_is_freebird()) {
*parts = freebird_partitions;
nb_parts = ARRAY_SIZE(freebird_partitions);
}
#endif
#ifdef CONFIG_SA1100_FRODO
if (machine_is_frodo()) {
*parts = frodo_partitions;
nb_parts = ARRAY_SIZE(frodo_partitions);
}
#endif
#ifdef CONFIG_SA1100_GRAPHICSCLIENT
if (machine_is_graphicsclient()) {
*parts = graphicsclient_partitions;
nb_parts = ARRAY_SIZE(graphicsclient_partitions);
}
#endif
#ifdef CONFIG_SA1100_GRAPHICSMASTER
if (machine_is_graphicsmaster()) {
*parts = graphicsmaster_partitions;
nb_parts = ARRAY_SIZE(graphicsmaster_partitions);
}
#endif
#ifdef CONFIG_SA1100_H3XXX
if (machine_is_h3xxx()) {
*parts = h3xxx_partitions;
nb_parts = ARRAY_SIZE(h3xxx_partitions);
}
#endif
#ifdef CONFIG_SA1100_HACKKIT
if (machine_is_hackkit()) {
*parts = hackkit_partitions;
nb_parts = ARRAY_SIZE(hackkit_partitions);
}
#endif
#ifdef CONFIG_SA1100_HUW_WEBPANEL
if (machine_is_huw_webpanel()) {
*parts = huw_webpanel_partitions;
nb_parts = ARRAY_SIZE(huw_webpanel_partitions);
}
#endif
#ifdef CONFIG_SA1100_JORNADA56X
if (machine_is_jornada56x()) {
*parts = jornada56x_partitions;
nb_parts = ARRAY_SIZE(jornada56x_partitions);
}
#endif
#ifdef CONFIG_SA1100_JORNADA720
if (machine_is_jornada720()) {
*parts = jornada720_partitions;
nb_parts = ARRAY_SIZE(jornada720_partitions);
}
#endif
#ifdef CONFIG_SA1100_PANGOLIN
if (machine_is_pangolin()) {
*parts = pangolin_partitions;
nb_parts = ARRAY_SIZE(pangolin_partitions);
}
#endif
#ifdef CONFIG_SA1100_PT_SYSTEM3
if (machine_is_pt_system3()) {
*parts = system3_partitions;
nb_parts = ARRAY_SIZE(system3_partitions);
}
#endif
#ifdef CONFIG_SA1100_SHANNON
if (machine_is_shannon()) {
*parts = shannon_partitions;
nb_parts = ARRAY_SIZE(shannon_partitions);
}
#endif
#ifdef CONFIG_SA1100_SHERMAN
if (machine_is_sherman()) {
*parts = sherman_partitions;
nb_parts = ARRAY_SIZE(sherman_partitions);
}
#endif
#ifdef CONFIG_SA1100_SIMPAD
if (machine_is_simpad()) {
*parts = simpad_partitions;
nb_parts = ARRAY_SIZE(simpad_partitions);
}
#endif
#ifdef CONFIG_SA1100_STORK
if (machine_is_stork()) {
*parts = stork_partitions;
nb_parts = ARRAY_SIZE(stork_partitions);
}
#endif
#ifdef CONFIG_SA1100_TRIZEPS
if (machine_is_trizeps()) {
*parts = trizeps_partitions;
nb_parts = ARRAY_SIZE(trizeps_partitions);
}
#endif
#ifdef CONFIG_SA1100_YOPY
if (machine_is_yopy()) {
*parts = yopy_partitions;
nb_parts = ARRAY_SIZE(yopy_partitions);
}
#endif
return nb_parts;
}
#endif
struct sa_subdev_info { struct sa_subdev_info {
unsigned long base; unsigned long base;
unsigned long size; unsigned long size;
int width;
void (*set_vpp)(struct map_info *, int); void (*set_vpp)(struct map_info *, int);
char name[16]; char name[16];
struct map_info map; struct map_info map;
...@@ -1096,174 +336,154 @@ static int __init sa1100_locate_flash(struct sa_info *info) ...@@ -1096,174 +336,154 @@ static int __init sa1100_locate_flash(struct sa_info *info)
int i, nr = -ENODEV; int i, nr = -ENODEV;
if (machine_is_adsbitsy()) { if (machine_is_adsbitsy()) {
info[0].base = SA1100_CS1_PHYS; info->subdev[0].base = SA1100_CS1_PHYS;
info[0].size = SZ_32M; info->subdev[0].size = SZ_32M;
nr = 1; nr = 1;
} }
if (machine_is_assabet()) { if (machine_is_assabet()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_32M; info->subdev[0].size = SZ_32M;
info[1].base = SA1100_CS1_PHYS; /* neponset */ info->subdev[1].base = SA1100_CS1_PHYS; /* neponset */
info[1].size = SZ_32M; info->subdev[1].size = SZ_32M;
nr = 2; nr = 2;
} }
if (machine_is_badge4()) { if (machine_is_badge4()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_64M; info->subdev[0].size = SZ_64M;
nr = 1; nr = 1;
} }
if (machine_is_cerf()) { if (machine_is_cerf()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_32M; info->subdev[0].size = SZ_32M;
nr = 1; nr = 1;
} }
if (machine_is_consus()) { if (machine_is_consus()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_32M; info->subdev[0].size = SZ_32M;
nr = 1; nr = 1;
} }
if (machine_is_flexanet()) { if (machine_is_flexanet()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_32M; info->subdev[0].size = SZ_32M;
nr = 1; nr = 1;
} }
if (machine_is_freebird()) { if (machine_is_freebird()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_32M; info->subdev[0].size = SZ_32M;
nr = 1; nr = 1;
} }
if (machine_is_frodo()) { if (machine_is_frodo()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_32M; info->subdev[0].size = SZ_32M;
nr = 1; nr = 1;
} }
if (machine_is_graphicsclient()) { if (machine_is_graphicsclient()) {
info[0].base = SA1100_CS1_PHYS; info->subdev[0].base = SA1100_CS1_PHYS;
info[0].size = SZ_32M; info->subdev[0].size = SZ_32M;
nr = 1; nr = 1;
} }
if (machine_is_graphicsmaster()) { if (machine_is_graphicsmaster()) {
info[0].base = SA1100_CS1_PHYS; info->subdev[0].base = SA1100_CS1_PHYS;
info[0].size = SZ_16M; info->subdev[0].size = SZ_16M;
nr = 1; nr = 1;
} }
if (machine_is_h3xxx()) { if (machine_is_h3xxx()) {
info[0].set_vpp = h3xxx_set_vpp; info->subdev[0].set_vpp = h3xxx_set_vpp;
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_32M; info->subdev[0].size = SZ_32M;
info->set_vpp = h3xxx_set_vpp;
nr = 1; nr = 1;
} }
if (machine_is_huw_webpanel()) { if (machine_is_huw_webpanel()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_16M; info->subdev[0].size = SZ_16M;
nr = 1; nr = 1;
} }
if (machine_is_itsy()) { if (machine_is_itsy()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_32M; info->subdev[0].size = SZ_32M;
nr = 1; nr = 1;
} }
if (machine_is_jornada56x()) { if (machine_is_jornada56x()) {
info[0].set_vpp = jornada56x_set_vpp; info->subdev[0].set_vpp = jornada56x_set_vpp;
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_32M; info->subdev[0].size = SZ_32M;
nr = 1; nr = 1;
} }
if (machine_is_jornada720()) { if (machine_is_jornada720()) {
info[0].set_vpp = jornada720_set_vpp; info->subdev[0].set_vpp = jornada720_set_vpp;
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_32M; info->subdev[0].size = SZ_32M;
info->set_vpp = jornada720_set_vpp;
nr = 1; nr = 1;
} }
if (machine_is_nanoengine()) { if (machine_is_nanoengine()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[1].size = SZ_32M; info->subdev[1].size = SZ_32M;
nr = 1; nr = 1;
} }
if (machine_is_pangolin()) { if (machine_is_pangolin()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_64M; info->subdev[0].size = SZ_64M;
nr = 1; nr = 1;
} }
if (machine_is_pfs168()) { if (machine_is_pfs168()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_32M; info->subdev[0].size = SZ_32M;
nr = 1; nr = 1;
} }
if (machine_is_pleb()) { if (machine_is_pleb()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_4M; info->subdev[0].size = SZ_4M;
info[1].base = SA1100_CS1_PHYS; info->subdev[1].base = SA1100_CS1_PHYS;
info[1].size = SZ_4M; info->subdev[1].size = SZ_4M;
nr = 2; nr = 2;
} }
if (machine_is_pt_system3()) { if (machine_is_pt_system3()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_16M; info->subdev[0].size = SZ_16M;
nr = 1; nr = 1;
} }
if (machine_is_shannon()) { if (machine_is_shannon()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_4M; info->subdev[0].size = SZ_4M;
nr = 1; nr = 1;
} }
if (machine_is_sherman()) { if (machine_is_sherman()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_32M; info->subdev[0].size = SZ_32M;
nr = 1; nr = 1;
} }
if (machine_is_simpad()) { if (machine_is_simpad()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_16M; info->subdev[0].size = SZ_16M;
info[1].base = SA1100_CS1_PHYS; info->subdev[1].base = SA1100_CS1_PHYS;
info[1].size = SZ_16M; info->subdev[1].size = SZ_16M;
nr = 2; nr = 2;
} }
if (machine_is_stork()) { if (machine_is_stork()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_32M; info->subdev[0].size = SZ_32M;
nr = 1; nr = 1;
} }
if (machine_is_trizeps()) { if (machine_is_trizeps()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_16M; info->subdev[0].size = SZ_16M;
nr = 1; nr = 1;
} }
if (machine_is_victor()) { if (machine_is_victor()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_2M; info->subdev[0].size = SZ_2M;
nr = 1; nr = 1;
} }
if (machine_is_yopy()) { if (machine_is_yopy()) {
info[0].base = SA1100_CS0_PHYS; info->subdev[0].base = SA1100_CS0_PHYS;
info[0].size = SZ_64M; info->subdev[0].size = SZ_64M;
info[1].base = SA1100_CS1_PHYS; info->subdev[1].base = SA1100_CS1_PHYS;
info[1].size = SZ_64M; info->subdev[1].size = SZ_64M;
nr = 2; nr = 2;
} }
if (nr < 0)
return nr;
/*
* Retrieve the bankwidth from the MSC registers.
* We currently only implement CS0 and CS1 here.
*/
for (i = 0; i < nr; i++) {
switch (info[i].base) {
default:
printk(KERN_WARNING "SA1100 flash: unknown base address "
"0x%08lx, assuming CS0\n", info[i].base);
case SA1100_CS0_PHYS:
info[i].width = (MSC0 & MSC_RBW) ? 2 : 4;
break;
case SA1100_CS1_PHYS:
info[i].width = ((MSC0 >> 16) & MSC_RBW) ? 2 : 4;
break;
}
}
return nr; return nr;
} }
...@@ -1273,12 +493,17 @@ static struct sa_info sa_info; ...@@ -1273,12 +493,17 @@ static struct sa_info sa_info;
static int __init sa1100_mtd_probe(struct device *dev) static int __init sa1100_mtd_probe(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev);
struct flash_platform_data *flash = pdev->dev.platform_data;
struct mtd_partition *parts; struct mtd_partition *parts;
const char *part_type = NULL; const char *part_type = NULL;
struct sa_info *info = &sa_info; struct sa_info *info = &sa_info;
int err, nr_parts = 0; int err, nr_parts = 0;
int nr; int nr;
if (!flash)
return -ENODEV;
nr = sa1100_locate_flash(info); nr = sa1100_locate_flash(info);
if (nr < 0) if (nr < 0)
return nr; return nr;
...@@ -1298,7 +523,8 @@ static int __init sa1100_mtd_probe(struct device *dev) ...@@ -1298,7 +523,8 @@ static int __init sa1100_mtd_probe(struct device *dev)
} else } else
#endif #endif
{ {
nr_parts = sa1100_static_partitions(&parts); parts = flash->parts;
nr_parts = flash->nr_parts;
part_type = "static"; part_type = "static";
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7