From: Colin Cross Date: Wed, 24 Nov 2010 05:40:20 +0000 (-0800) Subject: Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36 X-Git-Tag: firefly_0821_release~9834^2~315 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e7d1629efd49f695fc0691317f0f7696670fcac3;p=firefly-linux-kernel-4.4.55.git Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36 --- e7d1629efd49f695fc0691317f0f7696670fcac3 diff --cc arch/arm/mach-tegra/include/mach/iomap.h index 766b590a1be7,26f2363a8b3b..e8f5e1c0ae31 --- a/arch/arm/mach-tegra/include/mach/iomap.h +++ b/arch/arm/mach-tegra/include/mach/iomap.h @@@ -62,23 -62,17 +62,23 @@@ #define TEGRA_RES_SEMA_BASE 0x60001000 #define TEGRA_RES_SEMA_SIZE SZ_4K +#define TEGRA_ARB_SEMA_BASE 0x60002000 +#define TEGRA_ARB_SEMA_SIZE SZ_4K + #define TEGRA_PRIMARY_ICTLR_BASE 0x60004000 - #define TEGRA_PRIMARY_ICTLR_SIZE SZ_64 + #define TEGRA_PRIMARY_ICTLR_SIZE 64 +#define TEGRA_ARBGNT_ICTLR_BASE 0x60004040 +#define TEGRA_ARBGNT_ICTLR_SIZE 192 + #define TEGRA_SECONDARY_ICTLR_BASE 0x60004100 - #define TEGRA_SECONDARY_ICTLR_SIZE SZ_64 + #define TEGRA_SECONDARY_ICTLR_SIZE 64 #define TEGRA_TERTIARY_ICTLR_BASE 0x60004200 - #define TEGRA_TERTIARY_ICTLR_SIZE SZ_64 + #define TEGRA_TERTIARY_ICTLR_SIZE 64 #define TEGRA_QUATERNARY_ICTLR_BASE 0x60004300 - #define TEGRA_QUATERNARY_ICTLR_SIZE SZ_64 + #define TEGRA_QUATERNARY_ICTLR_SIZE 64 #define TEGRA_TMR1_BASE 0x60005000 #define TEGRA_TMR1_SIZE 8