From patchwork Sun Jan 12 12:25:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Doylov via B4 Relay X-Patchwork-Id: 13936347 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D93F01B2196; Sun, 12 Jan 2025 12:26:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736684781; cv=none; b=ts6E9N3ERVh9tUSdw1eLCaiaLcRk+cxAXZMhH8gHkKxVYv3RaUs48o4mxlmdsBVp30+qM6MmcP/wKElRAUnGbyA/HFwJDIj+36ZQfHIxS3XiW39g6B9j3Y9kxzmonCKoBauxOdspMs6hLGBHggTGRuwNOma89yI6uGTgBHwBQbE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736684781; c=relaxed/simple; bh=1BtfBU+VFpnpmflSFDCHod/dke+yeYEpABp6H5TAfhg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qi5qwi2yUififwaHx8B1k/82REn7i3usu/9E7tZIt0StLI7bjkdUWzW29UoTnA0MOWweabuzzdtqT33G/LiGsoNs7EDyMaRN8EQ6HiZeOvS7Fm1ZFRu3oZc9mlrXFAnyZdRvMPdo8sUDkRzYsMZ/XBqfedCer16Qs5cWzgT1Rqc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ogsPzAhE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ogsPzAhE" Received: by smtp.kernel.org (Postfix) with ESMTPS id 60E1EC4CEE6; Sun, 12 Jan 2025 12:26:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736684780; bh=1BtfBU+VFpnpmflSFDCHod/dke+yeYEpABp6H5TAfhg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=ogsPzAhERDjuPIXsNMc4YvUcD2R2b+JSipAOFLiUpmWd9+Ob51Qwq5frkcSVpDAda fnspzMnwGL8Q2eGoeEIQv8fmFwMSmgMJ0Y1sNRk4spKmpTMXzRdNJ65vcFtdtOTbZ7 KdGwAKNNIbrc2cY+mvqGTaKr0KrzYXL0qq/4rnYDFLH7Kiad3uWN5aym0zSMOBAyW4 3X3BYxdGHfy9njAiV3Of/TJSDoVRcR0zPr3htAwPoU3q+hTX1Vr6TYnRAbQTf5xGRq i61TLFhuaPgbOKKEjinwVprx3gkc440TjJltDXOqbMV8AH1kFYaldOR8l2FRXLSl57 uJDNUlb8wFp4g== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58EB2C02181; Sun, 12 Jan 2025 12:26:20 +0000 (UTC) From: Vasiliy Doylov via B4 Relay Date: Sun, 12 Jan 2025 15:25:38 +0300 Subject: [PATCH v3 4/5] iio: accel: mc3230: add multiple devices support Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250112-mainlining-mc3510c-v3-4-9ee6520ab69d@gmail.com> References: <20250112-mainlining-mc3510c-v3-0-9ee6520ab69d@gmail.com> In-Reply-To: <20250112-mainlining-mc3510c-v3-0-9ee6520ab69d@gmail.com> To: Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Vasiliy Doylov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3869; i=nekodevelopper@gmail.com; h=from:subject:message-id; bh=YcfiMUnze8tmhEPaR9oGF3t6Cjv+BkLj5cOU6InNf2c=; b=owGbwMvMwCW2fZ/SFZeSpU2Mp9WSGNKbt7yycpC+v7Xr6cdHrae/l09fu/HE6ili/lG/uRNmf NN/NEHasaOUhUGMi0FWTJHFZqPHbLH8cMlJ054qwMxhZQIZwsDFKQATmfmC4RezfEjRtaVXnpir Rn+vd5I2LjPrMLhk+uvmefP165ca7ZvCyHDjnv/jM9dy/r+fdlmvYjvHpp8P3tr/nni7Mt3q0G9 buT4GAA== X-Developer-Key: i=nekodevelopper@gmail.com; a=openpgp; fpr=3CB1489B166F57199296E520B7BE22D44474A582 X-Endpoint-Received: by B4 Relay for nekodevelopper@gmail.com/default with auth_id=314 X-Original-From: Vasiliy Doylov Reply-To: nekodevelopper@gmail.com From: Vasiliy Doylov This patch allows to add new devices to this driver. Signed-off-by: Vasiliy Doylov --- drivers/iio/accel/mc3230.c | 50 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c index ba30c904d3f67002deeb3ca5a7e12bfae312e05f..1b58f3ea50655b6563a78a2531b16a8088e8f8d5 100644 --- a/drivers/iio/accel/mc3230.c +++ b/drivers/iio/accel/mc3230.c @@ -22,20 +22,29 @@ #define MC3230_MODE_OPCON_STANDBY 0x03 #define MC3230_REG_CHIP_ID 0x18 -#define MC3230_CHIP_ID 0x01 - #define MC3230_REG_PRODUCT_CODE 0x3b -#define MC3230_PRODUCT_CODE 0x19 /* * The accelerometer has one measurement range: * * -1.5g - +1.5g (8-bit, signed) * - * scale = (1.5 + 1.5) * 9.81 / (2^8 - 1) = 0.115411765 */ -static const int mc3230_nscale = 115411765; +struct mc3230_chip_info { + const u8 chip_id; + const char *name; + const u8 product_code; + const int scale; +}; + +static struct mc3230_chip_info mc3230_chip_info = { + .chip_id = 0x01, + .name = "mc3230", + .product_code = 0x19, + /* (1.5 + 1.5) * 9.81 / (2^8 - 1) = 0.115411765 */ + .scale = 115411765, +}; #define MC3230_CHANNEL(reg, axis) { \ .type = IIO_ACCEL, \ @@ -48,6 +57,7 @@ static const int mc3230_nscale = 115411765; } struct mc3230_data { + const struct mc3230_chip_info *chip_info; struct i2c_client *client; struct iio_mount_matrix orientation; }; @@ -111,7 +121,7 @@ static int mc3230_read_raw(struct iio_dev *indio_dev, return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: *val = 0; - *val2 = mc3230_nscale; + *val2 = data->chip_info->scale; return IIO_VAL_INT_PLUS_NANO; default: return -EINVAL; @@ -127,15 +137,28 @@ static int mc3230_probe(struct i2c_client *client) int ret; struct iio_dev *indio_dev; struct mc3230_data *data; + const struct mc3230_chip_info *chip_info; + + chip_info = i2c_get_match_data(client); + if (chip_info == NULL) { + dev_err(&client->dev, "failed to get match data"); + return -ENODATA; + } /* First check chip-id and product-id */ ret = i2c_smbus_read_byte_data(client, MC3230_REG_CHIP_ID); - if (ret != MC3230_CHIP_ID) - return (ret < 0) ? ret : -ENODEV; + if (ret != chip_info->chip_id) { + dev_info(&client->dev, + "chip id check fail: 0x%x != 0x%x !\n", + ret, chip_info->chip_id); + } ret = i2c_smbus_read_byte_data(client, MC3230_REG_PRODUCT_CODE); - if (ret != MC3230_PRODUCT_CODE) - return (ret < 0) ? ret : -ENODEV; + if (ret != chip_info->product_code) { + dev_info(&client->dev, + "product code check fail: 0x%x != 0x%x !\n", + ret, chip_info->product_code); + } indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); if (!indio_dev) { @@ -144,11 +167,12 @@ static int mc3230_probe(struct i2c_client *client) } data = iio_priv(indio_dev); + data->chip_info = chip_info; data->client = client; i2c_set_clientdata(client, indio_dev); indio_dev->info = &mc3230_info; - indio_dev->name = "mc3230"; + indio_dev->name = chip_info->name; indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->channels = mc3230_channels; indio_dev->num_channels = ARRAY_SIZE(mc3230_channels); @@ -200,13 +224,13 @@ static int mc3230_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(mc3230_pm_ops, mc3230_suspend, mc3230_resume); static const struct i2c_device_id mc3230_i2c_id[] = { - { "mc3230" }, + { "mc3230", (kernel_ulong_t)&mc3230_chip_info }, {} }; MODULE_DEVICE_TABLE(i2c, mc3230_i2c_id); static const struct of_device_id mc3230_of_match[] = { - { .compatible = "mcube,mc3230" }, + { .compatible = "mcube,mc3230", &mc3230_chip_info }, {} }; MODULE_DEVICE_TABLE(of, mc3230_of_match);