From patchwork Sat Jan 29 03:27:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 538399 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 E0950C4167B for ; Sat, 29 Jan 2022 03:27:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343752AbiA2D1n (ORCPT ); Fri, 28 Jan 2022 22:27:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352276AbiA2D1m (ORCPT ); Fri, 28 Jan 2022 22:27:42 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A6DFC06173B for ; Fri, 28 Jan 2022 19:27:42 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id c190-20020a1c9ac7000000b0035081bc722dso5316706wme.5 for ; Fri, 28 Jan 2022 19:27:42 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=3joy+PQtl9Lgy2hme/XhYmJ/nQbCvBKozvSBN92ggvo=; b=CZ+OPZJfDaPv/tY928Sqt+xqFbihqyFCn/7R4s623V2uZ7nRKs4LRQ5WWSTw43xf66 FVkgY8D/mmxFfC90h227ZjCZQArfgDcaPHQDluFxCI+CGlc5QOmiiios+WQfc5ha1ImE 3UdCczHnIqXC16+BmlJOKrZP3hvI8HADWQzeOEXG0aoniWzLVQMgMfjWB9Cg/TUvXp3z PnhBgMGdq1hDKyXP1SaCFFSFDkiZbUN3odDdblZs0kTpJXDLt5nl6fRmxpZzbPyVU43P kGGJnQjJQaLvW9jD75gr9sfZlgl1ntCxWBb55zWibiv7SykLqZdLEchw0NCFwE2uN13R naPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3joy+PQtl9Lgy2hme/XhYmJ/nQbCvBKozvSBN92ggvo=; b=C6WJniwRXgoUbCBukx0Scf5K1Hjwr/vK9wimM62aoWZWmXZmBBrfeP5mLR+UllYtAz 6K1O+8x+gTSbghJfBeF1zG2ejjLD+yP8ysUGNwY0O5h2B8r1Mtehv3O0xEOpTWJK13sh B2GWyobxCGVns7MRVUHlUXz1YX3w3zrZjF5c0u8u/SB81MBln5gcXFjHotGyQVdEh2qV NMNDpTU6Rmj6NoDlduBh/RXW7aOFVWB2L7uI2rvOHoaqLPb/6GU2T+hs/JGjIv2xsBO7 F/yESH+q6oC69KrZr8xtUqVB1NSoMQ8wi+9lRZHTCmQYKtmsHwG1Bxp9cczfYN5R008R CBZw== X-Gm-Message-State: AOAM530BaLz+bX+xl8d6WIRFuKhn11atRtxbG1GB4pDPK+iV1pBK6ycK N7c+k3HvRi3KXOnhL9j0ztOT1A== X-Google-Smtp-Source: ABdhPJxNVcN2AtpjQomiqNyzIysYg3jFb/lWrXviuAtv4rBqxjp+Lwap0f2JccDU9ACVZ5U88uUcYQ== X-Received: by 2002:a7b:cf2e:: with SMTP id m14mr9587402wmg.26.1643426860739; Fri, 28 Jan 2022 19:27:40 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id o12sm7365477wry.115.2022.01.28.19.27.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 19:27:40 -0800 (PST) From: Bryan O'Donoghue To: djakov@kernel.org, bjorn.andersson@linaro.org, agross@kernel.org, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org Cc: jun.nie@linaro.org, shawn.guo@linaro.org, benl@squareup.com, dmitry.baryshkov@linaro.org, bryan.odonoghue@linaro.org Subject: [PATCH v2 2/2] interconnect: qcom: msm8939: Remove snoc_mm specific regmap Date: Sat, 29 Jan 2022 03:27:35 +0000 Message-Id: <20220129032735.2410936-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220129032735.2410936-1-bryan.odonoghue@linaro.org> References: <20220129032735.2410936-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Booting tip-of-tree on msm8939 we find the following error caused by our modelling of snoc and snoc_mm as peer devices with the same address space. [ 1.212340] qnoc-msm8939 580000.interconnect_mm: can't request region for resource [mem 0x00580000-0x0059407f] [ 1.212391] qnoc-msm8939 580000.interconnect_mm: Cannot ioremap interconnect bus resource [ 1.221524] qnoc-msm8939: probe of 580000.interconnect_mm failed with error -16 Declaring snoc_mm as a child device of snoc mitigates the fault and is consistent with a similar extant implementation in qcm2290. Signed-off-by: Bryan O'Donoghue --- drivers/interconnect/qcom/msm8939.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/interconnect/qcom/msm8939.c b/drivers/interconnect/qcom/msm8939.c index d188f3636e4c3..f9c2d7d3100dd 100644 --- a/drivers/interconnect/qcom/msm8939.c +++ b/drivers/interconnect/qcom/msm8939.c @@ -1301,19 +1301,11 @@ static struct qcom_icc_node *msm8939_snoc_mm_nodes[] = { [SNOC_MM_INT_2] = &mm_int_2, }; -static const struct regmap_config msm8939_snoc_mm_regmap_config = { - .reg_bits = 32, - .reg_stride = 4, - .val_bits = 32, - .max_register = 0x14080, - .fast_io = true, -}; - static struct qcom_icc_desc msm8939_snoc_mm = { .type = QCOM_ICC_NOC, .nodes = msm8939_snoc_mm_nodes, .num_nodes = ARRAY_SIZE(msm8939_snoc_mm_nodes), - .regmap_cfg = &msm8939_snoc_mm_regmap_config, + .regmap_cfg = &msm8939_snoc_regmap_config, .qos_offset = 0x7000, };