From patchwork Wed Apr 20 09:41:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 1619438 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=uxH8e0IW; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Kjwgg3CP6z9sG0 for ; Wed, 20 Apr 2022 19:42:23 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nh6qm-0005ld-BV; Wed, 20 Apr 2022 09:42:16 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nh6qd-0005XU-Ex for kernel-team@lists.ubuntu.com; Wed, 20 Apr 2022 09:42:07 +0000 Received: from localhost.localdomain (unknown [123.112.71.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id D27E93F658 for ; Wed, 20 Apr 2022 09:42:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1650447726; bh=A/Jmw9WU9/f+/Xzjn3nrwhN47oUcT2AN4hkQyh4tk5A=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uxH8e0IWXlEzEBbjUVbVd7ZaRJJ19p03fmKqdUwYHvMh+9D2aV8kHqXB/Uxysb3e8 CSJV8qXlnZKi71NXy3e/WCR/awR5t23iNFnatWbzgBrukD0MQaRRUM9TzZ6tUPjcKg SnPkGBJHfLhVxNknpolHlPSI7ezAaDv2V9Lc+jsvcTS6Wrk7zoivdLV4lmQ1otSxbG MDJZnV8jReHSmS8HX79yyTF69aIOaem0+E5XfL6Yfyn2SaOEwxpXMp8US2IGXwPoy/ 9XGTavGf+n/cDmwiKqHjmdC1ykDLYHjLsmyrIf79q8GNVBmMNmGWFPePG91RV+MOXL qALUIJDI9Qvfw== From: Hui Wang To: kernel-team@lists.ubuntu.com Subject: [SRU][OEM-5.17][PATCH 10/10] UBUNTU: [Config]: enable SERIAL_MULTI_INSTANTIATE Date: Wed, 20 Apr 2022 17:41:32 +0800 Message-Id: <20220420094132.7732-11-hui.wang@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220420094132.7732-1-hui.wang@canonical.com> References: <20220420094132.7732-1-hui.wang@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1965496 Signed-off-by: Hui Wang --- debian.oem/abi/amd64/oem.modules | 1 - debian.oem/config/annotations | 5 ++++- debian.oem/config/config.common.ubuntu | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian.oem/abi/amd64/oem.modules b/debian.oem/abi/amd64/oem.modules index 8670234465fb..266cfc8e9de4 100644 --- a/debian.oem/abi/amd64/oem.modules +++ b/debian.oem/abi/amd64/oem.modules @@ -2005,7 +2005,6 @@ i2c-ismt i2c-kempld i2c-matroxfb i2c-mlxcpld -i2c-multi-instantiate i2c-mux i2c-mux-gpio i2c-mux-ltc4306 diff --git a/debian.oem/config/annotations b/debian.oem/config/annotations index f6ca5be14bf7..ac9cbb2aa024 100644 --- a/debian.oem/config/annotations +++ b/debian.oem/config/annotations @@ -10437,7 +10437,7 @@ CONFIG_SONY_LAPTOP policy<{'amd64': 'm'}> CONFIG_SONYPI_COMPAT policy<{'amd64': 'y'}> CONFIG_SYSTEM76_ACPI policy<{'amd64': 'm'}> CONFIG_TOPSTAR_LAPTOP policy<{'amd64': 'm'}> -CONFIG_I2C_MULTI_INSTANTIATE policy<{'amd64': 'm'}> +CONFIG_SERIAL_MULTI_INSTANTIATE policy<{'amd64': 'm'}> CONFIG_MLX_PLATFORM policy<{'amd64': 'm'}> CONFIG_TOUCHSCREEN_DMI policy<{'amd64': 'y'}> CONFIG_INTEL_IPS policy<{'amd64': 'm'}> @@ -10445,6 +10445,9 @@ CONFIG_INTEL_SCU_PCI policy<{'amd64': 'y'}> CONFIG_INTEL_SCU_PLATFORM policy<{'amd64': 'm'}> CONFIG_INTEL_SCU_IPC_UTIL policy<{'amd64': 'm'}> +# +CONFIG_SERIAL_MULTI_INSTANTIATE note + # Menu: Device Drivers >> X86 Platform Specific Device Drivers >> Dell X86 Platform Specific Device Drivers CONFIG_X86_PLATFORM_DRIVERS_DELL policy<{'amd64': 'y'}> CONFIG_ALIENWARE_WMI policy<{'amd64': 'm'}> diff --git a/debian.oem/config/config.common.ubuntu b/debian.oem/config/config.common.ubuntu index ff080aa2bcff..3b3cafb185fd 100644 --- a/debian.oem/config/config.common.ubuntu +++ b/debian.oem/config/config.common.ubuntu @@ -3239,7 +3239,6 @@ CONFIG_I2C_ISCH=m CONFIG_I2C_ISMT=m CONFIG_I2C_KEMPLD=m CONFIG_I2C_MLXCPLD=m -CONFIG_I2C_MULTI_INSTANTIATE=m CONFIG_I2C_MUX=m CONFIG_I2C_MUX_GPIO=m CONFIG_I2C_MUX_LTC4306=m @@ -7151,6 +7150,7 @@ CONFIG_SERIAL_MAX3100=m CONFIG_SERIAL_MAX310X=y CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_MEN_Z135=m +CONFIG_SERIAL_MULTI_INSTANTIATE=m CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32