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 | |
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>
-rw-r--r-- | arch/arm/cpu/armv7/tegra-common/ap20.c | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/tegra-common/clock.c | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/tegra2/display.c | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/tegra2/pinmux.c | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/tegra2/power.c | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/tegra2/pwfm.c | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/tegra2/warmboot.c | 2 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-tegra/bitfield.h (renamed from arch/arm/include/asm/arch-tegra2/bitfield.h) | 6 | ||||
-rw-r--r-- | board/nvidia/common/board.c | 2 | ||||
-rw-r--r-- | board/nvidia/common/emc.c | 2 | ||||
-rw-r--r-- | board/nvidia/common/pmu.c | 2 | ||||
-rw-r--r-- | board/nvidia/common/uart-spi-fix.c | 2 | ||||
-rw-r--r-- | board/nvidia/common/usb.c | 2 | ||||
-rw-r--r-- | drivers/i2c/tegra2_i2c.c | 2 | ||||
-rw-r--r-- | drivers/spi/tegra2_spi.c | 2 | ||||
-rw-r--r-- | drivers/spi/tegra2_spi_new.c | 2 |
16 files changed, 18 insertions, 18 deletions
diff --git a/arch/arm/cpu/armv7/tegra-common/ap20.c b/arch/arm/cpu/armv7/tegra-common/ap20.c index 58405d49af3..4d141e9611d 100644 --- a/arch/arm/cpu/armv7/tegra-common/ap20.c +++ b/arch/arm/cpu/armv7/tegra-common/ap20.c @@ -23,7 +23,7 @@ #include <asm/io.h> #include <asm/arch/tegra.h> -#include <asm/arch/bitfield.h> +#include <asm/arch-tegra/bitfield.h> #include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/pmc.h> diff --git a/arch/arm/cpu/armv7/tegra-common/clock.c b/arch/arm/cpu/armv7/tegra-common/clock.c index d14fb5e0021..2d5a238c7a0 100644 --- a/arch/arm/cpu/armv7/tegra-common/clock.c +++ b/arch/arm/cpu/armv7/tegra-common/clock.c @@ -22,7 +22,7 @@ /* Tegra2 Clock control functions */ #include <asm/io.h> -#include <asm/arch/bitfield.h> +#include <asm/arch-tegra/bitfield.h> #include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/timer.h> diff --git a/arch/arm/cpu/armv7/tegra2/display.c b/arch/arm/cpu/armv7/tegra2/display.c index 3871772369a..4fa4c7524d5 100644 --- a/arch/arm/cpu/armv7/tegra2/display.c +++ b/arch/arm/cpu/armv7/tegra2/display.c @@ -22,7 +22,7 @@ */ #include <asm/io.h> -#include <asm/arch/bitfield.h> +#include <asm/arch-tegra/bitfield.h> #include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/timer.h> diff --git a/arch/arm/cpu/armv7/tegra2/pinmux.c b/arch/arm/cpu/armv7/tegra2/pinmux.c index f97e7d77997..f14c5ced625 100644 --- a/arch/arm/cpu/armv7/tegra2/pinmux.c +++ b/arch/arm/cpu/armv7/tegra2/pinmux.c @@ -22,7 +22,7 @@ /* Tegra2 pin multiplexing functions */ #include <asm/io.h> -#include <asm/arch/bitfield.h> +#include <asm/arch-tegra/bitfield.h> #include <asm/arch/tegra.h> #include <asm/arch/pinmux.h> #include <common.h> diff --git a/arch/arm/cpu/armv7/tegra2/power.c b/arch/arm/cpu/armv7/tegra2/power.c index 0f0e6748370..e3e1a970ce0 100644 --- a/arch/arm/cpu/armv7/tegra2/power.c +++ b/arch/arm/cpu/armv7/tegra2/power.c @@ -22,7 +22,7 @@ /* Tegra2 power control functions */ #include <asm/io.h> -#include <asm/arch/bitfield.h> +#include <asm/arch-tegra/bitfield.h> #include <asm/arch/clock.h> #include <asm/arch/pmc.h> #include <asm/arch/power.h> diff --git a/arch/arm/cpu/armv7/tegra2/pwfm.c b/arch/arm/cpu/armv7/tegra2/pwfm.c index 1a37243fa47..079b401b2a5 100644 --- a/arch/arm/cpu/armv7/tegra2/pwfm.c +++ b/arch/arm/cpu/armv7/tegra2/pwfm.c @@ -22,7 +22,7 @@ /* Tegra2 pulse width frequency modulator definitions */ #include <asm/io.h> -#include <asm/arch/bitfield.h> +#include <asm/arch-tegra/bitfield.h> #include <asm/arch/pwfm.h> void pwfm_setup(struct pwfm_ctlr *pwfm, int enable, int pulse_width, diff --git a/arch/arm/cpu/armv7/tegra2/warmboot.c b/arch/arm/cpu/armv7/tegra2/warmboot.c index 6bcf30e771b..7a22a7c3ecf 100644 --- a/arch/arm/cpu/armv7/tegra2/warmboot.c +++ b/arch/arm/cpu/armv7/tegra2/warmboot.c @@ -28,7 +28,7 @@ #include <asm/arch-tegra/ap20.h> #include <asm/arch-tegra/fuse.h> -#include <asm/arch/bitfield.h> +#include <asm/arch-tegra/bitfield.h> #include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/emc.h> diff --git a/arch/arm/include/asm/arch-tegra2/bitfield.h b/arch/arm/include/asm/arch-tegra/bitfield.h index 771499cb38d..7e394f38006 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)) /* diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 791e900bac0..c0f9b30bfd7 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -29,8 +29,8 @@ #include <asm/arch-tegra/fuse.h> /* TBD: bring these over when Tegra3 is ready, then remove these #ifdefs */ +#include <asm/arch-tegra/bitfield.h> #ifdef CONFIG_TEGRA2 -#include <asm/arch/bitfield.h> #include <asm/arch/clk_rst.h> #endif #include <asm/arch/clock.h> diff --git a/board/nvidia/common/emc.c b/board/nvidia/common/emc.c index 6be7da227e6..0155225b3d4 100644 --- a/board/nvidia/common/emc.c +++ b/board/nvidia/common/emc.c @@ -6,7 +6,7 @@ #include <common.h> #include <asm/io.h> -#include <asm/arch/bitfield.h> +#include <asm/arch-tegra/bitfield.h> #include <asm/arch/tegra.h> #include <asm/arch/sys_proto.h> #include <asm/arch/clk_rst.h> diff --git a/board/nvidia/common/pmu.c b/board/nvidia/common/pmu.c index 2bd6920a3a0..7e2082fad14 100644 --- a/board/nvidia/common/pmu.c +++ b/board/nvidia/common/pmu.c @@ -23,7 +23,7 @@ #include <common.h> #include <asm/io.h> -#include <asm/arch/bitfield.h> +#include <asm/arch-tegra/bitfield.h> #include <asm/arch/tegra.h> #include <asm/arch/sys_proto.h> diff --git a/board/nvidia/common/uart-spi-fix.c b/board/nvidia/common/uart-spi-fix.c index e8f47755b27..225d08f6b97 100644 --- a/board/nvidia/common/uart-spi-fix.c +++ b/board/nvidia/common/uart-spi-fix.c @@ -26,7 +26,7 @@ #include <libfdt.h> #include <fdt_decode.h> #include <fdt_support.h> -#include <asm/arch/bitfield.h> +#include <asm/arch-tegra/bitfield.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> #include <asm/arch/tegra.h> diff --git a/board/nvidia/common/usb.c b/board/nvidia/common/usb.c index 738f4660f87..da2092b7e86 100644 --- a/board/nvidia/common/usb.c +++ b/board/nvidia/common/usb.c @@ -23,7 +23,7 @@ #include <common.h> #include <asm/io.h> -#include <asm/arch/bitfield.h> +#include <asm/arch-tegra/bitfield.h> #include <asm/arch/tegra.h> #include <asm/arch/sys_proto.h> diff --git a/drivers/i2c/tegra2_i2c.c b/drivers/i2c/tegra2_i2c.c index f069c4d4375..b1415ea9cb3 100644 --- a/drivers/i2c/tegra2_i2c.c +++ b/drivers/i2c/tegra2_i2c.c @@ -24,7 +24,7 @@ #include <common.h> #include <asm/io.h> -#include <asm/arch/bitfield.h> +#include <asm/arch-tegra/bitfield.h> #include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/gpio.h> diff --git a/drivers/spi/tegra2_spi.c b/drivers/spi/tegra2_spi.c index 3c00928177c..58200683e28 100644 --- a/drivers/spi/tegra2_spi.c +++ b/drivers/spi/tegra2_spi.c @@ -28,7 +28,7 @@ #include <spi.h> #include <asm/clocks.h> #include <asm/io.h> -#include <asm/arch/bitfield.h> +#include <asm/arch-tegra/bitfield.h> #include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/gpio.h> diff --git a/drivers/spi/tegra2_spi_new.c b/drivers/spi/tegra2_spi_new.c index 191cef26d6f..ccdf3c3b9ee 100644 --- a/drivers/spi/tegra2_spi_new.c +++ b/drivers/spi/tegra2_spi_new.c @@ -28,7 +28,7 @@ #include <spi.h> #include <asm/clocks.h> #include <asm/io.h> -#include <asm/arch/bitfield.h> +#include <asm/arch-tegra/bitfield.h> #include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/gpio.h> |