aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/magician_defconfig29
-rw-r--r--arch/arm/mach-pxa/magician.c6
2 files changed, 19 insertions, 16 deletions
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig
index 76960c71d890..b9b234bdb36d 100644
--- a/arch/arm/configs/magician_defconfig
+++ b/arch/arm/configs/magician_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc3 3# Linux kernel version: 2.6.24-rc6
4# Tue Nov 20 12:05:40 2007 4# Sat Dec 22 10:38:43 2007
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y 7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -461,7 +461,6 @@ CONFIG_MTD_CMDLINE_PARTS=y
461CONFIG_MTD_CHAR=m 461CONFIG_MTD_CHAR=m
462CONFIG_MTD_BLKDEVS=m 462CONFIG_MTD_BLKDEVS=m
463CONFIG_MTD_BLOCK=m 463CONFIG_MTD_BLOCK=m
464# CONFIG_MTD_BLOCK_RO is not set
465# CONFIG_FTL is not set 464# CONFIG_FTL is not set
466# CONFIG_NFTL is not set 465# CONFIG_NFTL is not set
467# CONFIG_INFTL is not set 466# CONFIG_INFTL is not set
@@ -472,9 +471,8 @@ CONFIG_MTD_BLOCK=m
472# 471#
473# RAM/ROM/Flash chip drivers 472# RAM/ROM/Flash chip drivers
474# 473#
475CONFIG_MTD_CFI=m 474CONFIG_MTD_CFI=y
476# CONFIG_MTD_JEDECPROBE is not set 475# CONFIG_MTD_JEDECPROBE is not set
477CONFIG_MTD_GEN_PROBE=m
478# CONFIG_MTD_CFI_ADV_OPTIONS is not set 476# CONFIG_MTD_CFI_ADV_OPTIONS is not set
479CONFIG_MTD_MAP_BANK_WIDTH_1=y 477CONFIG_MTD_MAP_BANK_WIDTH_1=y
480CONFIG_MTD_MAP_BANK_WIDTH_2=y 478CONFIG_MTD_MAP_BANK_WIDTH_2=y
@@ -486,10 +484,9 @@ CONFIG_MTD_CFI_I1=y
486CONFIG_MTD_CFI_I2=y 484CONFIG_MTD_CFI_I2=y
487# CONFIG_MTD_CFI_I4 is not set 485# CONFIG_MTD_CFI_I4 is not set
488# CONFIG_MTD_CFI_I8 is not set 486# CONFIG_MTD_CFI_I8 is not set
489CONFIG_MTD_CFI_INTELEXT=m 487CONFIG_MTD_CFI_INTELEXT=y
490# CONFIG_MTD_CFI_AMDSTD is not set 488# CONFIG_MTD_CFI_AMDSTD is not set
491# CONFIG_MTD_CFI_STAA is not set 489# CONFIG_MTD_CFI_STAA is not set
492CONFIG_MTD_CFI_UTIL=m
493# CONFIG_MTD_RAM is not set 490# CONFIG_MTD_RAM is not set
494# CONFIG_MTD_ROM is not set 491# CONFIG_MTD_ROM is not set
495# CONFIG_MTD_ABSENT is not set 492# CONFIG_MTD_ABSENT is not set
@@ -499,10 +496,10 @@ CONFIG_MTD_CFI_UTIL=m
499# Mapping drivers for chip access 496# Mapping drivers for chip access
500# 497#
501# CONFIG_MTD_COMPLEX_MAPPINGS is not set 498# CONFIG_MTD_COMPLEX_MAPPINGS is not set
502CONFIG_MTD_PHYSMAP=m 499CONFIG_MTD_PHYSMAP=y
503CONFIG_MTD_PHYSMAP_START=0x8000000 500CONFIG_MTD_PHYSMAP_START=0x00000000
504CONFIG_MTD_PHYSMAP_LEN=0x0 501CONFIG_MTD_PHYSMAP_LEN=0x04000000
505CONFIG_MTD_PHYSMAP_BANKWIDTH=2 502CONFIG_MTD_PHYSMAP_BANKWIDTH=4
506# CONFIG_MTD_PXA2XX is not set 503# CONFIG_MTD_PXA2XX is not set
507# CONFIG_MTD_ARM_INTEGRATOR is not set 504# CONFIG_MTD_ARM_INTEGRATOR is not set
508# CONFIG_MTD_SHARP_SL is not set 505# CONFIG_MTD_SHARP_SL is not set
@@ -951,7 +948,7 @@ CONFIG_TMPFS=y
951# CONFIG_BEFS_FS is not set 948# CONFIG_BEFS_FS is not set
952# CONFIG_BFS_FS is not set 949# CONFIG_BFS_FS is not set
953# CONFIG_EFS_FS is not set 950# CONFIG_EFS_FS is not set
954CONFIG_JFFS2_FS=m 951CONFIG_JFFS2_FS=y
955CONFIG_JFFS2_FS_DEBUG=0 952CONFIG_JFFS2_FS_DEBUG=0
956CONFIG_JFFS2_FS_WRITEBUFFER=y 953CONFIG_JFFS2_FS_WRITEBUFFER=y
957# CONFIG_JFFS2_FS_WBUF_VERIFY is not set 954# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
@@ -1142,10 +1139,10 @@ CONFIG_CRC_CCITT=y
1142CONFIG_CRC32=y 1139CONFIG_CRC32=y
1143# CONFIG_CRC7 is not set 1140# CONFIG_CRC7 is not set
1144# CONFIG_LIBCRC32C is not set 1141# CONFIG_LIBCRC32C is not set
1145CONFIG_ZLIB_INFLATE=m 1142CONFIG_ZLIB_INFLATE=y
1146CONFIG_ZLIB_DEFLATE=m 1143CONFIG_ZLIB_DEFLATE=y
1147CONFIG_LZO_COMPRESS=m 1144CONFIG_LZO_COMPRESS=y
1148CONFIG_LZO_DECOMPRESS=m 1145CONFIG_LZO_DECOMPRESS=y
1149CONFIG_PLIST=y 1146CONFIG_PLIST=y
1150CONFIG_HAS_IOMEM=y 1147CONFIG_HAS_IOMEM=y
1151CONFIG_HAS_IOPORT=y 1148CONFIG_HAS_IOPORT=y
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 3b7e8bac7344..159f6dc4543a 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -224,6 +224,11 @@ static struct pxaohci_platform_data magician_ohci_info = {
224 * StrataFlash 224 * StrataFlash
225 */ 225 */
226 226
227static void magician_set_vpp(struct map_info *map, int vpp)
228{
229 gpio_set_value(EGPIO_MAGICIAN_FLASH_VPP, vpp);
230}
231
227#define PXA_CS_SIZE 0x04000000 232#define PXA_CS_SIZE 0x04000000
228 233
229static struct resource strataflash_resource = { 234static struct resource strataflash_resource = {
@@ -234,6 +239,7 @@ static struct resource strataflash_resource = {
234 239
235static struct physmap_flash_data strataflash_data = { 240static struct physmap_flash_data strataflash_data = {
236 .width = 4, 241 .width = 4,
242 .set_vpp = magician_set_vpp,
237}; 243};
238 244
239static struct platform_device strataflash = { 245static struct platform_device strataflash = {