From patchwork Thu Oct 14 13:35:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 12558555 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EF79C433EF for ; Thu, 14 Oct 2021 13:44:16 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6367960FDC for ; Thu, 14 Oct 2021 13:44:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6367960FDC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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: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:In-Reply-To:References: List-Owner; bh=JJ6zO6Yjpdk49d1BZewjp9AuWyvCDKZZPQmCLN5tATQ=; b=2a01DYjXcV0JrT /HHqR/Spk2H2lTxBtYLv+Om2c1wbSSRqYiU/DGygs7ufTAF8iXiEL/mqSYRlGmqtcB/cQBqWGerzu gGZFekhT8KB92bwWK3kr52lFZgW/udePUH6b1HAU37q9gvBQS5zfrgoWh7ftnS0gdULdngBNIGIVu KJXLxa1mMTHMFkk9cw8oxiW/fqye1yZDFMIauLzKX0r/+YKh/r+uJFVKMFxxHtrN2l9l87E03uaC5 fIkz1uj8OKvVlJJRr0SfvekJcjmWSaiwdPK9Xm/f5K5tv9esODi9X8JK/6Juw8XU7222nrL/zwGes ltSUUAoJ9TMqfPczh7lQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mb0tB-003Gbb-08; Thu, 14 Oct 2021 13:35:17 +0000 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mb0t6-003GZX-91 for linux-arm-kernel@lists.infradead.org; Thu, 14 Oct 2021 13:35:14 +0000 Received: by mail-lf1-x132.google.com with SMTP id u21so23897943lff.8 for ; Thu, 14 Oct 2021 06:35:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SnGd6eHlejKEAJbTJQfvjpkOnD5FU3ZOdS7LGYeSVQM=; b=LFHWvAvYptUUEwmCDCxDAs2myodlz51oOeMeTvZxN/Y8w2HD/vwmfxslH+XAO/3Akw AWYDDA61Mq8tbsHwEDB3jW9dW8ujxO2AOgyXIn0CmO54nOjYuncsL3868rp/iB8ohcyx 6R32LXFFu6IwDMpHjjKOkTLKPkAHMWIF/fdqnuiNsbgXc5xflhG3mikrJiEwq6NlKets +KbHbs4BNFIqutraBS5IvVuJ7XFEVHLUEIRPDktysfcknOQvN7CbOrtRjuwrbrjGuRLq TX1oKK+y6VgszQWvErn/KcEc4X0iXzoGnYUmsak3tLbQ/0VTTfo/YLtssePMqoaFnh7i dWVg== 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:mime-version :content-transfer-encoding; bh=SnGd6eHlejKEAJbTJQfvjpkOnD5FU3ZOdS7LGYeSVQM=; b=MRfvvMbWPKxGoQ58tlfvBxBujhJAm9pJUK7U9A7t0wJRTi/Tp9Jrx+d3T9v/CCQS8m hUnGQ6yTnlTlrYezopz587M9YccwZR+pxs4a6EyMf3yjHwfjsL/3bjJtNTV9C5X2q6sr pbdwL0HV9Rd+jCmDqabmRQ+54wOopiEOcN9ecTBnuYkT4wQOuklcbX7bhTZOmpg8un7L EtS93nRsF8lhvGUxq5rvpHPBzVTZc9svngjlW7HTZlxdaUdNoYFOYDTDjQQOT3RkClWg XpsyZGx2NQKNk1Sf2PwoqAxej2gRNZJqqlgeRiArbcm9oV3bgfR2IApK9+POcheNg+OQ 36CQ== X-Gm-Message-State: AOAM533QXumoUGGvyG47f1EAHNyWVj7RYKY/Cf1QX5ZlIDpqc8CGri6T 5Mv/w1eoBbsBjL2g52K12Mv1N/6bOkTIbvbN X-Google-Smtp-Source: ABdhPJxSZ3mCoCDfRA0lLn090vlCYBrcrcsLIxi2Vr/8FmIlPzISr0w3ZHh7eCksH/bWGWxmYfCYEg== X-Received: by 2002:a2e:8143:: with SMTP id t3mr5907365ljg.461.1634218509931; Thu, 14 Oct 2021 06:35:09 -0700 (PDT) Received: from localhost ([31.134.121.151]) by smtp.gmail.com with ESMTPSA id s7sm227554lfe.258.2021.10.14.06.35.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 06:35:09 -0700 (PDT) From: Sam Protsenko To: Krzysztof Kozlowski , Rob Herring Cc: Sumit Semwal , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/3] soc: samsung: exynos-chipid: Pass revision reg offsets Date: Thu, 14 Oct 2021 16:35:06 +0300 Message-Id: <20211014133508.1210-1-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211014_063512_351145_6857BBCE X-CRM114-Status: GOOD ( 23.98 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Old Exynos SoCs have both Product ID and Revision ID in one single register, while new SoCs tend to have two separate registers for those IDs. Implement handling of both cases by passing Revision ID register offsets in driver data. Previously existing macros for Exynos4210 (removed in this patch) were incorrect: #define EXYNOS_SUBREV_MASK (0xf << 4) #define EXYNOS_MAINREV_MASK (0xf << 0) Actual format of PRO_ID register in Exynos4210 (offset 0x0): [31:12] Product ID [9:8] Package information [7:4] Main Revision Number [3:0] Sub Revision Number This patch doesn't change the behavior on existing platforms, so '/sys/devices/soc0/revision' will show the same string as before. Signed-off-by: Sam Protsenko --- Changes in v2: - Renamed *_rev_bit fields in 'struct exynos_chipid_variant' to *_rev_shift - Renamed EXYNOS_REV_PART_LEN to EXYNOS_REV_PART_MASK - Renamed EXYNOS_REV_PART_OFF to EXYNOS_REV_PART_SHIFT Changes in v3: - Rebased on top of krzk/for-next tree - Fixed wrong *_rev_shift values in exynos4210_chipid_drv_data - Implemented reading the register only once in case when both Product ID and Revision ID are stored in the same register - Tested all possible cases by emulating read register values - Provided more detailed explanation in commit message drivers/soc/samsung/exynos-chipid.c | 69 +++++++++++++++++++---- include/linux/soc/samsung/exynos-chipid.h | 6 +- 2 files changed, 60 insertions(+), 15 deletions(-) diff --git a/drivers/soc/samsung/exynos-chipid.c b/drivers/soc/samsung/exynos-chipid.c index b2627a3a127a..986978e83661 100644 --- a/drivers/soc/samsung/exynos-chipid.c +++ b/drivers/soc/samsung/exynos-chipid.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -25,6 +26,17 @@ #include "exynos-asv.h" +struct exynos_chipid_variant { + unsigned int rev_reg; /* revision register offset */ + unsigned int main_rev_shift; /* main revision offset in rev_reg */ + unsigned int sub_rev_shift; /* sub revision offset in rev_reg */ +}; + +struct exynos_chipid_info { + u32 product_id; + u32 revision; +}; + static const struct exynos_soc_id { const char *name; unsigned int id; @@ -50,31 +62,57 @@ static const char *product_id_to_soc_id(unsigned int product_id) int i; for (i = 0; i < ARRAY_SIZE(soc_ids); i++) - if ((product_id & EXYNOS_MASK) == soc_ids[i].id) + if (product_id == soc_ids[i].id) return soc_ids[i].name; return NULL; } +static int exynos_chipid_get_chipid_info(struct regmap *regmap, + const struct exynos_chipid_variant *data, + struct exynos_chipid_info *soc_info) +{ + int ret; + unsigned int val, main_rev, sub_rev; + + ret = regmap_read(regmap, EXYNOS_CHIPID_REG_PRO_ID, &val); + if (ret < 0) + return ret; + soc_info->product_id = val & EXYNOS_MASK; + + if (data->rev_reg != EXYNOS_CHIPID_REG_PRO_ID) { + ret = regmap_read(regmap, data->rev_reg, &val); + if (ret < 0) + return ret; + } + main_rev = (val >> data->main_rev_shift) & EXYNOS_REV_PART_MASK; + sub_rev = (val >> data->sub_rev_shift) & EXYNOS_REV_PART_MASK; + soc_info->revision = (main_rev << EXYNOS_REV_PART_SHIFT) | sub_rev; + + return 0; +} + static int exynos_chipid_probe(struct platform_device *pdev) { + const struct exynos_chipid_variant *drv_data; + struct exynos_chipid_info soc_info; struct soc_device_attribute *soc_dev_attr; struct soc_device *soc_dev; struct device_node *root; struct regmap *regmap; - u32 product_id; - u32 revision; int ret; + drv_data = of_device_get_match_data(&pdev->dev); + if (!drv_data) + return -EINVAL; + regmap = device_node_to_regmap(pdev->dev.of_node); if (IS_ERR(regmap)) return PTR_ERR(regmap); - ret = regmap_read(regmap, EXYNOS_CHIPID_REG_PRO_ID, &product_id); + ret = exynos_chipid_get_chipid_info(regmap, drv_data, &soc_info); if (ret < 0) return ret; - revision = product_id & EXYNOS_REV_MASK; - soc_dev_attr = devm_kzalloc(&pdev->dev, sizeof(*soc_dev_attr), GFP_KERNEL); if (!soc_dev_attr) @@ -87,8 +125,8 @@ static int exynos_chipid_probe(struct platform_device *pdev) of_node_put(root); soc_dev_attr->revision = devm_kasprintf(&pdev->dev, GFP_KERNEL, - "%x", revision); - soc_dev_attr->soc_id = product_id_to_soc_id(product_id); + "%x", soc_info.revision); + soc_dev_attr->soc_id = product_id_to_soc_id(soc_info.product_id); if (!soc_dev_attr->soc_id) { pr_err("Unknown SoC\n"); return -ENODEV; @@ -106,7 +144,7 @@ static int exynos_chipid_probe(struct platform_device *pdev) platform_set_drvdata(pdev, soc_dev); dev_info(&pdev->dev, "Exynos: CPU[%s] PRO_ID[0x%x] REV[0x%x] Detected\n", - soc_dev_attr->soc_id, product_id, revision); + soc_dev_attr->soc_id, soc_info.product_id, soc_info.revision); return 0; @@ -125,9 +163,18 @@ static int exynos_chipid_remove(struct platform_device *pdev) return 0; } +static const struct exynos_chipid_variant exynos4210_chipid_drv_data = { + .rev_reg = 0x0, + .main_rev_shift = 4, + .sub_rev_shift = 0, +}; + static const struct of_device_id exynos_chipid_of_device_ids[] = { - { .compatible = "samsung,exynos4210-chipid" }, - {} + { + .compatible = "samsung,exynos4210-chipid", + .data = &exynos4210_chipid_drv_data, + }, + { } }; MODULE_DEVICE_TABLE(of, exynos_chipid_of_device_ids); diff --git a/include/linux/soc/samsung/exynos-chipid.h b/include/linux/soc/samsung/exynos-chipid.h index 8bca6763f99c..62f0e2531068 100644 --- a/include/linux/soc/samsung/exynos-chipid.h +++ b/include/linux/soc/samsung/exynos-chipid.h @@ -9,10 +9,8 @@ #define __LINUX_SOC_EXYNOS_CHIPID_H #define EXYNOS_CHIPID_REG_PRO_ID 0x00 -#define EXYNOS_SUBREV_MASK (0xf << 4) -#define EXYNOS_MAINREV_MASK (0xf << 0) -#define EXYNOS_REV_MASK (EXYNOS_SUBREV_MASK | \ - EXYNOS_MAINREV_MASK) +#define EXYNOS_REV_PART_MASK 0xf +#define EXYNOS_REV_PART_SHIFT 4 #define EXYNOS_MASK 0xfffff000 #define EXYNOS_CHIPID_REG_PKG_ID 0x04 From patchwork Thu Oct 14 13:35:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 12558553 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C180BC433EF for ; Thu, 14 Oct 2021 13:44:12 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 82E5360FDA for ; Thu, 14 Oct 2021 13:44:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 82E5360FDA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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=dKDTruo/V6i1drHwrN16HWNZnPzi/z0HEYK34oe+OPg=; b=FT0buafYgjX88l OdsgwQ8sKsVK4ZgdfRS8XoI0vQR35pGKsPFwzBv7qmmy2gvxIcGu+kPxyFMpiLv2ncDkPnXfth3+Z xzvKLPh4dd5rxOC02nTOKdKeLRAqIPWauAYr8nOktvp1R8RfrQblRT8kUmsvw4f1ZLCgYa+doqcRD PigbB65Ysl1AsZ2/j7Au/0mSnydGtAUv2ygrWyJnO1Vl3cprHkA8PkbxQqNvw95Ek0jOLD0flv4VO UM9PIQmrZLFZ0Nj77JfMT6mcrDSt1RYQ65SEGDHMJTQOmjjIxX3TdTrwmhNc8Ubg3kTb58F5kbBGi WcH19w0vFyHBrdxXR/HA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mb0tL-003Geb-SX; Thu, 14 Oct 2021 13:35:28 +0000 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mb0t7-003GZx-Ef for linux-arm-kernel@lists.infradead.org; Thu, 14 Oct 2021 13:35:15 +0000 Received: by mail-lf1-x12f.google.com with SMTP id y26so27128460lfa.11 for ; Thu, 14 Oct 2021 06:35:12 -0700 (PDT) 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=N6W4v1n3kGpm51LGuWr4DOSZfvAmRLOc39RwJrVRkNE=; b=sS2XyoOmFym8VPzYBeiYdbCcFPoN35ePuF/iXKNNcFZkLI/kGvUrBWZpNgcso8yyW2 IXjl/daA9ojrLYIEQQ/441lt96LQuEcY1+pRDtbYoPL1NiYAWF4C/ZNnbGD91VjvnDf1 fkEF/WUkqTA7c/4ODLK/4VLEC/Kte7PPZ4+dEjnEdtLVvT2nqi9jnVZKpcBIEmqS305n xH8pyH7fOrgZxD/GX1/iSD5Vfb096zTCoRsN8urq76fUSoFgboTSB+GWDlJL9hVI6Ne8 yQh0Ib0IVJjyOWqmJkFiVVa9exS8akUllhtdQnozqL2q/hV2v/QHcXWpv2kCrWrwGE8x Ku9A== 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=N6W4v1n3kGpm51LGuWr4DOSZfvAmRLOc39RwJrVRkNE=; b=P89MIh4fFJU0mIjRMQIfwa+6M9/NOaRvI1Vv/qMuCwEhzfg7o7amqnnjYq+MJdHsvh I34P9G/svrvj9oD5W8p7Ylg/Qzzy0Y22Qy7fQAXhTVq3W4WN1wGVp0KJTivwWyL6W6X7 DhfPJfMGoT4ZOGkSue1lNg+BzT97Ns0ZWgdeFpJo6/yOJIbkJa5bbTqkrg35h6P5bfsY zJDBdRpwlhXmB374kAibDWVVwmDRuZhMN4oC4Nqq9LssbyOhOPP2Vdt8CpAGsNHyZtKk LsyXpHOMsLv8mAzX8zqYJ2w/FGvNTEmJ+lCanZhc9wlOockvk61Nl9KXL+KDxw4egbBA b4Uw== X-Gm-Message-State: AOAM533hBdr8Ce+oucWHYcuLZWPp7Tj/OpXc6wA2rspVIu+JCAeFft1O y6MwMtwllPht0eK/6fr1BwUV8g== X-Google-Smtp-Source: ABdhPJwIxRC1sPZ1H4aANAzK5JyQ6HDhWAzS3gCbdn7ctBbZRGf9O2k6f9aboGT5aOzaIRXbz1YFKg== X-Received: by 2002:a2e:7f0f:: with SMTP id a15mr6384451ljd.251.1634218511471; Thu, 14 Oct 2021 06:35:11 -0700 (PDT) Received: from localhost ([31.134.121.151]) by smtp.gmail.com with ESMTPSA id y5sm264196ljy.38.2021.10.14.06.35.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 06:35:11 -0700 (PDT) From: Sam Protsenko To: Krzysztof Kozlowski , Rob Herring Cc: Sumit Semwal , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] dt-bindings: samsung: exynos-chipid: Document Exynos850 compatible Date: Thu, 14 Oct 2021 16:35:07 +0300 Message-Id: <20211014133508.1210-2-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211014133508.1210-1-semen.protsenko@linaro.org> References: <20211014133508.1210-1-semen.protsenko@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211014_063513_511341_B5712DA5 X-CRM114-Status: GOOD ( 11.18 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add compatible string for Exynos850 chip-id. While at it, use enum instead of items/const, to reduce further cluttering of "compatible" list. Signed-off-by: Sam Protsenko --- Changes in v2: - (none) Changes in v3: - Rebased on top of krzk/for-next .../devicetree/bindings/arm/samsung/exynos-chipid.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-chipid.yaml b/Documentation/devicetree/bindings/arm/samsung/exynos-chipid.yaml index f99c0c6df21b..bfc352a2fdd6 100644 --- a/Documentation/devicetree/bindings/arm/samsung/exynos-chipid.yaml +++ b/Documentation/devicetree/bindings/arm/samsung/exynos-chipid.yaml @@ -11,8 +11,9 @@ maintainers: properties: compatible: - items: - - const: samsung,exynos4210-chipid + enum: + - samsung,exynos4210-chipid + - samsung,exynos850-chipid reg: maxItems: 1 From patchwork Thu Oct 14 13:35:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 12558557 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E91D9C433F5 for ; Thu, 14 Oct 2021 13:44:21 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B3E8160FDA for ; Thu, 14 Oct 2021 13:44:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B3E8160FDA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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=p6H6Efvt201Fj6lldXcdfy5oKVYJab9K1A1vETBAssg=; b=4xOO8j/bSWpZm1 Iw8l4EkOZUoi0eedTFi1TyjBBM5h6O5OkNe26leHeOx84SzJFBvv1NwGQ8nRuISPTEAHOYKOAsuAa UJGjnDzZVo40ape70vznNeGpg5Uel/MiREhlG3rNOwhSsztTHw7j4VT6AZ8D0hZsk9mupoX5O5YEg budfzQR+RjNB8cUww9OoW+Vm68Eb8WzV1u7jUhSaTrTdBtoW5J4qO3bInu9QqIU4AHscwR6jcqCRO VxaNB9i0SxEew1BwfPR8ArMXqOnyQeejZvh5FFhVyvdFk21OnYxQcNpbBm5xkHsi5JrYADDBe8Csm +c2CRXVnsp0+JlMVX2nw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mb0tW-003Gh8-GG; Thu, 14 Oct 2021 13:35:38 +0000 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mb0tA-003Gbp-Ex for linux-arm-kernel@lists.infradead.org; Thu, 14 Oct 2021 13:35:18 +0000 Received: by mail-lf1-x132.google.com with SMTP id p16so27260883lfa.2 for ; Thu, 14 Oct 2021 06:35:16 -0700 (PDT) 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=pqqO0gNi0mXrcSrr2tK+8Xmxyib6Rh9OQgAHrafODtI=; b=h4udT+jjdzxi0xaSpw4odBM9ABs3u1SPjhJdtmjl2nxhuLLxPe+ZKGm8kiF+UNhK2/ muAkzeBnUJMS5WxdeO/3S1viCW+Yk2lgGHWQzOglKSR2n7aTBwxfGBl9/R2sMsuKhc6n tWyYE89zjbgRdlObGEF+W6yAMVh/MEO0Ikfuw552na1s0WSz8nlbopEsSRtdwEpJpMAr jKBtPJwEchAx1WYWWAJX0otQGyobDMdmBfHNcezJXUoE8L8vvVPfVUjNvHbN7WH9zaou gG582YzqcZ1aFKQXhS6ZffD4VZw7l97JunUj/Kb10VWTdjCA1oKraxw7EZbflnRkcXe1 Uk6Q== 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=pqqO0gNi0mXrcSrr2tK+8Xmxyib6Rh9OQgAHrafODtI=; b=DE/guibETC21HIAlUwCmwH5UyFD87feBA7kzAwfQgFQzaslTZdhxM6ApT6q+GBAY77 kXiFJN9wMOS21kARa1YK82TukMTDbXdrbg2shpv5/TZ8G4cQpYTnCNNBf9sQriHADX3X RHtSeY60xZcAIcVXXuBFz5BNjd1tkSKB7CNG9ivfy2KmwK7ye9JYSjS3Doy8zK6XRx5G ib1QkSJZlM1i/Gz7x6tcAOMmuyxteSqvQxiQxDMs9lP0BWgqMpW3W2sj+YU8xZMA/OBi Gsv6Q4E2TXIYAqVRleMtkKgM2ezihHgjMPmp4fITAkT1I2nGwJR9gnPHN31rOUgHC1/P tGYw== X-Gm-Message-State: AOAM532mDIhgRub47MEGuPY3OdU2miW3lgWppzjrblhwbDxEXESrx3Ui uAHsYOkt9N5WDvdsbGPHkBZkJw== X-Google-Smtp-Source: ABdhPJz4nppwU9Q9ZIiV+yAZXTac7SZINJwnDRxlDVNNLp7A/5ZHqwk0azy4kI8NrtKyVjl5/H4tXg== X-Received: by 2002:a2e:750a:: with SMTP id q10mr6147584ljc.518.1634218512940; Thu, 14 Oct 2021 06:35:12 -0700 (PDT) Received: from localhost ([31.134.121.151]) by smtp.gmail.com with ESMTPSA id l5sm139234ljh.66.2021.10.14.06.35.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 06:35:12 -0700 (PDT) From: Sam Protsenko To: Krzysztof Kozlowski , Rob Herring Cc: Sumit Semwal , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/3] soc: samsung: exynos-chipid: Add Exynos850 support Date: Thu, 14 Oct 2021 16:35:08 +0300 Message-Id: <20211014133508.1210-3-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211014133508.1210-1-semen.protsenko@linaro.org> References: <20211014133508.1210-1-semen.protsenko@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211014_063516_583855_1D6F017F X-CRM114-Status: GOOD ( 12.45 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add chip-id support for Exynos850 SoC. Despite its "E3830" ID, the actual SoC name is Exynos850 (Exynos3830 name is internal and outdated). Format of Product_ID register in Exynos850 (offset 0x0): [31:0] Product ID (identification) Format of CHIPID_REV register in Exynos850 (offset 0x10): [23:20] Main revision [19:16] Sub revision Signed-off-by: Sam Protsenko --- Changes in v2: - Renamed *_rev_bit fields in 'struct exynos_chipid_variant' to *_rev_shift Changes in v3: - Rebased on top of krzk/for-next - Added Exynos850 chip-id registers format in commit message drivers/soc/samsung/exynos-chipid.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/soc/samsung/exynos-chipid.c b/drivers/soc/samsung/exynos-chipid.c index 986978e83661..0aeb24bcc11a 100644 --- a/drivers/soc/samsung/exynos-chipid.c +++ b/drivers/soc/samsung/exynos-chipid.c @@ -55,6 +55,7 @@ static const struct exynos_soc_id { { "EXYNOS5440", 0xE5440000 }, { "EXYNOS5800", 0xE5422000 }, { "EXYNOS7420", 0xE7420000 }, + { "EXYNOS850", 0xE3830000 }, }; static const char *product_id_to_soc_id(unsigned int product_id) @@ -169,10 +170,19 @@ static const struct exynos_chipid_variant exynos4210_chipid_drv_data = { .sub_rev_shift = 0, }; +static const struct exynos_chipid_variant exynos850_chipid_drv_data = { + .rev_reg = 0x10, + .main_rev_shift = 20, + .sub_rev_shift = 16, +}; + static const struct of_device_id exynos_chipid_of_device_ids[] = { { .compatible = "samsung,exynos4210-chipid", .data = &exynos4210_chipid_drv_data, + }, { + .compatible = "samsung,exynos850-chipid", + .data = &exynos850_chipid_drv_data, }, { } };