From patchwork Thu Nov 21 08:21:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 13881749 Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64CCE1C9EB3; Thu, 21 Nov 2024 08:21:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732177284; cv=none; b=Y6DKAZd683jQMvkFSn127flRtSjaSFl3c11hOA5+rDLV2qFJZg7D77P8GdndQGdGQEhPqlaActx1gxnh0tYJVICEDrfHCZg3NKX2RgW4j6gU9mAfrF3+zZHWslCmMrC+ynDWYM5mIvCb5hH+iGvTpg7HAV/RDyENm7lGXXwWb1s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732177284; c=relaxed/simple; bh=QyrEhCXNAhpBOqwFALJpqV7cpP14N52tdA96aUoxEC8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=oqasPZfGZiQVNGt1JWaX8QaHQaTbLgEzRFN8Rc5p/koNtHkLZZ9hFfDSMDDyuVW3PilS5sF0KpRCF3x4UPJe36O/as21GRSyE2ICfj/ysWIkajd+IkKm1DK9DVZvBS5KDSF18sr4WHBBbFquqdSS6PS6M6RrwKnMP5JYIPyibxE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PJZsfm7r; arc=none smtp.client-ip=209.85.208.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PJZsfm7r" Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2fb3c3d5513so6639181fa.1; Thu, 21 Nov 2024 00:21:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732177280; x=1732782080; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ac6DcT7m+XqERQTxslNvsybc6SvgcEDlo0rPf5G7rM4=; b=PJZsfm7rwOthaTFmou+8FV5OkLqruk+fnZqBfDlS/Lagt4AIJBsHuk7PeKxLBQvcg9 lOcb0bEmY0633GIU6M/djtPVkgGbusnnLFMvYXhLCd5tkYUySoe9Fyahh5xHQT79U5A4 oi6YeCOP75Cs+19AlO8goGGbM7YMFlwdnWIfhoaj0grWdEaB4xOKrBiVXDtJclw1sYTe dSXjMVEs9vKHEdiFw4uNiBkRdQ4GaXGXmIn4hOApnBrKmqBMaCx4tTfv3fpm/i3oapXW DVr2n32R5p92OLsiEIhewWkmzz4D5eryTKLHd4v7vvXmfTUW7xmPT9slbmfmNY9xL68p CEzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732177280; x=1732782080; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ac6DcT7m+XqERQTxslNvsybc6SvgcEDlo0rPf5G7rM4=; b=kMeU2DpyeFDUTRGX4aeQGeTa21z4PUF8AJilVxqfYnCPh7jCIlOOz2LMgerHcEp8FV Xk0AkytaUjF8OkyU5Mt1VSvJCSnAzEW91194pCAfQxsK1Sa7DDP8oDfSSUIdb9Omku19 3AIX/taPXX8PLx7yZPJjFd9gTGwH8aYj/yKZiG9OTAFYGBFl2oPK86ThfmvjAMGiZ8td q4xdiEhV4GXuTLxbLl422IRYp6Mvw1onDdJx/ijQ+4PegT+KCids17+SGrBevxuX0pGc o12sWTdNitZTVxaNUJDeg5P1KzAbhatWhYtI4hLRr8FZc1zN/aSqJa0S0wHgF7eGihvZ x24A== X-Forwarded-Encrypted: i=1; AJvYcCUJtHZI9EeZZOOnXefLnA6krDaq7MsfHF+wNyjWDDjA5IknSLx4hmx08Ps4QR2UXi6ySmq3TUwiwonS@vger.kernel.org, AJvYcCV6LSE8CPibucu4JacIEUWaTWSe7ziBNsws45BQDby+OZG3C6AhtrqId4ba5PWrcBPHmICoO0sbCzLnxHO0@vger.kernel.org, AJvYcCWzAkirZ9f3X/TPZlP0xDMsKfR2UV4h4I7A7EJseTVoDnKACL5Vx3UqRwBjUJNDnWGt79iobUZ8qIoI@vger.kernel.org X-Gm-Message-State: AOJu0YxtOvWZeULQxf0R0HgoKDE5k3Owm022v8iB50hVJK3uko3WuOTY TJFsd4ppPsC2PfNrT+dXASsrcs9Ymxxa4lyjHLnylCnHhweUgg5X X-Google-Smtp-Source: AGHT+IFpTRtafYfo+W4m9opflshPgglG4mD7WloZ6X8pHAWv94FP85Jd9cKM6AWAj44y7zQ2ZlXuGA== X-Received: by 2002:a2e:bc03:0:b0:2ff:55a0:91ff with SMTP id 38308e7fff4ca-2ff8db0e497mr26811131fa.3.1732177280238; Thu, 21 Nov 2024 00:21:20 -0800 (PST) Received: from mva-rohm ([213.255.186.46]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2ff69ae80d2sm18682291fa.79.2024.11.21.00.21.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 00:21:19 -0800 (PST) Date: Thu, 21 Nov 2024 10:21:14 +0200 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matti Vaittinen , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/8] iio: kx022a: Support ROHM KX134ACR-LBZ Message-ID: References: Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: The register interface of the ROHM KX134ACR-LBZ accelerometer is almost identical to the KX132ACR-LBZ. The main difference between these accelerometers is that the KX134ACR-LBZ supports different G-ranges. The driver can model this by informing different scale to users. Also, the content of the "who_am_I" register is different. Add an ID and scales for the KX134ACR-LBZ. Signed-off-by: Matti Vaittinen --- Revision history: v1 => v2:. - patch number changed because a change was added to the series. - rebased on iio/testing to avoid conflicts with queued fixes --- drivers/iio/accel/kionix-kx022a-i2c.c | 2 ++ drivers/iio/accel/kionix-kx022a-spi.c | 2 ++ drivers/iio/accel/kionix-kx022a.c | 36 +++++++++++++++++++++++++++ drivers/iio/accel/kionix-kx022a.h | 2 ++ 4 files changed, 42 insertions(+) diff --git a/drivers/iio/accel/kionix-kx022a-i2c.c b/drivers/iio/accel/kionix-kx022a-i2c.c index 8a1d4fc28ddd..9fd049c2b62e 100644 --- a/drivers/iio/accel/kionix-kx022a-i2c.c +++ b/drivers/iio/accel/kionix-kx022a-i2c.c @@ -39,6 +39,7 @@ static const struct i2c_device_id kx022a_i2c_id[] = { { .name = "kx022a", .driver_data = (kernel_ulong_t)&kx022a_chip_info }, { .name = "kx132-1211", .driver_data = (kernel_ulong_t)&kx132_chip_info }, { .name = "kx132acr-lbz", .driver_data = (kernel_ulong_t)&kx132acr_chip_info }, + { .name = "kx134acr-lbz", .driver_data = (kernel_ulong_t)&kx134acr_chip_info }, { } }; MODULE_DEVICE_TABLE(i2c, kx022a_i2c_id); @@ -47,6 +48,7 @@ static const struct of_device_id kx022a_of_match[] = { { .compatible = "kionix,kx022a", .data = &kx022a_chip_info }, { .compatible = "kionix,kx132-1211", .data = &kx132_chip_info }, { .compatible = "rohm,kx132acr-lbz", .data = &kx132acr_chip_info }, + { .compatible = "rohm,kx134acr-lbz", .data = &kx134acr_chip_info }, { } }; MODULE_DEVICE_TABLE(of, kx022a_of_match); diff --git a/drivers/iio/accel/kionix-kx022a-spi.c b/drivers/iio/accel/kionix-kx022a-spi.c index f798b964d0b5..b20978afc565 100644 --- a/drivers/iio/accel/kionix-kx022a-spi.c +++ b/drivers/iio/accel/kionix-kx022a-spi.c @@ -39,6 +39,7 @@ static const struct spi_device_id kx022a_id[] = { { .name = "kx022a", .driver_data = (kernel_ulong_t)&kx022a_chip_info }, { .name = "kx132-1211", .driver_data = (kernel_ulong_t)&kx132_chip_info }, { .name = "kx132acr-lbz", .driver_data = (kernel_ulong_t)&kx132acr_chip_info }, + { .name = "kx134acr-lbz", .driver_data = (kernel_ulong_t)&kx134acr_chip_info }, { } }; MODULE_DEVICE_TABLE(spi, kx022a_id); @@ -47,6 +48,7 @@ static const struct of_device_id kx022a_of_match[] = { { .compatible = "kionix,kx022a", .data = &kx022a_chip_info }, { .compatible = "kionix,kx132-1211", .data = &kx132_chip_info }, { .compatible = "rohm,kx132acr-lbz", .data = &kx132acr_chip_info }, + { .compatible = "rohm,kx134acr-lbz", .data = &kx134acr_chip_info }, { } }; MODULE_DEVICE_TABLE(of, kx022a_of_match); diff --git a/drivers/iio/accel/kionix-kx022a.c b/drivers/iio/accel/kionix-kx022a.c index b23a27623a46..9fe16802c125 100644 --- a/drivers/iio/accel/kionix-kx022a.c +++ b/drivers/iio/accel/kionix-kx022a.c @@ -408,6 +408,14 @@ static const int kx022a_scale_table[][2] = { { 0, 4788403 }, }; +/* KX134ACR-LBZ ranges are (+/-) 8, 16, 32, 64 G */ +static const int kx134acr_lbz_scale_table[][2] = { + { 0, 2394202 }, + { 0, 4788403 }, + { 0, 9576807 }, + { 0, 19153613 }, +}; + static int kx022a_read_avail(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, const int **vals, int *type, int *length, @@ -1236,6 +1244,34 @@ const struct kx022a_chip_info kx132acr_chip_info = { }; EXPORT_SYMBOL_NS_GPL(kx132acr_chip_info, IIO_KX022A); +const struct kx022a_chip_info kx134acr_chip_info = { + .name = "kx134acr-lbz", + .regmap_config = &kx022a_regmap_config, + .channels = kx022a_channels, + .num_channels = ARRAY_SIZE(kx022a_channels), + .scale_table = kx134acr_lbz_scale_table, + .scale_table_size = ARRAY_SIZE(kx134acr_lbz_scale_table) * + ARRAY_SIZE(kx134acr_lbz_scale_table[0]), + .fifo_length = KX022A_FIFO_LENGTH, + .who = KX022A_REG_WHO, + .id = KX134ACR_LBZ_ID, + .cntl = KX022A_REG_CNTL, + .cntl2 = KX022A_REG_CNTL2, + .odcntl = KX022A_REG_ODCNTL, + .buf_cntl1 = KX022A_REG_BUF_CNTL1, + .buf_cntl2 = KX022A_REG_BUF_CNTL2, + .buf_clear = KX022A_REG_BUF_CLEAR, + .buf_status1 = KX022A_REG_BUF_STATUS_1, + .buf_read = KX022A_REG_BUF_READ, + .inc1 = KX022A_REG_INC1, + .inc4 = KX022A_REG_INC4, + .inc5 = KX022A_REG_INC5, + .inc6 = KX022A_REG_INC6, + .xout_l = KX022A_REG_XOUT_L, + .get_fifo_bytes_available = kx022a_get_fifo_bytes_available, +}; +EXPORT_SYMBOL_NS_GPL(kx134acr_chip_info, IIO_KX022A); + int kx022a_probe_internal(struct device *dev, const struct kx022a_chip_info *chip_info) { static const char * const regulator_names[] = {"io-vdd", "vdd"}; diff --git a/drivers/iio/accel/kionix-kx022a.h b/drivers/iio/accel/kionix-kx022a.h index 36e9d9de8c13..ea32fd252a38 100644 --- a/drivers/iio/accel/kionix-kx022a.h +++ b/drivers/iio/accel/kionix-kx022a.h @@ -14,6 +14,7 @@ #define KX022A_REG_WHO 0x0f #define KX022A_ID 0xc8 #define KX132ACR_LBZ_ID 0xd8 +#define KX134ACR_LBZ_ID 0xcc #define KX022A_REG_CNTL2 0x19 #define KX022A_MASK_SRST BIT(7) @@ -190,5 +191,6 @@ int kx022a_probe_internal(struct device *dev, const struct kx022a_chip_info *chi extern const struct kx022a_chip_info kx022a_chip_info; extern const struct kx022a_chip_info kx132_chip_info; extern const struct kx022a_chip_info kx132acr_chip_info; +extern const struct kx022a_chip_info kx134acr_chip_info; #endif