Merge commit 'origin' into master

[pandora-kernel.git] / arch / arm / mach-pxa / include / mach / pxa3xx_nand.h

diff --git a/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h b/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h
index 6ac9aea..eb35fca 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h
+++ b/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h
@@ -30,8 +30,8 @@ struct pxa3xx_nand_cmdset {
 };
 
 struct pxa3xx_nand_flash {
-       struct pxa3xx_nand_timing *timing; /* NAND Flash timing */
-       struct pxa3xx_nand_cmdset *cmdset;
+       const struct pxa3xx_nand_timing *timing; /* NAND Flash timing */
+       const struct pxa3xx_nand_cmdset *cmdset;
 
        uint32_t page_per_block;/* Pages per block (PG_PER_BLK) */
        uint32_t page_size;     /* Page size in bytes (PAGE_SZ) */
@@ -39,13 +39,6 @@ struct pxa3xx_nand_flash {
        uint32_t dfc_width;     /* Width of flash controller(DWIDTH_C) */
        uint32_t num_blocks;    /* Number of physical blocks in Flash */
        uint32_t chip_id;
-
-       /* NOTE: these are automatically calculated, do not define */
-       size_t          oob_size;
-       size_t          read_id_bytes;
-
-       unsigned int    col_addr_cycles;
-       unsigned int    row_addr_cycles;
 };
 
 struct pxa3xx_nand_platform_data {
@@ -56,10 +49,10 @@ struct pxa3xx_nand_platform_data {
         */
        int     enable_arbiter;
 
-       struct mtd_partition *parts;
-       unsigned int    nr_parts;
+       const struct mtd_partition              *parts;
+       unsigned int                            nr_parts;
 
-       struct pxa3xx_nand_flash * const        flash;
+       const struct pxa3xx_nand_flash *        flash;
        size_t                                  num_flash;
 };