← 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-omap2/prcm.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/prcm.c
24
24
#include <linux/io.h>
25
25
#include <linux/delay.h>
26
26
 
 
27
#include <mach/system.h>
27
28
#include <plat/common.h>
28
29
#include <plat/prcm.h>
29
30
#include <plat/irqs.h>
57
58
EXPORT_SYMBOL(omap_prcm_get_reset_sources);
58
59
 
59
60
/* Resets clock rates and reboots the system. Only called from system.h */
60
 
void omap_prcm_arch_reset(char mode, const char *cmd)
 
61
static void omap_prcm_arch_reset(char mode, const char *cmd)
61
62
{
62
63
        s16 prcm_offs = 0;
63
64
 
108
109
        omap2_prm_read_mod_reg(prcm_offs, OMAP2_RM_RSTCTRL); /* OCP barrier */
109
110
}
110
111
 
 
112
void (*arch_reset)(char, const char *) = omap_prcm_arch_reset;
 
113
 
111
114
/**
112
115
 * omap2_cm_wait_idlest - wait for IDLEST bit to indicate module readiness
113
116
 * @reg: physical address of module IDLEST register