diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-25 17:13:07 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-25 17:13:07 -0400 |
| commit | 1c49cb09b5666aa0d6df3b58f6c621df92c5dd44 (patch) | |
| tree | d6a35f8063d31033bf8059a296ba8dfbf046a373 /arch/arm/mach-omap2/cminst44xx.c | |
| parent | d79a08c56985fd3d7bd158687a1a162697935349 (diff) | |
| parent | 05f689400ea5fa3d71af82f910c8b140f87ad1f3 (diff) | |
Merge commit '05f6894' (omap-for-linus) into linaro-2.6.38
Conflicts:
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/usb-musb.c
arch/arm/plat-omap/include/plat/usb.h
drivers/usb/musb/musb_core.h
Diffstat (limited to 'arch/arm/mach-omap2/cminst44xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/cminst44xx.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c index c04bbbea17a..a482bfa0a95 100644 --- a/arch/arm/mach-omap2/cminst44xx.c +++ b/arch/arm/mach-omap2/cminst44xx.c @@ -73,6 +73,27 @@ u32 omap4_cminst_rmw_inst_reg_bits(u32 mask, u32 bits, u8 part, s16 inst, return v; } +u32 omap4_cminst_set_inst_reg_bits(u32 bits, u8 part, s16 inst, s16 idx) +{ + return omap4_cminst_rmw_inst_reg_bits(bits, bits, part, inst, idx); +} + +u32 omap4_cminst_clear_inst_reg_bits(u32 bits, u8 part, s16 inst, s16 idx) +{ + return omap4_cminst_rmw_inst_reg_bits(bits, 0x0, part, inst, idx); +} + +u32 omap4_cminst_read_inst_reg_bits(u8 part, u16 inst, s16 idx, u32 mask) +{ + u32 v; + + v = omap4_cminst_read_inst_reg(part, inst, idx); + v &= mask; + v >>= __ffs(mask); + + return v; +} + /* * */ |