Commit 71ffeafb authored by Roman Beranek's avatar Roman Beranek Committed by Maxime Ripard

drm: sun4i: rename sun4i_dotclock to sun4i_tcon_dclk

While the rate of TCON0's DCLK matches dotclock for parallel and LVDS
outputs, this doesn't hold for DSI. The 'D' in DCLK actually stands for
'Data' according to Allwinner's manuals. The clock is mostly referred to
as dclk throughout this driver already anyway, so stick with that.
Signed-off-by: default avatarRoman Beranek <me@crly.cz>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20230505052110.67514-4-me@crly.cz
parent ff32fcca
...@@ -19,7 +19,7 @@ sun8i-mixer-y += sun8i_mixer.o sun8i_ui_layer.o \ ...@@ -19,7 +19,7 @@ sun8i-mixer-y += sun8i_mixer.o sun8i_ui_layer.o \
sun8i_vi_scaler.o sun8i_csc.o sun8i_vi_scaler.o sun8i_csc.o
sun4i-tcon-y += sun4i_crtc.o sun4i-tcon-y += sun4i_crtc.o
sun4i-tcon-y += sun4i_dotclock.o sun4i-tcon-y += sun4i_tcon_dclk.o
sun4i-tcon-y += sun4i_lvds.o sun4i-tcon-y += sun4i_lvds.o
sun4i-tcon-y += sun4i_tcon.o sun4i-tcon-y += sun4i_tcon.o
sun4i-tcon-y += sun4i_rgb.o sun4i-tcon-y += sun4i_rgb.o
......
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
#include <uapi/drm/drm_mode.h> #include <uapi/drm/drm_mode.h>
#include "sun4i_crtc.h" #include "sun4i_crtc.h"
#include "sun4i_dotclock.h"
#include "sun4i_drv.h" #include "sun4i_drv.h"
#include "sun4i_lvds.h" #include "sun4i_lvds.h"
#include "sun4i_rgb.h" #include "sun4i_rgb.h"
#include "sun4i_tcon.h" #include "sun4i_tcon.h"
#include "sun6i_mipi_dsi.h" #include "sun6i_mipi_dsi.h"
#include "sun4i_tcon_dclk.h"
#include "sun8i_tcon_top.h" #include "sun8i_tcon_top.h"
#include "sunxi_engine.h" #include "sunxi_engine.h"
...@@ -1237,14 +1237,14 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, ...@@ -1237,14 +1237,14 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master,
ret = sun4i_tcon_init_irq(dev, tcon); ret = sun4i_tcon_init_irq(dev, tcon);
if (ret) { if (ret) {
dev_err(dev, "Couldn't init our TCON interrupts\n"); dev_err(dev, "Couldn't init our TCON interrupts\n");
goto err_free_dotclock; goto err_free_dclk;
} }
tcon->crtc = sun4i_crtc_init(drm, engine, tcon); tcon->crtc = sun4i_crtc_init(drm, engine, tcon);
if (IS_ERR(tcon->crtc)) { if (IS_ERR(tcon->crtc)) {
dev_err(dev, "Couldn't create our CRTC\n"); dev_err(dev, "Couldn't create our CRTC\n");
ret = PTR_ERR(tcon->crtc); ret = PTR_ERR(tcon->crtc);
goto err_free_dotclock; goto err_free_dclk;
} }
if (tcon->quirks->has_channel_0) { if (tcon->quirks->has_channel_0) {
...@@ -1264,7 +1264,7 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, ...@@ -1264,7 +1264,7 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master,
of_node_put(remote); of_node_put(remote);
if (ret < 0) if (ret < 0)
goto err_free_dotclock; goto err_free_dclk;
} }
if (tcon->quirks->needs_de_be_mux) { if (tcon->quirks->needs_de_be_mux) {
...@@ -1290,7 +1290,7 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, ...@@ -1290,7 +1290,7 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master,
return 0; return 0;
err_free_dotclock: err_free_dclk:
if (tcon->quirks->has_channel_0) if (tcon->quirks->has_channel_0)
sun4i_dclk_free(tcon); sun4i_dclk_free(tcon);
err_free_clocks: err_free_clocks:
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <linux/regmap.h> #include <linux/regmap.h>
#include "sun4i_tcon.h" #include "sun4i_tcon.h"
#include "sun4i_dotclock.h" #include "sun4i_tcon_dclk.h"
struct sun4i_dclk { struct sun4i_dclk {
struct clk_hw hw; struct clk_hw hw;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment