Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers

1 files changed, 18 insertions, 2 deletions

diff --git a/arch/arm/plat-pxa/include/plat/pxa3xx_nand.h b/arch/arm/plat-pxa/include/plat/pxa3xx_nand.h
index 442301fe48b4..c42f39f20195 100644
--- a/arch/arm/plat-pxa/include/plat/pxa3xx_nand.h
+++ b/arch/arm/plat-pxa/include/plat/pxa3xx_nand.h
@@ -41,6 +41,19 @@ struct pxa3xx_nand_flash {
         struct pxa3xx_nand_timing *timing;      /* NAND Flash timing */
 };
 
+/*
+ * Current pxa3xx_nand controller has two chip select which
+ * both be workable.
+ *
+ * Notice should be taken that:
+ * When you want to use this feature, you should not enable the
+ * keep configuration feature, for two chip select could be
+ * attached with different nand chip. The different page size
+ * and timing requirement make the keep configuration impossible.
+ */
+
+/* The max num of chip select current support */
+#define NUM_CHIP_SELECT         (2)
 struct pxa3xx_nand_platform_data {
 
         /* the data flash bus is shared between the Static Memory
@@ -52,8 +65,11 @@ struct pxa3xx_nand_platform_data {
         /* allow platform code to keep OBM/bootloader defined NFC config */
         int     keep_config;
 
-        const struct mtd_partition              *parts;
-        unsigned int                            nr_parts;
+        /* indicate how many chip selects will be used */
+        int     num_cs;
+
+        const struct mtd_partition              *parts[NUM_CHIP_SELECT];
+        unsigned int                            nr_parts[NUM_CHIP_SELECT];
 
         const struct pxa3xx_nand_flash *        flash;
         size_t                                  num_flash;