Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2378ad12 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

drm: rcar-du: Remove platform data support 



All platforms now instantiate the DU through DT, platform data support
isn't needed anymore.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
parent 6512f5fb

drivers/gpu/drm/rcar-du/rcar_du_crtc.h

+9 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#define __RCAR_DU_CRTC_H__



#include <linux/mutex.h>

#include <linux/platform_data/rcar-du.h>



#include <drm/drmP.h>

#include <drm/drm_crtc.h>
@@ -41,6 +40,15 @@ struct rcar_du_crtc { 


#define to_rcar_crtc(c)	container_of(c, struct rcar_du_crtc, crtc)



enum rcar_du_output {

	RCAR_DU_OUTPUT_DPAD0,

	RCAR_DU_OUTPUT_DPAD1,

	RCAR_DU_OUTPUT_LVDS0,

	RCAR_DU_OUTPUT_LVDS1,

	RCAR_DU_OUTPUT_TCON,

	RCAR_DU_OUTPUT_MAX,

};



int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index);

void rcar_du_crtc_enable_vblank(struct rcar_du_crtc *rcrtc, bool enable);

void rcar_du_crtc_cancel_page_flip(struct rcar_du_crtc *rcrtc,

drivers/gpu/drm/rcar-du/rcar_du_drv.c

+1 −3
Original line number Diff line number Diff line
@@ -146,12 +146,11 @@ static int rcar_du_load(struct drm_device *dev, unsigned long flags) 
{

	struct platform_device *pdev = dev->platformdev;

	struct device_node *np = pdev->dev.of_node;

	struct rcar_du_platform_data *pdata = pdev->dev.platform_data;

	struct rcar_du_device *rcdu;

	struct resource *mem;

	int ret;



	if (pdata == NULL && np == NULL) {

	if (np == NULL) {

		dev_err(dev->dev, "no platform data\n");

		return -ENODEV;

	}
@@ -163,7 +162,6 @@ static int rcar_du_load(struct drm_device *dev, unsigned long flags) 
	}



	rcdu->dev = &pdev->dev;

	rcdu->pdata = pdata;

	rcdu->info = np ? of_match_device(rcar_du_of_table, rcdu->dev)->data

		   : (void *)platform_get_device_id(pdev)->driver_data;

	rcdu->ddev = dev;

drivers/gpu/drm/rcar-du/rcar_du_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#define __RCAR_DU_DRV_H__



#include <linux/kernel.h>

#include <linux/platform_data/rcar-du.h>



#include "rcar_du_crtc.h"

#include "rcar_du_group.h"
@@ -67,7 +66,6 @@ struct rcar_du_device_info { 


struct rcar_du_device {

	struct device *dev;

	const struct rcar_du_platform_data *pdata;

	const struct rcar_du_device_info *info;



	void __iomem *mmio;

drivers/gpu/drm/rcar-du/rcar_du_encoder.c

+2 −6
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ static const struct drm_encoder_funcs encoder_funcs = { 
int rcar_du_encoder_init(struct rcar_du_device *rcdu,

			 enum rcar_du_encoder_type type,

			 enum rcar_du_output output,

			 const struct rcar_du_encoder_data *data,

			 struct device_node *np)

{

	struct rcar_du_encoder *renc;
@@ -190,11 +189,8 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, 
	drm_encoder_helper_add(&renc->encoder, &encoder_helper_funcs);



	switch (encoder_type) {

	case DRM_MODE_ENCODER_LVDS: {

		const struct rcar_du_panel_data *pdata =

			data ? &data->connector.lvds.panel : NULL;

		return rcar_du_lvds_connector_init(rcdu, renc, pdata, np);

	}

	case DRM_MODE_ENCODER_LVDS:

		return rcar_du_lvds_connector_init(rcdu, renc, np);



	case DRM_MODE_ENCODER_DAC:

		return rcar_du_vga_connector_init(rcdu, renc);

drivers/gpu/drm/rcar-du/rcar_du_encoder.h

+7 −3
Original line number Diff line number Diff line
@@ -14,13 +14,18 @@ 
#ifndef __RCAR_DU_ENCODER_H__

#define __RCAR_DU_ENCODER_H__



#include <linux/platform_data/rcar-du.h>



#include <drm/drm_crtc.h>



struct rcar_du_device;

struct rcar_du_lvdsenc;



enum rcar_du_encoder_type {

	RCAR_DU_ENCODER_UNUSED = 0,

	RCAR_DU_ENCODER_NONE,

	RCAR_DU_ENCODER_VGA,

	RCAR_DU_ENCODER_LVDS,

};



struct rcar_du_encoder {

	struct drm_encoder encoder;

	enum rcar_du_output output;
@@ -44,7 +49,6 @@ rcar_du_connector_best_encoder(struct drm_connector *connector); 
int rcar_du_encoder_init(struct rcar_du_device *rcdu,

			 enum rcar_du_encoder_type type,

			 enum rcar_du_output output,

			 const struct rcar_du_encoder_data *data,

			 struct device_node *np);



#endif /* __RCAR_DU_ENCODER_H__ */