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

Commit 15866813 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dp: remove the dependency on the usbpd header"

parents c5cba659 c1968e9e

drivers/gpu/drm/msm/dp/dp_hpd.h

+2 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 */



#ifndef _DP_HPD_H_

#define _DP_HPD_H_



#include <linux/usb/usbpd.h>

#include <linux/types.h>

#include <linux/device.h>

#include "dp_parser.h"
@@ -53,7 +52,7 @@ struct dp_hpd_cb { 
 */

struct dp_hpd {

	enum dp_hpd_type type;

	enum plug_orientation orientation;

	u32 orientation;

	bool hpd_high;

	bool hpd_irq;

	bool alt_mode_cfg_done;

drivers/gpu/drm/msm/dp/dp_usbpd.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 */



#define pr_fmt(fmt)	"[drm-dp] %s: " fmt, __func__



#include <linux/usb/usbpd.h>

#include <linux/slab.h>

#include <linux/device.h>

#include <linux/delay.h>

drivers/gpu/drm/msm/dp/dp_usbpd.h

+1 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 */



#ifndef _DP_USBPD_H_

#define _DP_USBPD_H_



#include <linux/usb/usbpd.h>



#include <linux/types.h>

#include <linux/device.h>

#include "dp_hpd.h"