From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 15AF1C48297 for ; Tue, 6 Feb 2024 14:57:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Evc3hICDegBCm864jrFVf+YR/418kJmvyQhsOd1jZ3Q=; b=NsfsRO5pb2dR2w Fp0qbhCpkN4RpJd17K1uQF/XTDweaT4foHmr6hx0HhcYAH7rPurHK1hRDwrKQkGaOg/uzEvYQHQ16 qI782w4xMsDzLA68K2+siLdtcfUJ/HugiJnYJ/TgefjnBNrPJIj58YNmpSp5D+ZoQmqF05QWgAUxx Z5rA8ANI7ER4b1EcVoQY7+C2Zkfdx8UFpuCgOoTj8GbvLHzyjLUCnWlp3hoeAlW0t50GsuNewvEQo 0zCMhJkXYwvhdaVFTNg9xskEd+iUY4ffBI5cESHnYLX4JhSY52T7MWNIBF0V3wI+Hhn8c5raxIz9X 4u3d2WTCdsSenp5XqWsQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rXMtL-00000007xZw-35qB; Tue, 06 Feb 2024 14:57:43 +0000 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rXMtG-00000007xXC-3tIX for linux-arm-kernel@lists.infradead.org; Tue, 06 Feb 2024 14:57:40 +0000 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40ff940b456so753025e9.2 for ; Tue, 06 Feb 2024 06:57:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1707231457; x=1707836257; darn=lists.infradead.org; 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=XdH/MMRBTUfqayVAnmhejns1JtGutpHRzA8LTWcgILQ=; b=pY2Wzr0TarCqcCu2O9asxfZ/tN4BvphBq5m76sbHyHG+FdOyuxRdKfhaVdHoqBS0lV 8yzJSTy8mkFlsKm/bSo9VvTEIdV9sCYqxsesf7QvyJqZuZu3GWCXx6hwrZuLdmwlwJBB IcG1ZD6hpXTBdx6uTdv9LKoIJ2ocKTord0jI0T8Oj8lq8pS6P9ki3mus/hy8noitaB2V R36uUS7mOmUJFY0bvcygwPJ+R89JnX7bgQbTC6tzw5GU7iPQSUyFpHdsx9LM/cWgN43n n7TadE4ukr4nJiz3y1//rCaVPn4WHoA7sxrGNAZi7tIKMkcaq7qcD8gvsbCJO2G0v7M4 r3NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707231457; x=1707836257; 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=XdH/MMRBTUfqayVAnmhejns1JtGutpHRzA8LTWcgILQ=; b=gPQY9ZbatEv69ncAkinZznvU19bxQvD9HFLxWyLGuLOM0zQfp2jzQuD9epsVvKpqja NfWuZlI0qdCWZcDtk7vckIdiDyYO+3gBuQuEVWDZoZUkcQXEVqNK+gu/WBr/caUoWmUC w4UMVknpIL9mU4bl22Uxl0WBHlWGJX8pz9ACgiDtdWip4eQLlihz26q11N0lImMHxnXj sACb6VCwucDCY6ycm4GcVkSdmMY2QNmINxDLqyil4N2XSEc/faW7HLIjlvZ4eOhAJxtS qjkHTZRICbcLar9ABaRST2m5JCFsUVSq0qJbDwH4oMKAUKcSiEXcHQTU9HW6kmkDKn5g 9Yfg== X-Gm-Message-State: AOJu0YyW/+y9QN6XavpoQQsVcDC75zh3EZV6PRGjoh+waae2M32dp7qq tz+U15kzHo7w5MbNyLRDSZiXR8bEZBLlnKcGArS/46nfhmHKsKTtrWg5ldDHYlo= X-Google-Smtp-Source: AGHT+IEANI1IHeJsecUK707xmJF7E4tpQM8iIUO3QCbVIvB3uiEIfJf5lxl8quWa7bhmLD1KFJ0Gpg== X-Received: by 2002:a05:600c:46ce:b0:40f:f4e0:c2c6 with SMTP id q14-20020a05600c46ce00b0040ff4e0c2c6mr402014wmo.12.1707231456795; Tue, 06 Feb 2024 06:57:36 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVtBTsv+GjvgKmDiMh00jYW5nzyq5ivozfUkLVr71EUPRNMJwVsYPPrGe4+GmTAMNtbTLLLgzfqETgNFMq4IlEupzzva2xnI3fo1Ulg14Xzn+dPTOHlxLjJEPhj0LcA83m28CFlabDX47m+DM6TiEZAEnwN4B6OPHDwR3tvbffao96CM648BE0gj9C+7JKzTTpCGpPz9523uYe42JQXyLl0q/CGTgkQupU3E2Gikxz78F7d8FsHYNvFvJ/Ob+ahn36iLomPVR1aG3ovKaca1Ayeal7LJbGJ3uo+s5bNr6xD18Z0s68SzbdcpCdX0cs3kTQLggIKeVC6Eu+17BQtZT4UNy4LUaO12FJ3n8cdlc+A/X52vPZ/cGGIx2nZcjywV00iCJZtaQRHY2KWeqLP1eLDq32bEjZeoVeUDxJE0vubBZ1XSv+eJ3yFH3vvikF4tuG2Vgyc4fVMueTg7N2XqrD07MU96qbmcEtc Received: from blmsp.fritz.box ([2001:4091:a246:821e:6f3b:6b50:4762:8343]) by smtp.gmail.com with ESMTPSA id l14-20020a05600c4f0e00b0040fc56712e8sm2257896wmq.17.2024.02.06.06.57.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 06:57:36 -0800 (PST) From: Markus Schneider-Pargmann To: Viresh Kumar , Nishanth Menon , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Vignesh Raghavendra , Tero Kristo , "Rafael J . Wysocki" Cc: Andrew Davis , Dhruva Gole , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Markus Schneider-Pargmann Subject: [PATCH 2/3] cpufreq: ti-cpufreq: Support nvmem for chip version Date: Tue, 6 Feb 2024 15:57:20 +0100 Message-ID: <20240206145721.2418893-3-msp@baylibre.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206145721.2418893-1-msp@baylibre.com> References: <20240206145721.2418893-1-msp@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240206_065739_002865_65B047E6 X-CRM114-Status: GOOD ( 20.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Support using nvmem-cells 'chipvariant' and 'chipspeed' instead of syscon. This makes it more flexible and moves more configuration into the devicetree. If nvmem-cells are present, probing will fail if the configuration of these cells is broken. If nvmem-cells is not present syscon will be used. Signed-off-by: Markus Schneider-Pargmann --- drivers/cpufreq/ti-cpufreq.c | 105 ++++++++++++++++++++++------------- 1 file changed, 66 insertions(+), 39 deletions(-) diff --git a/drivers/cpufreq/ti-cpufreq.c b/drivers/cpufreq/ti-cpufreq.c index 46c41e2ca727..3ee72b1309f0 100644 --- a/drivers/cpufreq/ti-cpufreq.c +++ b/drivers/cpufreq/ti-cpufreq.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -65,6 +66,7 @@ struct ti_cpufreq_soc_data { struct ti_cpufreq_data { struct device *cpu_dev; + struct device *dev; struct device_node *opp_node; struct regmap *syscon; const struct ti_cpufreq_soc_data *soc_data; @@ -244,31 +246,40 @@ static struct ti_cpufreq_soc_data am625_soc_data = { static int ti_cpufreq_get_efuse(struct ti_cpufreq_data *opp_data, u32 *efuse_value) { + struct device_node *np = opp_data->opp_node; struct device *dev = opp_data->cpu_dev; u32 efuse; int ret; - ret = regmap_read(opp_data->syscon, opp_data->soc_data->efuse_offset, - &efuse); - if (ret == -EIO) { - /* not a syscon register! */ - void __iomem *regs = ioremap(OMAP3_SYSCON_BASE + - opp_data->soc_data->efuse_offset, 4); - - if (!regs) - return -ENOMEM; - efuse = readl(regs); - iounmap(regs); + ret = nvmem_cell_read_u32(opp_data->dev, "chipspeed", &efuse); + if (ret && (ret != -ENOENT || !opp_data->syscon)) + return dev_err_probe(dev, ret, + "Failed to read nvmem cell 'chipspeed': %pe", + ERR_PTR(ret)); + + if (ret) { + ret = regmap_read(opp_data->syscon, opp_data->soc_data->efuse_offset, + &efuse); + if (ret == -EIO) { + /* not a syscon register! */ + void __iomem *regs = ioremap(OMAP3_SYSCON_BASE + + opp_data->soc_data->efuse_offset, 4); + + if (!regs) + return -ENOMEM; + efuse = readl(regs); + iounmap(regs); + } + else if (ret) { + dev_err(dev, + "Failed to read the efuse value from syscon: %d\n", + ret); + return ret; } - else if (ret) { - dev_err(dev, - "Failed to read the efuse value from syscon: %d\n", - ret); - return ret; - } - efuse = (efuse & opp_data->soc_data->efuse_mask); - efuse >>= opp_data->soc_data->efuse_shift; + efuse = (efuse & opp_data->soc_data->efuse_mask); + efuse >>= opp_data->soc_data->efuse_shift; + } *efuse_value = opp_data->soc_data->efuse_xlate(opp_data, efuse); @@ -285,30 +296,41 @@ static int ti_cpufreq_get_efuse(struct ti_cpufreq_data *opp_data, static int ti_cpufreq_get_rev(struct ti_cpufreq_data *opp_data, u32 *revision_value) { + struct device_node *np = opp_data->opp_node; struct device *dev = opp_data->cpu_dev; u32 revision; int ret; - ret = regmap_read(opp_data->syscon, opp_data->soc_data->rev_offset, - &revision); - if (ret == -EIO) { - /* not a syscon register! */ - void __iomem *regs = ioremap(OMAP3_SYSCON_BASE + - opp_data->soc_data->rev_offset, 4); - - if (!regs) - return -ENOMEM; - revision = readl(regs); - iounmap(regs); + ret = nvmem_cell_read_u32(opp_data->dev, "chipvariant", &revision); + if (ret && (ret != -ENOENT || !opp_data->syscon)) + return dev_err_probe(dev, ret, + "Failed to read nvmem cell 'chipvariant': %pe", + ERR_PTR(ret)); + + if (ret) { + ret = regmap_read(opp_data->syscon, opp_data->soc_data->rev_offset, + &revision); + if (ret == -EIO) { + /* not a syscon register! */ + void __iomem *regs = ioremap(OMAP3_SYSCON_BASE + + opp_data->soc_data->rev_offset, 4); + + if (!regs) + return -ENOMEM; + revision = readl(regs); + iounmap(regs); + } + else if (ret) { + dev_err(dev, + "Failed to read the revision number from syscon: %d\n", + ret); + return ret; } - else if (ret) { - dev_err(dev, - "Failed to read the revision number from syscon: %d\n", - ret); - return ret; + + revision = (revision >> REVISION_SHIFT) & REVISION_MASK; } - *revision_value = BIT((revision >> REVISION_SHIFT) & REVISION_MASK); + *revision_value = BIT(revision); return 0; } @@ -392,9 +414,14 @@ static int ti_cpufreq_probe(struct platform_device *pdev) goto register_cpufreq_dt; } - ret = ti_cpufreq_setup_syscon_register(opp_data); - if (ret) - goto fail_put_node; + opp_data->dev = &pdev->dev; + opp_data->dev->of_node = opp_data->opp_node; + + if (!of_property_read_bool(opp_data->opp_node, "nvmem-cells")) { + ret = ti_cpufreq_setup_syscon_register(opp_data); + if (ret) + goto fail_put_node; + } /* * OPPs determine whether or not they are supported based on -- 2.43.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel