diff options
| author | Simon Glass <sjg@chromium.org> | 2011-09-30 09:08:12 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-10-04 14:16:29 -0700 |
| commit | 0d2d1c620059157c364ab4fabc938b4a1ec14780 (patch) | |
| tree | 7a2f25a08f6a6e245f9e1cea8152ff66f6915c89 /arch/arm/include/asm | |
| parent | d15a36a7939cb2880144d8c940e51d5bd6a32ca3 (diff) | |
tegra: Make bitfield.h a common file
This is needed by both T2x and T3x.
BUG=chromium-os:19004
TEST=build and boot on seaboard
Change-Id: I03cb8e7b189cae0efb58d1ceed55a1e0dcd57c7f
Reviewed-on: http://gerrit.chromium.org/gerrit/8636
Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>
Reviewed-by: Tom Warren <twarren@nvidia.com>
Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/bitfield.h (renamed from arch/arm/include/asm/arch-tegra2/bitfield.h) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-tegra2/bitfield.h b/arch/arm/include/asm/arch-tegra/bitfield.h index 771499cb38..7e394f3800 100644 --- a/arch/arm/include/asm/arch-tegra2/bitfield.h +++ b/arch/arm/include/asm/arch-tegra/bitfield.h @@ -65,7 +65,7 @@ * writel(RegVal, UsbBase+USB_SUSP_CTRL); * if(UsbBase == NV_ADDRESS_MAP_USB3_BASE) * { - * RegVal = readl(UsbBase+USB_SUSP_CTRL); + * RegVal = readl(UsbBase+USB_SUSP_CTRL); * RegVal |= Bit12; * writel(RegVal, UsbBase+USB_SUSP_CTRL); * } @@ -125,13 +125,13 @@ */ #define bf_writel(field, value, reg) ({ \ u32 *__reg = (u32 *)(reg); \ - u32 __oldval = readl(__reg); \ + u32 __oldval = readl(__reg); \ bf_update(field, __oldval, value); \ writel(__oldval, __reg); \ }) /* Unpacks a field from a register using readl */ -#define bf_readl(field, reg) \ +#define bf_readl(field, reg) \ bf_unpack(field, readl(reg)) /* |