summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0083-OMAP4-prm-Remove-deprecated-functions.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0083-OMAP4-prm-Remove-deprecated-functions.patch')
-rw-r--r--recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0083-OMAP4-prm-Remove-deprecated-functions.patch81
1 files changed, 0 insertions, 81 deletions
diff --git a/recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0083-OMAP4-prm-Remove-deprecated-functions.patch b/recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0083-OMAP4-prm-Remove-deprecated-functions.patch
deleted file mode 100644
index 403764f8..00000000
--- a/recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0083-OMAP4-prm-Remove-deprecated-functions.patch
+++ /dev/null
@@ -1,81 +0,0 @@
1From fd94741b5ca1552a0c6e8c000f9f7530853862ea Mon Sep 17 00:00:00 2001
2From: Benoit Cousson <b-cousson@ti.com>
3Date: Sun, 10 Jul 2011 05:56:31 -0600
4Subject: [PATCH 083/149] OMAP4: prm: Remove deprecated functions
5
6The new prminst_xxx accessors based on partition and offset
7is now used, so removed all the previous prcm_xxx accessors.
8
9Signed-off-by: Benoit Cousson <b-cousson@ti.com>
10Cc: Paul Walmsley <paul@pwsan.com>
11Cc: Rajendra Nayak <rnayak@ti.com>
12[paul@pwsan.com: remove fn prototypes also]
13Signed-off-by: Paul Walmsley <paul@pwsan.com>
14---
15 arch/arm/mach-omap2/prm44xx.c | 37 -------------------------------------
16 arch/arm/mach-omap2/prm44xx.h | 4 ----
17 2 files changed, 0 insertions(+), 41 deletions(-)
18
19diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
20index f815329..0016555 100644
21--- a/arch/arm/mach-omap2/prm44xx.c
22+++ b/arch/arm/mach-omap2/prm44xx.c
23@@ -50,40 +50,3 @@ u32 omap4_prm_rmw_inst_reg_bits(u32 mask, u32 bits, s16 inst, s16 reg)
24
25 return v;
26 }
27-
28-/* Read a PRM register, AND it, and shift the result down to bit 0 */
29-/* XXX deprecated */
30-u32 omap4_prm_read_bits_shift(void __iomem *reg, u32 mask)
31-{
32- u32 v;
33-
34- v = __raw_readl(reg);
35- v &= mask;
36- v >>= __ffs(mask);
37-
38- return v;
39-}
40-
41-/* Read-modify-write a register in a PRM module. Caller must lock */
42-/* XXX deprecated */
43-u32 omap4_prm_rmw_reg_bits(u32 mask, u32 bits, void __iomem *reg)
44-{
45- u32 v;
46-
47- v = __raw_readl(reg);
48- v &= ~mask;
49- v |= bits;
50- __raw_writel(v, reg);
51-
52- return v;
53-}
54-
55-u32 omap4_prm_set_inst_reg_bits(u32 bits, s16 inst, s16 reg)
56-{
57- return omap4_prm_rmw_inst_reg_bits(bits, bits, inst, reg);
58-}
59-
60-u32 omap4_prm_clear_inst_reg_bits(u32 bits, s16 inst, s16 reg)
61-{
62- return omap4_prm_rmw_inst_reg_bits(bits, 0x0, inst, reg);
63-}
64diff --git a/arch/arm/mach-omap2/prm44xx.h b/arch/arm/mach-omap2/prm44xx.h
65index 725a6a8..7dfa379 100644
66--- a/arch/arm/mach-omap2/prm44xx.h
67+++ b/arch/arm/mach-omap2/prm44xx.h
68@@ -750,10 +750,6 @@
69 extern u32 omap4_prm_read_inst_reg(s16 inst, u16 idx);
70 extern void omap4_prm_write_inst_reg(u32 val, s16 inst, u16 idx);
71 extern u32 omap4_prm_rmw_inst_reg_bits(u32 mask, u32 bits, s16 inst, s16 idx);
72-extern u32 omap4_prm_rmw_reg_bits(u32 mask, u32 bits, void __iomem *reg);
73-extern u32 omap4_prm_set_inst_reg_bits(u32 bits, s16 inst, s16 idx);
74-extern u32 omap4_prm_clear_inst_reg_bits(u32 bits, s16 inst, s16 idx);
75-extern u32 omap4_prm_read_bits_shift(void __iomem *reg, u32 mask);
76
77 # endif
78
79--
801.7.2.5
81