History

Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc

* 'next/pm' of git://git.linaro.org/people/arnd/arm-soc: (66 commits) ARM: CSR: PM: use outer_resume to resume L2 cache ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII ARM: OMAP: voltage: voltage layer present, even when CONFIG_PM=n ARM: CSR: PM: add sleep entry for SiRFprimaII ARM: CSR: PM: save/restore irq status in suspend cycle ARM: CSR: PM: save/restore timer status in suspend cycle OMAP4: PM: TWL6030: add cmd register OMAP4: PM: TWL6030: fix ON/RET/OFF voltages OMAP4: PM: TWL6030: address 0V conversions OMAP4: PM: TWL6030: fix uv to voltage for >0x39 OMAP4: PM: TWL6030: fix voltage conversion formula omap: voltage: add a stub header file for external/regulator use OMAP2+: VC: more registers are per-channel starting with OMAP5 OMAP3+: voltage: update nominal voltage in voltdm_scale() not VC post-scale OMAP3+: voltage: rename omap_voltage_get_nom_volt -> voltdm_get_voltage OMAP3+: voltdm: final removal of omap_vdd_info OMAP3+: voltage: move/rename curr_volt from vdd_info into struct voltagedomain OMAP3+: voltage: rename scale and reset functions using voltdm_ prefix OMAP3+: VP: combine setting init voltage into common function OMAP3+: VP: remove unused omap_vp_get_curr_volt() ... Fix up trivial conflict in arch/arm/mach-prima2/l2x0.c (code removal vs edit)

Linus Torvalds committed 15 years ago

Commit cd9a0b62 parents ac5761a 090ad1044 files · +2097 −1325Browse files

Showing the changes to include/linux (1 of 44 files). Show all

Unified · Split

include/linux/rtc/sirfsoc_rtciobrg.h+18−0
@@ -0,0 +1,18 @@
1+/*
2+ * RTC I/O Bridge interfaces for CSR SiRFprimaII
3+ * ARM access the registers of SYSRTC, GPSRTC and PWRC through this module
4+ *
5+ * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
6+ *
7+ * Licensed under GPLv2 or later.
8+ */
9+#ifndef _SIRFSOC_RTC_IOBRG_H_
10+#define _SIRFSOC_RTC_IOBRG_H_
11+
12+extern void sirfsoc_rtc_iobrg_besyncing(void);
13+
14+extern u32 sirfsoc_rtc_iobrg_readl(u32 addr);
15+
16+extern void sirfsoc_rtc_iobrg_writel(u32 val, u32 addr);
17+
18+#endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t