summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/video/fbdev/mmp/core.c2
-rw-r--r--drivers/video/fbdev/mmp/hw/mmp_ctrl.c4
-rw-r--r--drivers/video/fbdev/mmp/hw/mmp_ctrl.h4
-rw-r--r--drivers/video/fbdev/mmp/hw/mmp_spi.c2
-rw-r--r--include/video/mmp_disp.h6
5 files changed, 9 insertions, 9 deletions
diff --git a/drivers/video/fbdev/mmp/core.c b/drivers/video/fbdev/mmp/core.c
index 3c35b0a3ea09..9d4fda2fc83f 100644
--- a/drivers/video/fbdev/mmp/core.c
+++ b/drivers/video/fbdev/mmp/core.c
@@ -65,7 +65,7 @@ static DEFINE_MUTEX(disp_lock);
* @p: panel to be registered
*
* this function provides interface for panel drivers to register panel
- * to panel_list and connect to path which matchs panel->plat_path_name.
+ * to panel_list and connect to path which matches panel->plat_path_name.
* no error returns when no matching path is found as path register after
* panel register is permitted.
*/
diff --git a/drivers/video/fbdev/mmp/hw/mmp_ctrl.c b/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
index 2c457da67a9f..3db608e5aef1 100644
--- a/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
+++ b/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
@@ -325,7 +325,7 @@ static void ctrl_set_default(struct mmphw_ctrl *ctrl)
u32 tmp, irq_mask;
/*
- * LCD Global control(LCD_TOP_CTRL) should be configed before
+ * LCD Global control(LCD_TOP_CTRL) should be configured before
* any other LCD registers read/write, or there maybe issues.
*/
tmp = readl_relaxed(ctrl->reg_base + LCD_TOP_CTRL);
@@ -521,7 +521,7 @@ static int mmphw_probe(struct platform_device *pdev)
/* init global regs */
ctrl_set_default(ctrl);
- /* init pathes from machine info and register them */
+ /* init paths from machine info and register them */
for (i = 0; i < ctrl->path_num; i++) {
/* get from config and machine info */
path_plat = &ctrl->path_plats[i];
diff --git a/drivers/video/fbdev/mmp/hw/mmp_ctrl.h b/drivers/video/fbdev/mmp/hw/mmp_ctrl.h
index 719b99a9bc77..b49d870df44f 100644
--- a/drivers/video/fbdev/mmp/hw/mmp_ctrl.h
+++ b/drivers/video/fbdev/mmp/hw/mmp_ctrl.h
@@ -1404,7 +1404,7 @@ struct mmphw_ctrl {
int status;
struct mutex access_ok;
- /*pathes*/
+ /* paths */
int path_num;
struct mmphw_path_plat path_plats[] __counted_by(path_num);
};
@@ -1434,7 +1434,7 @@ static inline void __iomem *ctrl_regs(struct mmp_path *path)
return path_to_ctrl(path)->reg_base;
}
-/* path regs, for regs symmetrical for both pathes */
+/* path regs, for regs symmetrical for both paths */
static inline struct lcd_regs *path_regs(struct mmp_path *path)
{
if (path->id == PATH_PN)
diff --git a/drivers/video/fbdev/mmp/hw/mmp_spi.c b/drivers/video/fbdev/mmp/hw/mmp_spi.c
index 3f253f4271ac..8e6e8be441d2 100644
--- a/drivers/video/fbdev/mmp/hw/mmp_spi.c
+++ b/drivers/video/fbdev/mmp/hw/mmp_spi.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* linux/drivers/video/mmp/hw/mmp_spi.c
- * using the spi in LCD controler for commands send
+ * using the spi in LCD controller for commands send
*
* Copyright (C) 2012 Marvell Technology Group Ltd.
* Authors: Guoqing Li <ligq@marvell.com>
diff --git a/include/video/mmp_disp.h b/include/video/mmp_disp.h
index 41354bd49895..8f2b434da4e9 100644
--- a/include/video/mmp_disp.h
+++ b/include/video/mmp_disp.h
@@ -172,7 +172,7 @@ struct mmp_panel {
/* use node to register to list */
struct list_head node;
const char *name;
- /* path name used to connect to proper path configed */
+ /* path name used to connect to proper path configured */
const char *plat_path_name;
struct device *dev;
int panel_type;
@@ -291,7 +291,7 @@ static inline int mmp_overlay_set_addr(struct mmp_overlay *overlay,
* it defined a common interface that plat driver need to implement
*/
struct mmp_path_info {
- /* driver data, set when registed*/
+ /* driver data, set when registered */
const char *name;
struct device *dev;
int id;
@@ -309,7 +309,7 @@ extern void mmp_unregister_path(struct mmp_path *path);
extern void mmp_register_panel(struct mmp_panel *panel);
extern void mmp_unregister_panel(struct mmp_panel *panel);
-/* defintions for platform data */
+/* definitions for platform data */
/* interface for buffer driver */
struct mmp_buffer_driver_mach_info {
const char *name;