From patchwork Thu Jan 17 05:11:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 155790 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1524340jaa; Wed, 16 Jan 2019 21:12:05 -0800 (PST) X-Google-Smtp-Source: ALg8bN5OA+qnWNeGb+VUPurBd7fwilNZERwrni7wZpfKfwnRwde/QkdMuqWpZ+TRne8vSsfR+N1w X-Received: by 2002:a63:902:: with SMTP id 2mr11462315pgj.219.1547701924981; Wed, 16 Jan 2019 21:12:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547701924; cv=none; d=google.com; s=arc-20160816; b=inYPBKpr+pW5si+hVLvS2bLDjSgb/9LtIy0fucm+rpLr2gj9yIIjB3e/r/Z6HzCYuV Tw57WftTDulHbslyWX7CfShczZ1d3IDkwz6T4AFBE5KXQbtzTTDqVsBUJ9go9XpVM2+Y nEQ+U+MUyNIRSZ+/2TPM31pMlxu7fJnH+HlE4Y6gWerDL55yCK9pzf5bPTamB1EQ8lr/ MbaWL8ihd/uNa4AgISHdDGjkcTBndcidAUzFeFgoFyRZTfSSN7e4rXs/6mQ+oVSyMkyE OD/ebHjjKw3QHljPeoFpaQSbNZQgjeCdkDLivRfHO7TrKTyHQ59BWMh3hzb3kLoBX0ee 4/sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=sw58SkYJejOHqOYOm4JYlutkdMfKaNYQfwacC5uJ8QE=; b=fGuX2rnLE+6gBDFk1jaOvsWc+wuv8/8xkkmYiqK+7kYugLpTayl32VG702pbu//Sct 6ayxGn1wu3MLuXA8xvYs1qT/VmoIe88D6JnLy71JlY0m76bbt2/AmWPJ765pI35n479x 5+eqmhBrGFkdOPnb8Vf1PCmqUYjknG69twROgS/VQM9RT6YvqRkb1g5WANnCJLqkap96 IDcTvA6ffQa0xO5h+6aPk/tf2YqZ6+dPXXWK7Mz6fcsAqypy7Kwt6TbLrCA8Ix1E9tQm KzRZjytmFl3PvRc11hNl2u2KZj7R4/ry//7IQTuE72htUpMog3qVYBQASJyISkyy1fgq +hrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PJPLA3vn; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s73si642433pfs.54.2019.01.16.21.12.04; Wed, 16 Jan 2019 21:12:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PJPLA3vn; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-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 S1729236AbfAQFMD (ORCPT + 15 others); Thu, 17 Jan 2019 00:12:03 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:46777 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729233AbfAQFMD (ORCPT ); Thu, 17 Jan 2019 00:12:03 -0500 Received: by mail-pf1-f194.google.com with SMTP id c73so4203376pfe.13 for ; Wed, 16 Jan 2019 21:12:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=sw58SkYJejOHqOYOm4JYlutkdMfKaNYQfwacC5uJ8QE=; b=PJPLA3vn6+kb/T71/ROYTnOjCgv6WZ6F/ukkzqV+zJwlfmt6hy1fxkPV+g/qYWpwMz V/Ahrk5Oq15ECxrcza2Q8K/12w8jvDoouXRhoIPGacgf0jKj/fQZ6Q86PfvF3mDsJkAv aEW0U5v+l9ptZpCPAkzXupRX6GsCtWQnfIvPs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=sw58SkYJejOHqOYOm4JYlutkdMfKaNYQfwacC5uJ8QE=; b=Vcv1DCwswC8wxBpcsPkqMYBQk6dPF6Fbhtac+uftZHUv0fLCfKbC/G7YNSfVi1uLFw bLeGIZRvnjnHUJTuGlXloU9vLa5orWNPelpdVc0In/vK0BELnAdFb/1DrvDdEFDksj4R 9dGj+CSmYloj4JZHi45fJodGm+wosGhZIsbbBPN2TbYBJE0QTQKm0K6V784alDZ0rhlE e5Ia3TNnRJEH58hoH8AUbYK83vJMjspi5acn250LmCYet4wxZ4BX45mvV7lRtf6zbBQS hfhMwOQ2WC6Fbu6rXx0rOsta8GruKhBC9w1tJsEsMO/EtE8JpklgLMMuXQAytbnBjsiv w+LA== X-Gm-Message-State: AJcUukcTDHrnFi6c0QUE4ejDlsyBOHAezScW8YoI7IHDO4KlcrVSZRYn lBEeA6LrJvq7/k0ajPVknEVkLw== X-Received: by 2002:a63:7154:: with SMTP id b20mr12135637pgn.342.1547701921753; Wed, 16 Jan 2019 21:12:01 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id l185sm701089pfl.54.2019.01.16.21.12.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 21:12:01 -0800 (PST) From: Bjorn Andersson To: Andy Gross , David Brown Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Rajendra Nayak Subject: [PATCH] soc: qcom: rpmpd: Drop family A RPM dependency Date: Wed, 16 Jan 2019 21:11:20 -0800 Message-Id: <20190117051120.31913-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The MFD_QCOM_RPM is the RPM in family A, but the rpmpd driver only implements support for SMD based devices. Drop the dependency and remove includes of the family A headers. No functional change. Signed-off-by: Bjorn Andersson --- Sorry for not spotting this earlier, let's apply the series and this fix on top. drivers/soc/qcom/Kconfig | 2 +- drivers/soc/qcom/rpmpd.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) -- 2.18.0 Reviewed-by: Rajendra Nayak diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 6241d3e3b115..a5d5167c3f16 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -109,7 +109,7 @@ config QCOM_RPMHPD config QCOM_RPMPD bool "Qualcomm RPM Power domain driver" - depends on MFD_QCOM_RPM && QCOM_SMD_RPM + depends on QCOM_SMD_RPM help QCOM RPM Power domain driver to support power-domains with performance states. The driver communicates a performance state diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c index 35a711017d6f..005326050c23 100644 --- a/drivers/soc/qcom/rpmpd.c +++ b/drivers/soc/qcom/rpmpd.c @@ -6,14 +6,12 @@ #include #include #include -#include #include #include #include #include #include -#include #include #define domain_to_rpmpd(domain) container_of(domain, struct rpmpd, pd) @@ -131,8 +129,8 @@ static int rpmpd_send_enable(struct rpmpd *pd, bool enable) .value = cpu_to_le32(enable), }; - return qcom_rpm_smd_write(pd->rpm, QCOM_RPM_ACTIVE_STATE, pd->res_type, - pd->res_id, &req, sizeof(req)); + return qcom_rpm_smd_write(pd->rpm, QCOM_SMD_RPM_ACTIVE_STATE, + pd->res_type, pd->res_id, &req, sizeof(req)); } static int rpmpd_send_corner(struct rpmpd *pd, int state, unsigned int corner) @@ -174,13 +172,13 @@ static int rpmpd_aggregate_corner(struct rpmpd *pd) active_corner = max(this_active_corner, peer_active_corner); - ret = rpmpd_send_corner(pd, QCOM_RPM_ACTIVE_STATE, active_corner); + ret = rpmpd_send_corner(pd, QCOM_SMD_RPM_ACTIVE_STATE, active_corner); if (ret) return ret; sleep_corner = max(this_sleep_corner, peer_sleep_corner); - return rpmpd_send_corner(pd, QCOM_RPM_SLEEP_STATE, sleep_corner); + return rpmpd_send_corner(pd, QCOM_SMD_RPM_SLEEP_STATE, sleep_corner); } static int rpmpd_power_on(struct generic_pm_domain *domain)