Commit c2156ccd authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/rockchip: drop use of drmP.h 



Drop use of the deprecated drmP.h header file.

While touching the list of include files move the
blocks so they follow the common pattern:

\#include <linux/*>

\#include <video/*>

\#include <drm/*>

\#include ""

Within each block sort the include files.
Add the includes needed to fix build after the removal of drmP.h.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190716064220.18157-19-sam@ravnborg.org
parent 05f0940b

drivers/gpu/drm/rockchip/analogix_dp-rockchip.c

+4 −6
Original line number Diff line number Diff line
@@ -16,16 +16,14 @@ 
#include <linux/reset.h>

#include <linux/clk.h>



#include <drm/drmP.h>

#include <drm/drm_dp_helper.h>

#include <drm/drm_of.h>

#include <drm/drm_panel.h>

#include <drm/drm_probe_helper.h>



#include <video/of_videomode.h>

#include <video/videomode.h>



#include <drm/bridge/analogix_dp.h>

#include <drm/drm_dp_helper.h>

#include <drm/drm_of.h>

#include <drm/drm_panel.h>

#include <drm/drm_probe_helper.h>



#include "rockchip_drm_drv.h"

#include "rockchip_drm_psr.h"

drivers/gpu/drm/rockchip/cdn-dp-core.c

+8 −9
Original line number Diff line number Diff line
@@ -4,24 +4,23 @@ 
 * Author: Chris Zhong <zyw@rock-chips.com>

 */



#include <drm/drmP.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_dp_helper.h>

#include <drm/drm_edid.h>

#include <drm/drm_of.h>

#include <drm/drm_probe_helper.h>



#include <linux/clk.h>

#include <linux/component.h>

#include <linux/extcon.h>

#include <linux/firmware.h>

#include <linux/regmap.h>

#include <linux/reset.h>

#include <linux/mfd/syscon.h>

#include <linux/phy/phy.h>

#include <linux/regmap.h>

#include <linux/reset.h>



#include <sound/hdmi-codec.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_dp_helper.h>

#include <drm/drm_edid.h>

#include <drm/drm_of.h>

#include <drm/drm_probe_helper.h>



#include "cdn-dp-core.h"

#include "cdn-dp-reg.h"

#include "rockchip_drm_vop.h"

drivers/gpu/drm/rockchip/cdn-dp-core.h

+1 −1
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
#ifndef _CDN_DP_CORE_H

#define _CDN_DP_CORE_H



#include <drm/drmP.h>

#include <drm/drm_dp_helper.h>

#include <drm/drm_panel.h>

#include <drm/drm_probe_helper.h>



#include "rockchip_drm_drv.h"



#define MAX_PHY		2

drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c

+5 −4
Original line number Diff line number Diff line
@@ -6,10 +6,6 @@ 
 *      Nickey Yang <nickey.yang@rock-chips.com>

 */



#include <drm/drmP.h>

#include <drm/drm_mipi_dsi.h>

#include <drm/bridge/dw_mipi_dsi.h>

#include <drm/drm_of.h>

#include <linux/clk.h>

#include <linux/iopoll.h>

#include <linux/math64.h>
@@ -18,8 +14,13 @@ 
#include <linux/of_device.h>

#include <linux/pm_runtime.h>

#include <linux/regmap.h>



#include <video/mipi_display.h>



#include <drm/bridge/dw_mipi_dsi.h>

#include <drm/drm_mipi_dsi.h>

#include <drm/drm_of.h>



#include "rockchip_drm_drv.h"

#include "rockchip_drm_vop.h"

drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c

+2 −3
Original line number Diff line number Diff line
@@ -10,11 +10,10 @@ 
#include <linux/phy/phy.h>

#include <linux/regmap.h>



#include <drm/drm_of.h>

#include <drm/drmP.h>

#include <drm/bridge/dw_hdmi.h>

#include <drm/drm_edid.h>

#include <drm/drm_of.h>

#include <drm/drm_probe_helper.h>

#include <drm/bridge/dw_hdmi.h>



#include "rockchip_drm_drv.h"

#include "rockchip_drm_vop.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE