Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp886721rwl; Sun, 25 Dec 2022 09:02:25 -0800 (PST) X-Google-Smtp-Source: AMrXdXsWfq6bjWiaRtfqJxVgc5gndqkXZet8neXyCx4ThH5nemz6RqwnPlTMySyTmtzeQ8ODu7V5 X-Received: by 2002:a17:902:f285:b0:192:6b94:d68b with SMTP id k5-20020a170902f28500b001926b94d68bmr4614083plc.55.1671987744858; Sun, 25 Dec 2022 09:02:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671987744; cv=none; d=google.com; s=arc-20160816; b=j26XRMeJVT57wvBrKORvxcdt/U5Tc/dR5tcc1SAck9K8bp+BCLLAxOKT7R0A64GqwR DDrpXhtk0FfbNTZhZeJ7EWOhLUdp3kODfFa32gbceeK1HpjtGD0y4W+/HOzDc7AXvX79 7fk4IU71BqYsnqEePAv/hvLLTHETBdfbo84aXZc47XBVXbKO3xUoScUe2UBfOs7QZWPR vM0Wjf4ZQFND4uiArxp8Kpta9mQUqrDcvODbPXPDSARZ+b9AbvZIFXtV9Ksw5lHpWL19 7uwbEx0ZKkohGSTlbr8m0c9jIzTq0B/cQaXawsp/5UwXQ8DdW3uzcc7aGOUpS/db2zMd dCGQ== 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 :dkim-signature; bh=I+RDFj6BpHhJ2bFeylBpDtFtMyr1ovdocCHUnTCQ0GU=; b=F6M1sb/3GLLM3MDRALYx5PqzDb9mLpDG72nE6U1eLh4OclpoljVAdeHkSplUNGfOM0 cJR36TOJjSGJvVvdKrKMsC8FCYgVqN5M1tDGjmmpGmEXj86x9ONptoBwyzHW/7xJCaAW e6zNpL/8RoDOBPmkQmQAcQt72WgK4aTw9W7P1rX/U/N4N4qubbu5ZH6iNTG6ge1vuiRj IccamUdua1T2yt5GyuNX+40cR6sLf7D4lJNZWFm8MHojMGwkS97O/W4vuIYNIozlOefc 8UVRQM7aAdpAW7uMAqsT1oNlTtDGRbw/xAp9R4pvP9I+OSD8L8+8VUPaSN0nbaBlAShz mmLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=OSW8iD6W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k15-20020a170902ba8f00b00186ab026646si8844906pls.394.2022.12.25.09.02.15; Sun, 25 Dec 2022 09:02:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=OSW8iD6W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231301AbiLYQ5q (ORCPT + 66 others); Sun, 25 Dec 2022 11:57:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229960AbiLYQ5o (ORCPT ); Sun, 25 Dec 2022 11:57:44 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72FC626CC; Sun, 25 Dec 2022 08:57:43 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id b24-20020a05600c4a9800b003d21efdd61dso6474391wmp.3; Sun, 25 Dec 2022 08:57:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=I+RDFj6BpHhJ2bFeylBpDtFtMyr1ovdocCHUnTCQ0GU=; b=OSW8iD6WXPGvrQcrcNlE8p0s0EDbg4nn1UNBqG0fOPZqiPtLdFkIodXaJGdImqr1d0 rrUhBQkKBOAS+PKD+1v5GrM9d6RD1VT/KIxqW/XhYnuGTh7e7/P4Q0l37oEri5s3RIOD tjCW/6taMRV+dSfECCKRLsPHolKcpWivufnnMNs88EJMXKJLzinf8LCHSw+5+47KMVCs n+MnjWXv/ktKg/AE7B7lalZTYCgDqhKXlE5zOSvsJzdCOtXbTrbRkhas9ELSRtxLKV1R s5ezJEL+z6EX+Ac9gg35ekzuVRrJtpa67koBvDa4Er+DBupLGugUYzv0obp2QWN3xgxr hFhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=I+RDFj6BpHhJ2bFeylBpDtFtMyr1ovdocCHUnTCQ0GU=; b=MsLe6sw/fFUYG8grlqFyqFZLT/9SO7F/UWxKxP6tz2BRde92iI7/1DGnDZaEnx8Uww t75BIgxI6O3stPMhMu8FDdETPUB4dFNosBXF4tUYo0Mq0OmDf6TlwmfJkgKtn9uLQlCQ R1GF+lh+FdbFCyGdkEXdkhuyZOCPVjUi1GANZgi+8o8cJeAOOHsWyOl7Bx3C5qHU8IX3 6+un1Mx/0Q9DcXFW5IlowhsG3puRqgD3XIvLpE6yrxFVzdnwaWYKf3nVEJTCkIfgo7en PKun5DDOnk5PjSr56fjDWtpOsMXuChd7pcZnjIMlLQCS5rCZ0ZwPvauWnfCF9HxlhgK4 IHkQ== X-Gm-Message-State: AFqh2kqmrQdH/SrDvC3b1FMlcR9b+9FgGJOl9/gMUq3FZujBQa2XFiv2 dVB+I06VSlfG2AkIwSSe8g4rfx0DSkw= X-Received: by 2002:a05:600c:4920:b0:3d3:39a9:e659 with SMTP id f32-20020a05600c492000b003d339a9e659mr12174659wmp.21.1671987461917; Sun, 25 Dec 2022 08:57:41 -0800 (PST) Received: from localhost.localdomain (188.red-83-35-57.dynamicip.rima-tde.net. [83.35.57.188]) by smtp.gmail.com with ESMTPSA id n9-20020a05600c4f8900b003d1b4d957aasm12610058wmq.36.2022.12.25.08.57.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Dec 2022 08:57:41 -0800 (PST) From: Angel Iglesias To: linux-iio@vger.kernel.org Cc: Angel Iglesias , Jonathan Cameron , Lars-Peter Clausen , "Rafael J. Wysocki" , Ulf Hansson , Paul Cercueil , linux-kernel@vger.kernel.org Subject: [PATCH 2/5] iio: pressure: bmp280: Add preinit callback Date: Sun, 25 Dec 2022 17:57:06 +0100 Message-Id: <724e92e64e6d91d48d762e804b430c716679bccb.1671986815.git.ang.iglesiasg@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adds preinit callback to execute operations on probe before applying initial configuration. Signed-off-by: Angel Iglesias diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c index 46959a91408f..c37cf2caec68 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -217,6 +217,7 @@ struct bmp280_chip_info { int (*read_press)(struct bmp280_data *, int *, int *); int (*read_humid)(struct bmp280_data *, int *, int *); int (*read_calib)(struct bmp280_data *); + int (*preinit)(struct bmp280_data *); }; /* @@ -935,6 +936,7 @@ static const struct bmp280_chip_info bmp280_chip_info = { .read_temp = bmp280_read_temp, .read_press = bmp280_read_press, .read_calib = bmp280_read_calib, + .preinit = NULL, }; static int bme280_chip_config(struct bmp280_data *data) @@ -979,6 +981,7 @@ static const struct bmp280_chip_info bme280_chip_info = { .read_press = bmp280_read_press, .read_humid = bmp280_read_humid, .read_calib = bme280_read_calib, + .preinit = NULL, }; /* @@ -1220,6 +1223,12 @@ static const int bmp380_odr_table[][2] = { [BMP380_ODR_0_0015HZ] = {0, 1526}, }; +static int bmp380_preinit(struct bmp280_data *data) +{ + /* BMP3xx requires soft-reset as part of initialization */ + return bmp380_cmd(data, BMP380_CMD_SOFT_RESET); +} + static int bmp380_chip_config(struct bmp280_data *data) { bool change = false, aux; @@ -1349,6 +1358,7 @@ static const struct bmp280_chip_info bmp380_chip_info = { .read_temp = bmp380_read_temp, .read_press = bmp380_read_press, .read_calib = bmp380_read_calib, + .preinit = bmp380_preinit, }; static int bmp180_measure(struct bmp280_data *data, u8 ctrl_meas) @@ -1604,6 +1614,7 @@ static const struct bmp280_chip_info bmp180_chip_info = { .read_temp = bmp180_read_temp, .read_press = bmp180_read_press, .read_calib = bmp180_read_calib, + .preinit = NULL, }; static irqreturn_t bmp085_eoc_irq(int irq, void *d) @@ -1762,9 +1773,13 @@ int bmp280_common_probe(struct device *dev, return -EINVAL; } - /* BMP3xx requires soft-reset as part of initialization */ - if (chip_id == BMP380_CHIP_ID) { - ret = bmp380_cmd(data, BMP380_CMD_SOFT_RESET); + /* + * Some chips like the BMP3xx have preinit tasks to run + * before applying the initial configuration. + */ + if (data->chip_info->preinit) { + ret = data->chip_info->preinit(data); + dev_err(dev, "error running preinit tasks"); if (ret < 0) return ret; } -- 2.39.0