From patchwork Fri Jan 13 15:22:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 642119 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 7E9EDC54EBD for ; Fri, 13 Jan 2023 15:30:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230157AbjAMPaj (ORCPT ); Fri, 13 Jan 2023 10:30:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230234AbjAMP3z (ORCPT ); Fri, 13 Jan 2023 10:29:55 -0500 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 617528BA8F for ; Fri, 13 Jan 2023 07:22:38 -0800 (PST) Received: by mail-lf1-x135.google.com with SMTP id m6so33577273lfj.11 for ; Fri, 13 Jan 2023 07:22:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ANsyJifEncSP92lLk3miSuvqvxDpZXt5DLlwH0kSeYg=; b=WIXZCl3srJseLgQX9neHOCK7tyE77OWiZNrNYCUffzMHjMR1Ubr+HyPObwJ6K+l7th 4YLcHeG1/m9TqNpnqCxbkoaN6ITL4NeRHYHZ4U8UNXg7qN+tniRChAW6BZgDVNCDqbre 82Wke+fhJXldtTPBrUh4glO52u5jdprrihNBY5c+c2LzdyKeBqkxTceEZUYgVxtfCNKp nSZJNk/2tiztZSXnpVa4CmxIB4wEDOncttA1EqOn/1cuPBCUaL9XPCYFahgRi6GXMrKQ cadAwiKnKmU5v2Ph86s5TuH3oxfzbQC6/zDUHS+oZLEJKP6Jcr/MSWfsh0tYw3Fr1MoQ hANQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ANsyJifEncSP92lLk3miSuvqvxDpZXt5DLlwH0kSeYg=; b=vsCsRaS19TJaz+ZbkQrn6OurykwiYz2sYm5R+kGFZ5VPvY8RW/59Axud6TTnXQhyEr rB3kyUyb5AWRCYOjs/Ktx1XEAUqU82vXJ0QEDVV0+QyCTkZktme5atDU26kGT3o6xBkx L9ht7UCKnE2pS5zoHkmU86SoEIQeKlEFaiwohDyYYoBFE/Gg7TyfZYeeEy4IcnxeZh7A oejpah5OZJtF3lIN+ZkdY0o/guG/wRTBMQcRO7TP+LkCko+f0wwtRzzvy0u0H9tC3IMT NCcVyv78whINgY8jYqScrXKUIefiTWhgaeBxTdie0d7oqR8H47UywVHNC/IgdYshBjVp pYmQ== X-Gm-Message-State: AFqh2krEjjxn8lGoiHHrc1kToMEj5XJxoYdG/tVdbpAE3YVN2x6SzL9L +c4acvLFDQjNtuJybYDyV33ybZrWx9s1v1wb X-Google-Smtp-Source: AMrXdXuvRKKfnLv0K6fkFCJ+VqdzGZXYnnyMmAWDagBwdzXXeg47jDWiaaCTc9oqRgG8p7X7oLxWrA== X-Received: by 2002:a05:6512:e86:b0:4b5:b87a:3262 with SMTP id bi6-20020a0565120e8600b004b5b87a3262mr25559492lfb.28.1673623356522; Fri, 13 Jan 2023 07:22:36 -0800 (PST) Received: from localhost.localdomain (abym53.neoplus.adsl.tpnet.pl. [83.9.32.53]) by smtp.gmail.com with ESMTPSA id c19-20020a056512325300b004cb3d77a936sm3875440lfr.46.2023.01.13.07.22.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 07:22:35 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] Revert "soc: qcom: rpmpd: Add SM4250 support" Date: Fri, 13 Jan 2023 16:22:31 +0100 Message-Id: <20230113152232.2624545-1-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org SM4250 and SM6115 use a shared device tree and the RPMPDs are identical. There's no need for a separate entry, so remove it. This reverts commit 5b617b1b10c1c6a4365d8f956032e95c53b8e388. Signed-off-by: Konrad Dybcio Acked-by: Krzysztof Kozlowski --- drivers/soc/qcom/rpmpd.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c index f0db6a10cf4e..337b1ad1cd3b 100644 --- a/drivers/soc/qcom/rpmpd.c +++ b/drivers/soc/qcom/rpmpd.c @@ -471,23 +471,6 @@ static const struct rpmpd_desc qcm2290_desc = { .max_state = RPM_SMD_LEVEL_TURBO_NO_CPR, }; -static struct rpmpd *sm4250_rpmpds[] = { - [SM4250_VDDCX] = &sm6115_vddcx, - [SM4250_VDDCX_AO] = &sm6115_vddcx_ao, - [SM4250_VDDCX_VFL] = &sm6115_vddcx_vfl, - [SM4250_VDDMX] = &sm6115_vddmx, - [SM4250_VDDMX_AO] = &sm6115_vddmx_ao, - [SM4250_VDDMX_VFL] = &sm6115_vddmx_vfl, - [SM4250_VDD_LPI_CX] = &sm6115_vdd_lpi_cx, - [SM4250_VDD_LPI_MX] = &sm6115_vdd_lpi_mx, -}; - -static const struct rpmpd_desc sm4250_desc = { - .rpmpds = sm4250_rpmpds, - .num_pds = ARRAY_SIZE(sm4250_rpmpds), - .max_state = RPM_SMD_LEVEL_TURBO_NO_CPR, -}; - static const struct of_device_id rpmpd_match_table[] = { { .compatible = "qcom,mdm9607-rpmpd", .data = &mdm9607_desc }, { .compatible = "qcom,msm8226-rpmpd", .data = &msm8226_desc }, @@ -502,7 +485,6 @@ static const struct of_device_id rpmpd_match_table[] = { { .compatible = "qcom,qcm2290-rpmpd", .data = &qcm2290_desc }, { .compatible = "qcom,qcs404-rpmpd", .data = &qcs404_desc }, { .compatible = "qcom,sdm660-rpmpd", .data = &sdm660_desc }, - { .compatible = "qcom,sm4250-rpmpd", .data = &sm4250_desc }, { .compatible = "qcom,sm6115-rpmpd", .data = &sm6115_desc }, { .compatible = "qcom,sm6125-rpmpd", .data = &sm6125_desc }, { .compatible = "qcom,sm6375-rpmpd", .data = &sm6375_desc }, From patchwork Fri Jan 13 15:22:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 642693 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 D3021C61DB3 for ; Fri, 13 Jan 2023 15:30:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230171AbjAMPam (ORCPT ); Fri, 13 Jan 2023 10:30:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230233AbjAMPaF (ORCPT ); Fri, 13 Jan 2023 10:30:05 -0500 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C53DF90E5A for ; Fri, 13 Jan 2023 07:22:39 -0800 (PST) Received: by mail-lf1-x133.google.com with SMTP id b3so33604482lfv.2 for ; Fri, 13 Jan 2023 07:22:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9GR+M9kwc8eT2cs2wW/CNkkocF5x7PXcufqp311RRzs=; b=kee0KnZBB5mlhKrW/FuLH+F/KJSsHDofE6f9UQzffSBP4ulfmnjhL4JKmXnaA0DcEs TtbdNp5/m+YNQ6Uy8+L6Qua8t1AIj4uLIi7k1i25v0gU4EcH/79FUx+ZRveThzbMRTjv himR+KdZNmsmlCyUnJ6koe4eYp8PeC6DjN2sXkH4lh7qtfA3Erp99ayshijaf9HQ/H7Y EbVZf9Hg6b2U2+fLNPKU7yD+dfI7FPd2bZfzWfwjZMTNjKnGR7O1CdVA0M7fJqY4hXm4 mmJ1d17F8BUhH8ArcePVHQ/bVJECXkEpW8Z3Vve6zS4wg5gt0m2bIkThr+DL4+KlAgt/ BIMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9GR+M9kwc8eT2cs2wW/CNkkocF5x7PXcufqp311RRzs=; b=CnWeP+gy+yyELgJT2gWzOmAd9xK5bM4VXmBz72N4S69NMkpJdYgyPoEjPdENq0WvSM xpQJF13WcCkDTiI2mBBPrRr2hHb5SEK/j2QwDEkzsVMTOT0dfQl3iVSM71i7WmLq07Ze BcBuWswU+mMnhskkvNkQT23xGCUv8jqs6cAhSI9/axInApZTydY/caGMJgx1quWOGRKe Exhyf6CCcIfADSrkTNYp7WArUqc5OiBY55/H2jWMu29keUOA8I9ng0cXEmkn0+tgD0Qc SGjTSqdCPVYimKUw1i2VTjWZlqTDJ18FuRPIQH3yOr9SzZYmSVCDc8HwTQ28iyXSl2Ii zaFQ== X-Gm-Message-State: AFqh2ko9f2es77bKXC3Rnnq36xf3uVjSEkp9zf1x7AvzV3lQso1Li7Ta eqj+Np9DtsfNbX1sIqw9IVfNnTGDcFiHGblC X-Google-Smtp-Source: AMrXdXsmpGytuMFvVR1ENG/ufgf35vTcwd7b2GrTF6pZoJA4+hamriWabozyn/h59ja0tLIbQknZTw== X-Received: by 2002:a05:6512:2395:b0:4cb:4344:a786 with SMTP id c21-20020a056512239500b004cb4344a786mr14051198lfv.20.1673623357997; Fri, 13 Jan 2023 07:22:37 -0800 (PST) Received: from localhost.localdomain (abym53.neoplus.adsl.tpnet.pl. [83.9.32.53]) by smtp.gmail.com with ESMTPSA id c19-20020a056512325300b004cb3d77a936sm3875440lfr.46.2023.01.13.07.22.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 07:22:37 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , linux-kernel@vger.kernel.org, Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Subject: [PATCH 2/2] Revert "dt-bindings: power: rpmpd: Add SM4250 support" Date: Fri, 13 Jan 2023 16:22:32 +0100 Message-Id: <20230113152232.2624545-2-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230113152232.2624545-1-konrad.dybcio@linaro.org> References: <20230113152232.2624545-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org SM4250 and SM6115 use a shared device tree and the RPMPDs are identical. There's no need for a separate entry, so remove it. This reverts commit 45ac44ed10e58cf9b510e6552317ed7d2602346f. Signed-off-by: Konrad Dybcio --- .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 - include/dt-bindings/power/qcom-rpmpd.h | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml index 633d49884019..5bb9f59d196f 100644 --- a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml +++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml @@ -39,7 +39,6 @@ properties: - qcom,sdm845-rpmhpd - qcom,sdx55-rpmhpd - qcom,sdx65-rpmhpd - - qcom,sm4250-rpmpd - qcom,sm6115-rpmpd - qcom,sm6125-rpmpd - qcom,sm6350-rpmhpd diff --git a/include/dt-bindings/power/qcom-rpmpd.h b/include/dt-bindings/power/qcom-rpmpd.h index 278de6df425e..2d22a36c682a 100644 --- a/include/dt-bindings/power/qcom-rpmpd.h +++ b/include/dt-bindings/power/qcom-rpmpd.h @@ -307,16 +307,6 @@ #define SDM660_SSCMX 8 #define SDM660_SSCMX_VFL 9 -/* SM4250 Power Domains */ -#define SM4250_VDDCX 0 -#define SM4250_VDDCX_AO 1 -#define SM4250_VDDCX_VFL 2 -#define SM4250_VDDMX 3 -#define SM4250_VDDMX_AO 4 -#define SM4250_VDDMX_VFL 5 -#define SM4250_VDD_LPI_CX 6 -#define SM4250_VDD_LPI_MX 7 - /* SM6115 Power Domains */ #define SM6115_VDDCX 0 #define SM6115_VDDCX_AO 1