[PATCH 4/4] drm/fsl-dcu: add TCON driver

[Stefan Agner]

Add driver for the TCON (timing controller) module. The TCON module
is a separate module attached after the DCU (display controller
unit). Each DCU instance has its own, directly connected TCON
instance. The DCU's RGB and timing signals are passing through
the TCON module. TCON can provide timing signals for raw TFT panels
or operate in a bypass mode which leaves all signals unaltered.

The driver currently only supports the bypass mode.

Signed-off-by: Stefan Agner 
---
 .../devicetree/bindings/display/fsl,dcu.txt|   4 +
 .../devicetree/bindings/display/fsl,tcon.txt   |  18 +++
 drivers/gpu/drm/fsl-dcu/Makefile   |   3 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c  |   6 +
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h  |   1 +
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c  |  11 ++
 drivers/gpu/drm/fsl-dcu/fsl_tcon.c | 134 +
 drivers/gpu/drm/fsl-dcu/fsl_tcon.h |  37 ++
 8 files changed, 213 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/display/fsl,tcon.txt
 create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_tcon.c
 create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_tcon.h

diff --git a/Documentation/devicetree/bindings/display/fsl,dcu.txt 
b/Documentation/devicetree/bindings/display/fsl,dcu.txt
index ebf1be9..8153c9a 100644
--- a/Documentation/devicetree/bindings/display/fsl,dcu.txt
+++ b/Documentation/devicetree/bindings/display/fsl,dcu.txt
@@ -11,6 +11,9 @@ Required properties:
 - big-endian   Boolean property, LS1021A DCU registers are big-endian.
 - fsl,panel:   The phandle to panel node.
 
+Optional properties:
+- fsl,tcon:The phandle to the timing controller node.
+
 Examples:
 dcu: dcu@2ce {
compatible = "fsl,ls1021a-dcu";
@@ -19,4 +22,5 @@ dcu: dcu@2ce {
clock-names = "dcu";
big-endian;
fsl,panel = <>;
+   fsl,tcon = <>;
 };
diff --git a/Documentation/devicetree/bindings/display/fsl,tcon.txt 
b/Documentation/devicetree/bindings/display/fsl,tcon.txt
new file mode 100644
index 000..2e1015e
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/fsl,tcon.txt
@@ -0,0 +1,18 @@
+Device Tree bindings for Freescale TCON Driver
+
+Required properties:
+- compatible:  Should be one of
+   * "fsl,vf610-tcon".
+
+- reg: Address and length of the register set for dcu.
+- clocks:  From common clock binding: handle to tcon ipg clock.
+- clock-names: From common clock binding: Shall be "ipg".
+
+Examples:
+timing-controller@4003d000 {
+   compatible = "fsl,vf610-tcon";
+   reg = <0x4003d000 0x1000>;
+   clocks = < VF610_CLK_TCON0>;
+   clock-names = "ipg";
+   status = "okay";
+};
diff --git a/drivers/gpu/drm/fsl-dcu/Makefile b/drivers/gpu/drm/fsl-dcu/Makefile
index 6ea1523..b35a292 100644
--- a/drivers/gpu/drm/fsl-dcu/Makefile
+++ b/drivers/gpu/drm/fsl-dcu/Makefile
@@ -3,5 +3,6 @@ fsl-dcu-drm-y := fsl_dcu_drm_drv.o \
 fsl_dcu_drm_rgb.o \
 fsl_dcu_drm_plane.o \
 fsl_dcu_drm_crtc.o \
-fsl_dcu_drm_fbdev.o
+fsl_dcu_drm_fbdev.o \
+fsl_tcon.o
 obj-$(CONFIG_DRM_FSL_DCU)  += fsl-dcu-drm.o
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c 
b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
index e01c813..679cde8 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
@@ -27,6 +27,7 @@
 
 #include "fsl_dcu_drm_crtc.h"
 #include "fsl_dcu_drm_drv.h"
+#include "fsl_tcon.h"
 
 static bool fsl_dcu_drm_is_volatile_reg(struct device *dev, unsigned int reg)
 {
@@ -218,6 +219,7 @@ static int fsl_dcu_drm_pm_suspend(struct device *dev)
drm_kms_helper_poll_disable(fsl_dev->drm);
regcache_cache_only(fsl_dev->regmap, true);
regcache_mark_dirty(fsl_dev->regmap);
+   fsl_tcon_suspend(fsl_dev->tcon);
clk_disable(fsl_dev->clk);
clk_unprepare(fsl_dev->clk);
 
@@ -244,6 +246,8 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
return ret;
}
 
+   fsl_tcon_resume(fsl_dev->tcon);
+
drm_kms_helper_poll_enable(fsl_dev->drm);
regcache_cache_only(fsl_dev->regmap, false);
regcache_sync(fsl_dev->regmap);
@@ -338,6 +342,8 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev)
return PTR_ERR(fsl_dev->regmap);
}
 
+   fsl_dev->tcon = fsl_tcon_init(dev);
+
id = of_match_node(fsl_dcu_of_match, pdev->dev.of_node);
if (!id)
return -ENODEV;
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h 
b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
index 2a724f3..a8919f6 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
@@ -183,6 +183,7 @@ struct fsl_dcu_drm_device {
struct regmap *regmap;
int irq;
struct 

[PATCH 4/4] drm/fsl-dcu: add TCON driver

[Stefan Agner]

Add driver for the TCON (timing controller) module. The TCON module
is a separate module attached after the DCU (display controller
unit). Each DCU instance has its own, directly connected TCON
instance. The DCU's RGB and timing signals are passing through
the TCON module. TCON can provide timing signals for raw TFT panels
or operate in a bypass mode which leaves all signals unaltered.

The driver currently only supports the bypass mode.

Signed-off-by: Stefan Agner 
---
 .../devicetree/bindings/display/fsl,dcu.txt|   4 +
 .../devicetree/bindings/display/fsl,tcon.txt   |  18 +++
 drivers/gpu/drm/fsl-dcu/Makefile   |   3 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c  |   6 +
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h  |   1 +
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c  |  11 ++
 drivers/gpu/drm/fsl-dcu/fsl_tcon.c | 134 +
 drivers/gpu/drm/fsl-dcu/fsl_tcon.h |  37 ++
 8 files changed, 213 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/display/fsl,tcon.txt
 create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_tcon.c
 create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_tcon.h

diff --git a/Documentation/devicetree/bindings/display/fsl,dcu.txt 
b/Documentation/devicetree/bindings/display/fsl,dcu.txt
index ebf1be9..8153c9a 100644
--- a/Documentation/devicetree/bindings/display/fsl,dcu.txt
+++ b/Documentation/devicetree/bindings/display/fsl,dcu.txt
@@ -11,6 +11,9 @@ Required properties:
 - big-endian   Boolean property, LS1021A DCU registers are big-endian.
 - fsl,panel:   The phandle to panel node.
 
+Optional properties:
+- fsl,tcon:The phandle to the timing controller node.
+
 Examples:
 dcu: dcu@2ce {
compatible = "fsl,ls1021a-dcu";
@@ -19,4 +22,5 @@ dcu: dcu@2ce {
clock-names = "dcu";
big-endian;
fsl,panel = <>;
+   fsl,tcon = <>;
 };
diff --git a/Documentation/devicetree/bindings/display/fsl,tcon.txt 
b/Documentation/devicetree/bindings/display/fsl,tcon.txt
new file mode 100644
index 000..2e1015e
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/fsl,tcon.txt
@@ -0,0 +1,18 @@
+Device Tree bindings for Freescale TCON Driver
+
+Required properties:
+- compatible:  Should be one of
+   * "fsl,vf610-tcon".
+
+- reg: Address and length of the register set for dcu.
+- clocks:  From common clock binding: handle to tcon ipg clock.
+- clock-names: From common clock binding: Shall be "ipg".
+
+Examples:
+timing-controller@4003d000 {
+   compatible = "fsl,vf610-tcon";
+   reg = <0x4003d000 0x1000>;
+   clocks = < VF610_CLK_TCON0>;
+   clock-names = "ipg";
+   status = "okay";
+};
diff --git a/drivers/gpu/drm/fsl-dcu/Makefile b/drivers/gpu/drm/fsl-dcu/Makefile
index 6ea1523..b35a292 100644
--- a/drivers/gpu/drm/fsl-dcu/Makefile
+++ b/drivers/gpu/drm/fsl-dcu/Makefile
@@ -3,5 +3,6 @@ fsl-dcu-drm-y := fsl_dcu_drm_drv.o \
 fsl_dcu_drm_rgb.o \
 fsl_dcu_drm_plane.o \
 fsl_dcu_drm_crtc.o \
-fsl_dcu_drm_fbdev.o
+fsl_dcu_drm_fbdev.o \
+fsl_tcon.o
 obj-$(CONFIG_DRM_FSL_DCU)  += fsl-dcu-drm.o
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c 
b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
index e01c813..679cde8 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
@@ -27,6 +27,7 @@
 
 #include "fsl_dcu_drm_crtc.h"
 #include "fsl_dcu_drm_drv.h"
+#include "fsl_tcon.h"
 
 static bool fsl_dcu_drm_is_volatile_reg(struct device *dev, unsigned int reg)
 {
@@ -218,6 +219,7 @@ static int fsl_dcu_drm_pm_suspend(struct device *dev)
drm_kms_helper_poll_disable(fsl_dev->drm);
regcache_cache_only(fsl_dev->regmap, true);
regcache_mark_dirty(fsl_dev->regmap);
+   fsl_tcon_suspend(fsl_dev->tcon);
clk_disable(fsl_dev->clk);
clk_unprepare(fsl_dev->clk);
 
@@ -244,6 +246,8 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
return ret;
}
 
+   fsl_tcon_resume(fsl_dev->tcon);
+
drm_kms_helper_poll_enable(fsl_dev->drm);
regcache_cache_only(fsl_dev->regmap, false);
regcache_sync(fsl_dev->regmap);
@@ -338,6 +342,8 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev)
return PTR_ERR(fsl_dev->regmap);
}
 
+   fsl_dev->tcon = fsl_tcon_init(dev);
+
id = of_match_node(fsl_dcu_of_match, pdev->dev.of_node);
if (!id)
return -ENODEV;
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h 
b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
index 2a724f3..a8919f6 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
@@ -183,6 +183,7 @@ struct fsl_dcu_drm_device {
struct regmap *regmap;
int irq;