drm/gma500: Clean up various defines

Remove unused defines that we'll never use and fix naming in some include guards

Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
This commit is contained in:
Patrik Jakobsson 2013-03-14 12:36:54 +01:00
parent 49ad8f54c0
commit 9e8e463609
5 changed files with 6 additions and 17 deletions

View file

@ -19,8 +19,8 @@
* *
*/ */
#ifndef _I830_BIOS_H_ #ifndef _INTEL_BIOS_H_
#define _I830_BIOS_H_ #define _INTEL_BIOS_H_
#include <drm/drmP.h> #include <drm/drmP.h>
#include <drm/drm_dp_helper.h> #include <drm/drm_dp_helper.h>
@ -618,4 +618,4 @@ extern void psb_intel_destroy_bios(struct drm_device *dev);
#define PORT_IDPC 8 #define PORT_IDPC 8
#define PORT_IDPD 9 #define PORT_IDPD 9
#endif /* _I830_BIOS_H_ */ #endif /* _INTEL_BIOS_H_ */

View file

@ -50,8 +50,6 @@ struct psb_intel_p2_t {
int p2_slow, p2_fast; int p2_slow, p2_fast;
}; };
#define INTEL_P2_NUM 2
struct psb_intel_limit_t { struct psb_intel_limit_t {
struct psb_intel_range_t dot, vco, n, m, m1, m2, p, p1; struct psb_intel_range_t dot, vco, n, m, m1, m2, p, p1;
struct psb_intel_p2_t p2; struct psb_intel_p2_t p2;

View file

@ -32,9 +32,6 @@
/* maximum connectors per crtcs in the mode set */ /* maximum connectors per crtcs in the mode set */
#define INTELFB_CONN_LIMIT 4 #define INTELFB_CONN_LIMIT 4
#define INTEL_I2C_BUS_DVO 1
#define INTEL_I2C_BUS_SDVO 2
/* Intel Pipe Clone Bit */ /* Intel Pipe Clone Bit */
#define INTEL_HDMIB_CLONE_BIT 1 #define INTEL_HDMIB_CLONE_BIT 1
#define INTEL_HDMIC_CLONE_BIT 2 #define INTEL_HDMIC_CLONE_BIT 2
@ -68,11 +65,6 @@
#define INTEL_OUTPUT_DISPLAYPORT 9 #define INTEL_OUTPUT_DISPLAYPORT 9
#define INTEL_OUTPUT_EDP 10 #define INTEL_OUTPUT_EDP 10
#define INTEL_DVO_CHIP_NONE 0
#define INTEL_DVO_CHIP_LVDS 1
#define INTEL_DVO_CHIP_TMDS 2
#define INTEL_DVO_CHIP_TVOUT 4
#define INTEL_MODE_PIXEL_MULTIPLIER_SHIFT (0x0) #define INTEL_MODE_PIXEL_MULTIPLIER_SHIFT (0x0)
#define INTEL_MODE_PIXEL_MULTIPLIER_MASK (0xf << INTEL_MODE_PIXEL_MULTIPLIER_SHIFT) #define INTEL_MODE_PIXEL_MULTIPLIER_MASK (0xf << INTEL_MODE_PIXEL_MULTIPLIER_SHIFT)

View file

@ -493,7 +493,6 @@
#define PIPEACONF_DISABLE 0 #define PIPEACONF_DISABLE 0
#define PIPEACONF_DOUBLE_WIDE (1 << 30) #define PIPEACONF_DOUBLE_WIDE (1 << 30)
#define PIPECONF_ACTIVE (1 << 30) #define PIPECONF_ACTIVE (1 << 30)
#define I965_PIPECONF_ACTIVE (1 << 30)
#define PIPECONF_DSIPLL_LOCK (1 << 29) #define PIPECONF_DSIPLL_LOCK (1 << 29)
#define PIPEACONF_SINGLE_WIDE 0 #define PIPEACONF_SINGLE_WIDE 0
#define PIPEACONF_PIPE_UNLOCKED 0 #define PIPEACONF_PIPE_UNLOCKED 0

View file

@ -21,8 +21,8 @@
* *
**************************************************************************/ **************************************************************************/
#ifndef _SYSIRQ_H_ #ifndef _PSB_IRQ_H_
#define _SYSIRQ_H_ #define _PSB_IRQ_H_
#include <drm/drmP.h> #include <drm/drmP.h>
@ -44,4 +44,4 @@ u32 psb_get_vblank_counter(struct drm_device *dev, int pipe);
int mdfld_enable_te(struct drm_device *dev, int pipe); int mdfld_enable_te(struct drm_device *dev, int pipe);
void mdfld_disable_te(struct drm_device *dev, int pipe); void mdfld_disable_te(struct drm_device *dev, int pipe);
#endif /* _SYSIRQ_H_ */ #endif /* _PSB_IRQ_H_ */