From patchwork Fri Mar 24 09:37:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 666606 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2782C76196 for ; Fri, 24 Mar 2023 09:39:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231830AbjCXJi7 (ORCPT ); Fri, 24 Mar 2023 05:38:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232107AbjCXJik (ORCPT ); Fri, 24 Mar 2023 05:38:40 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 962DB22A2B for ; Fri, 24 Mar 2023 02:37:57 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id u1so709458wmn.5 for ; Fri, 24 Mar 2023 02:37:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679650676; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=Xo+N+zh7l2Lx3IrEo7K+kadeIQouJNq22XibHO/II/E=; b=euR8iyBOS7GSUEIvAnONkwpFddBnabdrZW2vsdAQpYiSivWX15hbHfdWbBk9aBRhhx g/QrYs2NfN+ixKmILhdMfW3PRfSSiOz4mmNKAYlR++x8LqQLKeLUUG371mpqqlXQtfhT EkOOtG3PkXyjv0zZVCxqCdlxShertr9Ng26j48hR+QqDTX0WWHCrcigx39uiSJlSk6uw Y6fJv/dLxuclxC5mcA3Sm00iO20BpWa5A3KqHbWbK8S7BAXlheemhWOxugP+14C9T5tD yFTFdJAZsC13iBu72lgecUn/Jnp6yT0zn32b2tmLTCTVfsdFmkCEkVuvELd4sDk4X1yp gIyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679650676; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Xo+N+zh7l2Lx3IrEo7K+kadeIQouJNq22XibHO/II/E=; b=JymfMzvjBfbZ6/iAtm9Jue2EUAe1/j8XHw+PaRe58O3VitFYS7YvszFwdmgE2lwhP3 rznTbmOn2rkwzOv9CTLU8FtBe9TANypenUzZeivoJj8nDnud2mh4Zrd3QOygnWM0yZjK 3BCg/pzIAwlDsWb6I/pSoO1RR4lYARvyllwL4H5BVKpdCp9hqGFfa5CEQVrSHrBkx2zE wfzCRBA1ACGUwILg7FNSqASmvx0PISQQjilturrfJ7dW4HS1+GGTun6bS5AEJb1DYApo APCPj9WDI4o1JacCf7fakocWb22N3OxJ8lUiJGlpTDFbqY8Dh9m0CKcEAl7nAJiJS/Gg X4Ww== X-Gm-Message-State: AO0yUKUFJZWVoVq4GkE45K67Y+lCfukjOiyw1N5+vnoTX5zmebz//GTF j7uoXSIYTIMSGsSKPRC9u9K0Iu4xckhG7KjzvKYizw== X-Google-Smtp-Source: AK7set/ctZ50Tt1iJTlpemO+Af8Nfpb00/mJ9XozvF8VCFFVkLMpJwQGxdngulEu6b8lGYZPW4zvlQ== X-Received: by 2002:a1c:7412:0:b0:3eb:98aa:54cd with SMTP id p18-20020a1c7412000000b003eb98aa54cdmr1814451wmc.17.1679650676045; Fri, 24 Mar 2023 02:37:56 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id h13-20020a05600c314d00b003ee9c8cc631sm3406853wmo.23.2023.03.24.02.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 02:37:55 -0700 (PDT) From: Neil Armstrong Date: Fri, 24 Mar 2023 10:37:54 +0100 Subject: [PATCH] arm64: defconfig: remove duplicate TYPEC_UCSI & QCOM_PMIC_GLINK MIME-Version: 1.0 Message-Id: <20230324-topic-sm8450-upstream-defconfig-fixup-v1-1-2d75cc9b3c3d@linaro.org> X-B4-Tracking: v=1; b=H4sIAHFvHWQC/x2NywqDMBBFf0Wy7kAexj5+RbqIcaIDmoSMKQXx3 xu6PIfLuadgLIQsXt0pCn6IKcUG6tYJv7q4INDcWGipjTS6hyNl8sD7o7cSauajoNthxuBTDLR AoG/NYKwanA3P++CUaK3JMcJUXPRrq8W6bU3mgm39Px/f1/UDkteAMowAAAA= To: Konrad Dybcio , Bjorn Andersson Cc: Stephen Rothwell , linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.12.1 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Both configs were already applied by 2 separate changes, fix this to avoid: arch/arm64/configs/defconfig:989:warning: override: reassigning to symbol TYPEC_UCSI arch/arm64/configs/defconfig:1232:warning: override: reassigning to symbol QCOM_PMIC_GLINK Fixes: 4ffd0b001956 ("arm64: defconfig: add PMIC GLINK modules") Signed-off-by: Neil Armstrong --- arch/arm64/configs/defconfig | 2 -- 1 file changed, 2 deletions(-) --- base-commit: eba6ffc6c33353bb95c5d2bde35bb80e21c1f713 change-id: 20230324-topic-sm8450-upstream-defconfig-fixup-3516a5f976a1 Best regards, diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index b6e437486537..c4f231b70898 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -274,8 +274,6 @@ CONFIG_BLK_DEV_NVME=m CONFIG_QCOM_COINCELL=m CONFIG_QCOM_FASTRPC=m CONFIG_BATTERY_QCOM_BATTMGR=m -CONFIG_QCOM_PMIC_GLINK=m -CONFIG_TYPEC_UCSI=m CONFIG_UCSI_PMIC_GLINK=m CONFIG_SRAM=y CONFIG_PCI_ENDPOINT_TEST=m