diff options
author | Pieter du Preez <pdupreez@gmail.com> | 2008-08-01 05:06:40 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-01 05:06:40 -0400 |
commit | f6ed6f78d46b43b6d908b39ed3322f7cda23f4a8 (patch) | |
tree | 7f2fc6d0617e865ab4fac8ddd776ba3ff0da64eb /arch/arm/configs/cam60_defconfig | |
parent | 4a22442faeb33bdf34016a7b1f6b3d6ecd4e33e5 (diff) |
Fix rename of at91_nand -> atmel_nand
Structs called at91_nand_data where renamed to atmel_nand_data
and configs called *MTD_NAND_AT91* where renamed to
*MTD_NAND_ATMEL*. This was unfortunately not done consistently,
causing NAND chips not being initialised on several ARM boards.
I am aware that the author of the original change did not rename
MTD_NAND_AT91_BUSWIDTH to MTD_NAND_ATMEL_BUSWIDTH, for example.
All *MTD_NAND_AT91* where renamed to *MTD_NAND_ATMEL* in order
to keep naming consistency.
This patch was only tested on a MACH_SAM9_L9260, as this is the
only ARM board I have to my disposal.
Before this patch:
$ git-ls-files |xargs grep atmel_nand |wc -l
105
$ git-ls-files |xargs grep at91_nand |wc -l
4
$ git-ls-files |xargs grep MTD_NAND_ATMEL |wc -l
8
$ git-ls-files |xargs grep MTD_NAND_AT91 |wc -l
47
After this patch:
$ git-ls-files |xargs grep atmel_nand |wc -l
109
$ git-ls-files |xargs grep at91_nand |wc -l
0
$ git-ls-files |xargs grep MTD_NAND_ATMEL |wc -l
55
$ git-ls-files |xargs grep MTD_NAND_AT91 |wc -l
0
Signed-off-by: Pieter du Preez <pdupreez@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'arch/arm/configs/cam60_defconfig')
-rw-r--r-- | arch/arm/configs/cam60_defconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/configs/cam60_defconfig b/arch/arm/configs/cam60_defconfig index f3cd4a95373a..f945105d6cd6 100644 --- a/arch/arm/configs/cam60_defconfig +++ b/arch/arm/configs/cam60_defconfig | |||
@@ -466,10 +466,10 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y | |||
466 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 466 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
467 | CONFIG_MTD_NAND_IDS=y | 467 | CONFIG_MTD_NAND_IDS=y |
468 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 468 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
469 | CONFIG_MTD_NAND_AT91=y | 469 | CONFIG_MTD_NAND_ATMEL=y |
470 | # CONFIG_MTD_NAND_AT91_ECC_SOFT is not set | 470 | # CONFIG_MTD_NAND_ATMEL_ECC_SOFT is not set |
471 | CONFIG_MTD_NAND_AT91_ECC_HW=y | 471 | CONFIG_MTD_NAND_ATMEL_ECC_HW=y |
472 | # CONFIG_MTD_NAND_AT91_ECC_NONE is not set | 472 | # CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set |
473 | # CONFIG_MTD_NAND_NANDSIM is not set | 473 | # CONFIG_MTD_NAND_NANDSIM is not set |
474 | # CONFIG_MTD_NAND_PLATFORM is not set | 474 | # CONFIG_MTD_NAND_PLATFORM is not set |
475 | # CONFIG_MTD_ALAUDA is not set | 475 | # CONFIG_MTD_ALAUDA is not set |