Merge tag 'mediatek-drm-next-6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next
Mediatek DRM Next for Linux 6.1 1. Drop of_gpio header 2. Remove the unneeded result Signed-off-by: Dave Airlie <airlied@redhat.com> From: Chun-Kuang Hu <chunkuang.hu@kernel.org> Link: https://patchwork.freedesktop.org/patch/msgid/20220922234804.18557-1-chunkuang.hu@kernel.org
This commit is contained in:
@ -11,7 +11,6 @@
|
|||||||
#include <linux/media-bus-format.h>
|
#include <linux/media-bus-format.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
#include <linux/of_device.h>
|
#include <linux/of_device.h>
|
||||||
#include <linux/of_gpio.h>
|
|
||||||
#include <linux/of_graph.h>
|
#include <linux/of_graph.h>
|
||||||
#include <linux/pinctrl/consumer.h>
|
#include <linux/pinctrl/consumer.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
|
@ -833,11 +833,8 @@ static int mtk_drm_sys_prepare(struct device *dev)
|
|||||||
{
|
{
|
||||||
struct mtk_drm_private *private = dev_get_drvdata(dev);
|
struct mtk_drm_private *private = dev_get_drvdata(dev);
|
||||||
struct drm_device *drm = private->drm;
|
struct drm_device *drm = private->drm;
|
||||||
int ret;
|
|
||||||
|
|
||||||
ret = drm_mode_config_helper_suspend(drm);
|
return drm_mode_config_helper_suspend(drm);
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mtk_drm_sys_complete(struct device *dev)
|
static void mtk_drm_sys_complete(struct device *dev)
|
||||||
|
@ -16,7 +16,6 @@
|
|||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/of_platform.h>
|
#include <linux/of_platform.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
#include <linux/of_gpio.h>
|
|
||||||
#include <linux/of_graph.h>
|
#include <linux/of_graph.h>
|
||||||
#include <linux/phy/phy.h>
|
#include <linux/phy/phy.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
|
Reference in New Issue
Block a user