device: drop i915 specific headers from resource allocator includes

src/include/device/ is the place for include files of the resource
allocator. Hence, drop the i915 include file copies and use the ones
supplied with the i915 driver instead. The only remaining user of this
was the Intel Whitetip Mountain 2 reference board, all other occurences
have been previously fixed already.

Change-Id: Ib9f72df4e8f847597508971e9dbf671f49019767
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/8140
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>

src/include/device/i915.h

@@ -1,52 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2012 Google Inc.
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <device/i915_reg.h>
-#include <device/drm_dp_helper.h>
-
-/* things that are, strangely, not defined anywhere? */
-#define PCH_PP_UNLOCK	0xabcd0000
-#define WMx_LP_SR_EN	(1<<31)
-#define PRB0_TAIL	0x02030
-#define PRB0_HEAD	0x02034
-#define PRB0_START	0x02038
-#define PRB0_CTL	0x0203c
-
-/* debug enums. These are for printks that, due to their place in the
- * middle of graphics device IO, might change timing.  Use with care
- * or not at all.
- */
-enum {
-	vio = 2, /* dump every IO */
-	vspin = 4, /* print # of times we spun on a register value */
-};
-
-/* The mainboard must provide these functions. */
-unsigned long io_i915_read32(unsigned long addr);
-void io_i915_write32(unsigned long val, unsigned long addr);
-void graphics_register_reset(u32 aux_ctl, u32 aux_data, int verbose);
-
-/* intel_dp.c */
-u32 pack_aux(u32 *src, int src_bytes);
-void unpack_aux(u32 src, u8 *dst, int dst_bytes);
-int intel_dp_aux_ch(u32 ch_ctl, u32 ch_data, u32 *send, int send_bytes,
-	u8 *recv, int recv_size);
-
-

src/mainboard/intel/wtm2/graphics.c

@@ -20,7 +20,7 @@
  * will be all machine generated. Avoid editing.
  */
 #include <console/console.h>
-#include <device/i915.h>
+#include <drivers/intel/gma/i915.h>
 
 void graphics_register_reset(u32 aux_ctl, u32 aux_data, int verbose)
 {

src/mainboard/intel/wtm2/i915.c

@@ -41,7 +41,7 @@
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>
 #include <edid.h>
-#include <device/i915.h>
+#include <drivers/intel/gma/i915.h>
 
 /* how many bytes do we need for the framebuffer?
  * Well, this gets messy. To get an exact answer, we have

src/mainboard/intel/wtm2/intel_dp.c

@@ -30,7 +30,7 @@
 #include <console/console.h>
 #include <stdint.h>
 #include <delay.h>
-#include <device/i915.h>
+#include <drivers/intel/gma/i915.h>
 
 u32
 pack_aux(u32 *src32, int src_bytes)