From patchwork Mon Feb 21 22:07:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 544461 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 42CFCC433EF for ; Mon, 21 Feb 2022 22:08:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235170AbiBUWIX (ORCPT ); Mon, 21 Feb 2022 17:08:23 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:35290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235168AbiBUWIX (ORCPT ); Mon, 21 Feb 2022 17:08:23 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13A4222BE8 for ; Mon, 21 Feb 2022 14:07:59 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id s13so802921wrb.6 for ; Mon, 21 Feb 2022 14:07:59 -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=46n4LaD4ZyMBoEv7QyqZkVx2QkFYWM4XtM2ZRYBTQAc=; b=S9lJPgC5IiaAkUPxTOR6pCbBmqHzJ273ONgKjTf6kz6WxV5MBzqonQTVOKd1sckQXZ IDV10h7E98kCSM7jKMdSPbhics6Dgep2Ljv6hHDKWq6IYuYUBxDSFtmDh6kzKzPcS0w8 dI5yL49bUQh5MXjuLSzMecg1dQxRKWskmYsC2NlkEWIRuvfVr0eBqCqsouszfNPrFYTa fPHXCspgs9pPjOSr8UEA+nzGquf+D7RN+ZsZ2ML4JWDm4fupupDfHwnZI2c0UT9PuA+L heNeH1VNtE+4azA/CRC1BfqAwNGsfPjzUL5jlwbpehIcrABVCrJRsgtaMRQHWa+BzELA DdlA== 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=46n4LaD4ZyMBoEv7QyqZkVx2QkFYWM4XtM2ZRYBTQAc=; b=ttMiqZ4IJwqD4FHSJcqZ5eBy9sKqFVrz99RmA+12I7LcmFDi09tLvd/aBV1lDZfqo+ uMQ9ZBcaUkZVUlZLclgXtBYm7trkveHFdpqtQ1K5txgyZ6AnqQAFRk+r3X2fWfFQcM6O 3oB+pNx2GCZXbvlxr2K0j4+p9QGlFp0fFU9rwMSIrLXSefnt5o3XMPjNea4oSXU8gqsP Yjh3S72TaWHOO87EYkIN1v9E1FYyB1i/pCGomN7JFmzlx8BnQ0++W3xloJ6kvf4k735E cfRCYCN7UX9YKKpOz6ZA8LuWcGe9/es+V1CVemk4Bamo88sWSVSyl1Xc8Nh/OOf41eWB A6Bg== X-Gm-Message-State: AOAM532ZYm7BM2zAcS86yHlhw7XsK4BUlTligaSKu5YsyTGN0+TA5wO1 J60/1n7laYz876jm85NJrVhaFg== X-Google-Smtp-Source: ABdhPJyZO6pJpT1Fi1MbU0H1hFrOr6VklHoXSDG4dhj/GdcBFoZd1SHgepz8UzU72P/BcWzOAm7fPA== X-Received: by 2002:adf:80ad:0:b0:1e3:238a:178e with SMTP id 42-20020adf80ad000000b001e3238a178emr17952135wrl.551.1645481277661; Mon, 21 Feb 2022 14:07:57 -0800 (PST) Received: from localhost.localdomain (cpc78119-cwma10-2-0-cust590.7-3.cable.virginm.net. [81.96.50.79]) by smtp.gmail.com with ESMTPSA id w8sm51626093wre.83.2022.02.21.14.07.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 14:07:57 -0800 (PST) From: Caleb Connolly To: caleb.connolly@linaro.org, Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Andy Gross , Bjorn Andersson , Lee Jones , Stephen Boyd , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: sumit.semwal@linaro.org, amit.pundir@linaro.org, john.stultz@linaro.org Subject: [PATCH v8 1/9] spmi: add a helper to look up an SPMI device from a device node Date: Mon, 21 Feb 2022 22:07:35 +0000 Message-Id: <20220221220743.541704-2-caleb.connolly@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221220743.541704-1-caleb.connolly@linaro.org> References: <20220221220743.541704-1-caleb.connolly@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The helper function spmi_device_from_of() takes a device node and returns the SPMI device associated with it. This is like of_find_device_by_node but for SPMI devices. Signed-off-by: Caleb Connolly --- drivers/spmi/spmi.c | 17 +++++++++++++++++ include/linux/spmi.h | 2 ++ 2 files changed, 19 insertions(+) diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c index b37ead9e2fad..de550b777451 100644 --- a/drivers/spmi/spmi.c +++ b/drivers/spmi/spmi.c @@ -386,6 +386,23 @@ static struct bus_type spmi_bus_type = { .uevent = spmi_drv_uevent, }; +/** + * spmi_device_from_of() - get the associated SPMI device from a device node + * + * @np: device node + * + * Returns the struct spmi_device associated with a device node or NULL. + */ +inline struct spmi_device *spmi_device_from_of(struct device_node *np) +{ + struct device *dev = bus_find_device_by_of_node(&spmi_bus_type, np); + + if (dev) + return to_spmi_device(dev); + return NULL; +} +EXPORT_SYMBOL_GPL(spmi_device_from_of); + /** * spmi_controller_alloc() - Allocate a new SPMI device * @ctrl: associated controller diff --git a/include/linux/spmi.h b/include/linux/spmi.h index 729bcbf9f5ad..6ee476bc1cd6 100644 --- a/include/linux/spmi.h +++ b/include/linux/spmi.h @@ -7,6 +7,7 @@ #include #include #include +#include /* Maximum slave identifier */ #define SPMI_MAX_SLAVE_ID 16 @@ -164,6 +165,7 @@ static inline void spmi_driver_unregister(struct spmi_driver *sdrv) module_driver(__spmi_driver, spmi_driver_register, \ spmi_driver_unregister) +inline struct spmi_device *spmi_device_from_of(struct device_node *np); int spmi_register_read(struct spmi_device *sdev, u8 addr, u8 *buf); int spmi_ext_register_read(struct spmi_device *sdev, u8 addr, u8 *buf, size_t len); From patchwork Mon Feb 21 22:07:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 544460 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 5C974C43219 for ; Mon, 21 Feb 2022 22:08:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235181AbiBUWIZ (ORCPT ); Mon, 21 Feb 2022 17:08:25 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:35332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235173AbiBUWIZ (ORCPT ); Mon, 21 Feb 2022 17:08:25 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A05F122BE8 for ; Mon, 21 Feb 2022 14:08:00 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id j17so2671993wrc.0 for ; Mon, 21 Feb 2022 14:08:00 -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=A4kUsp99qPhCm2w72vierLheFy7DD/xJVJ6pKA0+Euo=; b=Ias28gsnuATmMgnLARnatjpH10y0hiBu3fCsJj29GzGXI6XSgPdbSsjSCv0JbG+U5Z qPq+gz38PhhkPg4uo3xOqPZ8XdCi0uz9ZkRDH7AA0g7WRLjqNTuOcJ9YNyNaUe9zYo8F QpdAUUsHxBHV932puLq3ieAvZ6mt4JU4RlPB1Fu9kS/hoY5ne6NbV1v6omcrJe285STk +4bmsXoGNQJT5IJtE0Wr4cWQWTmzUo0UBjYwA5/068AY4qsZUI3nGB8IO14LvjywpjlO Dzz1HevVVq5w/Y4FdGYBA/XSAYpFS3T4EB5J+UPtwGsbb1wqZdlV+ODoH1MmR0vZ5HIt b1og== 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=A4kUsp99qPhCm2w72vierLheFy7DD/xJVJ6pKA0+Euo=; b=HykE0ZXcXHfBwgCPxfZYaLjWtm69C3NgHy2POoFKWqUEsHvLgw/3wdfT6dofkkfZ1e jxdUa51HnKnILR8mXOUr+89hu3YG+8ckyTdFv1UgEMeKWoxd0b4GeRx+koAedWYl6N0/ C+gpb8BC4frOMtyrtDpOj2tZzJOm/EMqAjePJHUCYRd7z7wrZ177ia+MNqzAaYRvaHEg GesZXmilNkL8e9xbpaR9rO5PGx9VrJigNdcYJ3HPtUH//aYywGHt8h9FDfE1kZFZZABT T+M/sJNZ9ZFsRdjzFfjdsMnEnfBfpOh9sKmRr3qWILrHKjVLsQ2XAp22i+sTG/aIhGm5 Qtug== X-Gm-Message-State: AOAM530Co3ZflYskG7d6PalSjRdwZjyvhwXFEcpuczMNQXWq6Rt1GGKf /JzF3km/6MwBXyTeuQX4UsN1+Q== X-Google-Smtp-Source: ABdhPJz3tz2sUlMBATCFGvB98aEz0pzfntgCr8LpPWEPoE0KNDtfTPQOzhAOJ6/PvfuuHOu7HdcagQ== X-Received: by 2002:a05:6000:1684:b0:1ea:8ad6:4e12 with SMTP id y4-20020a056000168400b001ea8ad64e12mr370047wrd.174.1645481279059; Mon, 21 Feb 2022 14:07:59 -0800 (PST) Received: from localhost.localdomain (cpc78119-cwma10-2-0-cust590.7-3.cable.virginm.net. [81.96.50.79]) by smtp.gmail.com with ESMTPSA id w8sm51626093wre.83.2022.02.21.14.07.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 14:07:58 -0800 (PST) From: Caleb Connolly To: caleb.connolly@linaro.org, Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Andy Gross , Bjorn Andersson , Lee Jones , Stephen Boyd , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: sumit.semwal@linaro.org, amit.pundir@linaro.org, john.stultz@linaro.org, kernel test robot , Dan Carpenter Subject: [PATCH v8 2/9] mfd: qcom-spmi-pmic: expose the PMIC revid information to clients Date: Mon, 21 Feb 2022 22:07:36 +0000 Message-Id: <20220221220743.541704-3-caleb.connolly@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221220743.541704-1-caleb.connolly@linaro.org> References: <20220221220743.541704-1-caleb.connolly@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Some PMIC functions such as the RRADC need to be aware of the PMIC chip revision information to implement errata or otherwise adjust behaviour, export the PMIC information to enable this. This is specifically required to enable the RRADC to adjust coefficients based on which chip fab the PMIC was produced in, this can vary per unique device and therefore has to be read at runtime. [bugs in previous revision] Reported-by: kernel test robot Reported-by: Dan Carpenter Signed-off-by: Caleb Connolly Signed-off-by: Author Reported-by: Bug Blaster # off-by-one in .probe() Signed-off-by: Maintainer --- drivers/mfd/qcom-spmi-pmic.c | 174 ++++++++++++++++++++---------- include/soc/qcom/qcom-spmi-pmic.h | 60 +++++++++++ 2 files changed, 178 insertions(+), 56 deletions(-) create mode 100644 include/soc/qcom/qcom-spmi-pmic.h diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c index 1cacc00aa6c9..1ef426a1513b 100644 --- a/drivers/mfd/qcom-spmi-pmic.c +++ b/drivers/mfd/qcom-spmi-pmic.c @@ -3,11 +3,16 @@ * Copyright (c) 2014, The Linux Foundation. All rights reserved. */ +#include +#include +#include #include #include #include +#include #include #include +#include #define PMIC_REV2 0x101 #define PMIC_REV3 0x102 @@ -17,37 +22,6 @@ #define PMIC_TYPE_VALUE 0x51 -#define COMMON_SUBTYPE 0x00 -#define PM8941_SUBTYPE 0x01 -#define PM8841_SUBTYPE 0x02 -#define PM8019_SUBTYPE 0x03 -#define PM8226_SUBTYPE 0x04 -#define PM8110_SUBTYPE 0x05 -#define PMA8084_SUBTYPE 0x06 -#define PMI8962_SUBTYPE 0x07 -#define PMD9635_SUBTYPE 0x08 -#define PM8994_SUBTYPE 0x09 -#define PMI8994_SUBTYPE 0x0a -#define PM8916_SUBTYPE 0x0b -#define PM8004_SUBTYPE 0x0c -#define PM8909_SUBTYPE 0x0d -#define PM8028_SUBTYPE 0x0e -#define PM8901_SUBTYPE 0x0f -#define PM8950_SUBTYPE 0x10 -#define PMI8950_SUBTYPE 0x11 -#define PM8998_SUBTYPE 0x14 -#define PMI8998_SUBTYPE 0x15 -#define PM8005_SUBTYPE 0x18 -#define PM660L_SUBTYPE 0x1A -#define PM660_SUBTYPE 0x1B -#define PM8150_SUBTYPE 0x1E -#define PM8150L_SUBTYPE 0x1f -#define PM8150B_SUBTYPE 0x20 -#define PMK8002_SUBTYPE 0x21 -#define PM8009_SUBTYPE 0x24 -#define PM8150C_SUBTYPE 0x26 -#define SMB2351_SUBTYPE 0x29 - static const struct of_device_id pmic_spmi_id_table[] = { { .compatible = "qcom,pm660", .data = (void *)PM660_SUBTYPE }, { .compatible = "qcom,pm660l", .data = (void *)PM660L_SUBTYPE }, @@ -81,42 +55,118 @@ static const struct of_device_id pmic_spmi_id_table[] = { { } }; -static void pmic_spmi_show_revid(struct regmap *map, struct device *dev) +/** + * qcom_pmic_get() - Get a pointer to the base PMIC device + * + * @dev: the pmic function device + * @return: the struct qcom_spmi_pmic* pointer associated with the function device + * + * A PMIC can be represented by multiple SPMI devices, but + * only the base PMIC device will contain a reference to + * the revision information. + * + * This function takes a pointer to a function device and + * returns a pointer to the base PMIC device. + */ +const struct qcom_spmi_pmic *qcom_pmic_get(struct device *dev) +{ + struct spmi_device *sdev; + struct device_node *spmi_bus; + struct device_node *other_usid = NULL; + int function_parent_usid, ret; + u32 reg[2]; + + if (!of_match_device(pmic_spmi_id_table, dev->parent)) + return ERR_PTR(-EINVAL); + + sdev = to_spmi_device(dev->parent); + if (!sdev) + return ERR_PTR(-EINVAL); + + /* + * Quick return if the function device is already in the right + * USID + */ + if (sdev->usid % 2 == 0) + return spmi_device_get_drvdata(sdev); + + function_parent_usid = sdev->usid; + + /* + * Walk through the list of PMICs until we find the sibling USID. + * The goal is the find to previous sibling. Assuming there is no + * PMIC with more than 2 USIDs. We know that function_parent_usid + * is one greater than the base USID. + */ + spmi_bus = of_get_parent(sdev->dev.parent->of_node); + do { + other_usid = of_get_next_child(spmi_bus, other_usid); + ret = of_property_read_u32_array(other_usid, "reg", reg, 2); + if (ret) + return ERR_PTR(ret); + sdev = spmi_device_from_of(other_usid); + if (sdev == NULL) { + /* + * If the base USID for this PMIC hasn't probed yet + * but the secondary USID has, then we need to defer + * the function driver so that it will attempt to + * probe again when the base USID is ready. + */ + if (reg[0] == function_parent_usid - 1) + return ERR_PTR(-EPROBE_DEFER); + + continue; + } + + if (reg[0] == function_parent_usid - 1) + return spmi_device_get_drvdata(sdev); + } while (other_usid->sibling); + + return ERR_PTR(-ENODATA); +} +EXPORT_SYMBOL(qcom_pmic_get); + +static inline void pmic_print_info(struct device *dev, struct qcom_spmi_pmic *pmic) +{ + dev_dbg(dev, "%x: %s v%d.%d\n", + pmic->subtype, pmic->name, pmic->major, pmic->minor); +} + +static int pmic_spmi_load_revid(struct regmap *map, struct device *dev, + struct qcom_spmi_pmic *pmic) { - unsigned int rev2, minor, major, type, subtype; - const char *name = "unknown"; int ret, i; - ret = regmap_read(map, PMIC_TYPE, &type); + ret = regmap_read(map, PMIC_TYPE, &pmic->type); if (ret < 0) - return; + return ret; - if (type != PMIC_TYPE_VALUE) - return; + if (pmic->type != PMIC_TYPE_VALUE) + return ret; - ret = regmap_read(map, PMIC_SUBTYPE, &subtype); + ret = regmap_read(map, PMIC_SUBTYPE, &pmic->subtype); if (ret < 0) - return; + return ret; for (i = 0; i < ARRAY_SIZE(pmic_spmi_id_table); i++) { - if (subtype == (unsigned long)pmic_spmi_id_table[i].data) + if (pmic->subtype == (unsigned long)pmic_spmi_id_table[i].data) break; } if (i != ARRAY_SIZE(pmic_spmi_id_table)) - name = pmic_spmi_id_table[i].compatible; + pmic->name = devm_kstrdup_const(dev, pmic_spmi_id_table[i].compatible, GFP_KERNEL); - ret = regmap_read(map, PMIC_REV2, &rev2); + ret = regmap_read(map, PMIC_REV2, &pmic->rev2); if (ret < 0) - return; + return ret; - ret = regmap_read(map, PMIC_REV3, &minor); + ret = regmap_read(map, PMIC_REV3, &pmic->minor); if (ret < 0) - return; + return ret; - ret = regmap_read(map, PMIC_REV4, &major); + ret = regmap_read(map, PMIC_REV4, &pmic->major); if (ret < 0) - return; + return ret; /* * In early versions of PM8941 and PM8226, the major revision number @@ -124,14 +174,16 @@ static void pmic_spmi_show_revid(struct regmap *map, struct device *dev) * Increment the major revision number here if the chip is an early * version of PM8941 or PM8226. */ - if ((subtype == PM8941_SUBTYPE || subtype == PM8226_SUBTYPE) && - major < 0x02) - major++; + if ((pmic->subtype == PM8941_SUBTYPE || pmic->subtype == PM8226_SUBTYPE) && + pmic->major < 0x02) + pmic->major++; + + if (pmic->subtype == PM8110_SUBTYPE) + pmic->minor = pmic->rev2; - if (subtype == PM8110_SUBTYPE) - minor = rev2; + pmic_print_info(dev, pmic); - dev_dbg(dev, "%x: %s v%d.%d\n", subtype, name, major, minor); + return 0; } static const struct regmap_config spmi_regmap_config = { @@ -144,14 +196,24 @@ static const struct regmap_config spmi_regmap_config = { static int pmic_spmi_probe(struct spmi_device *sdev) { struct regmap *regmap; + struct qcom_spmi_pmic *pmic; + int ret; regmap = devm_regmap_init_spmi_ext(sdev, &spmi_regmap_config); if (IS_ERR(regmap)) return PTR_ERR(regmap); + pmic = devm_kzalloc(&sdev->dev, sizeof(*pmic), GFP_KERNEL); + if (!pmic) + return -ENOMEM; + /* Only the first slave id for a PMIC contains this information */ - if (sdev->usid % 2 == 0) - pmic_spmi_show_revid(regmap, &sdev->dev); + if (sdev->usid % 2 == 0) { + ret = pmic_spmi_load_revid(regmap, &sdev->dev, pmic); + if (ret < 0) + return ret; + spmi_device_set_drvdata(sdev, pmic); + } return devm_of_platform_populate(&sdev->dev); } diff --git a/include/soc/qcom/qcom-spmi-pmic.h b/include/soc/qcom/qcom-spmi-pmic.h new file mode 100644 index 000000000000..a8a77be22cfc --- /dev/null +++ b/include/soc/qcom/qcom-spmi-pmic.h @@ -0,0 +1,60 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (c) 2021 Linaro. All rights reserved. + * Copyright (c) 2021 Caleb Connolly + */ + +#ifndef __QCOM_PMIC_H__ +#define __QCOM_PMIC_H__ + +#define COMMON_SUBTYPE 0x00 +#define PM8941_SUBTYPE 0x01 +#define PM8841_SUBTYPE 0x02 +#define PM8019_SUBTYPE 0x03 +#define PM8226_SUBTYPE 0x04 +#define PM8110_SUBTYPE 0x05 +#define PMA8084_SUBTYPE 0x06 +#define PMI8962_SUBTYPE 0x07 +#define PMD9635_SUBTYPE 0x08 +#define PM8994_SUBTYPE 0x09 +#define PMI8994_SUBTYPE 0x0a +#define PM8916_SUBTYPE 0x0b +#define PM8004_SUBTYPE 0x0c +#define PM8909_SUBTYPE 0x0d +#define PM8028_SUBTYPE 0x0e +#define PM8901_SUBTYPE 0x0f +#define PM8950_SUBTYPE 0x10 +#define PMI8950_SUBTYPE 0x11 +#define PM8998_SUBTYPE 0x14 +#define PMI8998_SUBTYPE 0x15 +#define PM8005_SUBTYPE 0x18 +#define PM660L_SUBTYPE 0x1A +#define PM660_SUBTYPE 0x1B +#define PM8150_SUBTYPE 0x1E +#define PM8150L_SUBTYPE 0x1f +#define PM8150B_SUBTYPE 0x20 +#define PMK8002_SUBTYPE 0x21 +#define PM8009_SUBTYPE 0x24 +#define PM8150C_SUBTYPE 0x26 +#define SMB2351_SUBTYPE 0x29 + +#define PMI8998_FAB_ID_SMIC 0x11 +#define PMI8998_FAB_ID_GF 0x30 + +#define PM660_FAB_ID_GF 0x0 +#define PM660_FAB_ID_TSMC 0x2 +#define PM660_FAB_ID_MX 0x3 + +struct qcom_spmi_pmic { + unsigned int type; + unsigned int subtype; + unsigned int major; + unsigned int minor; + unsigned int rev2; + const char *name; +}; + +struct device; + +const struct qcom_spmi_pmic *qcom_pmic_get(struct device *dev); + +#endif /* __QCOM_PMIC_H__ */ From patchwork Mon Feb 21 22:07:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 544459 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 A25F6C433EF for ; Mon, 21 Feb 2022 22:08:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235209AbiBUWIa (ORCPT ); Mon, 21 Feb 2022 17:08:30 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:35424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235193AbiBUWI3 (ORCPT ); Mon, 21 Feb 2022 17:08:29 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA4E422BE5 for ; Mon, 21 Feb 2022 14:08:04 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id s13so803221wrb.6 for ; Mon, 21 Feb 2022 14:08:04 -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=zozG4Oy5Pt0vWjsRDZ91928+qvWs4STBKU9M4pGg1h4=; b=q/RFWKpEMo4qOlDj2TrTaK3CqFw+/dYPX/SKR9vqhsLXehYTh+plZUaqPaFmOZ3pIH QJhVTeWzPnIqlVuir/olF4EgjrZ1uoaOc/u7GDssBR/uGI58rQy3sKZtbaynZ/lp8pSX LbmJ8fw9vkM3Ug2ZxBVymq8PvjSuRhKkRaOGGLdslmz11cZkkhHnotu8pgZo/o3QoxwP yl3tCjcnBJ1jZhBHiYTZqTilpxqzo0VhHFAMsvd/aBcQsxaHgcod7h+kfbOUseU7zHZV bRjjNNzrAIPcJKalHrVFkb/cmjJLqKeCGhmEN70jT5ABooQ3UaZmM+kBNc9/Kug+GAgr vmOQ== 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=zozG4Oy5Pt0vWjsRDZ91928+qvWs4STBKU9M4pGg1h4=; b=O0bvMhE1mV3CYjYniDm6nwmZeV+eWWGvSX1C0ES7XI0a/4RX9MM1SPC7BJTV9RhV+y W7ViFrci+HwtsMVANq+ZsoVMfrbgIRWkB9sJjXGulJIcyxwsXUAZXsH4ScRvLxLwFYZU b7ntaN0KYC4KPyosO9pkNxhLA47yin8Lw824iebsHI0YjhwmVWMRAi022S44+VRvBibr EVWaCIGP0LY7qvH9EiO3aj7nv93G3AfyVCZio++qQNXnLVcaSIgItVeS12DZmSZ2GgZ7 gVma0fDF+BuQ8BIpZwH+5s/AZQlTGFRb7POIzddXArxYkScSFCys1CdUwHY5dK02w2Ct 6u4Q== X-Gm-Message-State: AOAM532FkVNo5t3x0Fe0r1NaLWkGGd3nkniso84rwGZWmfS87Bh3aDOi Ke2nLwqejpo22muY9m8tSyhliw== X-Google-Smtp-Source: ABdhPJyK9n9XH2SxUzlXtF5IRK1v3XwLYrAJR4CGhkKl0Wyq/KVtq75s3wsRJlS8JkJI0A6f1+132Q== X-Received: by 2002:a05:6000:15c4:b0:1ea:7fec:3d84 with SMTP id y4-20020a05600015c400b001ea7fec3d84mr1383906wry.33.1645481283488; Mon, 21 Feb 2022 14:08:03 -0800 (PST) Received: from localhost.localdomain (cpc78119-cwma10-2-0-cust590.7-3.cable.virginm.net. [81.96.50.79]) by smtp.gmail.com with ESMTPSA id w8sm51626093wre.83.2022.02.21.14.08.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 14:08:02 -0800 (PST) From: Caleb Connolly To: caleb.connolly@linaro.org, Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Andy Gross , Bjorn Andersson , Lee Jones , Stephen Boyd , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: sumit.semwal@linaro.org, amit.pundir@linaro.org, john.stultz@linaro.org Subject: [PATCH v8 6/9] arm64: dts: qcom: pmi8998: add rradc node Date: Mon, 21 Feb 2022 22:07:40 +0000 Message-Id: <20220221220743.541704-7-caleb.connolly@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221220743.541704-1-caleb.connolly@linaro.org> References: <20220221220743.541704-1-caleb.connolly@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add a DT node for the Round Robin ADC found in the PMI8998 PMIC. Signed-off-by: Caleb Connolly --- arch/arm64/boot/dts/qcom/pmi8998.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/pmi8998.dtsi b/arch/arm64/boot/dts/qcom/pmi8998.dtsi index 0fef5f113f05..da10668c361d 100644 --- a/arch/arm64/boot/dts/qcom/pmi8998.dtsi +++ b/arch/arm64/boot/dts/qcom/pmi8998.dtsi @@ -18,6 +18,14 @@ pmi8998_gpio: gpios@c000 { interrupt-controller; #interrupt-cells = <2>; }; + + pmi8998_rradc: rradc@4500 { + compatible = "qcom,pmi8998-rradc"; + reg = <0x4500>; + #io-channel-cells = <1>; + + status = "disabled"; + }; }; pmi8998_lsid1: pmic@3 { From patchwork Mon Feb 21 22:07:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 544458 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 71687C4167D for ; Mon, 21 Feb 2022 22:08:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235191AbiBUWIb (ORCPT ); Mon, 21 Feb 2022 17:08:31 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:35428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235208AbiBUWIa (ORCPT ); Mon, 21 Feb 2022 17:08:30 -0500 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0637822BEE for ; Mon, 21 Feb 2022 14:08:05 -0800 (PST) Received: by mail-wr1-x434.google.com with SMTP id p9so29313964wra.12 for ; Mon, 21 Feb 2022 14:08:05 -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=qImSYxU2i/y/qV71r8EFW+LTWk9ZfhM4KeM2jcTcklQ=; b=TNceFoUE9yqIcyXNY4dhjXbeQLk+Z0EnOYrfTUTB13uDRgADbBdUzHjyQuy/X9XOB1 rBbrd5agJShMCL6Nlr6vGo0XpKsse50aleT1fK7/+XN1NWxgWYY/z9QVjq8wBWgTR8c2 zVCiRpVXDj1LsCkRj/zMyGFASBRmHyBCBm4t9HPsNxNg3ixsvFQxp8dxPkjj45paiNlM uEjgvyjwgkGWuT/MJHhRcPhF6FwAXUBTYSB0q2+iPYBXgGmk/A+Qr4A1E5sY+5zL/ENZ TU+5+oMgZv1CXr4k6bC4ooBJBV7Wvst9NHqKbBBYH1wMoyN+StV/iqWS30zMr+9K8sdS hX5Q== 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=qImSYxU2i/y/qV71r8EFW+LTWk9ZfhM4KeM2jcTcklQ=; b=RRGuAaCnYIkcEFOR+OEqpfKf5shQ88LD3+Tc6eOL0ZUuXLs4uHeoUN69mnIHPzz5JU 1aM7VvJ8mTKnfY8b9tBg5GrDELtwF9ohfPzIWiVmqJqzjq6FKkTFDEyGMre+Alfx8X0L WXh7DlUcZ8ONxrtkW6cdl31NOTVlhlIqON+2eiWE+GxyPd5BKDdNIVlpOee1OaeWQxiY 2BctZ5SLDY2GC+DAy4MqsHV2RbisZh46x/AK5NB6OgJ46RoRffy5FKRRSZgOmymp0BIN QgSOv9xIIbUe9Cv0fTHetVFTL8RdLYbhKA2oSpjXuNaXHYqq5kOITQsk5CXYJsUcf3tG GRkw== X-Gm-Message-State: AOAM531l2C7O5cTzyGp3GOhO6WYMZpFel3rh778syPAYC91zils81M8M vxS7BKLwY8mPOsVWMa+qI32mkA== X-Google-Smtp-Source: ABdhPJxKBQ11CZJBFmQEGkDGzR6wDc1iODSZsvpp4RkvAu0slRndGzbZ6xsEUcE9iWEalXkrk5ACgA== X-Received: by 2002:a05:6000:154c:b0:1ea:76b7:20c4 with SMTP id 12-20020a056000154c00b001ea76b720c4mr2432804wry.626.1645481284641; Mon, 21 Feb 2022 14:08:04 -0800 (PST) Received: from localhost.localdomain (cpc78119-cwma10-2-0-cust590.7-3.cable.virginm.net. [81.96.50.79]) by smtp.gmail.com with ESMTPSA id w8sm51626093wre.83.2022.02.21.14.08.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 14:08:04 -0800 (PST) From: Caleb Connolly To: caleb.connolly@linaro.org, Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Andy Gross , Bjorn Andersson , Lee Jones , Stephen Boyd , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: sumit.semwal@linaro.org, amit.pundir@linaro.org, john.stultz@linaro.org Subject: [PATCH v8 7/9] arm64: dts: qcom: sdm845-oneplus: enable rradc Date: Mon, 21 Feb 2022 22:07:41 +0000 Message-Id: <20220221220743.541704-8-caleb.connolly@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221220743.541704-1-caleb.connolly@linaro.org> References: <20220221220743.541704-1-caleb.connolly@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Enable the RRADC for the OnePlus 6. Signed-off-by: Caleb Connolly --- arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi index 7f42e5315ecb..e8287cf02511 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi @@ -450,6 +450,10 @@ pinconf { }; }; +&pmi8998_rradc { + status = "okay"; +}; + &qupv3_id_1 { status = "okay"; }; From patchwork Mon Feb 21 22:07:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 544457 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 76C53C35273 for ; Mon, 21 Feb 2022 22:08:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235228AbiBUWIc (ORCPT ); Mon, 21 Feb 2022 17:08:32 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:35472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235173AbiBUWIb (ORCPT ); Mon, 21 Feb 2022 17:08:31 -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 24D2022BE9 for ; Mon, 21 Feb 2022 14:08:08 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id l123-20020a1c2581000000b0037b9d960079so324990wml.0 for ; Mon, 21 Feb 2022 14:08:08 -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=60je+LDflCDSpm+PbhIAk73PJa9MombVHWRyiPaaQWE=; b=Xc+ttGq4R78QFtqn/s4XTJgEVdfnTa45KWY338EVWaVgUeKsd/3rzs+fljLfLy8hAQ ywWMhR2Cef3L70rleLY3XxSLO150C8Wot5CTouwd52Gtj1uJhB/b2iIgmJvpP2w0kLFM mihbHvkyKnJPifkH+8karxCKTZmcW7VoSXkUbPFhY5Nw9AysNrWDYEnqDpPfSnQVU6zT KGo1CqfO7RE7J2yaI2Bg3H1pgRXHh8A8wDw1QQkhVzpEc15sOc9/1ZykQQzm5aPwxh9L 6qmL+OmU70hdvpnlqSo84pRS5CW+tnnrPWOyG1b/8wclFKf4ipsZBYOejtkoCKIRN6+R P/lw== 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=60je+LDflCDSpm+PbhIAk73PJa9MombVHWRyiPaaQWE=; b=nznF7pJhLMRtAJf9mQEJGTUFJgndkTe9KwFLa/6tJIcFsJmEmQD9G+XQ03lYPLUT8h 3IlZrD8jCxp+3BRUz9wk4vtmQU5eJSSflPC9oPgd+yViJKQxIhCD+X7X7v9iw8auUlMN GfzOMcOkPIrJ6SYltI+hDSLUZxyJnLqRmdD3xeftm7mgcr8Zt3GFMRwlJVUl3ZE7oN3d 1SBslZNQYlOx+UwPhKam6PvRSRwkII5xVkHBOxhYoGRWGPZfgS/K40O554pAj8/isxky DNIiUSwZegCV5oScUiIoNcu5P0fYavVrcXPXxr6CA4CpFtp2bzODtRYVICY9e0TNcg+g +l+g== X-Gm-Message-State: AOAM5318YC0sLnDUlIs/SRr1tF7Ld8bxp7KVaYDMNDz4D/BFol+nRxZn th9k6VQeuxkwNlVw1m3Qu+GgsQ== X-Google-Smtp-Source: ABdhPJySvP8m2Z4xEHLtT7V1pqg8A5o8lAHBN72Y7cEMji5QGaJrIVqIDM4jOtJiknnTHt3q4gAjOQ== X-Received: by 2002:a05:600c:14c6:b0:37c:440:c0e with SMTP id i6-20020a05600c14c600b0037c04400c0emr817905wmh.87.1645481286698; Mon, 21 Feb 2022 14:08:06 -0800 (PST) Received: from localhost.localdomain (cpc78119-cwma10-2-0-cust590.7-3.cable.virginm.net. [81.96.50.79]) by smtp.gmail.com with ESMTPSA id w8sm51626093wre.83.2022.02.21.14.08.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 14:08:06 -0800 (PST) From: Caleb Connolly To: caleb.connolly@linaro.org, Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Andy Gross , Bjorn Andersson , Lee Jones , Stephen Boyd , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: sumit.semwal@linaro.org, amit.pundir@linaro.org, john.stultz@linaro.org Subject: [PATCH v8 9/9] arm64: dts: qcom: sdm845-xiaomi-beryllium: enable rradc Date: Mon, 21 Feb 2022 22:07:43 +0000 Message-Id: <20220221220743.541704-10-caleb.connolly@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221220743.541704-1-caleb.connolly@linaro.org> References: <20220221220743.541704-1-caleb.connolly@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Enable the PMI8998 RRADC. Signed-off-by: Caleb Connolly --- arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts index 367389526b41..b3b6aa4e0fa3 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts @@ -312,6 +312,10 @@ resin { }; }; +&pmi8998_rradc { + status = "okay"; +}; + /* QUAT I2S Uses 1 I2S SD Line for audio on TAS2559/60 amplifiers */ &q6afedai { qi2s@22 {