From 88f9467e5166be329dc197bde4849e9eca653d60 Mon Sep 17 00:00:00 2001
From: Mark Yao <mark.yao@rock-chips.com>
Date: Mon, 7 Dec 2015 08:49:38 +0800
Subject: [PATCH] video: rk322x: rename vop rk3228 to rk322x

Change-Id: I6d8d9ff84f76d7fa5c820b682081bbe0cb851ff1
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---
 Documentation/devicetree/bindings/video/rockchip_lcdc.txt | 2 +-
 drivers/video/rockchip/lcdc/Kconfig                       | 6 +++---
 drivers/video/rockchip/lcdc/Makefile                      | 2 +-
 .../video/rockchip/lcdc/{rk3228_lcdc.c => rk322x_lcdc.c}  | 8 ++++----
 .../video/rockchip/lcdc/{rk3228_lcdc.h => rk322x_lcdc.h}  | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename drivers/video/rockchip/lcdc/{rk3228_lcdc.c => rk322x_lcdc.c} (99%)
 rename drivers/video/rockchip/lcdc/{rk3228_lcdc.h => rk322x_lcdc.h} (99%)

diff --git a/Documentation/devicetree/bindings/video/rockchip_lcdc.txt b/Documentation/devicetree/bindings/video/rockchip_lcdc.txt
index 333b329ddff9..b2226317312e 100755
--- a/Documentation/devicetree/bindings/video/rockchip_lcdc.txt
+++ b/Documentation/devicetree/bindings/video/rockchip_lcdc.txt
@@ -7,7 +7,7 @@ Required properties:
 - compatible: value should be one of the following
 		"rockchip,rk3288-lcdc"; /* for RK3288 SoCs */
 		"rockchip,rk3368-lcdc"; /* for RK3368 SoCs */
-		"rockchip,rk3228-lcdc"; /* for RK3228 SoCs */
+		"rockchip,rk322x-lcdc"; /* for RK322X SoCs */
 - rockchip,prop: set the lcdc as primary or extend display.
 - rochchip,pwr18: set the controller IO voltage,0 is 3.3v,1 is 1.8v.
 - reg: physical base address and length of the LCDC registers set.
diff --git a/drivers/video/rockchip/lcdc/Kconfig b/drivers/video/rockchip/lcdc/Kconfig
index bf63152d06a8..bec873068180 100644
--- a/drivers/video/rockchip/lcdc/Kconfig
+++ b/drivers/video/rockchip/lcdc/Kconfig
@@ -51,8 +51,8 @@ config LCDC_RK3368
 	help
 	  Driver for rk3368 lcdc.There are one lcd controllers on rk3368
 
-config LCDC_RK3228
-	bool "rk3228 lcdc support"
+config LCDC_RK322X
+	bool "rk322x lcdc support"
 	depends on FB_ROCKCHIP
 	help
-	  Driver for rk3228 lcdc.There are one lcd controllers on rk3228
+	  Driver for rk322x lcdc.There are one lcd controllers on rk322x
diff --git a/drivers/video/rockchip/lcdc/Makefile b/drivers/video/rockchip/lcdc/Makefile
index fd84d05fb048..0cbe7f332104 100644
--- a/drivers/video/rockchip/lcdc/Makefile
+++ b/drivers/video/rockchip/lcdc/Makefile
@@ -6,4 +6,4 @@ obj-$(CONFIG_LCDC_RK3288) += rk3288_lcdc.o
 obj-$(CONFIG_LCDC_RK3036) += rk3036_lcdc.o
 obj-$(CONFIG_LCDC_RK312X) += rk312x_lcdc.o
 obj-$(CONFIG_LCDC_RK3368) += rk3368_lcdc.o
-obj-$(CONFIG_LCDC_RK3228) += rk3228_lcdc.o
+obj-$(CONFIG_LCDC_RK322X) += rk322x_lcdc.o
diff --git a/drivers/video/rockchip/lcdc/rk3228_lcdc.c b/drivers/video/rockchip/lcdc/rk322x_lcdc.c
similarity index 99%
rename from drivers/video/rockchip/lcdc/rk3228_lcdc.c
rename to drivers/video/rockchip/lcdc/rk322x_lcdc.c
index 67d7a1119c56..d444b0b872ea 100644
--- a/drivers/video/rockchip/lcdc/rk3228_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk322x_lcdc.c
@@ -1,5 +1,5 @@
 /*
- * drivers/video/rockchip/lcdc/rk3228_lcdc.c
+ * drivers/video/rockchip/lcdc/rk322x_lcdc.c
  *
  * Copyright (C) 2015 ROCKCHIP, Inc.
  * Author: Mark Yao <mark.yao@rock-chips.com>
@@ -35,7 +35,7 @@
 #include <linux/rockchip/common.h>
 #include <dt-bindings/clock/rk_system_status.h>
 
-#include "rk3228_lcdc.h"
+#include "rk322x_lcdc.h"
 
 /*#define CONFIG_RK_FPGA 1*/
 
@@ -3554,7 +3554,7 @@ static void vop_shutdown(struct platform_device *pdev)
 
 #if defined(CONFIG_OF)
 static const struct of_device_id vop_dt_ids[] = {
-	{.compatible = "rockchip,rk3228-lcdc",},
+	{.compatible = "rockchip,rk322x-lcdc",},
 	{}
 };
 #endif
@@ -3563,7 +3563,7 @@ static struct platform_driver vop_driver = {
 	.probe = vop_probe,
 	.remove = vop_remove,
 	.driver = {
-		   .name = "rk3228-lcdc",
+		   .name = "rk322x-lcdc",
 		   .owner = THIS_MODULE,
 		   .of_match_table = of_match_ptr(vop_dt_ids),
 		   },
diff --git a/drivers/video/rockchip/lcdc/rk3228_lcdc.h b/drivers/video/rockchip/lcdc/rk322x_lcdc.h
similarity index 99%
rename from drivers/video/rockchip/lcdc/rk3228_lcdc.h
rename to drivers/video/rockchip/lcdc/rk322x_lcdc.h
index 9df5760967fe..3be4be76ff09 100644
--- a/drivers/video/rockchip/lcdc/rk3228_lcdc.h
+++ b/drivers/video/rockchip/lcdc/rk322x_lcdc.h
@@ -1,5 +1,5 @@
-#ifndef RK3228_LCDC_H_
-#define RK3228_LCDC_H_
+#ifndef RK322X_LCDC_H_
+#define RK322X_LCDC_H_
 
 #include<linux/rk_fb.h>
 #include<linux/io.h>
-- 
2.34.1