← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-linaro-u8500/trusty

« back to all changes in this revision

Viewing changes to arch/arm/mach-omap2/gpmc-nand.c

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-omap2/gpmc-nand.c
12
12
#include <linux/kernel.h>
13
13
#include <linux/platform_device.h>
14
14
#include <linux/io.h>
 
15
#include <linux/mtd/nand.h>
15
16
 
16
17
#include <asm/mach/flash.h>
17
18
 
69
70
        t.wr_cycle  = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->wr_cycle);
70
71
 
71
72
        /* Configure GPMC */
72
 
        gpmc_cs_configure(gpmc_nand_data->cs,
73
 
                                GPMC_CONFIG_DEV_SIZE, gpmc_nand_data->devsize);
 
73
        if (gpmc_nand_data->devsize == NAND_BUSWIDTH_16)
 
74
                gpmc_cs_configure(gpmc_nand_data->cs, GPMC_CONFIG_DEV_SIZE, 1);
 
75
        else
 
76
                gpmc_cs_configure(gpmc_nand_data->cs, GPMC_CONFIG_DEV_SIZE, 0);
74
77
        gpmc_cs_configure(gpmc_nand_data->cs,
75
78
                        GPMC_CONFIG_DEV_TYPE, GPMC_DEVICETYPE_NAND);
76
79
        err = gpmc_cs_set_timings(gpmc_nand_data->cs, &t);