1 files changed, 3 insertions, 63 deletions

diff --git a/src/mainboard/google/samus/mainboard.c b/src/mainboard/google/samus/mainboard.c
index fdc7d78769..89303b9017 100644
--- a/src/mainboard/google/samus/mainboard.c
+++ b/src/mainboard/google/samus/mainboard.c
@@ -33,73 +33,14 @@
 #include <arch/interrupt.h>
 #include <boot/coreboot_tables.h>
 #include "ec.h"
-#include "onboard.h"
 
-static void mainboard_init(device_t dev)
+void mainboard_suspend_resume(void)
 {
-	mainboard_ec_init();
 }
 
-static int mainboard_smbios_data(device_t dev, int *handle,
-				 unsigned long *current)
+static void mainboard_init(device_t dev)
 {
-	int len = 0;
-
-	len += smbios_write_type41(
-		current, handle,
-		BOARD_TRACKPAD_NAME,		/* name */
-		BOARD_TRACKPAD_IRQ,		/* instance */
-		BOARD_TRACKPAD_I2C_BUS,		/* segment */
-		BOARD_TRACKPAD_I2C_ADDR,	/* bus */
-		BOARD_TRACKPAD_IRQ_TYPE,	/* device */
-		0);				/* function */
-
-	len += smbios_write_type41(
-		current, handle,
-		BOARD_TOUCHSCREEN_NAME,		/* name */
-		BOARD_TOUCHSCREEN_IRQ,		/* instance */
-		BOARD_TOUCHSCREEN_I2C_BUS,	/* segment */
-		BOARD_TOUCHSCREEN_I2C_ADDR,	/* bus */
-		BOARD_TOUCHSCREEN_IRQ_TYPE,	/* device */
-		0);				/* function */
-
-	len += smbios_write_type41(
-		current, handle,
-		BOARD_CODEC_NAME,		/* name */
-		BOARD_CODEC_IRQ,		/* instance */
-		BOARD_CODEC_I2C_BUS,		/* segment */
-		BOARD_CODEC_I2C_ADDR,		/* bus */
-		BOARD_CODEC_IRQ_TYPE,		/* device */
-		0);				/* function */
-
-	len += smbios_write_type41(
-		current, handle,
-		BOARD_NFC_NAME,			/* name */
-		BOARD_NFC_IRQ,			/* instance */
-		BOARD_NFC_I2C_BUS,		/* segment */
-		BOARD_NFC_I2C_ADDR,		/* bus */
-		BOARD_NFC_IRQ_TYPE,		/* device */
-		0);				/* function */
-
-	len += smbios_write_type41(
-		current, handle,
-		BOARD_ACCEL_NAME,		/* name */
-		BOARD_ACCEL_IRQ,		/* instance */
-		BOARD_ACCEL_I2C_BUS,		/* segment */
-		BOARD_ACCEL_I2C_ADDR,		/* bus */
-		BOARD_ACCEL_IRQ_TYPE,		/* device */
-		0);				/* function */
-
-	len += smbios_write_type41(
-		current, handle,
-		BOARD_ACCEL_GYRO_NAME,		/* name */
-		BOARD_ACCEL_GYRO_IRQ,		/* instance */
-		BOARD_ACCEL_GYRO_I2C_BUS,	/* segment */
-		BOARD_ACCEL_GYRO_I2C_ADDR,	/* bus */
-		BOARD_ACCEL_GYRO_IRQ_TYPE,	/* device */
-		0);				/* function */
-
-	return len;
+	mainboard_ec_init();
 }
 
 // mainboard_enable is executed as first thing after
@@ -108,7 +49,6 @@ static int mainboard_smbios_data(device_t dev, int *handle,
 static void mainboard_enable(device_t dev)
 {
 	dev->ops->init = mainboard_init;
-	dev->ops->get_smbios_data = mainboard_smbios_data;
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }