Skip to content

Commit 04ed052

Browse files
Laurent Pinchartgeertu
authored andcommitted
drm: renesas: shmobile: Remove support for SYS panels
SYS panels are not used, and have no defined DT bindings. Remove their support to avoid impeding DT support. It can always be added back later. Signed-off-by: Laurent Pinchart <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/4ccca2a5ac05c73ea9fd6e44b8bc443fd9d14e0d.1694767209.git.geert+renesas@glider.be
1 parent e2eb7e6 commit 04ed052

File tree

3 files changed

+0
-56
lines changed

3 files changed

+0
-56
lines changed

drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -55,24 +55,6 @@ static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc)
5555
| ((idata->flags & SHMOB_DRM_IFACE_FL_DWCNT) ? LDMT1R_DWCNT : 0);
5656
lcdc_write(sdev, LDMT1R, value);
5757

58-
if (idata->interface >= SHMOB_DRM_IFACE_SYS8A &&
59-
idata->interface <= SHMOB_DRM_IFACE_SYS24) {
60-
/* Setup SYS bus. */
61-
value = (idata->sys.cs_setup << LDMT2R_CSUP_SHIFT)
62-
| (idata->sys.vsync_active_high ? LDMT2R_RSV : 0)
63-
| (idata->sys.vsync_dir_input ? LDMT2R_VSEL : 0)
64-
| (idata->sys.write_setup << LDMT2R_WCSC_SHIFT)
65-
| (idata->sys.write_cycle << LDMT2R_WCEC_SHIFT)
66-
| (idata->sys.write_strobe << LDMT2R_WCLW_SHIFT);
67-
lcdc_write(sdev, LDMT2R, value);
68-
69-
value = (idata->sys.read_latch << LDMT3R_RDLC_SHIFT)
70-
| (idata->sys.read_setup << LDMT3R_RCSC_SHIFT)
71-
| (idata->sys.read_cycle << LDMT3R_RCEC_SHIFT)
72-
| (idata->sys.read_strobe << LDMT3R_RCLW_SHIFT);
73-
lcdc_write(sdev, LDMT3R, value);
74-
}
75-
7658
value = ((mode->hdisplay / 8) << 16) /* HDCN */
7759
| (mode->htotal / 8); /* HTCN */
7860
lcdc_write(sdev, LDHCNR, value);
@@ -180,8 +162,6 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)
180162
lcdc_write(sdev, LDDCKSTPR, 0);
181163
lcdc_wait_bit(sdev, LDDCKSTPR, ~0, 0);
182164

183-
/* TODO: Setup SYS panel */
184-
185165
/* Setup geometry, format, frame buffer memory and operation mode. */
186166
shmob_drm_crtc_setup_geometry(scrtc);
187167

drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,6 @@ static int shmob_drm_init_interface(struct shmob_drm_device *sdev)
4343
[SHMOB_DRM_IFACE_RGB18] = LDMT1R_MIFTYP_RGB18,
4444
[SHMOB_DRM_IFACE_RGB24] = LDMT1R_MIFTYP_RGB24,
4545
[SHMOB_DRM_IFACE_YUV422] = LDMT1R_MIFTYP_YCBCR,
46-
[SHMOB_DRM_IFACE_SYS8A] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS8A,
47-
[SHMOB_DRM_IFACE_SYS8B] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS8B,
48-
[SHMOB_DRM_IFACE_SYS8C] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS8C,
49-
[SHMOB_DRM_IFACE_SYS8D] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS8D,
50-
[SHMOB_DRM_IFACE_SYS9] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS9,
51-
[SHMOB_DRM_IFACE_SYS12] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS12,
52-
[SHMOB_DRM_IFACE_SYS16A] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS16A,
53-
[SHMOB_DRM_IFACE_SYS16B] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS16B,
54-
[SHMOB_DRM_IFACE_SYS16C] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS16C,
55-
[SHMOB_DRM_IFACE_SYS18] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS18,
56-
[SHMOB_DRM_IFACE_SYS24] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS24,
5746
};
5847

5948
if (sdev->pdata->iface.interface >= ARRAY_SIZE(ldmt1r)) {

include/linux/platform_data/shmob_drm.h

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,6 @@ enum shmob_drm_interface {
2727
SHMOB_DRM_IFACE_RGB18, /* 18bpp */
2828
SHMOB_DRM_IFACE_RGB24, /* 24bpp */
2929
SHMOB_DRM_IFACE_YUV422, /* 16bpp */
30-
SHMOB_DRM_IFACE_SYS8A, /* 24bpp, 8:8:8 */
31-
SHMOB_DRM_IFACE_SYS8B, /* 18bpp, 8:8:2 */
32-
SHMOB_DRM_IFACE_SYS8C, /* 18bpp, 2:8:8 */
33-
SHMOB_DRM_IFACE_SYS8D, /* 16bpp, 8:8 */
34-
SHMOB_DRM_IFACE_SYS9, /* 18bpp, 9:9 */
35-
SHMOB_DRM_IFACE_SYS12, /* 24bpp, 12:12 */
36-
SHMOB_DRM_IFACE_SYS16A, /* 16bpp */
37-
SHMOB_DRM_IFACE_SYS16B, /* 18bpp, 16:2 */
38-
SHMOB_DRM_IFACE_SYS16C, /* 18bpp, 2:16 */
39-
SHMOB_DRM_IFACE_SYS18, /* 18bpp */
40-
SHMOB_DRM_IFACE_SYS24, /* 24bpp */
4130
};
4231

4332
struct shmob_drm_panel_data {
@@ -46,19 +35,6 @@ struct shmob_drm_panel_data {
4635
struct drm_mode_modeinfo mode;
4736
};
4837

49-
struct shmob_drm_sys_interface_data {
50-
unsigned int read_latch:6;
51-
unsigned int read_setup:8;
52-
unsigned int read_cycle:8;
53-
unsigned int read_strobe:8;
54-
unsigned int write_setup:8;
55-
unsigned int write_cycle:8;
56-
unsigned int write_strobe:8;
57-
unsigned int cs_setup:3;
58-
unsigned int vsync_active_high:1;
59-
unsigned int vsync_dir_input:1;
60-
};
61-
6238
#define SHMOB_DRM_IFACE_FL_DWPOL (1 << 0) /* Rising edge dot clock data latch */
6339
#define SHMOB_DRM_IFACE_FL_DIPOL (1 << 1) /* Active low display enable */
6440
#define SHMOB_DRM_IFACE_FL_DAPOL (1 << 2) /* Active low display data */
@@ -67,7 +43,6 @@ struct shmob_drm_sys_interface_data {
6743

6844
struct shmob_drm_interface_data {
6945
enum shmob_drm_interface interface;
70-
struct shmob_drm_sys_interface_data sys;
7146
unsigned int clk_div;
7247
unsigned int flags;
7348
};

0 commit comments

Comments
 (0)