Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git] / arch / mips / powertv / asic / prealloc-cronuslite.c
index 23a9056..b5537e4 100644 (file)
@@ -22,7 +22,9 @@
  */
 
 #include <linux/init.h>
+#include <linux/ioport.h>
 #include <asm/mach-powertv/asic.h>
+#include "prealloc.h"
 
 /*
  * NON_DVR_CAPABLE CRONUSLITE RESOURCES
 struct resource non_dvr_cronuslite_resources[] __initdata =
 {
        /*
-        *
         * VIDEO2 / LX2
-        *
         */
-       {
-               .name   = "ST231aImage",        /* Delta-Mu 2 image and ram */
-               .start  = 0x60000000,
-               .end    = 0x601FFFFF,           /* 2MiB */
-               .flags  = IORESOURCE_IO,
-       },
-       {
-               .name   = "ST231aMonitor",      /* 8KiB block ST231b monitor */
-               .start  = 0x60200000,
-               .end    = 0x60201FFF,
-               .flags  = IORESOURCE_IO,
-       },
-       {
-               .name   = "MediaMemory1",
-               .start  = 0x60202000,
-               .end    = 0x61FFFFFF, /*~29.9MiB (32MiB - (2MiB + 8KiB)) */
-               .flags  = IORESOURCE_IO,
-       },
+       /* Delta-Mu 1 image (2MiB) */
+       PREALLOC_NORMAL("ST231aImage", 0x60000000, 0x60200000-1,
+               IORESOURCE_MEM)
+       /* Delta-Mu 1 monitor (8KiB) */
+       PREALLOC_NORMAL("ST231aMonitor", 0x60200000, 0x60202000-1,
+               IORESOURCE_MEM)
+       /* Delta-Mu 1 RAM (~29.9MiB (32MiB - (2MiB + 8KiB))) */
+       PREALLOC_NORMAL("MediaMemory1", 0x60202000, 0x62000000-1,
+               IORESOURCE_MEM)
+
        /*
-        *
         * Sysaudio Driver
-        *
-        * This driver requires:
-        *
-        * Arbitrary Based Buffers:
-        *  DSP_Image_Buff - DSP code and data images (1MB)
-        *  ADSC_CPU_PCM_Buff - ADSC CPU PCM buffer (40KB)
-        *  ADSC_AUX_Buff - ADSC AUX buffer (16KB)
-        *  ADSC_Main_Buff - ADSC Main buffer (16KB)
-        *
         */
-       {
-               .name   = "DSP_Image_Buff",
-               .start  = 0x00000000,
-               .end    = 0x000FFFFF,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "ADSC_CPU_PCM_Buff",
-               .start  = 0x00000000,
-               .end    = 0x00009FFF,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "ADSC_AUX_Buff",
-               .start  = 0x00000000,
-               .end    = 0x00003FFF,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "ADSC_Main_Buff",
-               .start  = 0x00000000,
-               .end    = 0x00003FFF,
-               .flags  = IORESOURCE_MEM,
-       },
+       /* DSP code and data images (1MiB) */
+       PREALLOC_NORMAL("DSP_Image_Buff", 0x00000000, 0x00100000-1,
+               (IORESOURCE_MEM|IORESOURCE_PTV_RES_LOEXT))
+       /* ADSC CPU PCM buffer (40KiB) */
+       PREALLOC_NORMAL("ADSC_CPU_PCM_Buff", 0x00000000, 0x0000A000-1,
+               (IORESOURCE_MEM|IORESOURCE_PTV_RES_LOEXT))
+       /* ADSC AUX buffer (128KiB) */
+       PREALLOC_NORMAL("ADSC_AUX_Buff", 0x00000000, 0x00020000-1,
+               (IORESOURCE_MEM|IORESOURCE_PTV_RES_LOEXT))
+       /* ADSC Main buffer (128KiB) */
+       PREALLOC_NORMAL("ADSC_Main_Buff", 0x00000000, 0x00020000-1,
+               (IORESOURCE_MEM|IORESOURCE_PTV_RES_LOEXT))
+
        /*
-        *
         * STAVEM driver/STAPI
         *
-        * This driver requires:
-        *
-        * Arbitrary Based Buffers:
         *  This memory area is used for allocating buffers for Video decoding
         *  purposes.  Allocation/De-allocation within this buffer is managed
         *  by the STAVMEM driver of the STAPI.  They could be Decimated
         *  Picture Buffers, Intermediate Buffers, as deemed necessary for
         *  video decoding purposes, for any video decoders on Zeus.
-        *
         */
-       {
-               .name   = "AVMEMPartition0",
-               .start  = 0x63580000,
-               .end    = 0x63B80000 - 1,  /* 6 MB total */
-               .flags  = IORESOURCE_IO,
-       },
+       /* 6MiB */
+       PREALLOC_NORMAL("AVMEMPartition0", 0x00000000, 0x00600000-1,
+               IORESOURCE_MEM)
+
        /*
-        *
         * DOCSIS Subsystem
-        *
-        * This driver requires:
-        *
-        * Arbitrary Based Buffers:
-        *  Docsis -
-        *
         */
-       {
-               .name   = "Docsis",
-               .start  = 0x62000000,
-               .end    = 0x62700000 - 1,       /* 7 MB total */
-               .flags  = IORESOURCE_IO,
-       },
+       /* 7MiB */
+       PREALLOC_DOCSIS("Docsis", 0x67500000, 0x67c00000-1, IORESOURCE_MEM)
+
        /*
-        *
         * GHW HAL Driver
-        *
-        * This driver requires:
-        *
-        * Arbitrary Based Buffers:
-        *  GraphicsHeap - PowerTV Graphics Heap
-        *
         */
-       {
-               .name   = "GraphicsHeap",
-               .start  = 0x62700000,
-               .end    = 0x63500000 - 1,       /* 14 MB total */
-               .flags  = IORESOURCE_IO,
-       },
+       /* PowerTV Graphics Heap (14MiB) */
+       PREALLOC_NORMAL("GraphicsHeap", 0x62700000, 0x63500000-1,
+               IORESOURCE_MEM)
+
        /*
-        *
         * multi com buffer area
-        *
-        * This driver requires:
-        *
-        * Arbitrary Based Buffers:
-        *  Docsis -
-        *
         */
-       {
-               .name   = "MulticomSHM",
-               .start  = 0x26000000,
-               .end    = 0x26020000 - 1,
-               .flags  = IORESOURCE_MEM,
-       },
+       /* 128KiB */
+       PREALLOC_NORMAL("MulticomSHM", 0x26000000, 0x26020000-1,
+               IORESOURCE_MEM)
+
        /*
-        *
-        * DMA Ring buffer
-        *
-        * This driver requires:
-        *
-        * Arbitrary Based Buffers:
-        *  Docsis -
-        *
+        * DMA Ring buffer (don't need recording buffers)
         */
-       {
-               .name   = "BMM_Buffer",
-               .start  = 0x00000000,
-               .end    = 0x000AA000 - 1,
-               .flags  = IORESOURCE_MEM,
-       },
+       /* 680KiB */
+       PREALLOC_NORMAL("BMM_Buffer", 0x00000000, 0x000AA000-1,
+               (IORESOURCE_MEM|IORESOURCE_PTV_RES_LOEXT))
+
        /*
-        *
         * Display bins buffer for unit0
-        *
-        * This driver requires:
-        *
-        * Arbitrary Based Buffers:
-        *  Display Bins for unit0
-        *
         */
-       {
-               .name   = "DisplayBins0",
-               .start  = 0x00000000,
-               .end    = 0x00000FFF,           /* 4 KB total */
-               .flags  = IORESOURCE_MEM,
-       },
+       /* 4KiB */
+       PREALLOC_NORMAL("DisplayBins0", 0x00000000, 0x00001000-1,
+               (IORESOURCE_MEM|IORESOURCE_PTV_RES_LOEXT))
+
        /*
-        *
-        * Display bins buffer
-        *
-        * This driver requires:
-        *
-        * Arbitrary Based Buffers:
-        *  Display Bins for unit1
-        *
+        * Display bins buffer for unit1
         */
-       {
-               .name   = "DisplayBins1",
-               .start  = 0x63B83000,
-               .end    = 0x63B84000 - 1,  /* 4 KB total */
-               .flags  = IORESOURCE_IO,
-       },
+       /* 4KiB */
+       PREALLOC_NORMAL("DisplayBins1", 0x00000000, 0x00001000-1,
+               IORESOURCE_MEM)
+
        /*
-        *
         * AVFS: player HAL memory
-        *
-        *
         */
-       {
-               .name   = "AvfsDmaMem",
-               .start  = 0x63B84000,
-               .end    = 0x63E48C00 - 1,  /* 945K * 3 for playback */
-               .flags  = IORESOURCE_IO,
-       },
+       /* 945K * 3 for playback */
+       PREALLOC_NORMAL("AvfsDmaMem", 0x00000000, 0x002c4c00-1,
+               (IORESOURCE_MEM|IORESOURCE_PTV_RES_LOEXT))
+
        /*
-        *
         * PMEM
-        *
-        * This driver requires:
-        *
-        * Arbitrary Based Buffers:
-        *  Persistent memory for diagnostics.
-        *
         */
-       {
-               .name   = "DiagPersistentMemory",
-               .start  = 0x00000000,
-               .end    = 0x10000 - 1,
-               .flags  = IORESOURCE_MEM,
-       },
+       /* Persistent memory for diagnostics (64KiB) */
+       PREALLOC_PMEM("DiagPersistentMemory", 0x00000000, 0x10000-1,
+            (IORESOURCE_MEM|IORESOURCE_PTV_RES_LOEXT))
+
        /*
-        *
         * Smartcard
-        *
-        * This driver requires:
-        *
-        * Arbitrary Based Buffers:
-        *  Read and write buffers for Internal/External cards
-        *
         */
-       {
-               .name   = "SmartCardInfo",
-               .start  = 0x63B80000,
-               .end    = 0x63B82800 - 1,
-               .flags  = IORESOURCE_IO,
-       },
+       /* Read and write buffers for Internal/External cards (10KiB) */
+       PREALLOC_NORMAL("SmartCardInfo", 0x00000000, 0x2800-1, IORESOURCE_MEM)
+
        /*
-        *
         * KAVNET
-        *    NP Reset Vector - must be of the form xxCxxxxx
-        *         NP Image - must be video bank 1
-        *         NP IPC - must be video bank 2
         */
-       {
-               .name   = "NP_Reset_Vector",
-               .start  = 0x27c00000,
-               .end    = 0x27c01000 - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "NP_Image",
-               .start  = 0x27020000,
-               .end    = 0x27060000 - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "NP_IPC",
-               .start  = 0x63500000,
-               .end    = 0x63580000 - 1,
-               .flags  = IORESOURCE_IO,
-       },
+       /* NP Reset Vector - must be of the form xxCxxxxx (4KiB) */
+       PREALLOC_NORMAL("NP_Reset_Vector", 0x27c00000, 0x27c01000-1,
+               IORESOURCE_MEM)
+       /* NP Image - must be video bank 1 (320KiB) */
+       PREALLOC_NORMAL("NP_Image", 0x27020000, 0x27070000-1, IORESOURCE_MEM)
+       /* NP IPC - must be video bank 2 (512KiB) */
+       PREALLOC_NORMAL("NP_IPC", 0x63500000, 0x63580000-1, IORESOURCE_MEM)
+
        /*
         * NAND Flash
         */
-       {
-               .name   = "NandFlash",
-               .start  = NAND_FLASH_BASE,
-               .end    = NAND_FLASH_BASE + 0x400 - 1,
-               .flags  = IORESOURCE_IO,
-       },
+       /* 10KiB */
+       PREALLOC_NORMAL("NandFlash", NAND_FLASH_BASE, NAND_FLASH_BASE+0x400-1,
+               IORESOURCE_MEM)
+
+       /*
+        * TFTPBuffer
+        *
+        *  This buffer is used in some minimal configurations (e.g. two-way
+        *  loader) for storing software images
+        */
+       PREALLOC_TFTP("TFTPBuffer", 0x00000000, MEBIBYTE(80)-1,
+               (IORESOURCE_MEM|IORESOURCE_PTV_RES_LOEXT))
+
        /*
         * Add other resources here
         */
-       { },
+
+       /*
+        * End of Resource marker
+        */
+       {
+               .flags  = 0,
+       },
 };