11 files changed, 42 insertions, 32 deletions

diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 26d94c0b555c..11c3db985285 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -377,7 +377,7 @@ static struct davinci_nand_pdata da830_evm_nand_pdata = {
         .nr_parts       = ARRAY_SIZE(da830_evm_nand_partitions),
         .ecc_mode       = NAND_ECC_HW,
         .ecc_bits       = 4,
-        .options        = NAND_USE_FLASH_BBT,
+        .bbt_options    = NAND_BBT_USE_FLASH,
         .bbt_td         = &da830_evm_nand_bbt_main_descr,
         .bbt_md         = &da830_evm_nand_bbt_mirror_descr,
         .timing         = &da830_evm_nandflash_timing,
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index ec21663f8ddc..1d7d24995226 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -256,7 +256,7 @@ static struct davinci_nand_pdata da850_evm_nandflash_data = {
         .nr_parts       = ARRAY_SIZE(da850_evm_nandflash_partition),
         .ecc_mode       = NAND_ECC_HW,
         .ecc_bits       = 4,
-        .options        = NAND_USE_FLASH_BBT,
+        .bbt_options    = NAND_BBT_USE_FLASH,
         .timing         = &da850_evm_nandflash_timing,
 };
 
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 65566280b7c9..4e0e707c313d 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -77,7 +77,7 @@ static struct davinci_nand_pdata davinci_nand_data = {
         .parts                  = davinci_nand_partitions,
         .nr_parts               = ARRAY_SIZE(davinci_nand_partitions),
         .ecc_mode               = NAND_ECC_HW,
-        .options                = NAND_USE_FLASH_BBT,
+        .bbt_options            = NAND_BBT_USE_FLASH,
         .ecc_bits               = 4,
 };
 
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index b307470b071d..ff2d2413279a 100644
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -74,7 +74,7 @@ static struct davinci_nand_pdata davinci_nand_data = {
         .parts                  = davinci_nand_partitions,
         .nr_parts               = ARRAY_SIZE(davinci_nand_partitions),
         .ecc_mode               = NAND_ECC_HW_SYNDROME,
-        .options                = NAND_USE_FLASH_BBT,
+        .bbt_options            = NAND_BBT_USE_FLASH,
 };
 
 static struct resource davinci_nand_resources[] = {
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 04c43abcca66..1918ae711428 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -139,7 +139,7 @@ static struct davinci_nand_pdata davinci_nand_data = {
         .parts                  = davinci_nand_partitions,
         .nr_parts               = ARRAY_SIZE(davinci_nand_partitions),
         .ecc_mode               = NAND_ECC_HW,
-        .options                = NAND_USE_FLASH_BBT,
+        .bbt_options            = NAND_BBT_USE_FLASH,
         .ecc_bits               = 4,
 };
 
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 28fafa7819bc..0cf8abf78d33 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -151,7 +151,7 @@ static struct davinci_nand_pdata davinci_evm_nandflash_data = {
         .parts          = davinci_evm_nandflash_partition,
         .nr_parts       = ARRAY_SIZE(davinci_evm_nandflash_partition),
         .ecc_mode       = NAND_ECC_HW,
-        .options        = NAND_USE_FLASH_BBT,
+        .bbt_options    = NAND_BBT_USE_FLASH,
         .timing         = &davinci_evm_nandflash_timing,
 };
 
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index 6efc84cceca0..3cfff555e8f2 100644
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -396,7 +396,8 @@ static struct davinci_nand_pdata mityomapl138_nandflash_data = {
         .parts          = mityomapl138_nandflash_partition,
         .nr_parts       = ARRAY_SIZE(mityomapl138_nandflash_partition),
         .ecc_mode       = NAND_ECC_HW,
-        .options        = NAND_USE_FLASH_BBT | NAND_BUSWIDTH_16,
+        .bbt_options    = NAND_BBT_USE_FLASH,
+        .options        = NAND_BUSWIDTH_16,
         .ecc_bits       = 1, /* 4 bit mode is not supported with 16 bit NAND */
 };
 
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index 38d6f644d8b9..e5f231aefee4 100644
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -87,7 +87,7 @@ static struct davinci_nand_pdata davinci_ntosd2_nandflash_data = {
         .parts          = davinci_ntosd2_nandflash_partition,
         .nr_parts       = ARRAY_SIZE(davinci_ntosd2_nandflash_partition),
         .ecc_mode       = NAND_ECC_HW,
-        .options        = NAND_USE_FLASH_BBT,
+        .bbt_options    = NAND_BBT_USE_FLASH,
 };
 
 static struct resource davinci_ntosd2_nandflash_resource[] = {
diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c
index 90ee7b5aabdc..f69e40a29e02 100644
--- a/arch/arm/mach-davinci/board-tnetv107x-evm.c
+++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
@@ -144,7 +144,7 @@ static struct davinci_nand_pdata nand_config = {
         .parts          = nand_partitions,
         .nr_parts       = ARRAY_SIZE(nand_partitions),
         .ecc_mode       = NAND_ECC_HW,
-        .options        = NAND_USE_FLASH_BBT,
+        .bbt_options    = NAND_BBT_USE_FLASH,
         .ecc_bits       = 1,
 };
 
diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c
index 60d2f4871afa..a30c7c5a6d83 100644
--- a/arch/arm/mach-davinci/cpuidle.c
+++ b/arch/arm/mach-davinci/cpuidle.c
@@ -79,9 +79,11 @@ static struct davinci_ops davinci_states[DAVINCI_CPUIDLE_MAX_STATES] = {
 
 /* Actual code that puts the SoC in different idle states */
 static int davinci_enter_idle(struct cpuidle_device *dev,
-                                                struct cpuidle_state *state)
+                                struct cpuidle_driver *drv,
+                                                int index)
 {
-        struct davinci_ops *ops = cpuidle_get_statedata(state);
+        struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
+        struct davinci_ops *ops = cpuidle_get_statedata(state_usage);
         struct timeval before, after;
         int idle_time;
 
@@ -99,13 +101,17 @@ static int davinci_enter_idle(struct cpuidle_device *dev,
         local_irq_enable();
         idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC +
                         (after.tv_usec - before.tv_usec);
-        return idle_time;
+
+        dev->last_residency = idle_time;
+
+        return index;
 }
 
 static int __init davinci_cpuidle_probe(struct platform_device *pdev)
 {
         int ret;
         struct cpuidle_device *device;
+        struct cpuidle_driver *driver = &davinci_idle_driver;
         struct davinci_cpuidle_config *pdata = pdev->dev.platform_data;
 
         device = &per_cpu(davinci_cpuidle_device, smp_processor_id());
@@ -117,32 +123,33 @@ static int __init davinci_cpuidle_probe(struct platform_device *pdev)
 
         ddr2_reg_base = pdata->ddr2_ctlr_base;
 
-        ret = cpuidle_register_driver(&davinci_idle_driver);
-        if (ret) {
-                dev_err(&pdev->dev, "failed to register driver\n");
-                return ret;
-        }
-
         /* Wait for interrupt state */
-        device->states[0].enter = davinci_enter_idle;
-        device->states[0].exit_latency = 1;
-        device->states[0].target_residency = 10000;
-        device->states[0].flags = CPUIDLE_FLAG_TIME_VALID;
-        strcpy(device->states[0].name, "WFI");
-        strcpy(device->states[0].desc, "Wait for interrupt");
+        driver->states[0].enter = davinci_enter_idle;
+        driver->states[0].exit_latency = 1;
+        driver->states[0].target_residency = 10000;
+        driver->states[0].flags = CPUIDLE_FLAG_TIME_VALID;
+        strcpy(driver->states[0].name, "WFI");
+        strcpy(driver->states[0].desc, "Wait for interrupt");
 
         /* Wait for interrupt and DDR self refresh state */
-        device->states[1].enter = davinci_enter_idle;
-        device->states[1].exit_latency = 10;
-        device->states[1].target_residency = 10000;
-        device->states[1].flags = CPUIDLE_FLAG_TIME_VALID;
-        strcpy(device->states[1].name, "DDR SR");
-        strcpy(device->states[1].desc, "WFI and DDR Self Refresh");
+        driver->states[1].enter = davinci_enter_idle;
+        driver->states[1].exit_latency = 10;
+        driver->states[1].target_residency = 10000;
+        driver->states[1].flags = CPUIDLE_FLAG_TIME_VALID;
+        strcpy(driver->states[1].name, "DDR SR");
+        strcpy(driver->states[1].desc, "WFI and DDR Self Refresh");
         if (pdata->ddr2_pdown)
                 davinci_states[1].flags |= DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN;
-        cpuidle_set_statedata(&device->states[1], &davinci_states[1]);
+        cpuidle_set_statedata(&device->states_usage[1], &davinci_states[1]);
 
         device->state_count = DAVINCI_CPUIDLE_MAX_STATES;
+        driver->state_count = DAVINCI_CPUIDLE_MAX_STATES;
+
+        ret = cpuidle_register_driver(&davinci_idle_driver);
+        if (ret) {
+                dev_err(&pdev->dev, "failed to register driver\n");
+                return ret;
+        }
 
         ret = cpuidle_register_device(device);
         if (ret) {
diff --git a/arch/arm/mach-davinci/include/mach/nand.h b/arch/arm/mach-davinci/include/mach/nand.h
index 025151049f05..1cf555aef896 100644
--- a/arch/arm/mach-davinci/include/mach/nand.h
+++ b/arch/arm/mach-davinci/include/mach/nand.h
@@ -74,8 +74,10 @@ struct davinci_nand_pdata {		/* platform_data */
         nand_ecc_modes_t        ecc_mode;
         u8                      ecc_bits;
 
-        /* e.g. NAND_BUSWIDTH_16 or NAND_USE_FLASH_BBT */
+        /* e.g. NAND_BUSWIDTH_16 */
         unsigned                options;
+        /* e.g. NAND_BBT_USE_FLASH */
+        unsigned                bbt_options;
 
         /* Main and mirror bbt descriptor overrides */
         struct nand_bbt_descr   *bbt_td;