← Back to branch summary

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

« back to all changes in this revision

Viewing changes to arch/arm/mach-omap1/board-htcherald.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-omap1/board-htcherald.c
331
331
        },
332
332
};
333
333
 
334
 
struct htcpld_chip_platform_data htcpld_chips[] = {
 
334
static struct htcpld_chip_platform_data htcpld_chips[] = {
335
335
        [0] = {
336
336
                .addr           = 0x03,
337
337
                .reset          = 0x04,
366
366
        },
367
367
};
368
368
 
369
 
struct htcpld_core_platform_data htcpld_pfdata = {
 
369
static struct htcpld_core_platform_data htcpld_pfdata = {
370
370
        .int_reset_gpio_hi = HTCPLD_GPIO_INT_RESET_HI,
371
371
        .int_reset_gpio_lo = HTCPLD_GPIO_INT_RESET_LO,
372
372
        .i2c_adapter_id    = 1,