diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx51.dtsi | 7 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx53.dtsi | 7 | ||||
| -rw-r--r-- | arch/arm/configs/cam60_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/corgi_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/ep93xx_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/mini2440_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/mv78xx0_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/nhk8815_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/orion5x_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/pxa3xx_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/spitz_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-clps711x/autcpu12.c | 19 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clk-imx51-imx53.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/devices/platform-mxc_nand.c | 11 | ||||
| -rw-r--r-- | arch/blackfin/configs/BF561-ACVILON_defconfig | 1 | ||||
| -rw-r--r-- | arch/mips/configs/rb532_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/mpc83xx_defconfig | 1 |
19 files changed, 40 insertions, 20 deletions
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index 2f71a91ca98e..75d069fcf897 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi | |||
| @@ -407,6 +407,13 @@ | |||
| 407 | status = "disabled"; | 407 | status = "disabled"; |
| 408 | }; | 408 | }; |
| 409 | 409 | ||
| 410 | nand@83fdb000 { | ||
| 411 | compatible = "fsl,imx51-nand"; | ||
| 412 | reg = <0x83fdb000 0x1000 0xcfff0000 0x10000>; | ||
| 413 | interrupts = <8>; | ||
| 414 | status = "disabled"; | ||
| 415 | }; | ||
| 416 | |||
| 410 | ssi3: ssi@83fe8000 { | 417 | ssi3: ssi@83fe8000 { |
| 411 | compatible = "fsl,imx51-ssi", "fsl,imx21-ssi"; | 418 | compatible = "fsl,imx51-ssi", "fsl,imx21-ssi"; |
| 412 | reg = <0x83fe8000 0x4000>; | 419 | reg = <0x83fe8000 0x4000>; |
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi index 221cf3321b0a..76ebb1ad2675 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.dtsi | |||
| @@ -518,6 +518,13 @@ | |||
| 518 | status = "disabled"; | 518 | status = "disabled"; |
| 519 | }; | 519 | }; |
| 520 | 520 | ||
| 521 | nand@63fdb000 { | ||
| 522 | compatible = "fsl,imx53-nand"; | ||
| 523 | reg = <0x63fdb000 0x1000 0xf7ff0000 0x10000>; | ||
| 524 | interrupts = <8>; | ||
| 525 | status = "disabled"; | ||
| 526 | }; | ||
| 527 | |||
| 521 | ssi3: ssi@63fe8000 { | 528 | ssi3: ssi@63fe8000 { |
| 522 | compatible = "fsl,imx53-ssi", "fsl,imx21-ssi"; | 529 | compatible = "fsl,imx53-ssi", "fsl,imx21-ssi"; |
| 523 | reg = <0x63fe8000 0x4000>; | 530 | reg = <0x63fe8000 0x4000>; |
diff --git a/arch/arm/configs/cam60_defconfig b/arch/arm/configs/cam60_defconfig index cedc92ef88ab..14579711d8fc 100644 --- a/arch/arm/configs/cam60_defconfig +++ b/arch/arm/configs/cam60_defconfig | |||
| @@ -49,7 +49,6 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y | |||
| 49 | CONFIG_MTD_PLATRAM=m | 49 | CONFIG_MTD_PLATRAM=m |
| 50 | CONFIG_MTD_DATAFLASH=y | 50 | CONFIG_MTD_DATAFLASH=y |
| 51 | CONFIG_MTD_NAND=y | 51 | CONFIG_MTD_NAND=y |
| 52 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 53 | CONFIG_MTD_NAND_ATMEL=y | 52 | CONFIG_MTD_NAND_ATMEL=y |
| 54 | CONFIG_BLK_DEV_LOOP=y | 53 | CONFIG_BLK_DEV_LOOP=y |
| 55 | CONFIG_BLK_DEV_RAM=y | 54 | CONFIG_BLK_DEV_RAM=y |
diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig index e53c47563845..4b8a25d9e686 100644 --- a/arch/arm/configs/corgi_defconfig +++ b/arch/arm/configs/corgi_defconfig | |||
| @@ -97,7 +97,6 @@ CONFIG_MTD_BLOCK=y | |||
| 97 | CONFIG_MTD_ROM=y | 97 | CONFIG_MTD_ROM=y |
| 98 | CONFIG_MTD_COMPLEX_MAPPINGS=y | 98 | CONFIG_MTD_COMPLEX_MAPPINGS=y |
| 99 | CONFIG_MTD_NAND=y | 99 | CONFIG_MTD_NAND=y |
| 100 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 101 | CONFIG_MTD_NAND_SHARPSL=y | 100 | CONFIG_MTD_NAND_SHARPSL=y |
| 102 | CONFIG_BLK_DEV_LOOP=y | 101 | CONFIG_BLK_DEV_LOOP=y |
| 103 | CONFIG_IDE=y | 102 | CONFIG_IDE=y |
diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig index 8e97b2f7ceec..806005a4c4c1 100644 --- a/arch/arm/configs/ep93xx_defconfig +++ b/arch/arm/configs/ep93xx_defconfig | |||
| @@ -61,7 +61,6 @@ CONFIG_MTD_CFI_STAA=y | |||
| 61 | CONFIG_MTD_ROM=y | 61 | CONFIG_MTD_ROM=y |
| 62 | CONFIG_MTD_PHYSMAP=y | 62 | CONFIG_MTD_PHYSMAP=y |
| 63 | CONFIG_MTD_NAND=y | 63 | CONFIG_MTD_NAND=y |
| 64 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 65 | CONFIG_BLK_DEV_NBD=y | 64 | CONFIG_BLK_DEV_NBD=y |
| 66 | CONFIG_EEPROM_LEGACY=y | 65 | CONFIG_EEPROM_LEGACY=y |
| 67 | CONFIG_SCSI=y | 66 | CONFIG_SCSI=y |
diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig index 082175c54e7c..00630e6af45c 100644 --- a/arch/arm/configs/mini2440_defconfig +++ b/arch/arm/configs/mini2440_defconfig | |||
| @@ -102,7 +102,6 @@ CONFIG_MTD_CFI_STAA=y | |||
| 102 | CONFIG_MTD_RAM=y | 102 | CONFIG_MTD_RAM=y |
| 103 | CONFIG_MTD_ROM=y | 103 | CONFIG_MTD_ROM=y |
| 104 | CONFIG_MTD_NAND=y | 104 | CONFIG_MTD_NAND=y |
| 105 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 106 | CONFIG_MTD_NAND_S3C2410=y | 105 | CONFIG_MTD_NAND_S3C2410=y |
| 107 | CONFIG_MTD_NAND_PLATFORM=y | 106 | CONFIG_MTD_NAND_PLATFORM=y |
| 108 | CONFIG_MTD_LPDDR=y | 107 | CONFIG_MTD_LPDDR=y |
diff --git a/arch/arm/configs/mv78xx0_defconfig b/arch/arm/configs/mv78xx0_defconfig index 7305ebddb510..1f08219c1b3c 100644 --- a/arch/arm/configs/mv78xx0_defconfig +++ b/arch/arm/configs/mv78xx0_defconfig | |||
| @@ -49,7 +49,6 @@ CONFIG_MTD_CFI_INTELEXT=y | |||
| 49 | CONFIG_MTD_CFI_AMDSTD=y | 49 | CONFIG_MTD_CFI_AMDSTD=y |
| 50 | CONFIG_MTD_PHYSMAP=y | 50 | CONFIG_MTD_PHYSMAP=y |
| 51 | CONFIG_MTD_NAND=y | 51 | CONFIG_MTD_NAND=y |
| 52 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 53 | CONFIG_MTD_NAND_ORION=y | 52 | CONFIG_MTD_NAND_ORION=y |
| 54 | CONFIG_BLK_DEV_LOOP=y | 53 | CONFIG_BLK_DEV_LOOP=y |
| 55 | # CONFIG_SCSI_PROC_FS is not set | 54 | # CONFIG_SCSI_PROC_FS is not set |
diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig index bf123c5384d4..240b25eea565 100644 --- a/arch/arm/configs/nhk8815_defconfig +++ b/arch/arm/configs/nhk8815_defconfig | |||
| @@ -57,7 +57,6 @@ CONFIG_MTD_CHAR=y | |||
| 57 | CONFIG_MTD_BLOCK=y | 57 | CONFIG_MTD_BLOCK=y |
| 58 | CONFIG_MTD_NAND=y | 58 | CONFIG_MTD_NAND=y |
| 59 | CONFIG_MTD_NAND_ECC_SMC=y | 59 | CONFIG_MTD_NAND_ECC_SMC=y |
| 60 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 61 | CONFIG_MTD_NAND_NOMADIK=y | 60 | CONFIG_MTD_NAND_NOMADIK=y |
| 62 | CONFIG_MTD_ONENAND=y | 61 | CONFIG_MTD_ONENAND=y |
| 63 | CONFIG_MTD_ONENAND_VERIFY_WRITE=y | 62 | CONFIG_MTD_ONENAND_VERIFY_WRITE=y |
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig index a288d7033950..cd5e6ba9a54d 100644 --- a/arch/arm/configs/orion5x_defconfig +++ b/arch/arm/configs/orion5x_defconfig | |||
| @@ -72,7 +72,6 @@ CONFIG_MTD_CFI_INTELEXT=y | |||
| 72 | CONFIG_MTD_CFI_AMDSTD=y | 72 | CONFIG_MTD_CFI_AMDSTD=y |
| 73 | CONFIG_MTD_PHYSMAP=y | 73 | CONFIG_MTD_PHYSMAP=y |
| 74 | CONFIG_MTD_NAND=y | 74 | CONFIG_MTD_NAND=y |
| 75 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 76 | CONFIG_MTD_NAND_PLATFORM=y | 75 | CONFIG_MTD_NAND_PLATFORM=y |
| 77 | CONFIG_MTD_NAND_ORION=y | 76 | CONFIG_MTD_NAND_ORION=y |
| 78 | CONFIG_BLK_DEV_LOOP=y | 77 | CONFIG_BLK_DEV_LOOP=y |
diff --git a/arch/arm/configs/pxa3xx_defconfig b/arch/arm/configs/pxa3xx_defconfig index 1677a0607ca9..60e313834b3f 100644 --- a/arch/arm/configs/pxa3xx_defconfig +++ b/arch/arm/configs/pxa3xx_defconfig | |||
| @@ -36,7 +36,6 @@ CONFIG_MTD_CONCAT=y | |||
| 36 | CONFIG_MTD_CHAR=y | 36 | CONFIG_MTD_CHAR=y |
| 37 | CONFIG_MTD_BLOCK=y | 37 | CONFIG_MTD_BLOCK=y |
| 38 | CONFIG_MTD_NAND=y | 38 | CONFIG_MTD_NAND=y |
| 39 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 40 | CONFIG_MTD_NAND_PXA3xx=y | 39 | CONFIG_MTD_NAND_PXA3xx=y |
| 41 | CONFIG_MTD_NAND_PXA3xx_BUILTIN=y | 40 | CONFIG_MTD_NAND_PXA3xx_BUILTIN=y |
| 42 | CONFIG_MTD_ONENAND=y | 41 | CONFIG_MTD_ONENAND=y |
diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig index 70158273c6dd..df77931a4326 100644 --- a/arch/arm/configs/spitz_defconfig +++ b/arch/arm/configs/spitz_defconfig | |||
| @@ -94,7 +94,6 @@ CONFIG_MTD_BLOCK=y | |||
| 94 | CONFIG_MTD_ROM=y | 94 | CONFIG_MTD_ROM=y |
| 95 | CONFIG_MTD_COMPLEX_MAPPINGS=y | 95 | CONFIG_MTD_COMPLEX_MAPPINGS=y |
| 96 | CONFIG_MTD_NAND=y | 96 | CONFIG_MTD_NAND=y |
| 97 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 98 | CONFIG_MTD_NAND_SHARPSL=y | 97 | CONFIG_MTD_NAND_SHARPSL=y |
| 99 | CONFIG_BLK_DEV_LOOP=y | 98 | CONFIG_BLK_DEV_LOOP=y |
| 100 | CONFIG_IDE=y | 99 | CONFIG_IDE=y |
diff --git a/arch/arm/mach-clps711x/autcpu12.c b/arch/arm/mach-clps711x/autcpu12.c index 3fb79a1d0bde..32871918bb6e 100644 --- a/arch/arm/mach-clps711x/autcpu12.c +++ b/arch/arm/mach-clps711x/autcpu12.c | |||
| @@ -23,6 +23,8 @@ | |||
| 23 | #include <linux/string.h> | 23 | #include <linux/string.h> |
| 24 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
| 25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
| 26 | #include <linux/ioport.h> | ||
| 27 | #include <linux/platform_device.h> | ||
| 26 | 28 | ||
| 27 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
| 28 | #include <asm/sizes.h> | 30 | #include <asm/sizes.h> |
| @@ -62,9 +64,26 @@ void __init autcpu12_map_io(void) | |||
| 62 | iotable_init(autcpu12_io_desc, ARRAY_SIZE(autcpu12_io_desc)); | 64 | iotable_init(autcpu12_io_desc, ARRAY_SIZE(autcpu12_io_desc)); |
| 63 | } | 65 | } |
| 64 | 66 | ||
| 67 | static struct resource autcpu12_nvram_resource[] __initdata = { | ||
| 68 | DEFINE_RES_MEM_NAMED(AUTCPU12_PHYS_NVRAM, SZ_128K, "SRAM"), | ||
| 69 | }; | ||
| 70 | |||
| 71 | static struct platform_device autcpu12_nvram_pdev __initdata = { | ||
| 72 | .name = "autcpu12_nvram", | ||
| 73 | .id = -1, | ||
| 74 | .resource = autcpu12_nvram_resource, | ||
| 75 | .num_resources = ARRAY_SIZE(autcpu12_nvram_resource), | ||
| 76 | }; | ||
| 77 | |||
| 78 | static void __init autcpu12_init(void) | ||
| 79 | { | ||
| 80 | platform_device_register(&autcpu12_nvram_pdev); | ||
| 81 | } | ||
| 82 | |||
| 65 | MACHINE_START(AUTCPU12, "autronix autcpu12") | 83 | MACHINE_START(AUTCPU12, "autronix autcpu12") |
| 66 | /* Maintainer: Thomas Gleixner */ | 84 | /* Maintainer: Thomas Gleixner */ |
| 67 | .atag_offset = 0x20000, | 85 | .atag_offset = 0x20000, |
| 86 | .init_machine = autcpu12_init, | ||
| 68 | .map_io = autcpu12_map_io, | 87 | .map_io = autcpu12_map_io, |
| 69 | .init_irq = clps711x_init_irq, | 88 | .init_irq = clps711x_init_irq, |
| 70 | .timer = &clps711x_timer, | 89 | .timer = &clps711x_timer, |
diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c index e5165a84f93f..a0bf84803eac 100644 --- a/arch/arm/mach-imx/clk-imx51-imx53.c +++ b/arch/arm/mach-imx/clk-imx51-imx53.c | |||
| @@ -369,6 +369,7 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, | |||
| 369 | clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "83fcc000.ssi"); | 369 | clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "83fcc000.ssi"); |
| 370 | clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "70014000.ssi"); | 370 | clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "70014000.ssi"); |
| 371 | clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "83fe8000.ssi"); | 371 | clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "83fe8000.ssi"); |
| 372 | clk_register_clkdev(clk[nfc_gate], NULL, "83fdb000.nand"); | ||
| 372 | 373 | ||
| 373 | /* set the usboh3 parent to pll2_sw */ | 374 | /* set the usboh3 parent to pll2_sw */ |
| 374 | clk_set_parent(clk[usboh3_sel], clk[pll2_sw]); | 375 | clk_set_parent(clk[usboh3_sel], clk[pll2_sw]); |
| @@ -461,6 +462,7 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, | |||
| 461 | clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "63fcc000.ssi"); | 462 | clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "63fcc000.ssi"); |
| 462 | clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "50014000.ssi"); | 463 | clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "50014000.ssi"); |
| 463 | clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "63fd0000.ssi"); | 464 | clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "63fd0000.ssi"); |
| 465 | clk_register_clkdev(clk[nfc_gate], NULL, "63fdb000.nand"); | ||
| 464 | clk_register_clkdev(clk[can1_ipg_gate], "ipg", "53fc8000.can"); | 466 | clk_register_clkdev(clk[can1_ipg_gate], "ipg", "53fc8000.can"); |
| 465 | clk_register_clkdev(clk[can1_serial_gate], "per", "53fc8000.can"); | 467 | clk_register_clkdev(clk[can1_serial_gate], "per", "53fc8000.can"); |
| 466 | clk_register_clkdev(clk[can2_ipg_gate], "ipg", "53fcc000.can"); | 468 | clk_register_clkdev(clk[can2_ipg_gate], "ipg", "53fcc000.can"); |
diff --git a/arch/arm/plat-mxc/devices/platform-mxc_nand.c b/arch/arm/plat-mxc/devices/platform-mxc_nand.c index 1568f39fba8b..95b75cc70515 100644 --- a/arch/arm/plat-mxc/devices/platform-mxc_nand.c +++ b/arch/arm/plat-mxc/devices/platform-mxc_nand.c | |||
| @@ -63,10 +63,6 @@ struct platform_device *__init imx_add_mxc_nand( | |||
| 63 | /* AXI has to come first, that's how the mxc_nand driver expect it */ | 63 | /* AXI has to come first, that's how the mxc_nand driver expect it */ |
| 64 | struct resource res[] = { | 64 | struct resource res[] = { |
| 65 | { | 65 | { |
| 66 | .start = data->axibase, | ||
| 67 | .end = data->axibase + SZ_16K - 1, | ||
| 68 | .flags = IORESOURCE_MEM, | ||
| 69 | }, { | ||
| 70 | .start = data->iobase, | 66 | .start = data->iobase, |
| 71 | .end = data->iobase + data->iosize - 1, | 67 | .end = data->iobase + data->iosize - 1, |
| 72 | .flags = IORESOURCE_MEM, | 68 | .flags = IORESOURCE_MEM, |
| @@ -74,10 +70,13 @@ struct platform_device *__init imx_add_mxc_nand( | |||
| 74 | .start = data->irq, | 70 | .start = data->irq, |
| 75 | .end = data->irq, | 71 | .end = data->irq, |
| 76 | .flags = IORESOURCE_IRQ, | 72 | .flags = IORESOURCE_IRQ, |
| 73 | }, { | ||
| 74 | .start = data->axibase, | ||
| 75 | .end = data->axibase + SZ_16K - 1, | ||
| 76 | .flags = IORESOURCE_MEM, | ||
| 77 | }, | 77 | }, |
| 78 | }; | 78 | }; |
| 79 | return imx_add_platform_device("mxc_nand", data->id, | 79 | return imx_add_platform_device("mxc_nand", data->id, |
| 80 | res + !data->axibase, | 80 | res, ARRAY_SIZE(res) - !data->axibase, |
| 81 | ARRAY_SIZE(res) - !data->axibase, | ||
| 82 | pdata, sizeof(*pdata)); | 81 | pdata, sizeof(*pdata)); |
| 83 | } | 82 | } |
diff --git a/arch/blackfin/configs/BF561-ACVILON_defconfig b/arch/blackfin/configs/BF561-ACVILON_defconfig index 0fdc4ecaa531..91988370b75e 100644 --- a/arch/blackfin/configs/BF561-ACVILON_defconfig +++ b/arch/blackfin/configs/BF561-ACVILON_defconfig | |||
| @@ -57,7 +57,6 @@ CONFIG_MTD_PLATRAM=y | |||
| 57 | CONFIG_MTD_PHRAM=y | 57 | CONFIG_MTD_PHRAM=y |
| 58 | CONFIG_MTD_BLOCK2MTD=y | 58 | CONFIG_MTD_BLOCK2MTD=y |
| 59 | CONFIG_MTD_NAND=y | 59 | CONFIG_MTD_NAND=y |
| 60 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 61 | CONFIG_MTD_NAND_PLATFORM=y | 60 | CONFIG_MTD_NAND_PLATFORM=y |
| 62 | CONFIG_BLK_DEV_LOOP=y | 61 | CONFIG_BLK_DEV_LOOP=y |
| 63 | CONFIG_BLK_DEV_RAM=y | 62 | CONFIG_BLK_DEV_RAM=y |
diff --git a/arch/mips/configs/rb532_defconfig b/arch/mips/configs/rb532_defconfig index 55902d9cd0f2..b85b121397c8 100644 --- a/arch/mips/configs/rb532_defconfig +++ b/arch/mips/configs/rb532_defconfig | |||
| @@ -119,7 +119,6 @@ CONFIG_MTD_CHAR=y | |||
| 119 | CONFIG_MTD_BLOCK=y | 119 | CONFIG_MTD_BLOCK=y |
| 120 | CONFIG_MTD_BLOCK2MTD=y | 120 | CONFIG_MTD_BLOCK2MTD=y |
| 121 | CONFIG_MTD_NAND=y | 121 | CONFIG_MTD_NAND=y |
| 122 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 123 | CONFIG_MTD_NAND_PLATFORM=y | 122 | CONFIG_MTD_NAND_PLATFORM=y |
| 124 | CONFIG_ATA=y | 123 | CONFIG_ATA=y |
| 125 | # CONFIG_ATA_VERBOSE_ERROR is not set | 124 | # CONFIG_ATA_VERBOSE_ERROR is not set |
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig index 126ef1b08a01..e4ad2e27551a 100644 --- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | |||
| @@ -38,7 +38,6 @@ CONFIG_MTD_CFI=y | |||
| 38 | CONFIG_MTD_CFI_AMDSTD=y | 38 | CONFIG_MTD_CFI_AMDSTD=y |
| 39 | CONFIG_MTD_PHYSMAP_OF=y | 39 | CONFIG_MTD_PHYSMAP_OF=y |
| 40 | CONFIG_MTD_NAND=y | 40 | CONFIG_MTD_NAND=y |
| 41 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 42 | CONFIG_MTD_NAND_FSL_ELBC=y | 41 | CONFIG_MTD_NAND_FSL_ELBC=y |
| 43 | CONFIG_PROC_DEVICETREE=y | 42 | CONFIG_PROC_DEVICETREE=y |
| 44 | CONFIG_BLK_DEV_LOOP=y | 43 | CONFIG_BLK_DEV_LOOP=y |
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig index abcf00ad939e..34ff5686be08 100644 --- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | |||
| @@ -37,7 +37,6 @@ CONFIG_MTD_CFI=y | |||
| 37 | CONFIG_MTD_CFI_AMDSTD=y | 37 | CONFIG_MTD_CFI_AMDSTD=y |
| 38 | CONFIG_MTD_PHYSMAP_OF=y | 38 | CONFIG_MTD_PHYSMAP_OF=y |
| 39 | CONFIG_MTD_NAND=y | 39 | CONFIG_MTD_NAND=y |
| 40 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 41 | CONFIG_PROC_DEVICETREE=y | 40 | CONFIG_PROC_DEVICETREE=y |
| 42 | CONFIG_BLK_DEV_LOOP=y | 41 | CONFIG_BLK_DEV_LOOP=y |
| 43 | CONFIG_BLK_DEV_RAM=y | 42 | CONFIG_BLK_DEV_RAM=y |
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 9352e4430c3b..09116c6a6719 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_defconfig | |||
| @@ -50,7 +50,6 @@ CONFIG_MTD_CFI=y | |||
| 50 | CONFIG_MTD_CFI_AMDSTD=y | 50 | CONFIG_MTD_CFI_AMDSTD=y |
| 51 | CONFIG_MTD_PHYSMAP_OF=y | 51 | CONFIG_MTD_PHYSMAP_OF=y |
| 52 | CONFIG_MTD_NAND=y | 52 | CONFIG_MTD_NAND=y |
| 53 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 54 | CONFIG_MTD_NAND_FSL_ELBC=y | 53 | CONFIG_MTD_NAND_FSL_ELBC=y |
| 55 | CONFIG_PROC_DEVICETREE=y | 54 | CONFIG_PROC_DEVICETREE=y |
| 56 | CONFIG_BLK_DEV_LOOP=y | 55 | CONFIG_BLK_DEV_LOOP=y |
