summaryrefslogtreecommitdiff
path: root/nuttx/configs
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-07-10 12:03:10 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-07-10 12:03:10 -0600
commit929a5e7e0682c06a97c77f752fd26eb85e31bcb0 (patch)
treead170f31bbc33e6cc596daa4982a75d8c82eb94e /nuttx/configs
parent17b702fc22453e1e5dd577355da802014d3dc98d (diff)
downloadpx4-nuttx-929a5e7e0682c06a97c77f752fd26eb85e31bcb0.tar.gz
px4-nuttx-929a5e7e0682c06a97c77f752fd26eb85e31bcb0.tar.bz2
px4-nuttx-929a5e7e0682c06a97c77f752fd26eb85e31bcb0.zip
SAMA5D4-EK: LCDC works (with a few color problems)
Diffstat (limited to 'nuttx/configs')
-rw-r--r--nuttx/configs/sama5d4-ek/README.txt2
-rw-r--r--nuttx/configs/sama5d4-ek/include/board.h13
2 files changed, 12 insertions, 3 deletions
diff --git a/nuttx/configs/sama5d4-ek/README.txt b/nuttx/configs/sama5d4-ek/README.txt
index 442643d46..c61a3d154 100644
--- a/nuttx/configs/sama5d4-ek/README.txt
+++ b/nuttx/configs/sama5d4-ek/README.txt
@@ -2846,7 +2846,7 @@ TM7000 LCD/Touchscreen
LCD_DAT8_PA8 J9 pin 26 LCD_DATA_8 J4 pin 26 LCD
LCD_DAT9_PA9 J9 pin 27 LCD_DATA_9 J4 pin 27 LCD
LCD_DAT10_PA10 J9 pin 28 LCD_DATA_10 J4 pin 28 LCD
- LCD_DAT11_PA11 J9 pin 29 LCD_DATA_ 1 J4 pin 29 LCD
+ LCD_DAT11_PA11 J9 pin 29 LCD_DATA_11 J4 pin 29 LCD
LCD_DAT12_PA12 J9 pin 16 LCD_DATA_12 J4 pin 16 LCD
LCD_DAT13_PA13 J9 pin 12 LCD_DATA_13 J4 pin 12 LCD
LCD_DAT14_PA14 J9 pin 14 LCD_DATA_14 J4 pin 14 LCD
diff --git a/nuttx/configs/sama5d4-ek/include/board.h b/nuttx/configs/sama5d4-ek/include/board.h
index 64e726c64..0baf6fa8c 100644
--- a/nuttx/configs/sama5d4-ek/include/board.h
+++ b/nuttx/configs/sama5d4-ek/include/board.h
@@ -169,12 +169,11 @@
/* LCD Interface, Geometry and Timing ***********************************************/
-#define BOARD_LCDC_OUTPUT_BPP 24 /* Output format to H/W is 24BPP RGB */
+#define BOARD_LCDC_OUTPUT_BPP 18 /* Output format to H/W is 18BPP RGB666 */
#define BOARD_LCDC_WIDTH 800 /* Display width (pixels) */
#define BOARD_LCDC_HEIGHT 480 /* Display height (rows) */
#undef BOARD_LCDC_MCK_MUL2 /* Source clock is Mck (vs 2*Mck) */
#define BOARD_LCDC_PIXCLK_INV 1 /* Invert pixel clock, use falling edge */
-#define BOARD_LCDC_PIXELCLOCK 33260000 /* Pixel clock frequency */
#define BOARD_LCDC_GUARDTIME 9 /* Guard time (frames) */
#define BOARD_LCDC_VSPW 2 /* Vertical pulse width (lines) */
#define BOARD_LCDC_HSPW 128 /* Horizontal pulse width (LCDDOTCLK) */
@@ -183,6 +182,16 @@
#define BOARD_LCDC_HFPW 168 /* Horizontal front porch (LCDDOTCLK) */
#define BOARD_LCDC_HBPW 88 /* Horizontal back porch (LCDDOTCLK) */
+/* Pixel clock rate in Hz (HS period * VS period * BOARD_LCDC_FRAMERATE). */
+
+#define BOARD_LCDC_FRAMERATE 40 /* Frame rate in Hz */
+#define BOARD_LCDC_HSPERIOD \
+ (BOARD_LCDC_HSPW + BOARD_LCDC_HBPW + BOARD_LCDC_WIDTH + BOARD_LCDC_HFPW)
+#define BOARD_LCDC_VSPERIOD \
+ (BOARD_LCDC_VSPW + BOARD_LCDC_VBPW + BOARD_LCDC_HEIGHT + BOARD_LCDC_VFPW)
+#define BOARD_LCDC_PIXELCLOCK \
+ (BOARD_LCDC_HSPERIOD * BOARD_LCDC_VSPERIOD * BOARD_LCDC_FRAMERATE)
+
/* Backlight prescaler value and PWM output polarity */
#define BOARD_LCDC_PWMPS LCDC_LCDCFG6_PWMPS_DIV1