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

Commit 5a0e9d72 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Dave Airlie
Browse files

ARM: shmobile: marzen: Remove DU platform device 



Platform data support has been removed from the DU driver, drop DU
support from the legacy Marzen board file. The multiplatform DT-based
Marzen support should be used instead.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 792c17cb

arch/arm/mach-shmobile/board-marzen.c

+0 −58
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/pinctrl/machine.h>

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

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

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

#include <linux/platform_data/usb-rcar-phy.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>
@@ -171,62 +170,6 @@ static struct platform_device hspi_device = { 
	.num_resources	= ARRAY_SIZE(hspi_resources),

};



/*

 * DU

 *

 * The panel only specifies the [hv]display and [hv]total values. The position

 * and width of the sync pulses don't matter, they're copied from VESA timings.

 */

static struct rcar_du_encoder_data du_encoders[] = {

	{

		.type = RCAR_DU_ENCODER_VGA,

		.output = RCAR_DU_OUTPUT_DPAD0,

	}, {

		.type = RCAR_DU_ENCODER_LVDS,

		.output = RCAR_DU_OUTPUT_DPAD1,

		.connector.lvds.panel = {

			.width_mm = 210,

			.height_mm = 158,

			.mode = {

				.pixelclock = 65000000,

				.hactive = 1024,

				.hfront_porch = 20,

				.hback_porch = 160,

				.hsync_len = 136,

				.vactive = 768,

				.vfront_porch = 3,

				.vback_porch = 29,

				.vsync_len = 6,

			},

		},

	},

};



static const struct rcar_du_platform_data du_pdata __initconst = {

	.encoders = du_encoders,

	.num_encoders = ARRAY_SIZE(du_encoders),

};



static const struct resource du_resources[] __initconst = {

	DEFINE_RES_MEM(0xfff80000, 0x40000),

	DEFINE_RES_IRQ(gic_iid(0x3f)),

};



static void __init marzen_add_du_device(void)

{

	struct platform_device_info info = {

		.name = "rcar-du-r8a7779",

		.id = -1,

		.res = du_resources,

		.num_res = ARRAY_SIZE(du_resources),

		.data = &du_pdata,

		.size_data = sizeof(du_pdata),

		.dma_mask = DMA_BIT_MASK(32),

	};



	platform_device_register_full(&info);

}



/* LEDS */

static struct gpio_led marzen_leds[] = {

	{
@@ -385,7 +328,6 @@ static void __init marzen_init(void) 
	platform_device_register_full(&vin1_info);

	platform_device_register_full(&vin3_info);

	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));

	marzen_add_du_device();

}



static const char *marzen_boards_compat_dt[] __initdata = {