diff options
-rw-r--r-- | arch/arm/cpu/armv7/tegra2/ap20.c | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/tegra2/board.c | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/tegra2/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 | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/tegra2/timer.c | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/tegra2/warmboot.c | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/tegra2/warmboot_avp.c | 2 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-tegra2/tegra.h (renamed from arch/arm/include/asm/arch-tegra2/tegra2.h) | 0 | ||||
-rw-r--r-- | board/nvidia/chromeos/cros_gpio.c | 2 | ||||
-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-- | board/nvidia/harmony/harmony.c | 2 | ||||
-rw-r--r-- | drivers/gpio/tegra2_gpio.c | 2 | ||||
-rw-r--r-- | include/configs/tegra2-common.h | 2 |
19 files changed, 18 insertions, 17 deletions
diff --git a/arch/arm/cpu/armv7/tegra2/ap20.c b/arch/arm/cpu/armv7/tegra2/ap20.c index cd84224af12..f9aa610aec1 100644 --- a/arch/arm/cpu/armv7/tegra2/ap20.c +++ b/arch/arm/cpu/armv7/tegra2/ap20.c @@ -23,7 +23,7 @@ #include "ap20.h" #include <asm/io.h> -#include <asm/arch/tegra2.h> +#include <asm/arch/tegra.h> #include <asm/arch/bitfield.h> #include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> diff --git a/arch/arm/cpu/armv7/tegra2/board.c b/arch/arm/cpu/armv7/tegra2/board.c index 3fb6d5a1b35..0d71b6157f5 100644 --- a/arch/arm/cpu/armv7/tegra2/board.c +++ b/arch/arm/cpu/armv7/tegra2/board.c @@ -25,7 +25,7 @@ #include <asm/io.h> #include "ap20.h" #include <asm/arch/sys_proto.h> -#include <asm/arch/tegra2.h> +#include <asm/arch/tegra.h> #include <asm/arch/pmc.h> #include <fdt_decode.h> diff --git a/arch/arm/cpu/armv7/tegra2/clock.c b/arch/arm/cpu/armv7/tegra2/clock.c index 25924fe9557..fd5393086fb 100644 --- a/arch/arm/cpu/armv7/tegra2/clock.c +++ b/arch/arm/cpu/armv7/tegra2/clock.c @@ -26,7 +26,7 @@ #include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/timer.h> -#include <asm/arch/tegra2.h> +#include <asm/arch/tegra.h> #include <common.h> #include <div64.h> diff --git a/arch/arm/cpu/armv7/tegra2/display.c b/arch/arm/cpu/armv7/tegra2/display.c index 47161b4c0f2..3871772369a 100644 --- a/arch/arm/cpu/armv7/tegra2/display.c +++ b/arch/arm/cpu/armv7/tegra2/display.c @@ -26,7 +26,7 @@ #include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/timer.h> -#include <asm/arch/tegra2.h> +#include <asm/arch/tegra.h> #include <asm/arch/display.h> #include <asm/arch/dc.h> #include <common.h> diff --git a/arch/arm/cpu/armv7/tegra2/pinmux.c b/arch/arm/cpu/armv7/tegra2/pinmux.c index 013a39aca15..f97e7d77997 100644 --- a/arch/arm/cpu/armv7/tegra2/pinmux.c +++ b/arch/arm/cpu/armv7/tegra2/pinmux.c @@ -23,7 +23,7 @@ #include <asm/io.h> #include <asm/arch/bitfield.h> -#include <asm/arch/tegra2.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 351d110efb2..0f0e6748370 100644 --- a/arch/arm/cpu/armv7/tegra2/power.c +++ b/arch/arm/cpu/armv7/tegra2/power.c @@ -26,6 +26,7 @@ #include <asm/arch/clock.h> #include <asm/arch/pmc.h> #include <asm/arch/power.h> +#include <asm/arch/tegra.h> #include <common.h> void power_enable_partition(enum power_partition_id id) diff --git a/arch/arm/cpu/armv7/tegra2/timer.c b/arch/arm/cpu/armv7/tegra2/timer.c index b69c1724049..552c9adcbb1 100644 --- a/arch/arm/cpu/armv7/tegra2/timer.c +++ b/arch/arm/cpu/armv7/tegra2/timer.c @@ -37,7 +37,7 @@ #include <common.h> #include <asm/io.h> -#include <asm/arch/tegra2.h> +#include <asm/arch/tegra.h> #include <asm/arch/timer.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/armv7/tegra2/warmboot.c b/arch/arm/cpu/armv7/tegra2/warmboot.c index 07f3c8514d4..8c2ddf7cdb2 100644 --- a/arch/arm/cpu/armv7/tegra2/warmboot.c +++ b/arch/arm/cpu/armv7/tegra2/warmboot.c @@ -29,7 +29,7 @@ #include <asm/arch/clock.h> #include <asm/arch/pmc.h> #include <asm/arch/pinmux.h> -#include <asm/arch/tegra2.h> +#include <asm/arch/tegra.h> #include <asm/arch/fuse.h> #include <asm/arch/emc.h> #include <asm/arch/gp_padctrl.h> diff --git a/arch/arm/cpu/armv7/tegra2/warmboot_avp.c b/arch/arm/cpu/armv7/tegra2/warmboot_avp.c index 6065326fa02..4a22caf06bc 100644 --- a/arch/arm/cpu/armv7/tegra2/warmboot_avp.c +++ b/arch/arm/cpu/armv7/tegra2/warmboot_avp.c @@ -27,7 +27,7 @@ #include <asm/arch/clock.h> #include <asm/arch/pinmux.h> #include <asm/arch/pmc.h> -#include <asm/arch/tegra2.h> +#include <asm/arch/tegra.h> #include <asm/arch/flow.h> #include <asm/arch/warmboot.h> #include "ap20.h" diff --git a/arch/arm/include/asm/arch-tegra2/tegra2.h b/arch/arm/include/asm/arch-tegra2/tegra.h index 21b80cff7bf..21b80cff7bf 100644 --- a/arch/arm/include/asm/arch-tegra2/tegra2.h +++ b/arch/arm/include/asm/arch-tegra2/tegra.h diff --git a/board/nvidia/chromeos/cros_gpio.c b/board/nvidia/chromeos/cros_gpio.c index ad5813fb71c..e9c3f004152 100644 --- a/board/nvidia/chromeos/cros_gpio.c +++ b/board/nvidia/chromeos/cros_gpio.c @@ -13,7 +13,7 @@ #include <common.h> #include <fdt_decode.h> #include <asm/arch/gpio.h> -#include <asm/arch/tegra2.h> +#include <asm/arch/tegra.h> #include <asm/global_data.h> #include <chromeos/common.h> #include <chromeos/cros_gpio.h> diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index c5c29a0e147..b534ba84789 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -26,7 +26,7 @@ #include <asm/clocks.h> #include <asm/io.h> #include <asm/arch/bitfield.h> -#include <asm/arch/tegra2.h> +#include <asm/arch/tegra.h> #include <asm/arch/sys_proto.h> #include <asm/arch/gpio.h> diff --git a/board/nvidia/common/emc.c b/board/nvidia/common/emc.c index 5195bb45fe3..6be7da227e6 100644 --- a/board/nvidia/common/emc.c +++ b/board/nvidia/common/emc.c @@ -7,7 +7,7 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/bitfield.h> -#include <asm/arch/tegra2.h> +#include <asm/arch/tegra.h> #include <asm/arch/sys_proto.h> #include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> diff --git a/board/nvidia/common/pmu.c b/board/nvidia/common/pmu.c index 803556165b8..2bd6920a3a0 100644 --- a/board/nvidia/common/pmu.c +++ b/board/nvidia/common/pmu.c @@ -24,7 +24,7 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/bitfield.h> -#include <asm/arch/tegra2.h> +#include <asm/arch/tegra.h> #include <asm/arch/sys_proto.h> #include <asm/arch/pmu.h> diff --git a/board/nvidia/common/uart-spi-fix.c b/board/nvidia/common/uart-spi-fix.c index 45c189c9649..e8f47755b27 100644 --- a/board/nvidia/common/uart-spi-fix.c +++ b/board/nvidia/common/uart-spi-fix.c @@ -29,7 +29,7 @@ #include <asm/arch/bitfield.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> -#include <asm/arch/tegra2.h> +#include <asm/arch/tegra.h> #include <asm/arch/tegra2_spi.h> #include "uart-spi-fix.h" diff --git a/board/nvidia/common/usb.c b/board/nvidia/common/usb.c index 51ef5680b24..738f4660f87 100644 --- a/board/nvidia/common/usb.c +++ b/board/nvidia/common/usb.c @@ -24,7 +24,7 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/bitfield.h> -#include <asm/arch/tegra2.h> +#include <asm/arch/tegra.h> #include <asm/arch/sys_proto.h> #include <asm/arch/clk_rst.h> diff --git a/board/nvidia/harmony/harmony.c b/board/nvidia/harmony/harmony.c index 49832770974..ce168423703 100644 --- a/board/nvidia/harmony/harmony.c +++ b/board/nvidia/harmony/harmony.c @@ -23,5 +23,5 @@ #include <common.h> #include <asm/io.h> -#include <asm/arch/tegra2.h> +#include <asm/arch/tegra.h> diff --git a/drivers/gpio/tegra2_gpio.c b/drivers/gpio/tegra2_gpio.c index c3753a8bf5f..99c506e98d3 100644 --- a/drivers/gpio/tegra2_gpio.c +++ b/drivers/gpio/tegra2_gpio.c @@ -32,7 +32,7 @@ #include <common.h> #include <asm/io.h> #include <asm/bitops.h> -#include <asm/arch/tegra2.h> +#include <asm/arch/tegra.h> #include <asm/arch/gpio.h> enum { diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h index cc4e8904f37..3dd3b2e8733 100644 --- a/include/configs/tegra2-common.h +++ b/include/configs/tegra2-common.h @@ -55,7 +55,7 @@ #define CONFIG_ALIGN_LCD_TO_SECTION /* Align LCD to 1MB boundary */ #define CONFIG_BOARD_EARLY_INIT_F -#include <asm/arch/tegra2.h> /* get chip and board defs */ +#include <asm/arch/tegra.h> /* get chip and board defs */ #define CACHE_LINE_SIZE 32 |