[S] Change in coreboot[main]: mb/starlabs/starlite_adl: Correct USB port configuration for cameras

[Sean Rhodes (Code Review)]

Sean Rhodes has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86064?usp=email )

(

5 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
 )Change subject: mb/starlabs/starlite_adl: Correct USB port configuration for cameras
......................................................................

mb/starlabs/starlite_adl: Correct USB port configuration for cameras

Both cameras share the same USB 2.0 interface, rather than using their
own port. Update the configuration to match this.

Change-Id: Ia2d8698394de69af53489e3a08c7fe7b4f2fbc07
Signed-off-by: Sean Rhodes 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86064
Reviewed-by: Matt DeVillier 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/starlabs/starlite_adl/Kconfig
M src/mainboard/starlabs/starlite_adl/cfr.c
M src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb
M src/mainboard/starlabs/starlite_adl/variants/mk_v/devtree.c
4 files changed, 5 insertions(+), 26 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Matt DeVillier: Looks good to me, approved

diff --git a/src/mainboard/starlabs/starlite_adl/Kconfig b/src/mainboard/starlabs/starlite_adl/Kconfig
index 55a66be..51b762b 100644
--- a/src/mainboard/starlabs/starlite_adl/Kconfig
+++ b/src/mainboard/starlabs/starlite_adl/Kconfig
@@ -41,7 +41,7 @@

config CCD_PORT
    int
-	default 4
+	default 5

config CONSOLE_SERIAL
    default n if !EDK2_DEBUG
diff --git a/src/mainboard/starlabs/starlite_adl/cfr.c b/src/mainboard/starlabs/starlite_adl/cfr.c
index 4cd31d9..69635bb 100644
--- a/src/mainboard/starlabs/starlite_adl/cfr.c
+++ b/src/mainboard/starlabs/starlite_adl/cfr.c
@@ -27,13 +27,6 @@
    			SM_ENUM_VALUE_END			},
 });

-static const struct sm_object camera = SM_DECLARE_BOOL({
-	.opt_name	= "camera",
-	.ui_name	= "Camera",
-	.ui_helptext	= "Enable or disable the built-in camera",
-	.default_value	= true,
-});
-
 #if CONFIG(EC_STARLABS_CHARGING_SPEED)
 static const struct sm_object charging_speed = SM_DECLARE_ENUM({
    .opt_name	= "charging_speed",
@@ -270,7 +263,6 @@
    .ui_name = "Devices",
    .obj_list = (const struct sm_object *[]) {
    	&accelerometer,
-		&camera,
    	#if CONFIG(SOC_INTEL_TIGERLAKE) || CONFIG(SOC_INTEL_ALDERLAKE) || CONFIG(SOC_INTEL_RAPTORLAKE)
    	&gna,
    	#endif
diff --git a/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb b/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb
index 9abba7e..8c87eff 100644
--- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb
+++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb
@@ -60,12 +60,9 @@
    		# Detachable Keyboard + SD Card Reader
    		register "usb2_ports[2]"			= "USB2_PORT_MID(OC_SKIP)"

-			# Internal Webcam
+			# Camera + Webcam
    		register "usb2_ports[CONFIG_CCD_PORT]"		= "USB2_PORT_MID(OC_SKIP)"

-			# Camera
-			register "usb2_ports[5]"			= "USB2_PORT_MID(OC_SKIP)"
-
    		# Internal Bluetooth
    		register "usb2_ports[9]"			= "USB2_PORT_MID(OC_SKIP)"

@@ -102,14 +99,8 @@
    					device ref usb2_port3 on end
    				end
    				chip drivers/usb/acpi
-						register "desc"		= ""Internal Webcam""
-						register "type"		= "UPC_TYPE_INTERNAL"
-						register "group"	= "ACPI_PLD_GROUP(0, 3)"
-						device ref usb2_port5 on end
-					end
-					chip drivers/usb/acpi
-						register "desc"		= ""Camera""
-						register "type"		= "UPC_TYPE_INTERNAL"
+						register "desc"		= ""USB 2.0 Hub""
+						register "type"		= "UPC_TYPE_HUB"
    					register "group"	= "ACPI_PLD_GROUP(0, 4)"
    					device ref usb2_port6 on end
    				end
diff --git a/src/mainboard/starlabs/starlite_adl/variants/mk_v/devtree.c b/src/mainboard/starlabs/starlite_adl/variants/mk_v/devtree.c
index 4ace9b5..c2a95f7 100644
--- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/devtree.c
+++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/devtree.c
@@ -57,14 +57,10 @@
    	nic_dev->enabled = 0;
    }

-	/* Enable/Disable Webcam based on CMOS settings */
+	/* Enable/Disable Webcam/Camera based on CMOS settings */
    if (get_uint_option("webcam", 1) == 0)
    	cfg->usb2_ports[CONFIG_CCD_PORT].enable = 0;

-	/* Enable/Disable Camera based on CMOS settings */
-	if (get_uint_option("camera", 1) == 0)
-		cfg->usb2_ports[5].enable = 0;
-
    /* Enable/Disable Touchscreen based on CMOS settings */
    if (get_uint_option("touchscreen", 1) == 0)
    	touchscreen_dev->enabled = 0;