Commit 531747b8 authored by Jani Nikula's avatar Jani Nikula

drm/i915/dvo: rename dvo.h to intel_dvo_dev.h and make self-contained

Put the header more in line with the rest. No functional changes.
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/9f4dc21928f9cccd7a3593a2f9faa44b4412ff33.1556540889.git.jani.nikula@intel.com
parent 779bc1d0
...@@ -24,6 +24,7 @@ header_test := \ ...@@ -24,6 +24,7 @@ header_test := \
intel_dp.h \ intel_dp.h \
intel_drv.h \ intel_drv.h \
intel_dvo.h \ intel_dvo.h \
intel_dvo_dev.h \
intel_fbc.h \ intel_fbc.h \
intel_fbdev.h \ intel_fbdev.h \
intel_frontbuffer.h \ intel_frontbuffer.h \
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
* *
*/ */
#include "dvo.h" #include "intel_drv.h"
#include "intel_dvo_dev.h"
#define CH7017_TV_DISPLAY_MODE 0x00 #define CH7017_TV_DISPLAY_MODE 0x00
#define CH7017_FLICKER_FILTER 0x01 #define CH7017_FLICKER_FILTER 0x01
......
...@@ -26,7 +26,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ...@@ -26,7 +26,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/ **************************************************************************/
#include "dvo.h" #include "intel_drv.h"
#include "intel_dvo_dev.h"
#define CH7xxx_REG_VID 0x4a #define CH7xxx_REG_VID 0x4a
#define CH7xxx_REG_DID 0x4b #define CH7xxx_REG_DID 0x4b
......
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
* *
*/ */
#include "dvo.h" #include "intel_drv.h"
#include "intel_dvo_dev.h"
/* /*
* register definitions for the i82807aa. * register definitions for the i82807aa.
......
...@@ -26,9 +26,10 @@ ...@@ -26,9 +26,10 @@
* *
*/ */
#include "dvo.h"
#include "i915_reg.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_reg.h"
#include "intel_drv.h"
#include "intel_dvo_dev.h"
#define NS2501_VID 0x1305 #define NS2501_VID 0x1305
#define NS2501_DID 0x6726 #define NS2501_DID 0x6726
......
...@@ -26,7 +26,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ...@@ -26,7 +26,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/ **************************************************************************/
#include "dvo.h" #include "intel_drv.h"
#include "intel_dvo_dev.h"
#define SIL164_VID 0x0001 #define SIL164_VID 0x0001
#define SIL164_DID 0x0006 #define SIL164_DID 0x0006
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
* *
*/ */
#include "dvo.h" #include "intel_drv.h"
#include "intel_dvo_dev.h"
/* register definitions according to the TFP410 data sheet */ /* register definitions according to the TFP410 data sheet */
#define TFP410_VID 0x014C #define TFP410_VID 0x014C
......
...@@ -32,11 +32,11 @@ ...@@ -32,11 +32,11 @@
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "dvo.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "intel_connector.h" #include "intel_connector.h"
#include "intel_drv.h" #include "intel_drv.h"
#include "intel_dvo.h" #include "intel_dvo.h"
#include "intel_dvo_dev.h"
#include "intel_panel.h" #include "intel_panel.h"
#define SIL164_ADDR 0x38 #define SIL164_ADDR 0x38
......
...@@ -20,12 +20,14 @@ ...@@ -20,12 +20,14 @@
* OF THIS SOFTWARE. * OF THIS SOFTWARE.
*/ */
#ifndef _INTEL_DVO_H #ifndef __INTEL_DVO_DEV_H__
#define _INTEL_DVO_H #define __INTEL_DVO_DEV_H__
#include <linux/i2c.h> #include <linux/i2c.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include "intel_drv.h"
#include "i915_reg.h"
struct intel_dvo_device { struct intel_dvo_device {
const char *name; const char *name;
...@@ -135,4 +137,4 @@ extern const struct intel_dvo_dev_ops tfp410_ops; ...@@ -135,4 +137,4 @@ extern const struct intel_dvo_dev_ops tfp410_ops;
extern const struct intel_dvo_dev_ops ch7017_ops; extern const struct intel_dvo_dev_ops ch7017_ops;
extern const struct intel_dvo_dev_ops ns2501_ops; extern const struct intel_dvo_dev_ops ns2501_ops;
#endif /* _INTEL_DVO_H */ #endif /* __INTEL_DVO_DEV_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment