Commit 9194731c authored by Laurent Pinchart's avatar Laurent Pinchart

drm/rcar-du: Rename platform data fields to match what they describe

The struct rcar_du_encoder_data encoder::field describes the encoder
type, and the rcar_du_encoder_lvds_data and rcar_du_encoder_vga_data
structures describe connector properties. Rename them accordingly.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
parent 6978f123
...@@ -137,7 +137,7 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, ...@@ -137,7 +137,7 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu,
switch (type) { switch (type) {
case RCAR_DU_ENCODER_LVDS: case RCAR_DU_ENCODER_LVDS:
return rcar_du_lvds_connector_init(rcdu, renc, return rcar_du_lvds_connector_init(rcdu, renc,
&data->u.lvds.panel); &data->connector.lvds.panel);
case RCAR_DU_ENCODER_VGA: case RCAR_DU_ENCODER_VGA:
return rcar_du_vga_connector_init(rcdu, renc); return rcar_du_vga_connector_init(rcdu, renc);
......
...@@ -14,10 +14,11 @@ ...@@ -14,10 +14,11 @@
#ifndef __RCAR_DU_ENCODER_H__ #ifndef __RCAR_DU_ENCODER_H__
#define __RCAR_DU_ENCODER_H__ #define __RCAR_DU_ENCODER_H__
#include <linux/platform_data/rcar-du.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
struct rcar_du_device; struct rcar_du_device;
struct rcar_du_encoder_data;
struct rcar_du_encoder { struct rcar_du_encoder {
struct drm_encoder encoder; struct drm_encoder encoder;
......
...@@ -191,7 +191,7 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu) ...@@ -191,7 +191,7 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
const struct rcar_du_encoder_data *pdata = const struct rcar_du_encoder_data *pdata =
&rcdu->pdata->encoders[i]; &rcdu->pdata->encoders[i];
if (pdata->encoder == RCAR_DU_ENCODER_UNUSED) if (pdata->type == RCAR_DU_ENCODER_UNUSED)
continue; continue;
if (pdata->output >= ARRAY_SIZE(rcdu->crtcs)) { if (pdata->output >= ARRAY_SIZE(rcdu->crtcs)) {
...@@ -201,8 +201,7 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu) ...@@ -201,8 +201,7 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
continue; continue;
} }
rcar_du_encoder_init(rcdu, pdata->encoder, pdata->output, rcar_du_encoder_init(rcdu, pdata->type, pdata->output, pdata);
pdata);
} }
/* Set the possible CRTCs and possible clones. All encoders can be /* Set the possible CRTCs and possible clones. All encoders can be
......
...@@ -28,22 +28,29 @@ struct rcar_du_panel_data { ...@@ -28,22 +28,29 @@ struct rcar_du_panel_data {
struct drm_mode_modeinfo mode; struct drm_mode_modeinfo mode;
}; };
struct rcar_du_encoder_lvds_data { struct rcar_du_connector_lvds_data {
struct rcar_du_panel_data panel; struct rcar_du_panel_data panel;
}; };
struct rcar_du_encoder_vga_data { struct rcar_du_connector_vga_data {
/* TODO: Add DDC information for EDID retrieval */ /* TODO: Add DDC information for EDID retrieval */
}; };
/*
* struct rcar_du_encoder_data - Encoder platform data
* @type: the encoder type (RCAR_DU_ENCODER_*)
* @output: the DU output the connector is connected to
* @connector.lvds: platform data for LVDS connectors
* @connector.vga: platform data for VGA connectors
*/
struct rcar_du_encoder_data { struct rcar_du_encoder_data {
enum rcar_du_encoder_type encoder; enum rcar_du_encoder_type type;
unsigned int output; unsigned int output;
union { union {
struct rcar_du_encoder_lvds_data lvds; struct rcar_du_connector_lvds_data lvds;
struct rcar_du_encoder_vga_data vga; struct rcar_du_connector_vga_data vga;
} u; } connector;
}; };
struct rcar_du_platform_data { struct rcar_du_platform_data {
......
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