code.ossystems Code Review - openembedded-core.git/blob

   1 From e2d19993731b3b4b083329f3acb4538e9d94fc36 Mon Sep 17 00:00:00 2001
   2 From: Erik Gilling <konkers@android.com>
   3 Date: Tue, 21 Apr 2009 13:38:12 -0700
   4 Subject: [PATCH 7/8] omap: zoom2: add external uart DEBUG_LL support to zoom2 board file
   5
   6 Signed-off-by: Erik Gilling <konkers@android.com>
   7 ---
   8  arch/arm/mach-omap2/board-zoom2.c |   23 +++++++++++++++++++++--
   9  1 files changed, 21 insertions(+), 2 deletions(-)
  10
  11 diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c
  12 index e4bf50a..5742b55 100644
  13 --- a/arch/arm/mach-omap2/board-zoom2.c
  14 +++ b/arch/arm/mach-omap2/board-zoom2.c
  15 @@ -16,9 +16,11 @@
  16  #include <linux/gpio.h>
  17  #include <linux/i2c/twl4030.h>
  18  #include <linux/regulator/machine.h>
  19 +#include <linux/io.h>
  20
  21  #include <asm/mach-types.h>
  22  #include <asm/mach/arch.h>
  23 +#include <asm/mach/map.h>
  24
  25  #include <mach/common.h>
  26  #include <mach/usb.h>
  27 @@ -27,6 +29,10 @@
  28  #include "mmc-twl4030.h"
  29  #include "omap3-opp.h"
  30
  31 +#define ZOOM2_QUART_PHYS        0x10000000
  32 +#define ZOOM2_QUART_VIRT        0xFB000000
  33 +#define ZOOM2_QUART_SIZE        SZ_1M
  34 +
  35  /* Zoom2 has Qwerty keyboard*/
  36  static int zoom2_twl4030_keymap[] = {
  37         KEY(0, 0, KEY_E),
  38 @@ -277,15 +283,28 @@ static void __init omap_zoom2_init(void)
  39         usb_musb_init();
  40  }
  41
  42 +static struct map_desc zoom2_io_desc[] __initdata = {
  43 +       {
  44 +               .virtual        = ZOOM2_QUART_VIRT,
  45 +               .pfn            = __phys_to_pfn(ZOOM2_QUART_PHYS),
  46 +               .length         = ZOOM2_QUART_SIZE,
  47 +               .type           = MT_DEVICE
  48 +       },
  49 +};
  50 +
  51  static void __init omap_zoom2_map_io(void)
  52  {
  53         omap2_set_globals_343x();
  54 +       iotable_init(zoom2_io_desc, ARRAY_SIZE(zoom2_io_desc));
  55         omap2_map_common_io();
  56  }
  57
  58  MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
  59 -       .phys_io        = 0x48000000,
  60 -       .io_pg_offst    = ((0xd8000000) >> 18) & 0xfffc,
  61 +       /* phys_io is only used for DEBUG_LL early printing.  The Zoom2's
  62 +        * console is on an external quad UART sitting at address 0x10000000
  63 +        */
  64 +       .phys_io        = 0x10000000,
  65 +       .io_pg_offst    = ((0xfb000000) >> 18) & 0xfffc,
  66         .boot_params    = 0x80000100,
  67         .map_io         = omap_zoom2_map_io,
  68         .init_irq       = omap_zoom2_init_irq,
  69 --
  70 1.6.3.2
  71