diff --git a/src/mainboard/starlabs/lite/Kconfig b/src/mainboard/starlabs/lite/Kconfig index 14ddfc47fa..4fc2469cd7 100644 --- a/src/mainboard/starlabs/lite/Kconfig +++ b/src/mainboard/starlabs/lite/Kconfig @@ -75,4 +75,9 @@ config UART_FOR_CONSOLE config VARIANT_DIR default "glk" if BOARD_STARLABS_LITE_GLK default "glkr" if BOARD_STARLABS_LITE_GLKR + +config WEBCAM_USB_PORT + int + default 4 if BOARD_STARLABS_LITE_GLK + default 7 if BOARD_STARLABS_LITE_GLKR endif diff --git a/src/mainboard/starlabs/lite/devtree.c b/src/mainboard/starlabs/lite/devtree.c index 221eb43c03..0bd1cf816e 100644 --- a/src/mainboard/starlabs/lite/devtree.c +++ b/src/mainboard/starlabs/lite/devtree.c @@ -47,6 +47,5 @@ void devtree_update(void) nic_dev->enabled = 0; /* Enable/Disable Webcam based on CMOS settings */ - if (get_uint_option("webcam", 1) == 0) - cfg->usb2_port[4].enable = 0; + cfg->usb2_port[CONFIG_WEBCAM_USB_PORT].enable = get_uint_option("webcam", 1); } diff --git a/src/mainboard/starlabs/lite/variants/glk/devicetree.cb b/src/mainboard/starlabs/lite/variants/glk/devicetree.cb index b1b8b445f6..67083a0c56 100644 --- a/src/mainboard/starlabs/lite/variants/glk/devicetree.cb +++ b/src/mainboard/starlabs/lite/variants/glk/devicetree.cb @@ -89,8 +89,6 @@ chip soc/intel/apollolake register "usb2_port[0]" = "PORT_EN(OC_SKIP)" # Motherboard USB 3.0 register "usb2_port[3]" = "PORT_EN(OC1)" - # Internal Webcam - register "usb2_port[4]" = "PORT_EN(OC_SKIP)" # Daughterboard USB 3.0 register "usb2_port[5]" = "PORT_EN(OC_SKIP)" # Daughterboard SD Card diff --git a/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb b/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb index dad2a43a4c..8a2f15ae43 100644 --- a/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb +++ b/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb @@ -91,8 +91,6 @@ chip soc/intel/apollolake register "usb2_port[3]" = "PORT_EN(OC1)" # Daughterboard SD Card register "usb2_port[5]" = "PORT_EN(OC_SKIP)" - # Internal Webcam - register "usb2_port[7]" = "PORT_EN(OC_SKIP)" ### USB 3.0 Devices # Motherboard USB 3.0