From patchwork Fri Jun 23 21:49:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 112346 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6064604vqr; Fri, 23 Jun 2023 15:05:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6VIIyXua3s9vmiUCj2wsoe/a4uIoi9LVuxHZXq+RwBo13YKX4BEBGfXleCiq6TnZ+05CnE X-Received: by 2002:a05:6808:6243:b0:394:45ad:3ea7 with SMTP id dt3-20020a056808624300b0039445ad3ea7mr25554396oib.5.1687557909762; Fri, 23 Jun 2023 15:05:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687557909; cv=none; d=google.com; s=arc-20160816; b=Q3wJ52QnTrvkRLYcVK8atlhILkgo8PghHN+cuY9zS2hSfPam+xdzs0Yy+UzRNCzdKQ 0GAKxizMWEMOhY09hxqGmBmsaDqNhYkdB7W0KkcmB9MS4unO6P/AX9MUqPUjk+78BwZL p38801JGNb7H+OqKtrmiib+0sLbZz5silsM9eNczxTsoK1C0a08IvSHyvjQ5LVhjZr8U jV368M5F6keTWuZKzsydnIhBQL7nvVJPbgYoD4V4OLlCSY+WxiNaL2lT1ZuUlFpEsiu+ eFF3Ga48ft4Lnn8thJFuL52/kUYbWeMkVB3VRSR5QdFLbuoRCgv0Z6V6rmYKZPua6diF cCwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=SlONZ8TKyqT3PdFqD54Nj2aaobJzFqkktvSArbuqu70=; fh=VsX4z0tyvf0RAheyUx8BwMMyitohmjFBru78Qc382AE=; b=Q2zvAv1Le5QG/Ny2uS2D2tSBI1BGzWVMpxo+SQiVz8ZJt6ZskvCd5cJVqN+GGsqN3t 4Z1OK/68M2LnohaeqLDcL5KsVuPuvJ8cr4O2IiQO9lN02aD/tLEag+WWrdrEnY4b6mKy o8mrEm0MwsBlCtw5DmzvXiB8rZuot5edJlklD2+V4gsikzAKfObwe0cWJUQghU8+Es/3 gPO0aRdVOVviDh6yhyFjT73QiDkUzDxCitSJOESU6F5haH93ilryoDOBm+/i/mXqf9Jk BHlXt/JxwWJIqVfqV1G86WhCSlvgVhqJJ0ibQLnvySfdptU6Cr6tiUwl023CPRLJGT4D V+9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="d14/Sqwl"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m9-20020a654389000000b00543d2b94731si295544pgp.479.2023.06.23.15.04.57; Fri, 23 Jun 2023 15:05:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="d14/Sqwl"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231752AbjFWVub (ORCPT + 99 others); Fri, 23 Jun 2023 17:50:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232818AbjFWVts (ORCPT ); Fri, 23 Jun 2023 17:49:48 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85C8A2723 for ; Fri, 23 Jun 2023 14:49:47 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-4f86bc35f13so1565403e87.1 for ; Fri, 23 Jun 2023 14:49:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687556985; x=1690148985; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=SlONZ8TKyqT3PdFqD54Nj2aaobJzFqkktvSArbuqu70=; b=d14/Sqwli0wZo1aDlP1ix49NXOgH7Az2yJI2ZTAVgrTdZSAY7laI7V8/5jk5KRaB17 AkfudzVs4F6WQpi4MMr9O9Q9KJfSbkDlfrEjzJOZN6gcso065RCdVNJSLcgbgbP7Dl9n IvQw3hiDFbkZmIliWWNSV0d5wk+8/wOWjWBO2B14YUSvteqaWZuZKpEZXUo8k8f4R0Iv OqashMtNr449Lv4lT1EJkhZTe5gFcnXfivHmOWY/AOdYwFern7SpF6nTxcDMCVUmSJnJ J3SdsSxKBvwxgmKCINkEGS2BE+CkRW6QYSjjQTV6Ktf16AKbB14BZ7T8zoBkFAGJjhkG WCgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687556985; x=1690148985; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SlONZ8TKyqT3PdFqD54Nj2aaobJzFqkktvSArbuqu70=; b=Kv4XKXgFSdhK3sFQcpq0Q97JjKun5g80BeAA6E/pjiSNAj+iEITL5EVek2eFcdk8xe mI9Lkc6SHdy7HlVRJMH8pgGzbf5QGDmbjjKNB6+z1LZWCxRz247ls001UacspOPpA7ew GV3DVIWwAOWyZh84An/j8GJhrQaDVhb5WL75Zzdc3HfFGxmRijEZBeglqZuw780S1lMU Ay9DQEaeHcvZYybQZaxLFCQymIZEhk0pTQOqgKXS8BAULK7Kyxp2cbVctRz52kuMJQM4 UCSRceDBsiLOqfOJFHlIN5Rf80U+cM07M95ozmw67zu51dM8wGzR+ryiwg6OdOzLbO8P 240Q== X-Gm-Message-State: AC+VfDz7a+56V2j1uHhQFK9OGSd/lXCXcOG9Mh4rRWTddHRhgQFMIC6F X7pV5aHI1F2Uv8y8jBzObvemuw== X-Received: by 2002:a2e:9854:0:b0:2b4:756b:8e71 with SMTP id e20-20020a2e9854000000b002b4756b8e71mr12630714ljj.44.1687556985660; Fri, 23 Jun 2023 14:49:45 -0700 (PDT) Received: from [192.168.1.101] (abyk30.neoplus.adsl.tpnet.pl. [83.9.30.30]) by smtp.gmail.com with ESMTPSA id x20-20020a2e9c94000000b002b48437dcaasm1840919lji.103.2023.06.23.14.49.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 14:49:45 -0700 (PDT) From: Konrad Dybcio Date: Fri, 23 Jun 2023 23:49:44 +0200 Subject: [PATCH 3/3] firmware: qcom_scm: Drop useless compatibles MIME-Version: 1.0 Message-Id: <20230623-topic-scm_cleanup-v1-3-383089eae98d@linaro.org> References: <20230623-topic-scm_cleanup-v1-0-383089eae98d@linaro.org> In-Reply-To: <20230623-topic-scm_cleanup-v1-0-383089eae98d@linaro.org> To: Andy Gross , Bjorn Andersson Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1687556981; l=1502; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=YeauYl4ZQZY5xFS1G6VWl/VwUEAHSGaL4eh3BOpBnEE=; b=sxaKygGpuvRJhsRXCw9CfYWD83iHXn9UfSEtVsNIFx5potBlUyoyY1D2CYYobi0D7yey7a337 E0RwUnUXfZ8AGyqZCKQAgdFaZSKTNauXyrqi4F2T0Z3LFUmHT+N4uKo X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769532723034117567?= X-GMAIL-MSGID: =?utf-8?q?1769532723034117567?= There are three categories of compatibles within the driver: 1. Ones which were introduced without a qcom,scm fallback 2. Ones which were introduced with a qcom,scm fallback 3. Ones which were defined but never used Keep 1 for backwards compatibility and axe 2 & 3. Signed-off-by: Konrad Dybcio --- drivers/firmware/qcom_scm.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index d7fc972b20ab..ff0e8911499c 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -1481,20 +1481,15 @@ static void qcom_scm_shutdown(struct platform_device *pdev) } static const struct of_device_id qcom_scm_dt_match[] = { + { .compatible = "qcom,scm" }, + + /* Legacy entries kept for backwards compatibility */ { .compatible = "qcom,scm-apq8064" }, { .compatible = "qcom,scm-apq8084" }, { .compatible = "qcom,scm-ipq4019" }, - { .compatible = "qcom,scm-mdm9607" }, - { .compatible = "qcom,scm-msm8660" }, - { .compatible = "qcom,scm-msm8960" }, - { .compatible = "qcom,scm-msm8916" }, { .compatible = "qcom,scm-msm8953" }, { .compatible = "qcom,scm-msm8974" }, - { .compatible = "qcom,scm-msm8976" }, - { .compatible = "qcom,scm-msm8994" }, { .compatible = "qcom,scm-msm8996" }, - { .compatible = "qcom,scm-sm6375" }, - { .compatible = "qcom,scm" }, {} }; MODULE_DEVICE_TABLE(of, qcom_scm_dt_match);