1 files changed, 0 insertions, 119 deletions

diff --git a/recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0116-OMAP2-PRM-add-register-access-functions-for-VC-VP.patch b/recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0116-OMAP2-PRM-add-register-access-functions-for-VC-VP.patch
deleted file mode 100644
index fbb27a2e..00000000
--- a/recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0116-OMAP2-PRM-add-register-access-functions-for-VC-VP.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 3326bc8057e4dd85f135faa00a3d079fab05ac1e Mon Sep 17 00:00:00 2001
-From: Kevin Hilman <khilman@ti.com>
-Date: Mon, 28 Mar 2011 10:25:12 -0700
-Subject: [PATCH 116/149] OMAP2+: PRM: add register access functions for VC/VP
-
-On OMAP3+, the voltage controller (VC) and voltage processor (VP) are
-inside the PRM.  Add some PRM helper functions for register access to
-these module registers.
-
-Signed-off-by: Kevin Hilman <khilman@ti.com>
----
- arch/arm/mach-omap2/prm2xxx_3xxx.c |   15 +++++++++++++++
- arch/arm/mach-omap2/prm2xxx_3xxx.h |    8 ++++++++
- arch/arm/mach-omap2/prm44xx.c      |   22 ++++++++++++++++++++++
- arch/arm/mach-omap2/prm44xx.h      |    8 ++++++++
- 4 files changed, 53 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.c b/arch/arm/mach-omap2/prm2xxx_3xxx.c
-index 58c5c87..3b83763 100644
---- a/arch/arm/mach-omap2/prm2xxx_3xxx.c
-+++ b/arch/arm/mach-omap2/prm2xxx_3xxx.c
-@@ -197,3 +197,18 @@ void omap3_prm_vp_clear_txdone(u8 vp_id)
-        omap2_prm_write_mod_reg(vp->tranxdone_status,
-                                OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET);
- }
-+
-+u32 omap3_prm_vcvp_read(u8 offset)
-+{
-+       return omap2_prm_read_mod_reg(OMAP3430_GR_MOD, offset);
-+}
-+
-+void omap3_prm_vcvp_write(u32 val, u8 offset)
-+{
-+       omap2_prm_write_mod_reg(val, OMAP3430_GR_MOD, offset);
-+}
-+
-+u32 omap3_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset)
-+{
-+       return omap2_prm_rmw_mod_reg_bits(mask, bits, OMAP3430_GR_MOD, offset);
-+}
-diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.h b/arch/arm/mach-omap2/prm2xxx_3xxx.h
-index 5112526..cef533d 100644
---- a/arch/arm/mach-omap2/prm2xxx_3xxx.h
-+++ b/arch/arm/mach-omap2/prm2xxx_3xxx.h
-@@ -307,7 +307,15 @@ extern int omap2_prm_deassert_hardreset(s16 prm_mod, u8 rst_shift, u8 st_shift);
- u32 omap3_prm_vp_check_txdone(u8 vp_id);
- void omap3_prm_vp_clear_txdone(u8 vp_id);
- 
-+/*
-+ * OMAP3 access functions for voltage controller (VC) and
-+ * voltage proccessor (VP) in the PRM.
-+ */
-+extern u32 omap3_prm_vcvp_read(u8 offset);
-+extern void omap3_prm_vcvp_write(u32 val, u8 offset);
-+extern u32 omap3_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset);
- #endif /* CONFIG_ARCH_OMAP4 */
-+
- #endif
- 
- /*
-diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
-index 390e32c..495a31a 100644
---- a/arch/arm/mach-omap2/prm44xx.c
-+++ b/arch/arm/mach-omap2/prm44xx.c
-@@ -24,6 +24,8 @@
- #include "vp.h"
- #include "prm44xx.h"
- #include "prm-regbits-44xx.h"
-+#include "prcm44xx.h"
-+#include "prminst44xx.h"
- 
- /* PRM low-level functions */
- 
-@@ -99,3 +101,23 @@ void omap4_prm_vp_clear_txdone(u8 vp_id)
-                                     OMAP4430_PRM_OCP_SOCKET_INST,
-                                     vp->irqstatus_mpu);
- };
-+
-+u32 omap4_prm_vcvp_read(u8 offset)
-+{
-+       return omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,
-+                                          OMAP4430_PRM_DEVICE_INST, offset);
-+}
-+
-+void omap4_prm_vcvp_write(u32 val, u8 offset)
-+{
-+       omap4_prminst_write_inst_reg(val, OMAP4430_PRM_PARTITION,
-+                                    OMAP4430_PRM_DEVICE_INST, offset);
-+}
-+
-+u32 omap4_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset)
-+{
-+       return omap4_prminst_rmw_inst_reg_bits(mask, bits,
-+                                              OMAP4430_PRM_PARTITION,
-+                                              OMAP4430_PRM_DEVICE_INST,
-+                                              offset);
-+}
-diff --git a/arch/arm/mach-omap2/prm44xx.h b/arch/arm/mach-omap2/prm44xx.h
-index b28c87d..3d66ccd 100644
---- a/arch/arm/mach-omap2/prm44xx.h
-+++ b/arch/arm/mach-omap2/prm44xx.h
-@@ -755,6 +755,14 @@ extern u32 omap4_prm_rmw_inst_reg_bits(u32 mask, u32 bits, s16 inst, s16 idx);
- u32 omap4_prm_vp_check_txdone(u8 vp_id);
- void omap4_prm_vp_clear_txdone(u8 vp_id);
- 
-+/*
-+ * OMAP4 access functions for voltage controller (VC) and
-+ * voltage proccessor (VP) in the PRM.
-+ */
-+extern u32 omap4_prm_vcvp_read(u8 offset);
-+extern void omap4_prm_vcvp_write(u32 val, u8 offset);
-+extern u32 omap4_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset);
-+
- # endif
- 
- #endif
--- 
-1.7.2.5
-