diff --git a/configs/sam4l-xplained/README.txt b/configs/sam4l-xplained/README.txt index 91e7ff967dc..113b3a11dec 100644 --- a/configs/sam4l-xplained/README.txt +++ b/configs/sam4l-xplained/README.txt @@ -655,7 +655,7 @@ Configuration sub-directories Application Configuration -> Examples CONFIG_EXAMPLES_SLCD=y - CONFIG_EXAMPLES_SLCD_DEVNAME="/dev/slcd" + CONFIG_EXAMPLES_SLCD_DEVNAME="/dev/slcd0" CONFIG_EXAMPLES_SLCD_BUFSIZE=64 Application Configuration -> NSH Library diff --git a/configs/sam4l-xplained/src/sam4l-xplained.h b/configs/sam4l-xplained/src/sam4l-xplained.h index dc26f38c676..263b6fc8d1f 100644 --- a/configs/sam4l-xplained/src/sam4l-xplained.h +++ b/configs/sam4l-xplained/src/sam4l-xplained.h @@ -350,7 +350,7 @@ int sam_sdinitialize(int minor); * * Description: * Initialize the SAM4L Xplained Pro LCD hardware and register the character - * driver as /dev/slcd. + * driver as /dev/slcd0. * ****************************************************************************/ diff --git a/configs/sam4l-xplained/src/sam_appinit.c b/configs/sam4l-xplained/src/sam_appinit.c index 141c51091e1..b8e0d94201e 100644 --- a/configs/sam4l-xplained/src/sam_appinit.c +++ b/configs/sam4l-xplained/src/sam_appinit.c @@ -103,7 +103,7 @@ int board_app_initialize(uintptr_t arg) { #if defined(CONFIG_SAM34_LCDCA) && defined(CONFIG_SAM4L_XPLAINED_SLCD1MODULE) - /* Initialize the SLCD and register the SLCD device as /dev/slcd */ + /* Initialize the SLCD and register the SLCD device as /dev/slcd0 */ { int ret = sam_slcd_initialize(); diff --git a/configs/sam4l-xplained/src/sam_slcd.c b/configs/sam4l-xplained/src/sam_slcd.c index c767cdb33e2..c627356dd40 100644 --- a/configs/sam4l-xplained/src/sam_slcd.c +++ b/configs/sam4l-xplained/src/sam_slcd.c @@ -1159,7 +1159,7 @@ static int slcd_poll(FAR struct file *filep, FAR struct pollfd *fds, * * Description: * Initialize the SAM4L Xplained Pro LCD hardware and register the character - * driver as /dev/slcd. + * driver as /dev/slcd0. * ****************************************************************************/ @@ -1288,7 +1288,7 @@ int sam_slcd_initialize(void) /* Register the LCD device driver */ - ret = register_driver("/dev/slcd", &g_slcdops, 0644, &g_slcdstate); + ret = register_driver("/dev/slcd0", &g_slcdops, 0644, &g_slcdstate); g_slcdstate.initialized = true; /* Turn on the backlight */ diff --git a/configs/stm32f4discovery/src/stm32_bringup.c b/configs/stm32f4discovery/src/stm32_bringup.c index 64bdde98ab5..345a2a67448 100644 --- a/configs/stm32f4discovery/src/stm32_bringup.c +++ b/configs/stm32f4discovery/src/stm32_bringup.c @@ -189,7 +189,7 @@ int stm32_bringup(void) #endif #ifdef CONFIG_LCD_ST7032 - ret = stm32_st7032init("/dev/disp0"); + ret = stm32_st7032init("/dev/slcd0"); if (ret < 0) { syslog(LOG_ERR, "ERROR: st7032_register failed: %d\n", ret); diff --git a/configs/stm32ldiscovery/include/board.h b/configs/stm32ldiscovery/include/board.h index fa3f7c59aa0..e4a4646589c 100644 --- a/configs/stm32ldiscovery/include/board.h +++ b/configs/stm32ldiscovery/include/board.h @@ -294,7 +294,7 @@ extern "C" * * Description: * Initialize the STM32L-Discovery LCD hardware and register the character - * driver as /dev/slcd. + * driver as /dev/slcd0. * ****************************************************************************/ diff --git a/configs/stm32ldiscovery/src/stm32_appinit.c b/configs/stm32ldiscovery/src/stm32_appinit.c index c87229509d1..394caf5bc75 100644 --- a/configs/stm32ldiscovery/src/stm32_appinit.c +++ b/configs/stm32ldiscovery/src/stm32_appinit.c @@ -81,7 +81,7 @@ int board_app_initialize(uintptr_t arg) int ret = OK; #ifdef CONFIG_STM32_LCD - /* Initialize the SLCD and register the SLCD device as /dev/slcd */ + /* Initialize the SLCD and register the SLCD device as /dev/slcd0 */ ret = stm32_slcd_initialize(); if (ret != OK) diff --git a/configs/stm32ldiscovery/src/stm32_lcd.c b/configs/stm32ldiscovery/src/stm32_lcd.c index 6e7b4c6da40..dd96b9dcafe 100644 --- a/configs/stm32ldiscovery/src/stm32_lcd.c +++ b/configs/stm32ldiscovery/src/stm32_lcd.c @@ -1462,7 +1462,7 @@ static int slcd_poll(FAR struct file *filep, FAR struct pollfd *fds, * * Description: * Initialize the STM32L-Discovery LCD hardware and register the character - * driver as /dev/slcd. + * driver as /dev/slcd0. * ****************************************************************************/ @@ -1569,7 +1569,7 @@ int stm32_slcd_initialize(void) /* Register the LCD device driver */ - ret = register_driver("/dev/slcd", &g_slcdops, 0644, &g_slcdstate); + ret = register_driver("/dev/slcd0", &g_slcdops, 0644, &g_slcdstate); g_slcdstate.initialized = true; /* Then clear the display */