Skip to content

Commit 71ffeaf

Browse files
Roman Beranekmripard
authored andcommitted
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: Roman Beranek <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent ff32fcc commit 71ffeaf

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

drivers/gpu/drm/sun4i/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ sun8i-mixer-y += sun8i_mixer.o sun8i_ui_layer.o \
1919
sun8i_vi_scaler.o sun8i_csc.o
2020

2121
sun4i-tcon-y += sun4i_crtc.o
22-
sun4i-tcon-y += sun4i_dotclock.o
22+
sun4i-tcon-y += sun4i_tcon_dclk.o
2323
sun4i-tcon-y += sun4i_lvds.o
2424
sun4i-tcon-y += sun4i_tcon.o
2525
sun4i-tcon-y += sun4i_rgb.o

drivers/gpu/drm/sun4i/sun4i_tcon.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
#include <uapi/drm/drm_mode.h>
3232

3333
#include "sun4i_crtc.h"
34-
#include "sun4i_dotclock.h"
3534
#include "sun4i_drv.h"
3635
#include "sun4i_lvds.h"
3736
#include "sun4i_rgb.h"
3837
#include "sun4i_tcon.h"
3938
#include "sun6i_mipi_dsi.h"
39+
#include "sun4i_tcon_dclk.h"
4040
#include "sun8i_tcon_top.h"
4141
#include "sunxi_engine.h"
4242

@@ -1237,14 +1237,14 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master,
12371237
ret = sun4i_tcon_init_irq(dev, tcon);
12381238
if (ret) {
12391239
dev_err(dev, "Couldn't init our TCON interrupts\n");
1240-
goto err_free_dotclock;
1240+
goto err_free_dclk;
12411241
}
12421242

12431243
tcon->crtc = sun4i_crtc_init(drm, engine, tcon);
12441244
if (IS_ERR(tcon->crtc)) {
12451245
dev_err(dev, "Couldn't create our CRTC\n");
12461246
ret = PTR_ERR(tcon->crtc);
1247-
goto err_free_dotclock;
1247+
goto err_free_dclk;
12481248
}
12491249

12501250
if (tcon->quirks->has_channel_0) {
@@ -1264,7 +1264,7 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master,
12641264
of_node_put(remote);
12651265

12661266
if (ret < 0)
1267-
goto err_free_dotclock;
1267+
goto err_free_dclk;
12681268
}
12691269

12701270
if (tcon->quirks->needs_de_be_mux) {
@@ -1290,7 +1290,7 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master,
12901290

12911291
return 0;
12921292

1293-
err_free_dotclock:
1293+
err_free_dclk:
12941294
if (tcon->quirks->has_channel_0)
12951295
sun4i_dclk_free(tcon);
12961296
err_free_clocks:

drivers/gpu/drm/sun4i/sun4i_dotclock.c renamed to drivers/gpu/drm/sun4i/sun4i_tcon_dclk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <linux/regmap.h>
1111

1212
#include "sun4i_tcon.h"
13-
#include "sun4i_dotclock.h"
13+
#include "sun4i_tcon_dclk.h"
1414

1515
struct sun4i_dclk {
1616
struct clk_hw hw;

0 commit comments

Comments
 (0)