Merge remote branch 'remotes/korg_olof_tegra/for-3.4/soc' into for-3.4/fixes-for...

diff --combined arch/arm/mach-tegra/common.c
index 2db20da1d585a98535046fe01e4911c80a108a17,029558114236f9ddddb6052d5c5491120839b14c..29a3f5702af273fe9876258cd0915b1e81fe4b49
--- 1/arch/arm/mach-tegra/common.c
--- 2/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@@ -27,6 -27,7 +27,6 @@@
  #include <asm/hardware/gic.h>
  
  #include <mach/iomap.h>
 -#include <mach/system.h>
  
  #include "board.h"
  #include "clock.h"
@@@ -95,8 -96,6 +95,8 @@@ static void __init tegra_init_cache(u3
  #ifdef CONFIG_ARCH_TEGRA_2x_SOC
  void __init tegra20_init_early(void)
  {
 +      disable_hlt();  /* idle WFI usage needs to be confirmed */
 +
        tegra_init_fuse();
        tegra2_init_clocks();
        tegra_clk_init_from_table(tegra20_clk_init_table);
@@@ -106,6 -105,7 +106,7 @@@
  #ifdef CONFIG_ARCH_TEGRA_3x_SOC
  void __init tegra30_init_early(void)
  {
+       tegra30_init_clocks();
        tegra_init_cache(0x441, 0x551);
  }
  #endif

diff --combined arch/arm/mach-tegra/include/mach/iomap.h
index c05b311ee4f7d13323f2fe744da479c629d3f432,67644c905d8ee27b8b00a89b2e3567aba6f4f043..2fd9472591320d78b30bcd5b2970ca07fa5b47f7
--- 1/arch/arm/mach-tegra/include/mach/iomap.h
--- 2/arch/arm/mach-tegra/include/mach/iomap.h
+++ b/arch/arm/mach-tegra/include/mach/iomap.h
@@@ -74,6 -74,9 +74,9 @@@
  #define TEGRA_QUATERNARY_ICTLR_BASE   0x60004300
  #define TEGRA_QUATERNARY_ICTLR_SIZE   SZ_64
  
+ #define TEGRA_QUINARY_ICTLR_BASE      0x60004400
+ #define TEGRA_QUINARY_ICTLR_SIZE      SZ_64
+ 
  #define TEGRA_TMR1_BASE                       0x60005000
  #define TEGRA_TMR1_SIZE                       SZ_8
  
@@@ -271,46 -274,4 +274,46 @@@
  # define TEGRA_DEBUG_UART_BASE TEGRA_UARTE_BASE
  #endif
  
 +/* On TEGRA, many peripherals are very closely packed in
 + * two 256MB io windows (that actually only use about 64KB
 + * at the start of each).
 + *
 + * We will just map the first 1MB of each window (to minimize
 + * pt entries needed) and provide a macro to transform physical
 + * io addresses to an appropriate void __iomem *.
 + *
 + */
 +
 +#define IO_IRAM_PHYS  0x40000000
 +#define IO_IRAM_VIRT  IOMEM(0xFE400000)
 +#define IO_IRAM_SIZE  SZ_256K
 +
 +#define IO_CPU_PHYS     0x50040000
 +#define IO_CPU_VIRT     IOMEM(0xFE000000)
 +#define IO_CPU_SIZE   SZ_16K
 +
 +#define IO_PPSB_PHYS  0x60000000
 +#define IO_PPSB_VIRT  IOMEM(0xFE200000)
 +#define IO_PPSB_SIZE  SZ_1M
 +
 +#define IO_APB_PHYS   0x70000000
 +#define IO_APB_VIRT   IOMEM(0xFE300000)
 +#define IO_APB_SIZE   SZ_1M
 +
 +#define IO_TO_VIRT_BETWEEN(p, st, sz) ((p) >= (st) && (p) < ((st) + (sz)))
 +#define IO_TO_VIRT_XLATE(p, pst, vst) (((p) - (pst) + (vst)))
 +
 +#define IO_TO_VIRT(n) ( \
 +      IO_TO_VIRT_BETWEEN((n), IO_PPSB_PHYS, IO_PPSB_SIZE) ?           \
 +              IO_TO_VIRT_XLATE((n), IO_PPSB_PHYS, IO_PPSB_VIRT) :     \
 +      IO_TO_VIRT_BETWEEN((n), IO_APB_PHYS, IO_APB_SIZE) ?             \
 +              IO_TO_VIRT_XLATE((n), IO_APB_PHYS, IO_APB_VIRT) :       \
 +      IO_TO_VIRT_BETWEEN((n), IO_CPU_PHYS, IO_CPU_SIZE) ?             \
 +              IO_TO_VIRT_XLATE((n), IO_CPU_PHYS, IO_CPU_VIRT) :       \
 +      IO_TO_VIRT_BETWEEN((n), IO_IRAM_PHYS, IO_IRAM_SIZE) ?           \
 +              IO_TO_VIRT_XLATE((n), IO_IRAM_PHYS, IO_IRAM_VIRT) :     \
 +      NULL)
 +
 +#define IO_ADDRESS(n) (IO_TO_VIRT(n))
 +
  #endif