Commit bfc838f8 authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

drm/gma500: Convert to use new SCU IPC API 



Convert the GMA500 driver to use the new SCU IPC API. This allows us
to get rid of the duplicate PMC IPC implementation which is now covered
in SCU IPC driver.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 5c8fe583

drivers/gpu/drm/gma500/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ config DRM_GMA3600 
config DRM_MEDFIELD

	bool "Intel Medfield support (Experimental)"

	depends on DRM_GMA500 && X86_INTEL_MID

	select INTEL_SCU_IPC

	help

	  Say yes to include support for the Intel Medfield platform.

drivers/gpu/drm/gma500/mdfld_device.c

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
#include <linux/delay.h>

#include <linux/gpio/machine.h>



#include <asm/intel_scu_ipc.h>



#include "mdfld_dsi_output.h"

#include "mdfld_output.h"

#include "mid_bios.h"

drivers/gpu/drm/gma500/mdfld_dsi_output.c

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#include <linux/pm_runtime.h>

#include <linux/gpio/consumer.h>



#include <asm/intel_scu_ipc.h>



#include "mdfld_dsi_dpi.h"

#include "mdfld_dsi_output.h"

#include "mdfld_dsi_pkg_sender.h"

drivers/gpu/drm/gma500/mdfld_output.c

+6 −2
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
 * Scott Rowe <scott.m.rowe@intel.com>

*/



#include <asm/intel_scu_ipc.h>



#include "mdfld_output.h"

#include "mdfld_dsi_dpi.h"

#include "mdfld_dsi_output.h"
@@ -58,11 +60,14 @@ static void mdfld_init_panel(struct drm_device *dev, int mipi_pipe, 
	}

}





int mdfld_output_init(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;



	dev_priv->scu = devm_intel_scu_ipc_dev_get(&dev->pdev->dev);

	if (!dev_priv->scu)

		return -EPROBE_DEFER;



	/* FIXME: hardcoded for now */

	dev_priv->mdfld_panel_id = TC35876X;

	/* MIPI panel 1 */
@@ -71,4 +76,3 @@ int mdfld_output_init(struct drm_device *dev) 
	mdfld_init_panel(dev, 1, HDMI);

	return 0;

}

drivers/gpu/drm/gma500/oaktrail_device.c

+0 −3
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ 
#include <linux/dmi.h>

#include <linux/module.h>



#include <asm/intel-mid.h>

#include <asm/intel_scu_ipc.h>



#include <drm/drm.h>



#include "intel_bios.h"