diff --git a/include/nuttx/video/ltdc.h b/arch/arm/include/stm32/ltdc.h
similarity index 99%
rename from include/nuttx/video/ltdc.h
rename to arch/arm/include/stm32/ltdc.h
index 8252ccb121..24f2632e13 100644
--- a/include/nuttx/video/ltdc.h
+++ b/arch/arm/include/stm32/ltdc.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * include/nuttx/video/ltdc.h
+ * arch/arm/src/include/stm32/ltdc.h
  *
  *   Copyright (C) 2014 Marco Krahl. All rights reserved.
  *   Author: Marco Krahl <ocram.lhark@gmail.com>
@@ -33,8 +33,8 @@
  *
  ******************************************************************************/
 
-#ifndef _INCLUDE_NUTTX_VIDEO_LTDC_H
-#define _INCLUDE_NUTTX_VIDEO_LTDC_H
+#ifndef __ARCH_ARM_INCLUDE_STM32_LTDC_H
+#define __ARCH_ARM_INCLUDE_STM32_LTDC_H
 
 /*******************************************************************************
  * Included Files
@@ -560,4 +560,4 @@ struct ltdc_layer_s
  ******************************************************************************/
 FAR struct ltdc_layer_s *up_ltdcgetlayer(int lid);
 #endif /* CONFIG_STM32_LTDC */
-#endif /* _INCLUDE_NUTTX_VIDEO_LTDC_H */
+#endif /* __ARCH_ARM_INCLUDE_STM32_LTDC_H */
diff --git a/arch/arm/src/stm32/stm32_dma2d.c b/arch/arm/src/stm32/stm32_dma2d.c
index 402b027363..182415b77d 100644
--- a/arch/arm/src/stm32/stm32_dma2d.c
+++ b/arch/arm/src/stm32/stm32_dma2d.c
@@ -48,9 +48,9 @@
 #include <debug.h>
 
 #include <nuttx/video/fb.h>
-#include <nuttx/video/ltdc.h>
 #include <nuttx/kmalloc.h>
 
+#include <arch/chip/ltdc.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -109,16 +109,15 @@
  ****************************************************************************/
 
 int stm32_dma2dblit(FAR struct stm32_ltdc_s *dest,
-                            FAR struct stm32_ltdc_s *fore,
-                            fb_coord_t forexpos, fb_coord_t foreypos,
-                            FAR struct stm32_ltdc_s *back,
-                            FAR const struct ltdc_area_s *backarea)
+                    FAR struct stm32_ltdc_s *fore,
+                    fb_coord_t forexpos, fb_coord_t foreypos,
+                    FAR struct stm32_ltdc_s *back,
+                    FAR const struct ltdc_area_s *backarea)
 {
   gdbg("Not implemented");
   return -ENOSYS;
 }
 
-
 /****************************************************************************
  *
  * Name: stm32_dma2dblend
@@ -144,16 +143,15 @@ int stm32_dma2dblit(FAR struct stm32_ltdc_s *dest,
  ****************************************************************************/
 
 int stm32_dma2dblend(FAR struct stm32_ltdc_s *dest,
-                            FAR struct stm32_ltdc_s *fore,
-                            fb_coord_t forexpos, fb_coord_t foreypos,
-                            FAR struct stm32_ltdc_s *back,
-                            FAR const struct ltdc_area_s *backarea)
+                     FAR struct stm32_ltdc_s *fore,
+                     fb_coord_t forexpos, fb_coord_t foreypos,
+                     FAR struct stm32_ltdc_s *back,
+                     FAR const struct ltdc_area_s *backarea)
 {
   gdbg("Not implemented");
   return -ENOSYS;
 }
 
-
 /******************************************************************************
  * Name: up_dma2dinitialize
  *
@@ -182,4 +180,3 @@ int up_dma2dinitialize(void)
 void up_dma2duninitialize(void)
 {
 }
-
diff --git a/arch/arm/src/stm32/stm32_dma2d.h b/arch/arm/src/stm32/stm32_dma2d.h
index 9540e311dd..adb86db034 100644
--- a/arch/arm/src/stm32/stm32_dma2d.h
+++ b/arch/arm/src/stm32/stm32_dma2d.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/video/fb.h>
-#include <nuttx/video/ltdc.h>
+#include <arch/chip/ltdc.h>
 #include "stm32_ltdc.h"
 
 #ifdef CONFIG_STM32_DMA2D
diff --git a/arch/arm/src/stm32/stm32_ltdc.c b/arch/arm/src/stm32/stm32_ltdc.c
index a2526607ac..52ec101811 100644
--- a/arch/arm/src/stm32/stm32_ltdc.c
+++ b/arch/arm/src/stm32/stm32_ltdc.c
@@ -49,9 +49,9 @@
 #include <debug.h>
 
 #include <nuttx/video/fb.h>
-#include <nuttx/video/ltdc.h>
 #include <nuttx/kmalloc.h>
 
+#include <arch/chip/ltdc.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -61,7 +61,6 @@
 #include "stm32_ltdc.h"
 #include "stm32_dma2d.h"
 
-
 /****************************************************************************
  * Pre-Processor Definitions
  ****************************************************************************/
@@ -82,28 +81,34 @@
 /* Configure LTDC register */
 
 /* LTDC_LxWHPCR register */
+
 #define STM32_LTDC_LxWHPCR_WHSTPOS  (BOARD_LTDC_HSYNC + BOARD_LTDC_HBP - 1)
 #define STM32_LTDC_LxWHPCR_WHSPPOS  (BOARD_LTDC_HSYNC + BOARD_LTDC_HBP + \
                                      STM32_LTDC_WIDTH - 1)
 
 /* LTDC_LxWVPCR register */
+
 #define STM32_LTDC_LxWVPCR_WVSTPOS  (BOARD_LTDC_VSYNC + BOARD_LTDC_VBP - 1)
 #define STM32_LTDC_LxWVPCR_WVSPPOS  (BOARD_LTDC_VSYNC + BOARD_LTDC_VBP + \
                                      STM32_LTDC_HEIGHT - 1)
 
 /* LTDC_SSCR register */
+
 #define STM32_LTDC_SSCR_VSH          LTDC_SSCR_VSH(BOARD_LTDC_VSYNC - 1)
 #define STM32_LTDC_SSCR_HSW          LTDC_SSCR_HSW(BOARD_LTDC_HSYNC - 1)
 
 /* LTDC_BPCR register */
+
 #define STM32_LTDC_BPCR_AVBP         LTDC_BPCR_AVBP(STM32_LTDC_LxWVPCR_WVSTPOS)
 #define STM32_LTDC_BPCR_AHBP         LTDC_BPCR_AHBP(STM32_LTDC_LxWHPCR_WHSTPOS)
 
 /* LTDC_AWCR register */
+
 #define STM32_LTDC_AWCR_AAH          LTDC_AWCR_AAH(STM32_LTDC_LxWVPCR_WVSPPOS)
 #define STM32_LTDC_AWCR_AAW          LTDC_AWCR_AAW(STM32_LTDC_LxWHPCR_WHSPPOS)
 
 /* LTDC_TWCR register */
+
 #define STM32_LTDC_TWCR_TOTALH       LTDC_TWCR_TOTALH(BOARD_LTDC_VSYNC + \
                                      BOARD_LTDC_VBP + \
                                      STM32_LTDC_HEIGHT + BOARD_LTDC_VFP - 1)
@@ -114,26 +119,29 @@
 /* Global GCR register */
 
 /* Synchronisation and Polarity */
+
 #define STM32_LTDC_GCR_PCPOL         BOARD_LTDC_GCR_PCPOL
 #define STM32_LTDC_GCR_DEPOL         BOARD_LTDC_GCR_DEPOL
 #define STM32_LTDC_GCR_VSPOL         BOARD_LTDC_GCR_VSPOL
 #define STM32_LTDC_GCR_HSPOL         BOARD_LTDC_GCR_HSPOL
 
 /* Dither */
+
 #define STM32_LTDC_GCR_DEN           BOARD_LTDC_GCR_DEN
 #define STM32_LTDC_GCR_DBW           LTDC_GCR_GBW(BOARD_LTDC_GCR_DBW)
 #define STM32_LTDC_GCR_DGW           LTDC_GCR_DGW(BOARD_LTDC_GCR_DGW)
 #define STN32_LTDC_GCR_DRW           LTDC_GCR_DBW(BOARD_LTDC_GCR_DRW)
 
 /* IER register */
+
 #define STM32_LTDC_IER_LIE           LTDC_IER_LIE
 #define STM32_LTDC_IER_FUIE          !LTDC_IER_FUIE
 #define STM32_LTDC_IER_TERRIE        !LTDC_IER_TERRIE
 #define STM32_LTDC_IER_RRIE          LTDC_IER_RRIE
 
 /* LIPCR register */
-#define STM32_LTDC_LIPCR_LIPOS       LTDC_LIPCR_LIPOS(STM32_LTDC_TWCR_TOTALW)
 
+#define STM32_LTDC_LIPCR_LIPOS       LTDC_LIPCR_LIPOS(STM32_LTDC_TWCR_TOTALW)
 
 /* Configuration ************************************************************/
 
@@ -236,7 +244,6 @@
 
 #define STM32_LTDC_Lx_BYPP(n)        ((n) / 8)
 
-
 #define STM32_L1_FBSIZE (STM32_L1_STRIDE * STM32_LTDC_HEIGHT)
 
 #ifdef CONFIG_STM32_LTDC_L2
@@ -364,7 +371,7 @@
 #define LTDC_LAYER_SETENABLE        (1 << 6) /* Change enabled state */
 #define LTDC_LAYER_ENABLE           (1 << 7) /* Enable the layer */
 
-/* Layer initalizing state */
+/* Layer initializing state */
 
 #define LTDC_LAYER_INIT             LTDC_LAYER_SETAREA | \
                                     LTDC_LAYER_SETALPHAVALUE | \
@@ -407,7 +414,6 @@
 # endif
 #endif
 
-
 /* Layer clut rgb value positioning */
 
 #define LTDC_L1CLUT_REDOFFSET       0
@@ -502,7 +508,7 @@ static void stm32_ltdc_gpioconfig(void);
 static void stm32_ltdc_periphconfig(void);
 static void stm32_ltdc_bgcolor(uint32_t rgb);
 static void stm32_ltdc_dither(bool enable, uint8_t red,
-                                uint8_t green, uint8_t blue);
+                              uint8_t green, uint8_t blue);
 static void stm32_ltdc_interrupt(uint32_t mask, uint32_t value);
 static void stm32_ltdc_reload(uint8_t value);
 
@@ -514,9 +520,9 @@ static inline uint8_t stm32_ltdc_lgetopac(FAR struct stm32_layer_s *layer);
 static inline bool stm32_ltdc_lvalidate(FAR struct stm32_layer_s *layer);
 #ifdef CONFIG_STM32_LTDC_INTERFACE
 static int stm32_ltdc_lvalidatearea(FAR struct stm32_layer_s *layer,
-                              fb_coord_t xpos, fb_coord_t ypos,
-                              fb_coord_t xres, fb_coord_t yres,
-                              fb_coord_t srcxpos, fb_coord_t srcypos);
+                                    fb_coord_t xpos, fb_coord_t ypos,
+                                    fb_coord_t xres, fb_coord_t yres,
+                                    fb_coord_t srcxpos, fb_coord_t srcypos);
 #endif
 static void stm32_ltdc_lupdate(FAR struct stm32_layer_s *layer);
 
@@ -527,40 +533,39 @@ static void stm32_ltdc_lcolor(FAR struct stm32_layer_s *layer, uint32_t argb);
 static void stm32_ltdc_lcolorkey(FAR struct stm32_layer_s *layer);
 static void stm32_ltdc_lalpha(FAR struct stm32_layer_s *layer);
 static void stm32_ltdc_lblendmode(FAR struct stm32_layer_s *layer,
-                                    uint8_t bf1, uint8_t bf2);
+                                  uint8_t bf1, uint8_t bf2);
 
 #ifdef STM32_LAYER_CLUT_SIZE
 static void stm32_ltdc_cmapcpy(FAR struct fb_cmap_s *dest,
-                                FAR const struct fb_cmap_s *src);
+                               FAR const struct fb_cmap_s *src);
 static void stm32_ltdc_lclut(FAR struct stm32_layer_s *layer);
 static void stm32_ltdc_lclutenable(FAR struct stm32_layer_s* layer, bool enable);
 #endif
 static void stm32_ltdc_linit(int lid);
 static void stm32_ltdc_lenable(FAR struct stm32_layer_s *layer);
 static void stm32_ltdc_lclear(FAR struct stm32_layer_s *layer,
-                                nxgl_mxpixel_t color);
+                              nxgl_mxpixel_t color);
 
 /* Generic frame buffer interface */
 
 static int stm32_getvideoinfo(FAR struct fb_vtable_s *vtable,
-              struct fb_videoinfo_s *vinfo);
+                              struct fb_videoinfo_s *vinfo);
 static int stm32_getplaneinfo(FAR struct fb_vtable_s *vtable,
-              int planeno, struct fb_planeinfo_s *pinfo);
+                              int planeno, struct fb_planeinfo_s *pinfo);
 
-/*
- * The following is provided only if the video hardware supports RGB color
+/* The following is provided only if the video hardware supports RGB color
  * mapping
  */
 
 #ifdef STM32_LAYER_CLUT_SIZE
 static int stm32_getcmap(struct fb_vtable_s *vtable,
-              struct fb_cmap_s *cmap);
+                         struct fb_cmap_s *cmap);
 static int stm32_putcmap(struct fb_vtable_s *vtable,
-              const struct fb_cmap_s *cmap);
+                         const struct fb_cmap_s *cmap);
 #endif
 
-
 /* ltdc interface */
+
 #ifdef STM32_LAYER_CLUT_SIZE
 static int stm32_setclut(struct ltdc_layer_s *layer,
               const struct fb_cmap_s *cmap);
@@ -584,11 +589,11 @@ static int stm32_getalpha(FAR struct ltdc_layer_s *layer, uint8_t *alpha);
 static int stm32_setblendmode(FAR struct ltdc_layer_s *layer, uint32_t mode);
 static int stm32_getblendmode(FAR struct ltdc_layer_s *layer, uint32_t *mode);
 static int stm32_setarea(FAR struct ltdc_layer_s *layer,
-                          FAR const struct ltdc_area_s *area,
-                          fb_coord_t srcxpos, fb_coord_t srcypos);
+                         FAR const struct ltdc_area_s *area,
+                         fb_coord_t srcxpos, fb_coord_t srcypos);
 static int stm32_getarea(FAR struct ltdc_layer_s *layer,
-                          FAR struct ltdc_area_s *area,
-                          fb_coord_t *srcxpos, fb_coord_t *srcypos);
+                         FAR struct ltdc_area_s *area,
+                         fb_coord_t *srcxpos, fb_coord_t *srcypos);
 static int stm32_update(FAR struct ltdc_layer_s *layer, uint32_t mode);
 
 #ifdef CONFIG_STM32_DMA2D
@@ -598,10 +603,10 @@ static int stm32_blit(FAR struct ltdc_layer_s *dest,
                       FAR struct ltdc_layer_s *back,
                       FAR const struct ltdc_area_s *backarea);
 static int stm32_blend(FAR struct ltdc_layer_s *dest,
-                        FAR struct ltdc_layer_s *fore,
-                        fb_coord_t forexpos, fb_coord_t foreypos,
-                        FAR struct ltdc_layer_s *back,
-                        FAR const struct ltdc_area_s *backarea);
+                       FAR struct ltdc_layer_s *fore,
+                       fb_coord_t forexpos, fb_coord_t foreypos,
+                       FAR struct ltdc_layer_s *back,
+                       FAR const struct ltdc_area_s *backarea);
 #endif
 #endif /* CONFIG_STM32_LTDC_INTERFACE */
 
@@ -973,7 +978,6 @@ static void stm32_ltdc_periphconfig(void)
   regvdbg("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR));
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_bgcolor
  *
@@ -992,7 +996,6 @@ static void stm32_ltdc_bgcolor(uint32_t rgb)
   regvdbg("configured LTDC_BCCR=%08x\n", getreg32(STM32_LTDC_BCCR));
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_dither
  *
@@ -1008,9 +1011,9 @@ static void stm32_ltdc_bgcolor(uint32_t rgb)
  ****************************************************************************/
 
 static void stm32_ltdc_dither(bool enable,
-                            uint8_t red,
-                            uint8_t green,
-                            uint8_t blue)
+                              uint8_t red,
+                              uint8_t green,
+                              uint8_t blue)
 {
   uint32_t    regval;
 
@@ -1034,7 +1037,6 @@ static void stm32_ltdc_dither(bool enable,
   regvdbg("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR));
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_interrupt
  *
@@ -1049,7 +1051,7 @@ static void stm32_ltdc_dither(bool enable,
 
 static void stm32_ltdc_interrupt(uint32_t mask, uint32_t value)
 {
-  uint32_t    regval;
+  uint32_t regval;
 
   /* Get interrupts */
 
@@ -1071,7 +1073,6 @@ static void stm32_ltdc_interrupt(uint32_t mask, uint32_t value)
   regvdbg("configured LTDC_LIPCR=%08x\n", getreg32(STM32_LTDC_LIPCR));
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_reload
  *
@@ -1107,7 +1108,6 @@ static void stm32_ltdc_reload(uint8_t value)
     }
 }
 
-
 /****************************************************************************
  * Name: stm32_global_configure
  *
@@ -1137,6 +1137,7 @@ static void stm32_global_configure(void)
 
   memset(g_clut, 0, sizeof(g_clut));
 #endif
+
   /* Configure dither */
 
   stm32_ltdc_dither(
@@ -1172,7 +1173,6 @@ static void stm32_global_configure(void)
   stm32_ltdc_interrupt(STM32_LTDC_IER_RRIE, 1);
 }
 
-
 /****************************************************************************
  * Name: stm32_lcd_enable
  *
@@ -1205,7 +1205,6 @@ static void stm32_lcd_enable(bool enable)
   regvdbg("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR));
 }
 
-
 /****************************************************************************
  * Configure layer register
  ****************************************************************************/
@@ -1221,6 +1220,7 @@ static void stm32_lcd_enable(bool enable)
  *   enable - Enable or disable
  *
  ****************************************************************************/
+
 #ifdef STM32_LAYER_CLUT_SIZE
 static void stm32_ltdc_lclutenable(FAR struct stm32_layer_s* layer, bool enable)
 {
@@ -1261,7 +1261,6 @@ static inline void stm32_ltdc_lsetopac(FAR struct stm32_layer_s *layer)
   layer->opac = 0xff;
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_lunsetopac
  *
@@ -1278,7 +1277,6 @@ static inline void stm32_ltdc_lunsetopac(FAR struct stm32_layer_s *layer)
   layer->opac = 0;
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_lgetopac
  *
@@ -1295,7 +1293,6 @@ static inline uint8_t stm32_ltdc_lgetopac(FAR struct stm32_layer_s *layer)
   return layer->opac | layer->state.alpha;
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_lvalidate
  *
@@ -1320,7 +1317,6 @@ static inline bool stm32_ltdc_lvalidate(FAR struct stm32_layer_s *layer)
 #endif
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_lvalidatearea
  *
@@ -1341,6 +1337,7 @@ static inline bool stm32_ltdc_lvalidate(FAR struct stm32_layer_s *layer)
  *   On error   - -EINVAL
  *
  ****************************************************************************/
+
 #ifdef CONFIG_STM32_LTDC_INTERFACE
 static int stm32_ltdc_lvalidatearea(FAR struct stm32_layer_s *layer,
                                     fb_coord_t xpos, fb_coord_t ypos,
@@ -1392,34 +1389,39 @@ static void stm32_ltdc_lupdate(FAR struct stm32_layer_s *layer)
 {
   if (layer->operation & LTDC_LAYER_SETAREA)
     {
-      /* Updates the layer horicontal and vertical position register */
+      /* Updates the layer horizontal and vertical position register */
 
       stm32_ltdc_larea(layer);
     }
+
   if (layer->operation & LTDC_LAYER_SETALPHAVALUE)
     {
       /* Updates the constant alpha register */
 
       stm32_ltdc_lalpha(layer);
     }
+
   if (layer->operation & LTDC_LAYER_SETBLENDMODE)
     {
-      /* Update blenfactor 1 and 2 register */
+      /* Update blendfactor 1 and 2 register */
 
       stm32_ltdc_lblendmode(layer, layer->bf1, layer->bf2);
     }
+
   if (layer->operation & LTDC_LAYER_SETCOLORKEY)
     {
       /* Update layer colorkey register */
 
       stm32_ltdc_lcolorkey(layer);
     }
+
   if (layer->operation & LTDC_LAYER_SETCOLOR)
     {
       /* Update layer color register */
 
       stm32_ltdc_lcolor(layer, layer->state.color);
     }
+
   if (layer->operation & LTDC_LAYER_SETENABLE)
     {
       /* Enable the layer */
@@ -1428,7 +1430,6 @@ static void stm32_ltdc_lupdate(FAR struct stm32_layer_s *layer)
     }
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_larea
  *
@@ -1449,14 +1450,13 @@ static void stm32_ltdc_larea(struct stm32_layer_s *layer)
   FAR struct stm32_ltdc_s *priv = &layer->state;
   FAR struct ltdc_area_s *area = &priv->area;
 
-
   regvdbg("xpos = %d, ypos = %d, xres = %d, yres = %d\n",
         area->xpos, area->ypos, area->xres, area->yres);
 
   lxpos = area->xpos + (STM32_LTDC_LxWHPCR_WHSTPOS + 1);
   lypos = area->ypos + (STM32_LTDC_LxWVPCR_WVSTPOS + 1);
 
-  /* Accumulate horicontal position */
+  /* Accumulate horizontal position */
 
   whpcr =  LTDC_LxWHPCR_WHSTPOS(lxpos);
   whpcr |= LTDC_LxWHPCR_WHSPPOS(lxpos + area->xres - 1);
@@ -1482,7 +1482,6 @@ static void stm32_ltdc_larea(struct stm32_layer_s *layer)
   layer->operation &= ~LTDC_LAYER_SETAREA;
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_lpixelformat
  *
@@ -1491,7 +1490,7 @@ static void stm32_ltdc_larea(struct stm32_layer_s *layer)
  *   Note! This changes have no effect until the shadow register reload has
  *   been done.
  *
- * Paramater:
+ * Parameter:
  *   Reference to the layer control structure
  *
  ****************************************************************************/
@@ -1506,7 +1505,6 @@ static void stm32_ltdc_lpixelformat(FAR struct stm32_layer_s *layer)
             stm32_pfcr_layer_t[layer->state.lid]);
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_framebuffer
  *
@@ -1552,7 +1550,6 @@ static inline void stm32_ltdc_lframebuffer(FAR struct stm32_layer_s *layer)
   putreg32(area->yres, stm32_cfblnr_layer_t[priv->lid]);
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_lalpha
  *
@@ -1577,7 +1574,6 @@ static void stm32_ltdc_lalpha(FAR struct stm32_layer_s *layer)
   layer->operation &= ~LTDC_LAYER_SETALPHAVALUE;
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_blendfactor
  *
@@ -1597,17 +1593,16 @@ static void stm32_ltdc_lalpha(FAR struct stm32_layer_s *layer)
 static void stm32_ltdc_lblendmode(FAR struct stm32_layer_s *layer,
                                     uint8_t bf1, uint8_t bf2)
 {
-    regvdbg("set LTDC_L%dBFCR=%08x\n", layer->state.lid + 1,
-              (LTDC_LxBFCR_BF1(bf1) | LTDC_LxBFCR_BF2(bf2)));
-    putreg32((LTDC_LxBFCR_BF1(bf1) | LTDC_LxBFCR_BF2(bf2)),
-                stm32_bfcr_layer_t[layer->state.lid]);
+  regvdbg("set LTDC_L%dBFCR=%08x\n", layer->state.lid + 1,
+          (LTDC_LxBFCR_BF1(bf1) | LTDC_LxBFCR_BF2(bf2)));
+  putreg32((LTDC_LxBFCR_BF1(bf1) | LTDC_LxBFCR_BF2(bf2)),
+           stm32_bfcr_layer_t[layer->state.lid]);
 
-    /* Clear the blendmode operation flag */
+  /* Clear the blendmode operation flag */
 
-    layer->operation &= ~LTDC_LAYER_SETBLENDMODE;
+  layer->operation &= ~LTDC_LAYER_SETBLENDMODE;
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_lcolor
  *
@@ -1631,7 +1626,6 @@ static void stm32_ltdc_lcolor(FAR struct stm32_layer_s *layer, uint32_t argb)
   layer->operation &= ~LTDC_LAYER_SETCOLOR;
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_lcolorkey
  *
@@ -1678,7 +1672,6 @@ static void stm32_ltdc_lcolorkey(FAR struct stm32_layer_s *layer)
   layer->operation &= ~LTDC_LAYER_SETCOLORKEY;
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_lclut
  *
@@ -1777,14 +1770,13 @@ static void stm32_ltdc_lenable(FAR struct stm32_layer_s *layer)
   layer->operation &= ~LTDC_LAYER_SETENABLE;
 }
 
-
 /****************************************************************************
  * Name stm32_ltdc_lclear
  *
  * Description:
  *   Clear the whole layer
  *
- * Paramater:
+ * Parameter:
  *   layer - Reference to the layer control structure
  *   color - The color to clear
  *
@@ -1816,6 +1808,7 @@ static void stm32_ltdc_lclear(FAR struct stm32_layer_s *layer,
       return;
     }
 #endif
+
 #if STM32_LTDC_L1_BPP == 16 || STM32_LTDC_L2_BPP == 16
   if (priv->pinfo.bpp == 16)
     {
@@ -1833,6 +1826,7 @@ static void stm32_ltdc_lclear(FAR struct stm32_layer_s *layer,
       return;
     }
 #endif
+
 #if STM32_LTDC_L1_BPP == 24 || STM32_LTDC_L2_BPP == 24
   if (priv->pinfo.bpp == 24)
     {
@@ -1859,6 +1853,7 @@ static void stm32_ltdc_lclear(FAR struct stm32_layer_s *layer,
       return;
     }
 #endif
+
 #if STM32_LTDC_L1_BPP == 32 || STM32_LTDC_L2_BPP == 32
   if (priv->pinfo.bpp == 32)
     {
@@ -1876,7 +1871,6 @@ static void stm32_ltdc_lclear(FAR struct stm32_layer_s *layer,
 #endif
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_linit
  *
@@ -1977,10 +1971,8 @@ static void stm32_ltdc_linit(int lid)
       stm32_ltdc_lclutenable(layer, false);
     }
 #endif
-
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdc_cmapcpy
  *
@@ -2007,7 +1999,7 @@ static void stm32_ltdc_cmapcpy(FAR struct fb_cmap_s *dest,
   for (n = src->first; n < src->len && n < STM32_LTDC_CLUT_ENTRIES; n++)
     {
       regvdbg("n = %d, red = %02x, green = %02x, blue = %02x\n",
-        n, src->red[n], src->green[n], src->blue[n]);
+              n, src->red[n], src->green[n], src->blue[n]);
       dest->red[n]   = src->red[n];
       dest->green[n] = src->green[n];
       dest->blue[n]  = src->blue[n];
@@ -2018,7 +2010,6 @@ static void stm32_ltdc_cmapcpy(FAR struct fb_cmap_s *dest,
 }
 #endif
 
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -2058,7 +2049,6 @@ static int stm32_getvideoinfo(struct fb_vtable_s *vtable,
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: stm32_getplaneinfo
  *
@@ -2094,7 +2084,6 @@ static int stm32_getplaneinfo(struct fb_vtable_s *vtable, int planeno,
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: stm32_getcmap
  *
@@ -2122,7 +2111,6 @@ static int stm32_getcmap(struct fb_vtable_s *vtable,
 #endif
 }
 
-
 /****************************************************************************
  * Name: stm32_putcmap
  *
@@ -2150,7 +2138,6 @@ static int stm32_putcmap(struct fb_vtable_s *vtable,
 }
 #endif /* STM32_LAYER_CLUT_SIZE */
 
-
 /****************************************************************************
  * Name: stm32_lgetvideoinfo
  *
@@ -2184,7 +2171,6 @@ static int stm32_lgetvideoinfo(struct ltdc_layer_s *layer,
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: stm32_lgetplaneinfo
  *
@@ -2218,7 +2204,6 @@ static int stm32_lgetplaneinfo(struct ltdc_layer_s *layer, int planeno,
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: stm32_setclut
  *
@@ -2282,7 +2267,6 @@ static int stm32_setclut(struct ltdc_layer_s *layer,
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: stm32_getclut
  *
@@ -2415,7 +2399,6 @@ static int stm32_getlid(FAR struct ltdc_layer_s *layer, int *lid, uint32_t flag)
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: stm32_setcolor
  *
@@ -2453,7 +2436,6 @@ static int stm32_setcolor(FAR struct ltdc_layer_s *layer, uint32_t argb)
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: stm32_getcolor
  *
@@ -2488,12 +2470,11 @@ static int stm32_getcolor(FAR struct ltdc_layer_s *layer, uint32_t *argb)
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: stm32_setcolorkey
  *
  * Description:
- *    Configure layer default color key (chromakey) value for transparence.
+ *    Configure layer default color key (chromakey) value for transparency.
  *    Layer default value during initializing: 0x00000000
  *    Colorkey is active after next update.
  *
@@ -2526,12 +2507,11 @@ static int stm32_setcolorkey(FAR struct ltdc_layer_s *layer, uint32_t rgb)
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: stm32_getcolorkey
  *
  * Description:
- *   Get the configured layer color key (chromakey) for transparence.
+ *   Get the configured layer color key (chromakey) for transparency.
  *
  * Parameter:
  *   layer  - Reference to the layer structure
@@ -2561,7 +2541,6 @@ static int stm32_getcolorkey(FAR struct ltdc_layer_s *layer, uint32_t *rgb)
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: setalpha
  *
@@ -2603,7 +2582,6 @@ static int stm32_setalpha(FAR struct ltdc_layer_s *layer, uint8_t alpha)
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: stm32_getalpha
  *
@@ -2638,7 +2616,6 @@ static int stm32_getalpha(FAR struct ltdc_layer_s *layer, uint8_t *alpha)
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: setblendmode
  *
@@ -2718,6 +2695,7 @@ static int stm32_setblendmode(FAR struct ltdc_layer_s *layer, uint32_t mode)
           stm32_ltdc_lunsetopac(priv);
           mode       &= ~LTDC_BLEND_ALPHA;
         }
+
       if (mode & LTDC_BLEND_COLORKEY)
         {
           /* Enable colorkeying */
@@ -2725,7 +2703,8 @@ static int stm32_setblendmode(FAR struct ltdc_layer_s *layer, uint32_t mode)
           priv->operation |= LTDC_LAYER_ENABLECOLORKEY;
           mode            &= ~LTDC_BLEND_COLORKEY;
         }
-      if(mode & ~(LTDC_BLEND_SRCPIXELALPHA|LTDC_BLEND_DESTPIXELALPHA))
+
+      if (mode & ~(LTDC_BLEND_SRCPIXELALPHA|LTDC_BLEND_DESTPIXELALPHA))
         {
           gdbg("Unknown blendmode %02x\n", mode);
           ret = -EINVAL;
@@ -2748,7 +2727,6 @@ static int stm32_setblendmode(FAR struct ltdc_layer_s *layer, uint32_t mode)
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: stm32_getblendmode
  *
@@ -2782,7 +2760,6 @@ static int stm32_getblendmode(FAR struct ltdc_layer_s *layer, uint32_t *mode)
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: stm32_setarea
  *
@@ -2847,7 +2824,6 @@ static int stm32_setarea(FAR struct ltdc_layer_s *layer,
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: stm32_getarea
  *
@@ -2889,7 +2865,6 @@ static int stm32_getarea(FAR struct ltdc_layer_s *layer,
   return -EINVAL;
 }
 
-
 /****************************************************************************
  * Name: stm32_update
  *
@@ -3001,8 +2976,7 @@ static int stm32_update(FAR struct ltdc_layer_s *layer, uint32_t mode)
 
           stm32_ltdc_lenable(inactive);
 
-          /*
-           * Ensure that both layer active and the manipulated layer
+          /* Ensure that both layer active and the manipulated layer
            * settings restored during the next update (non flip) operation
            */
 
@@ -3060,12 +3034,13 @@ static int stm32_blit(FAR struct ltdc_layer_s *dest,
                       FAR struct ltdc_layer_s *back,
                       FAR const struct ltdc_area_s *backarea)
 {
-  gvdbg("dest = %p, fore = %p, forexpos = %d, foreypos = %d, back = %p, \
-            backarea = %p\n", dest, fore, forexpos, foreypos, back, backarea);
   FAR struct stm32_layer_s *destlayer = (FAR struct stm32_layer_s *)dest;
   FAR struct stm32_layer_s *forelayer = (FAR struct stm32_layer_s *)fore;
   FAR struct stm32_layer_s *backlayer = (FAR struct stm32_layer_s *)back;
 
+  gvdbg("dest = %p, fore = %p, forexpos = %d, foreypos = %d, back = %p, \
+            backarea = %p\n", dest, fore, forexpos, foreypos, back, backarea);
+
   if (stm32_ltdc_lvalidate(destlayer) &&
       stm32_ltdc_lvalidate(forelayer) &&
       stm32_ltdc_lvalidate(backlayer))
@@ -3081,7 +3056,6 @@ static int stm32_blit(FAR struct ltdc_layer_s *dest,
   return -EINVAL;
 }
 
-
 /****************************************************************************
  *
  * Name: blend
@@ -3114,12 +3088,13 @@ static int stm32_blend(FAR struct ltdc_layer_s *dest,
                         FAR struct ltdc_layer_s *back,
                         FAR const struct ltdc_area_s *backarea)
 {
-  gvdbg("dest = %p, fore = %p, forexpos = %d, foreypos = %d, back = %p, \
-            backarea = %p\n", dest, fore, forexpos, foreypos, back, backarea);
   FAR struct stm32_layer_s *destlayer = (FAR struct stm32_layer_s *)dest;
   FAR struct stm32_layer_s *forelayer = (FAR struct stm32_layer_s *)fore;
   FAR struct stm32_layer_s *backlayer = (FAR struct stm32_layer_s *)back;
 
+  gvdbg("dest = %p, fore = %p, forexpos = %d, foreypos = %d, back = %p, \
+            backarea = %p\n", dest, fore, forexpos, foreypos, back, backarea);
+
   if (stm32_ltdc_lvalidate(destlayer) &&
       stm32_ltdc_lvalidate(forelayer) &&
       stm32_ltdc_lvalidate(backlayer))
@@ -3136,7 +3111,6 @@ static int stm32_blend(FAR struct ltdc_layer_s *dest,
 }
 #endif
 
-
 /****************************************************************************
  * Name: stm32_ltdcgetlayer
  *
@@ -3168,7 +3142,6 @@ FAR struct ltdc_layer_s *stm32_ltdcgetlayer(int lid)
 }
 #endif /* CONFIG_STM32_LTDC_INTERFACE */
 
-
 /****************************************************************************
  * Name: stm32_ltdcinitialize
  *
@@ -3234,7 +3207,6 @@ int stm32_ltdcinitialize(void)
   return OK;
 }
 
-
 /****************************************************************************
  * Name: stm32_ltdcgetvplane
  *
@@ -3261,7 +3233,6 @@ struct fb_vtable_s *stm32_ltdcgetvplane(int vplane)
     return NULL;
 }
 
-
 /****************************************************************************
  * Name: fb_uninitialize
  *
@@ -3278,7 +3249,6 @@ void stm32_ltdcuninitialize(void)
   stm32_lcd_enable(false);
 }
 
-
 /****************************************************************************
  * Name:  stm32_lcdclear
  *
diff --git a/arch/arm/src/stm32/stm32_ltdc.h b/arch/arm/src/stm32/stm32_ltdc.h
index 4b2fb628e2..c0e60bd184 100644
--- a/arch/arm/src/stm32/stm32_ltdc.h
+++ b/arch/arm/src/stm32/stm32_ltdc.h
@@ -42,13 +42,17 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
+
 #include <stdbool.h>
 #include <semaphore.h>
+
 #include <nuttx/video/fb.h>
-#include <nuttx/video/ltdc.h>
 #include <nuttx/nx/nxglib.h>
 
+#include <arch/chip/ltdc.h>
+
 #ifdef CONFIG_STM32_LTDC
+
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
@@ -98,8 +102,7 @@ struct stm32_ltdc_s
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
-/*
- * The STM32 LTDC driver uses the common framebuffer interfaces declared in
+/* The STM32 LTDC driver uses the common framebuffer interfaces declared in
  * include/nuttx/video/fb.h.
  */
 
diff --git a/configs/stm32f429i-disco/src/stm32_lcd.c b/configs/stm32f429i-disco/src/stm32_lcd.c
index c64577324d..e885927e36 100644
--- a/configs/stm32f429i-disco/src/stm32_lcd.c
+++ b/configs/stm32f429i-disco/src/stm32_lcd.c
@@ -45,7 +45,8 @@
 #include <nuttx/arch.h>
 #include <nuttx/lcd/ili9341.h>
 #include <nuttx/video/fb.h>
-#include <nuttx/video/ltdc.h>
+
+#include <arch/chip/ltdc.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"