src/mainboard/google: Adopt Mainboards to changed Type41 Func

Required for automatic onboard device detection in the next patch.

Change-Id: I3087de779faf8d006510c460b5372b22ae54b887
Signed-off-by: Christian Walter <christian.walter@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32909
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

12 files changed, 37 insertions, 20 deletions

diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c
index 90cd674198..310a870da6 100644
--- a/src/arch/x86/smbios.c
+++ b/src/arch/x86/smbios.c
@@ -962,7 +962,7 @@ int smbios_write_type38(unsigned long *current, int *handle,
 
 int smbios_write_type41(unsigned long *current, int *handle,
 			const char *name, u8 instance, u16 segment,
-			u8 bus, u8 device, u8 function)
+			u8 bus, u8 device, u8 function, u8 device_type)
 {
 	struct smbios_type41 *t = (struct smbios_type41 *)*current;
 	int len = sizeof(struct smbios_type41);
@@ -972,7 +972,7 @@ int smbios_write_type41(unsigned long *current, int *handle,
 	t->handle = *handle;
 	t->length = len - 2;
 	t->reference_designation = smbios_add_string(t->eos, name);
-	t->device_type = SMBIOS_DEVICE_TYPE_OTHER;
+	t->device_type = device_type;
 	t->device_status = 1;
 	t->device_type_instance = instance;
 	t->segment_group_number = segment;
diff --git a/src/include/smbios.h b/src/include/smbios.h
index afe77d6ad9..017e90e742 100644
--- a/src/include/smbios.h
+++ b/src/include/smbios.h
@@ -44,7 +44,7 @@ int smbios_write_type38(unsigned long *current, int *handle,
 			const u8 irq);
 int smbios_write_type41(unsigned long *current, int *handle,
 			const char *name, u8 instance, u16 segment,
-			u8 bus, u8 device, u8 function);
+			u8 bus, u8 device, u8 function, u8 device_type);
 
 const char *smbios_system_manufacturer(void);
 const char *smbios_system_product_name(void);
diff --git a/src/mainboard/google/auron/variants/auron_paine/variant.c b/src/mainboard/google/auron/variants/auron_paine/variant.c
index 62d4f522f7..84e26db1b7 100644
--- a/src/mainboard/google/auron/variants/auron_paine/variant.c
+++ b/src/mainboard/google/auron/variants/auron_paine/variant.c
@@ -26,7 +26,8 @@ int variant_smbios_data(struct device *dev, int *handle, unsigned long *current)
 		BOARD_TRACKPAD_I2C_BUS,		/* segment */
 		BOARD_TRACKPAD_I2C_ADDR,	/* bus */
 		0,				/* device */
-		0);				/* function */
+		0,				/* function */
+		SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 
 	return len;
 }
diff --git a/src/mainboard/google/auron/variants/auron_yuna/variant.c b/src/mainboard/google/auron/variants/auron_yuna/variant.c
index 62d4f522f7..84e26db1b7 100644
--- a/src/mainboard/google/auron/variants/auron_yuna/variant.c
+++ b/src/mainboard/google/auron/variants/auron_yuna/variant.c
@@ -26,7 +26,8 @@ int variant_smbios_data(struct device *dev, int *handle, unsigned long *current)
 		BOARD_TRACKPAD_I2C_BUS,		/* segment */
 		BOARD_TRACKPAD_I2C_ADDR,	/* bus */
 		0,				/* device */
-		0);				/* function */
+		0,				/* function */
+		SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 
 	return len;
 }
diff --git a/src/mainboard/google/auron/variants/buddy/variant.c b/src/mainboard/google/auron/variants/buddy/variant.c
index 9f8188fe43..dcda04dbb6 100644
--- a/src/mainboard/google/auron/variants/buddy/variant.c
+++ b/src/mainboard/google/auron/variants/buddy/variant.c
@@ -35,7 +35,8 @@ int variant_smbios_data(struct device *dev, int *handle, unsigned long *current)
 		BOARD_TOUCHSCREEN_I2C_BUS,	/* segment */
 		BOARD_TOUCHSCREEN_I2C_ADDR,	/* bus */
 		0,				/* device */
-		0);				/* function */
+		0,				/* function */
+		SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 
 	return len;
 }
diff --git a/src/mainboard/google/auron/variants/gandof/variant.c b/src/mainboard/google/auron/variants/gandof/variant.c
index cd7a66332d..29b298839f 100644
--- a/src/mainboard/google/auron/variants/gandof/variant.c
+++ b/src/mainboard/google/auron/variants/gandof/variant.c
@@ -29,7 +29,8 @@ int variant_smbios_data(struct device *dev, int *handle, unsigned long *current)
 		BOARD_TRACKPAD_I2C_BUS,		/* segment */
 		BOARD_TRACKPAD_I2C_ADDR,	/* bus */
 		0,				/* device */
-		0);				/* function */
+		0,				/* function */
+		SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 
 	return len;
 }
diff --git a/src/mainboard/google/auron/variants/lulu/variant.c b/src/mainboard/google/auron/variants/lulu/variant.c
index 97302b8486..a76cc858c3 100644
--- a/src/mainboard/google/auron/variants/lulu/variant.c
+++ b/src/mainboard/google/auron/variants/lulu/variant.c
@@ -29,7 +29,8 @@ int variant_smbios_data(struct device *dev, int *handle, unsigned long *current)
 		BOARD_TRACKPAD_I2C_BUS,		/* segment */
 		BOARD_TRACKPAD_I2C_ADDR,	/* bus */
 		0,				/* device */
-		0);				/* function */
+		0,				/* function */
+		SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 
 	len += smbios_write_type41(
 		current, handle,
@@ -38,7 +39,8 @@ int variant_smbios_data(struct device *dev, int *handle, unsigned long *current)
 		BOARD_TOUCHSCREEN_I2C_BUS,	/* segment */
 		BOARD_TOUCHSCREEN_I2C_ADDR,	/* bus */
 		0,				/* device */
-		0);				/* function */
+		0,				/* function */
+		SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 
 	return len;
 }
diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c
index 9cc13c9473..c298689639 100644
--- a/src/mainboard/google/butterfly/mainboard.c
+++ b/src/mainboard/google/butterfly/mainboard.c
@@ -264,7 +264,8 @@ static int butterfly_onboard_smbios_data(struct device *dev, int *handle,
 		0,				/* segment */
 		BOARD_TRACKPAD_I2C_ADDR,	/* bus */
 		0,				/* device */
-		0);				/* function */
+		0,				/* function */
+		SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 
 	return len;
 }
diff --git a/src/mainboard/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c
index 410866d0fe..37d1a672cd 100644
--- a/src/mainboard/google/link/mainboard.c
+++ b/src/mainboard/google/link/mainboard.c
@@ -170,7 +170,8 @@ static int link_onboard_smbios_data(struct device *dev, int *handle,
 		0,				/* segment */
 		BOARD_LIGHTSENSOR_I2C_ADDR,	/* bus */
 		0,				/* device */
-		0);				/* function */
+		0,				/* function */
+		SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 
 	len += smbios_write_type41(
 		current, handle,
@@ -179,7 +180,8 @@ static int link_onboard_smbios_data(struct device *dev, int *handle,
 		0,				/* segment */
 		BOARD_TRACKPAD_I2C_ADDR,	/* bus */
 		0,				/* device */
-		0);				/* function */
+		0,				/* function */
+		SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 
 	len += smbios_write_type41(
 		current, handle,
@@ -188,7 +190,8 @@ static int link_onboard_smbios_data(struct device *dev, int *handle,
 		0,				/* segment */
 		BOARD_TOUCHSCREEN_I2C_ADDR,	/* bus */
 		0,				/* device */
-		0);				/* function */
+		0,				/* function */
+		SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 
 	return len;
 }
diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c
index 52e4af3ea7..8c3ad6352e 100644
--- a/src/mainboard/google/parrot/mainboard.c
+++ b/src/mainboard/google/parrot/mainboard.c
@@ -57,7 +57,8 @@ static int parrot_onboard_smbios_data(struct device *dev, int *handle,
 			0,				/* segment */
 			BOARD_TRACKPAD_I2C_ADDR,	/* bus */
 			0,				/* device */
-			0);				/* function */
+			0,				/* function */
+			SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 	} else {
 		len += smbios_write_type41(
 			current, handle,
@@ -66,7 +67,8 @@ static int parrot_onboard_smbios_data(struct device *dev, int *handle,
 			0,				/* segment */
 			BOARD_TRACKPAD_I2C_ADDR,	/* bus */
 			0,				/* device */
-			0);				/* function */
+			0,				/* function */
+			SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 	}
 
 	return len;
diff --git a/src/mainboard/google/rambi/mainboard.c b/src/mainboard/google/rambi/mainboard.c
index 15faac9bf8..d3f6164cd3 100644
--- a/src/mainboard/google/rambi/mainboard.c
+++ b/src/mainboard/google/rambi/mainboard.c
@@ -142,7 +142,8 @@ static int mainboard_smbios_data(struct device *dev, int *handle,
 		BOARD_TRACKPAD_I2C_BUS,         /* segment */
 		BOARD_TRACKPAD_I2C_ADDR,        /* bus */
 		0,                              /* device */
-		0);                             /* function */
+		0,                             /* function */
+		SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 #endif
 #ifdef BOARD_TOUCHSCREEN_NAME
 	len += smbios_write_type41(
@@ -152,7 +153,8 @@ static int mainboard_smbios_data(struct device *dev, int *handle,
 		BOARD_TOUCHSCREEN_I2C_BUS,      /* segment */
 		BOARD_TOUCHSCREEN_I2C_ADDR,     /* bus */
 		0,                              /* device */
-		0);                             /* function */
+		0,                             /* function */
+		SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 #endif
 	return len;
 }
diff --git a/src/mainboard/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c
index 4bbc1d6907..b98fc8a380 100644
--- a/src/mainboard/google/slippy/mainboard.c
+++ b/src/mainboard/google/slippy/mainboard.c
@@ -54,7 +54,8 @@ static int mainboard_smbios_data(struct device *dev, int *handle,
 		BOARD_LIGHTSENSOR_I2C_BUS,	/* segment */
 		BOARD_LIGHTSENSOR_I2C_ADDR,	/* bus */
 		0,				/* device */
-		0);				/* function */
+		0,				/* function */
+		SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 
 	len += smbios_write_type41(
 		current, handle,
@@ -63,7 +64,8 @@ static int mainboard_smbios_data(struct device *dev, int *handle,
 		BOARD_TRACKPAD_I2C_BUS,		/* segment */
 		BOARD_TRACKPAD_I2C_ADDR,	/* bus */
 		0,				/* device */
-		0);				/* function */
+		0,				/* function */
+		SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 
 	len += smbios_write_type41(
 		current, handle,
@@ -72,7 +74,8 @@ static int mainboard_smbios_data(struct device *dev, int *handle,
 		BOARD_TOUCHSCREEN_I2C_BUS,	/* segment */
 		BOARD_TOUCHSCREEN_I2C_ADDR,	/* bus */
 		0,				/* device */
-		0);				/* function */
+		0,				/* function */
+		SMBIOS_DEVICE_TYPE_OTHER);	/* device type */
 
 	return len;
 }