CR ENGR00025276: Fix doxygen

Fix doxygen for one set of documents for the supported mxc and imx platforms.

http://www.bitshrine.org/gpp/linux-2.6.19.2-mx-unified_doxygen.patch

45 files changed, 113 insertions, 91 deletions

diff --git a/include/asm-arm/arch-mxc/board-mx27ads.h b/include/asm-arm/arch-mxc/board-mx27ads.h
index 8f00526a68b6..6a9ddde60692 100644
--- a/include/asm-arm/arch-mxc/board-mx27ads.h
+++ b/include/asm-arm/arch-mxc/board-mx27ads.h
@@ -15,18 +15,18 @@
 #define __ASM_ARCH_MXC_BOARD_MX27ADS_H__
 
 /*!
- * @defgroup BRDCFG Board Configuration Options
- * @ingroup MSL
+ * @defgroup BRDCFG_MX27 Board Configuration Options
+ * @ingroup MSL_MX27
  */
 
 /*!
- * @file board-mx27ads.h
+ * @file arch-mxc/board-mx27ads.h
  *
  * @brief This file contains all the board level configuration options.
  *
  * It currently hold the options defined for MX27 ADS Platform.
  *
- * @ingroup BRDCFG
+ * @ingroup BRDCFG_MX27
  */
 
 /*
diff --git a/include/asm-arm/arch-mxc/board-mx31ads.h b/include/asm-arm/arch-mxc/board-mx31ads.h
index 4387d78ec78e..938c8085f6c1 100644
--- a/include/asm-arm/arch-mxc/board-mx31ads.h
+++ b/include/asm-arm/arch-mxc/board-mx31ads.h
@@ -14,6 +14,21 @@
 #ifndef __ASM_ARCH_MXC_BOARD_MX31ADS_H__
 #define __ASM_ARCH_MXC_BOARD_MX31ADS_H__
 
+/*!
+ * @defgroup BRDCFG_MX31 Board Configuration Options
+ * @ingroup MSL_MX31
+ */
+
+/*!
+ * @file arch-mxc/board-mx31ads.h
+ *
+ * @brief This file contains all the board level configuration options.
+ *
+ * It currently hold the options defined for MX31 ADS Platform.
+ *
+ * @ingroup BRDCFG_MX31
+ */
+
 /*
  * Include Files
  */
diff --git a/include/asm-arm/arch-mxc/clock.h b/include/asm-arm/arch-mxc/clock.h
index 1ffa62246c9b..f1600879e5cd 100644
--- a/include/asm-arm/arch-mxc/clock.h
+++ b/include/asm-arm/arch-mxc/clock.h
@@ -15,12 +15,10 @@
 #define __ASM_ARCH_MXC_CLOCK_H__
 
 /*!
- * @defgroup CLOCKS Clocking Setup and Retrieving
- * @ingroup MSL
+ * @defgroup CLOCKS Clock Control API
  */
-
 /*!
- * @file clock.h
+ * @file arch-mxc/clock.h
  *
  * @brief API for setting up and retrieving clocks.
  *
diff --git a/include/asm-arm/arch-mxc/dma.h b/include/asm-arm/arch-mxc/dma.h
index 7e671128bff2..c552b29236ca 100644
--- a/include/asm-arm/arch-mxc/dma.h
+++ b/include/asm-arm/arch-mxc/dma.h
@@ -15,7 +15,7 @@
 #define __ASM_ARCH_MXC_DMA_H__
 
 /*!
- * @file dma.h
+ * @file arch-mxc/dma.h
  * @brief This file contains Unified DMA API for all MXC platforms.
  * The API is platform independent.
  *
diff --git a/include/asm-arm/arch-mxc/dpm.h b/include/asm-arm/arch-mxc/dpm.h
index ea67a12aecbb..6f007f957174 100644
--- a/include/asm-arm/arch-mxc/dpm.h
+++ b/include/asm-arm/arch-mxc/dpm.h
@@ -28,16 +28,11 @@
 #include <asm/timex.h>
 
 /*!
- * @defgroup DPM Dynamic Power Management
- * @ingroup MSL
- */
-
-/*!
- * @file dpm.h
+ * @file arch-mxc/dpm.h
  *
  * @brief This file provides DPM support hooks for the Freescale MXC
  *
- * @ingroup DPM
+ * @ingroup DPM_MX27 DPM_MX31
  */
 
 /*!
diff --git a/include/asm-arm/arch-mxc/dptc.h b/include/asm-arm/arch-mxc/dptc.h
index b1a8d9f73675..12d58e3f480b 100644
--- a/include/asm-arm/arch-mxc/dptc.h
+++ b/include/asm-arm/arch-mxc/dptc.h
@@ -13,11 +13,11 @@
  */
 
 /*!
- * @file dptc.h
+ * @file arch-mxc/dptc.h
  *
  * @brief MXC dptc header file.
  *
- * @ingroup PM
+ * @ingroup PM_MX31
  */
 #ifndef __ASM_ARCH_MXC_DPTC_H__
 #define __ASM_ARCH_MXC_DPTC_H__
diff --git a/include/asm-arm/arch-mxc/dvfs.h b/include/asm-arm/arch-mxc/dvfs.h
index ff2c898573d1..bb31a3876413 100644
--- a/include/asm-arm/arch-mxc/dvfs.h
+++ b/include/asm-arm/arch-mxc/dvfs.h
@@ -12,11 +12,11 @@
  */
 
 /*!
- * @file dvfs.h
+ * @file arch-mxc/dvfs.h
  *
  * @brief MXC dvfs header file.
  *
- * @ingroup PM
+ * @ingroup PM_MX31
  */
 #ifndef __ASM_ARCH_MXC_DVFS_H__
 #define __ASM_ARCH_MXC_DVFS_H__
diff --git a/include/asm-arm/arch-mxc/dvfs_dptc_struct.h b/include/asm-arm/arch-mxc/dvfs_dptc_struct.h
index 382a3c2cbf43..fed4fcc1f55c 100644
--- a/include/asm-arm/arch-mxc/dvfs_dptc_struct.h
+++ b/include/asm-arm/arch-mxc/dvfs_dptc_struct.h
@@ -12,11 +12,11 @@
  */
 
 /*!
- * @file dvfs_dptc_struct.h
+ * @file arch-mxc/dvfs_dptc_struct.h
  *
  * @brief MXC dvfs & dptc structure definitions file.
  *
- * @ingroup PM
+ * @ingroup PM_MX27 PM_MX31
  */
 #ifndef __ASM_ARCH_MXC_DVFS_DPTC_STRUCT_H__
 #define __ASM_ARCH_MXC_DVFS_DPTC_STRUCT_H__
diff --git a/include/asm-arm/arch-mxc/gpio.h b/include/asm-arm/arch-mxc/gpio.h
index 7ecd688c22b5..ffa1e441a8c0 100644
--- a/include/asm-arm/arch-mxc/gpio.h
+++ b/include/asm-arm/arch-mxc/gpio.h
@@ -15,12 +15,11 @@
 
 /*!
  * @defgroup GPIO General Purpose Input Output (GPIO)
- * @ingroup MSL
  */
 
 /*!
- * @file gpio.h
- * @brief This file contains the GPIO and IOMUX configuration details.
+ * @file arch-mxc/gpio.h
+ * @brief This file contains the GPIO API functions.
  *
  * @ingroup GPIO
  */
diff --git a/include/asm-arm/arch-mxc/hardware.h b/include/asm-arm/arch-mxc/hardware.h
index d062fe4a5980..26d73f55a53a 100644
--- a/include/asm-arm/arch-mxc/hardware.h
+++ b/include/asm-arm/arch-mxc/hardware.h
@@ -12,10 +12,10 @@
  */
 
 /*!
- * @file hardware.h
+ * @file arch-mxc/hardware.h
  * @brief This file contains the hardware definitions of the board.
  *
- * @ingroup System
+ * @ingroup MSL_MX27 MSL_MX31
  */
 #ifndef __ASM_ARCH_MXC_HARDWARE_H__
 #define __ASM_ARCH_MXC_HARDWARE_H__
diff --git a/include/asm-arm/arch-mxc/io.h b/include/asm-arm/arch-mxc/io.h
index 96c319948839..46a1f6aad35a 100644
--- a/include/asm-arm/arch-mxc/io.h
+++ b/include/asm-arm/arch-mxc/io.h
@@ -12,12 +12,12 @@
  */
 
 /*!
- * @file io.h
+ * @file arch-mxc/io.h
  * @brief This file contains some memory mapping macros.
  * @note There is no real ISA or PCI buses. But have to define these macros
  * for some drivers to compile.
  *
- * @ingroup System
+ * @ingroup MSL_MX27 MSL_MX31
  */
 
 #ifndef __ASM_ARCH_MXC_IO_H__
diff --git a/include/asm-arm/arch-mxc/ipu.h b/include/asm-arm/arch-mxc/ipu.h
index 88700095f3d5..9cbfe37168a7 100644
--- a/include/asm-arm/arch-mxc/ipu.h
+++ b/include/asm-arm/arch-mxc/ipu.h
@@ -15,7 +15,7 @@
  * @defgroup IPU MXC Image Processing Unit (IPU) Driver
  */
 /*!
- * @file ipu.h
+ * @file arch-mxc/ipu.h
  *
  * @brief This file contains the IPU driver API declarations.
  *
diff --git a/include/asm-arm/arch-mxc/irqs.h b/include/asm-arm/arch-mxc/irqs.h
index b8f2acc085ce..83c3f50921c2 100644
--- a/include/asm-arm/arch-mxc/irqs.h
+++ b/include/asm-arm/arch-mxc/irqs.h
@@ -17,10 +17,10 @@
 
 /*!
  * @defgroup Interrupt Interrupt Controller (AVIC)
- * @ingroup MSL
  */
+
 /*!
- * @file irqs.h
+ * @file arch-mxc/irqs.h
  * @brief This file defines the number of normal interrupts and fast interrupts
  *
  * @ingroup Interrupt
diff --git a/include/asm-arm/arch-mxc/memory.h b/include/asm-arm/arch-mxc/memory.h
index 6af0b9091e3a..4d6264e0dccb 100644
--- a/include/asm-arm/arch-mxc/memory.h
+++ b/include/asm-arm/arch-mxc/memory.h
@@ -16,15 +16,19 @@
 #include <asm/arch/hardware.h>
 
 /*!
- * @defgroup Memory Memory Map
- * @ingroup MSL
+ * @defgroup Memory_MX27 Memory Map
+ * @ingroup MSL_MX27
+ */
+/*!
+ * @defgroup Memory_MX31 Memory Map
+ * @ingroup MSL_MX31
  */
 
 /*!
- * @file memory.h
+ * @file arch-mxc/memory.h
  * @brief This file contains macros needed by the Linux kernel and drivers.
  *
- * @ingroup Memory
+ * @ingroup Memory_MX27 Memory_MX31
  */
 
 /*!
diff --git a/include/asm-arm/arch-mxc/mx27.h b/include/asm-arm/arch-mxc/mx27.h
index b668dd2026eb..eb741a84f0ff 100644
--- a/include/asm-arm/arch-mxc/mx27.h
+++ b/include/asm-arm/arch-mxc/mx27.h
@@ -12,19 +12,10 @@
  */
 
 /*!
- * @defgroup MSL Machine Specific Layer (MSL)
- */
-
-/*!
- * @defgroup System System-wide Misc Files for MSL
- * @ingroup MSL
- */
-
-/*!
- * @file mx27.h
+ * @file arch-mxc/mx27.h
  * @brief This file contains register definitions.
  *
- * @ingroup System
+ * @ingroup MSL_MX27
  */
 
 #ifndef __ASM_ARCH_MXC_MX27_H__
diff --git a/include/asm-arm/arch-mxc/mx27_pins.h b/include/asm-arm/arch-mxc/mx27_pins.h
index 44528e5392a0..7724316d8c77 100644
--- a/include/asm-arm/arch-mxc/mx27_pins.h
+++ b/include/asm-arm/arch-mxc/mx27_pins.h
@@ -14,6 +14,14 @@
 #ifndef __ASM_ARCH_MXC_MX27_PINS_H__
 #define __ASM_ARCH_MXC_MX27_PINS_H__
 
+/*!
+ * @file arch-mxc/mx27_pins.h
+ *
+ * @brief MX27 I/O Pin List
+ *
+ * @ingroup GPIO_MX27
+ */
+
 #ifndef __ASSEMBLY__
 
 /*!
diff --git a/include/asm-arm/arch-mxc/mx2_dma.h b/include/asm-arm/arch-mxc/mx2_dma.h
index 011a91c85581..2cf3d1747727 100644
--- a/include/asm-arm/arch-mxc/mx2_dma.h
+++ b/include/asm-arm/arch-mxc/mx2_dma.h
@@ -15,14 +15,14 @@
 #define __ASM_ARCH_MXC_MX2_H__
 
 /*!
-*@defgroup DMA DMA driver
-*/
+ * @defgroup DMA_MX27 DMA driver for i.MX27
+ */
 
 /*!
- *@file mx2_dma.h
+ *@file arch-mxc/mx2_dma.h
  *@brief DMA driver header file
  *
- * @ingroup DMA
+ * @ingroup DMA_MX27
  *
  */
 
diff --git a/include/asm-arm/arch-mxc/mx31.h b/include/asm-arm/arch-mxc/mx31.h
index 053912adba6e..1c98fc65fe97 100644
--- a/include/asm-arm/arch-mxc/mx31.h
+++ b/include/asm-arm/arch-mxc/mx31.h
@@ -20,6 +20,12 @@
 #include <asm/arch/mx31_pins.h>
 
 /*!
+ * @file arch-mxc/mx31.h
+ * @brief This file contains register definitions.
+ *
+ * @ingroup MSL_MX31
+ */
+/*!
  * defines the OS clock tick rate
  */
 #define CLOCK_TICK_RATE         16625000
diff --git a/include/asm-arm/arch-mxc/mx31_pins.h b/include/asm-arm/arch-mxc/mx31_pins.h
index fea9276fd753..66642de1839f 100644
--- a/include/asm-arm/arch-mxc/mx31_pins.h
+++ b/include/asm-arm/arch-mxc/mx31_pins.h
@@ -13,6 +13,14 @@
 #ifndef __ASM_ARCH_MXC_MX31_PINS_H__
 #define __ASM_ARCH_MXC_MX31_PINS_H__
 
+/*!
+ * @file arch-mxc/mx31_pins.h
+ *
+ * @brief MX31 I/O Pin List
+ *
+ * @ingroup GPIO_MX31
+ */
+
 #ifndef __ASSEMBLY__
 
 /*!
diff --git a/include/asm-arm/arch-mxc/mxc.h b/include/asm-arm/arch-mxc/mxc.h
index fa8027cff47c..7051d230fcc3 100644
--- a/include/asm-arm/arch-mxc/mxc.h
+++ b/include/asm-arm/arch-mxc/mxc.h
@@ -19,6 +19,10 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/types.h>
+
+/*!
+ * @ingroup MSL_MX27 MSL_MX31
+ */
 /*!
  * gpio port structure
  */
diff --git a/include/asm-arm/arch-mxc/mxc_i2c.h b/include/asm-arm/arch-mxc/mxc_i2c.h
index 46de3cc40501..97fee0f33d49 100644
--- a/include/asm-arm/arch-mxc/mxc_i2c.h
+++ b/include/asm-arm/arch-mxc/mxc_i2c.h
@@ -18,7 +18,7 @@
  */
 
 /*!
- * @file mxc_i2c.h
+ * @file arch-mxc/mxc_i2c.h
  *
  * @brief This file contains the I2C chip level configuration details.
  *
diff --git a/include/asm-arm/arch-mxc/mxc_pf.h b/include/asm-arm/arch-mxc/mxc_pf.h
index dd5f13d8bf9d..77a14d7bf79c 100644
--- a/include/asm-arm/arch-mxc/mxc_pf.h
+++ b/include/asm-arm/arch-mxc/mxc_pf.h
@@ -15,7 +15,7 @@
  * @defgroup MXC_PF MPEG4/H.264 Post Filter Driver
  */
 /*!
- * @file mxc_pf.h
+ * @file arch-mxc/mxc_pf.h
  *
  * @brief MXC IPU MPEG4/H.264 Post-filtering driver
  *
diff --git a/include/asm-arm/arch-mxc/mxc_pm.h b/include/asm-arm/arch-mxc/mxc_pm.h
index 2d3675f97773..8c80938de5b1 100644
--- a/include/asm-arm/arch-mxc/mxc_pm.h
+++ b/include/asm-arm/arch-mxc/mxc_pm.h
@@ -17,7 +17,7 @@
  */
 
 /*!
- * @file mxc_pm.h
+ * @file arch-mxc/mxc_pm.h
  *
  * @brief This file contains the  chip level configuration details and
  * public API declarations for CRM_AP module
diff --git a/include/asm-arm/arch-mxc/mxc_scc.h b/include/asm-arm/arch-mxc/mxc_scc.h
index 82306cb055ec..3116e60dc157 100644
--- a/include/asm-arm/arch-mxc/mxc_scc.h
+++ b/include/asm-arm/arch-mxc/mxc_scc.h
@@ -12,7 +12,7 @@
  */
 
 /*!
- * @file mxc_scc.h
+ * @file arch-mxc/mxc_scc.h
  *
  * @brief This is intended to be the file which contains all of code or changes
  * needed to port the driver.
diff --git a/include/asm-arm/arch-mxc/mxc_scc_driver.h b/include/asm-arm/arch-mxc/mxc_scc_driver.h
index 3d94f2cc13fb..e013d33d02b4 100644
--- a/include/asm-arm/arch-mxc/mxc_scc_driver.h
+++ b/include/asm-arm/arch-mxc/mxc_scc_driver.h
@@ -39,7 +39,7 @@ extern "C" {
  */
 
 /*!
- * @file mxc_scc_driver.h
+ * @file arch-mxc/mxc_scc_driver.h
  *
  * @brief Header file to use the SCC driver.
  *
diff --git a/include/asm-arm/arch-mxc/mxc_security_api.h b/include/asm-arm/arch-mxc/mxc_security_api.h
index 0d1c533a7d1e..930526a810b7 100644
--- a/include/asm-arm/arch-mxc/mxc_security_api.h
+++ b/include/asm-arm/arch-mxc/mxc_security_api.h
@@ -26,7 +26,7 @@
  */
 
 /*!
- * @file mxc_security_api.h
+ * @file arch-mxc/mxc_security_api.h
  *
  * @brief MXC Security user header file.
  *
diff --git a/include/asm-arm/arch-mxc/mxc_uart.h b/include/asm-arm/arch-mxc/mxc_uart.h
index 3fc1dfd22f6f..e62d354ed9ff 100644
--- a/include/asm-arm/arch-mxc/mxc_uart.h
+++ b/include/asm-arm/arch-mxc/mxc_uart.h
@@ -16,7 +16,7 @@
  */
 
 /*!
- * @file mxc_uart.h
+ * @file arch-mxc/mxc_uart.h
  *
  * @brief This file contains the UART configuration structure definition.
  *
diff --git a/include/asm-arm/arch-mxc/mxc_v4l2.h b/include/asm-arm/arch-mxc/mxc_v4l2.h
index 14123386449a..aba8d74fc908 100644
--- a/include/asm-arm/arch-mxc/mxc_v4l2.h
+++ b/include/asm-arm/arch-mxc/mxc_v4l2.h
@@ -12,7 +12,7 @@
  */
 
 /*!
- * @file mxc_v4l2.h
+ * @file arch-mxc/mxc_v4l2.h
  *
  * @brief mxc V4L2 private structures
  *
diff --git a/include/asm-arm/arch-mxc/mxc_vpu.h b/include/asm-arm/arch-mxc/mxc_vpu.h
index 9f730048ba19..a1e1d7b99557 100644
--- a/include/asm-arm/arch-mxc/mxc_vpu.h
+++ b/include/asm-arm/arch-mxc/mxc_vpu.h
@@ -16,7 +16,7 @@
  */
 
 /*!
- * @file mxc_vpu.h
+ * @file arch-mxc/mxc_vpu.h
  *
  * @brief VPU system initialization and file operation definition
  *
diff --git a/include/asm-arm/arch-mxc/mxcfb.h b/include/asm-arm/arch-mxc/mxcfb.h
index 92dd55de1d0a..6c7dc6a8b32b 100644
--- a/include/asm-arm/arch-mxc/mxcfb.h
+++ b/include/asm-arm/arch-mxc/mxcfb.h
@@ -12,7 +12,7 @@
  */
 
 /*
- * @file    mxcfb.h
+ * @file arch-mxc/   mxcfb.h
  *
  * @brief Global header file for the MXC Frame buffer
  *
diff --git a/include/asm-arm/arch-mxc/param.h b/include/asm-arm/arch-mxc/param.h
index e37fd1ffd637..2218ae878c1f 100644
--- a/include/asm-arm/arch-mxc/param.h
+++ b/include/asm-arm/arch-mxc/param.h
@@ -18,9 +18,9 @@
  */
 
 /*!
- * @file param.h
+ * @file arch-mxc/param.h
  *
  * @brief This file exists only because other kernel files include it.
  *
- * @ingroup System
+ * @ingroup MSL_MX27 MSL_MX31
  */
diff --git a/include/asm-arm/arch-mxc/pm_api.h b/include/asm-arm/arch-mxc/pm_api.h
index ed9528698039..4b9c8a2ae147 100644
--- a/include/asm-arm/arch-mxc/pm_api.h
+++ b/include/asm-arm/arch-mxc/pm_api.h
@@ -12,15 +12,18 @@
  */
 
 /*!
- * @defgroup PM Dynamic Process Temperature Compensation (DPTC) & Dynamic Voltage Frequency Scaling (DVFS) Drivers
+ * @defgroup PM_MX27 Dynamic Process Temperature Compensation (DPTC) for i.MX27
+ */
+/*!
+ * @defgroup PM_MX31 Dynamic Process Temperature Compensation (DPTC) & Dynamic Voltage Frequency Scaling (DVFS) Drivers for i.MX31
  */
 
 /*!
- * @file pm_api.h
+ * @file arch-mxc/pm_api.h
  *
  * @brief MXC PM API header file.
  *
- * @ingroup PM
+ * @ingroup PM_MX27 PM_MX31
  */
 #ifndef __ASM_ARCH_MXC_PM_API_H__
 #define __ASM_ARCH_MXC_PM_API_H__
diff --git a/include/asm-arm/arch-mxc/pmic_adc.h b/include/asm-arm/arch-mxc/pmic_adc.h
index 24ffa1d27b9b..30573861785c 100644
--- a/include/asm-arm/arch-mxc/pmic_adc.h
+++ b/include/asm-arm/arch-mxc/pmic_adc.h
@@ -20,7 +20,7 @@
  */
 
 /*!
- * @file pmic_adc.h
+ * @file arch-mxc/pmic_adc.h
  * @brief This is the header of PMIC ADC driver.
  *
  * @ingroup PMIC_ADC
diff --git a/include/asm-arm/arch-mxc/pmic_audio.h b/include/asm-arm/arch-mxc/pmic_audio.h
index f870ae7234d2..61c6235b4295 100644
--- a/include/asm-arm/arch-mxc/pmic_audio.h
+++ b/include/asm-arm/arch-mxc/pmic_audio.h
@@ -19,7 +19,7 @@
  */
 
 /*!
- * @file pmic_audio.h
+ * @file arch-mxc/pmic_audio.h
  * @brief External definitions for the PMIC Audio Client driver.
  *
  * The PMIC Audio driver and this API were developed to support the
diff --git a/include/asm-arm/arch-mxc/pmic_battery.h b/include/asm-arm/arch-mxc/pmic_battery.h
index fe7309413fdd..b3929910d516 100644
--- a/include/asm-arm/arch-mxc/pmic_battery.h
+++ b/include/asm-arm/arch-mxc/pmic_battery.h
@@ -19,7 +19,7 @@
  */
 
 /*!
- * @file pmic_battery.h
+ * @file arch-mxc/pmic_battery.h
  * @brief This is the header of PMIC Battery driver.
  *
  * @ingroup PMIC_BATTERY
diff --git a/include/asm-arm/arch-mxc/pmic_convity.h b/include/asm-arm/arch-mxc/pmic_convity.h
index 88327d5424ee..484abf0f3c56 100644
--- a/include/asm-arm/arch-mxc/pmic_convity.h
+++ b/include/asm-arm/arch-mxc/pmic_convity.h
@@ -19,7 +19,7 @@
  */
 
 /*!
- * @file pmic_convity.h
+ * @file arch-mxc/pmic_convity.h
  * @brief External definitions for the PMIC Connectivity Client driver.
  *
  * The PMIC Connectivity driver and this API were developed to support the
diff --git a/include/asm-arm/arch-mxc/pmic_external.h b/include/asm-arm/arch-mxc/pmic_external.h
index 3d60c993173a..f06e9e3a0ce7 100644
--- a/include/asm-arm/arch-mxc/pmic_external.h
+++ b/include/asm-arm/arch-mxc/pmic_external.h
@@ -27,7 +27,7 @@
  */
 
 /*!
- * @file pmic_external.h
+ * @file arch-mxc/pmic_external.h
  * @brief This file contains interface of PMIC protocol driver.
  *
  * @ingroup PMIC_CORE
diff --git a/include/asm-arm/arch-mxc/pmic_light.h b/include/asm-arm/arch-mxc/pmic_light.h
index e9d96b32a6d5..3465b1bf3090 100644
--- a/include/asm-arm/arch-mxc/pmic_light.h
+++ b/include/asm-arm/arch-mxc/pmic_light.h
@@ -19,7 +19,7 @@
  */
 
 /*!
- * @file pmic_light.h
+ * @file arch-mxc/pmic_light.h
  * @brief This is the header of PMIC Light driver.
  *
  * @ingroup PMIC_LIGHT
diff --git a/include/asm-arm/arch-mxc/pmic_power.h b/include/asm-arm/arch-mxc/pmic_power.h
index a3c80c8dadd2..25885ff9da88 100644
--- a/include/asm-arm/arch-mxc/pmic_power.h
+++ b/include/asm-arm/arch-mxc/pmic_power.h
@@ -19,7 +19,7 @@
  */
 
 /*!
- * @file pmic_power.h
+ * @file arch-mxc/pmic_power.h
  * @brief This is the header of PMIC power driver.
  *
  * @ingroup PMIC_POWER
diff --git a/include/asm-arm/arch-mxc/pmic_rtc.h b/include/asm-arm/arch-mxc/pmic_rtc.h
index 1325553d617a..83a29af21728 100644
--- a/include/asm-arm/arch-mxc/pmic_rtc.h
+++ b/include/asm-arm/arch-mxc/pmic_rtc.h
@@ -20,7 +20,7 @@
  */
 
 /*!
- * @file pmic_rtc.h
+ * @file arch-mxc/pmic_rtc.h
  * @brief This is the header of PMIC RTC driver.
  *
  * @ingroup PMIC_RTC
diff --git a/include/asm-arm/arch-mxc/pmic_status.h b/include/asm-arm/arch-mxc/pmic_status.h
index e20572951779..9b58b1fca4b6 100644
--- a/include/asm-arm/arch-mxc/pmic_status.h
+++ b/include/asm-arm/arch-mxc/pmic_status.h
@@ -14,7 +14,7 @@
 #define __ASM_ARCH_MXC_PMIC_STATUS_H__
 #include <asm-generic/errno-base.h>
 /*!
- * @file pmic_status.h
+ * @file arch-mxc/pmic_status.h
  * @brief PMIC APIs return code definition.
  *
  * @ingroup PMIC_CORE
diff --git a/include/asm-arm/arch-mxc/sdma.h b/include/asm-arm/arch-mxc/sdma.h
index 2cc4c90fe9c1..a101e7353136 100644
--- a/include/asm-arm/arch-mxc/sdma.h
+++ b/include/asm-arm/arch-mxc/sdma.h
@@ -20,7 +20,7 @@
  */
 
 /*!
- * @file sdma.h
+ * @file arch-mxc/sdma.h
  *
  * @brief This file contains the SDMA API declarations.
  *
diff --git a/include/asm-arm/arch-mxc/spba.h b/include/asm-arm/arch-mxc/spba.h
index 1d698411b2ce..52d26cf30c52 100644
--- a/include/asm-arm/arch-mxc/spba.h
+++ b/include/asm-arm/arch-mxc/spba.h
@@ -14,11 +14,11 @@
 
 /*!
  * @defgroup SPBA Shared Peripheral Bus Arbiter (SPBA)
- * @ingroup MSL
+ * @ingroup MSL_MX31
  */
 
 /*!
- * @file spba.h
+ * @file arch-mxc/spba.h
  * @brief This file contains the Shared Peripheral Bus Arbiter (spba) API.
  *
  * @ingroup SPBA
diff --git a/include/asm-arm/arch-mxc/system.h b/include/asm-arm/arch-mxc/system.h
index 493591d6e5c7..914d595bd9ae 100644
--- a/include/asm-arm/arch-mxc/system.h
+++ b/include/asm-arm/arch-mxc/system.h
@@ -22,19 +22,10 @@
 #define __ASM_ARCH_MXC_SYSTEM_H__
 
 /*!
- * @defgroup MSL Machine Specific Layer (MSL)
- */
-
-/*!
- * @defgroup System System-wide Misc Files for MSL
- * @ingroup MSL
- */
-
-/*!
- * @file system.h
+ * @file arch-mxc/system.h
  * @brief This file contains idle and reset functions.
  *
- * @ingroup System
+ * @ingroup MSL_MX27 MSL_MX31
  */
 
 /*!
diff --git a/include/asm-arm/arch-mxc/vmalloc.h b/include/asm-arm/arch-mxc/vmalloc.h
index 2732fb4f62b4..9fcba5964d06 100644
--- a/include/asm-arm/arch-mxc/vmalloc.h
+++ b/include/asm-arm/arch-mxc/vmalloc.h
@@ -21,11 +21,11 @@
 #define __ASM_ARCH_MXC_VMALLOC_H__
 
 /*!
- * @file vmalloc.h
+ * @file arch-mxc/vmalloc.h
  *
  * @brief This file contains the macros for vmalloc.
  *
- * @ingroup System
+ * @ingroup MSL_MX27 MSL_MX31
  */
 
 /*!