diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-04-01 22:24:29 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-04-01 22:24:29 +0300 |
| commit | 21295368367beaa563b310d5492166dba158b884 (patch) | |
| tree | c8a7c44beff93c040c76788ce2f6f4916281cbd8 /arch/arm/mach-omap2/prm2xxx.c | |
| parent | 209431eff8afb928d72200c79153165c7d860ca0 (diff) | |
| parent | ca125b5e31f5ada6844f57c5a8e7cd104d26c8fa (diff) | |
| download | linux-21295368367beaa563b310d5492166dba158b884.tar.xz | |
Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into omap-for-v4.1/prcm-cleanup
Conflicts:
arch/arm/boot/dts/dra7.dtsi
Diffstat (limited to 'arch/arm/mach-omap2/prm2xxx.c')
| -rw-r--r-- | arch/arm/mach-omap2/prm2xxx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/prm2xxx.c b/arch/arm/mach-omap2/prm2xxx.c index af0f15278fc2..752018ce129c 100644 --- a/arch/arm/mach-omap2/prm2xxx.c +++ b/arch/arm/mach-omap2/prm2xxx.c @@ -123,13 +123,14 @@ static void omap2xxx_prm_dpll_reset(void) * Clears wakeup status bits for a given module, so that the device can * re-enter idle. */ -void omap2xxx_prm_clear_mod_irqs(s16 module, u8 regs, u32 wkst_mask) +static int omap2xxx_prm_clear_mod_irqs(s16 module, u8 regs, u32 wkst_mask) { u32 wkst; wkst = omap2_prm_read_mod_reg(module, regs); wkst &= wkst_mask; omap2_prm_write_mod_reg(wkst, module, regs); + return 0; } int omap2xxx_clkdm_sleep(struct clockdomain *clkdm) @@ -216,9 +217,10 @@ static struct prm_ll_data omap2xxx_prm_ll_data = { .deassert_hardreset = &omap2_prm_deassert_hardreset, .is_hardreset_asserted = &omap2_prm_is_hardreset_asserted, .reset_system = &omap2xxx_prm_dpll_reset, + .clear_mod_irqs = &omap2xxx_prm_clear_mod_irqs, }; -int __init omap2xxx_prm_init(void) +int __init omap2xxx_prm_init(const struct omap_prcm_init_data *data) { return prm_register(&omap2xxx_prm_ll_data); } |