Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp532791pxv; Thu, 1 Jul 2021 03:56:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXPwVkOSzi1BzXN4eIKouHuj/tAQmn4648+U1YkM8pzLpCS5rRvjpxpuVuGsx2dd44RvQr X-Received: by 2002:a92:ce43:: with SMTP id a3mr11752254ilr.59.1625136960540; Thu, 01 Jul 2021 03:56:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625136960; cv=none; d=google.com; s=arc-20160816; b=eFd11Q9MgKpv3TML66HzsWHpa+V9WabXzrhdK5NMKUazyk6bBz0COex7b2yPxX3Frq kijr1EM8jbY8FNdP7mhap0ol+kBBTAfgDjtntmCBvJEdy5qb+DHliD+zfgvy+Q4gbGZs dlfJtxlWokLn/yGsG+zo/E7UIrR8Fzi22UKtTG0ANCn7hhKCNrJnMyVE0jzuaSo5hKr3 rne/SMjU02+5aSfqElsWzG0mm7C+aWwI+U8I9EKRn0+ofpwVfaW++Bs/xpQvV4T1Z55m 1r/A4ZVbcyoK8Fb4R+TFwI/Hn1DDnSO0Yuo4F5UukE69B4v9gtXDDtynr3/Hs/f9OMeR eaEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=5Koj4NXZjoxXAwabQ2WqukvqDlZTbo14tgB8ORM5QGE=; b=Ys0FWwO2gyuomx7dAf6kEulNJx6uIgw081+pCzgQBoxZDnhFSvKREOJOZzpeeV+JOi p3U/CaarqAt+niwyd6GatmJCqqF42xapqWdBO7EREthBvl3nvyIDLZZmrQgvoB+XeSmH EsoAuumQ+iBoRxatAK9Tiv/S8GItzT6zuUmymGZWMwxjqRmMaAI31rG1iY+UpEG/KAgF GhJctA4J+HKerbV2lgArUcduupKulmQRJSPHJQbCHQKqJQt+/K6xCrNcBLxXGuNHaUVQ UA1vkPJlPT5GhX9rMlQFg7bmF18z82hQ+VNzjSJvHHRpv/vVoJQoDr664lygkr9ufApx /QeA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u8si20905230ill.90.2021.07.01.03.55.46; Thu, 01 Jul 2021 03:56:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236185AbhGAK50 (ORCPT + 99 others); Thu, 1 Jul 2021 06:57:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236118AbhGAK5V (ORCPT ); Thu, 1 Jul 2021 06:57:21 -0400 Received: from relay08.th.seeweb.it (relay08.th.seeweb.it [IPv6:2001:4b7a:2000:18::169]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE9EFC0617AD; Thu, 1 Jul 2021 03:54:50 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (unknown [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r2.th.seeweb.it (Postfix) with ESMTPSA id 2EDEB3F614; Thu, 1 Jul 2021 12:54:49 +0200 (CEST) From: AngeloGioacchino Del Regno To: bjorn.andersson@linaro.org Cc: agross@kernel.org, robh+dt@kernel.org, lgirdwood@gmail.com, broonie@kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org, konrad.dybcio@somainline.org, marijn.suijten@somainline.org, jami.kettunen@somainline.org, paul.bouchara@somainline.org, martin.botka@somainline.org, ~postmarketos/upstreaming@lists.sr.ht, jeffrey.l.hugo@gmail.com, AngeloGioacchino Del Regno Subject: [PATCH v6 3/6] arm64: qcom: qcs404: Change CPR nvmem-names Date: Thu, 1 Jul 2021 12:54:38 +0200 Message-Id: <20210701105441.319572-4-angelogioacchino.delregno@somainline.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210701105441.319572-1-angelogioacchino.delregno@somainline.org> References: <20210701105441.319572-1-angelogioacchino.delregno@somainline.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The CPR driver's common functions were split and put in another file in order to support newer CPR revisions: to simplify the commonization, the expected names of the fuses had to be changed in order for both new and old support to use the same fuse name retrieval function and keeping the naming consistent. The thread id was added to the fuse name and, since CPRv1 does not support threads, it is expected to always read ID 0, which means that the expected name here is now "cpr0_(fuse_name)" instead of "cpr_(fuse_name)": luckily, QCS404 is the only user so change it accordingly. Signed-off-by: AngeloGioacchino Del Regno --- arch/arm64/boot/dts/qcom/qcs404.dtsi | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi index 339790ba585d..f9350b028435 100644 --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi @@ -1168,19 +1168,19 @@ cpr: power-controller@b018000 { <&cpr_efuse_ring2>, <&cpr_efuse_ring3>, <&cpr_efuse_revision>; - nvmem-cell-names = "cpr_quotient_offset1", - "cpr_quotient_offset2", - "cpr_quotient_offset3", - "cpr_init_voltage1", - "cpr_init_voltage2", - "cpr_init_voltage3", - "cpr_quotient1", - "cpr_quotient2", - "cpr_quotient3", - "cpr_ring_osc1", - "cpr_ring_osc2", - "cpr_ring_osc3", - "cpr_fuse_revision"; + nvmem-cell-names = "cpr0_quotient_offset1", + "cpr0_quotient_offset2", + "cpr0_quotient_offset3", + "cpr0_init_voltage1", + "cpr0_init_voltage2", + "cpr0_init_voltage3", + "cpr0_quotient1", + "cpr0_quotient2", + "cpr0_quotient3", + "cpr0_ring_osc1", + "cpr0_ring_osc2", + "cpr0_ring_osc3", + "cpr0_fuse_revision"; }; timer@b120000 { -- 2.32.0