soc/intel/apollolake: Switch to common p2sb

Using common p2sb driver instead of private one.

TEST=Boot up into OS, and read back registers through PCR by iotools,
return is not 0xffffffff.

Change-Id: I30f3ef7bc37a8cb268af6fe2e4da3ec835c17633
Signed-off-by: Lijian Zhao <lijian.zhao@intel.com>
Reviewed-on: https://review.coreboot.org/22191
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index 405a45c..74e2190 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -28,6 +28,7 @@
 #include <device/pci.h>
 #include <intelblocks/acpi.h>
 #include <intelblocks/fast_spi.h>
+#include <intelblocks/p2sb.h>
 #include <intelblocks/msr.h>
 #include <fsp/api.h>
 #include <fsp/util.h>
@@ -43,7 +44,6 @@
 #include <spi-generic.h>
 #include <soc/cpu.h>
 #include <soc/pm.h>
-#include <soc/p2sb.h>
 #include <soc/systemagent.h>
 
 #include "chip.h"