From patchwork Thu May 12 09:44:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1630050 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=rCgfMUlQ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KzRjQ4hNCz9sGY for ; Thu, 12 May 2022 19:45:45 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1np5O1-0005Oe-FS; Thu, 12 May 2022 09:45:33 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1np5Ny-0005MX-VG for kernel-team@lists.ubuntu.com; Thu, 12 May 2022 09:45:30 +0000 Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 7783C3F1A1 for ; Thu, 12 May 2022 09:45:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652348730; bh=9nJxXzeYoeitdz3l+UFg4fQj0jKQVHiW2/L2b4k50qQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rCgfMUlQbl0W/LJOKUrtMmceEFMr1mSatGUTuBUENAA+7I62fm8CpOVtDXWtMGIGF EU6O4HC6b4o1fmhXEbeVNIPXcnMvPJITz69Odue5MTATwqg1R5j/t9pxvbTEErJKOf LKCfby8AxsrbrnDjjmKNx+Bb1OD/Qq7nqBZ9MhQb3Fxyo2CjdkU7Dbe26NVOKbH5P6 q3/rwwKntrtk5EZSnE+frqThr+KonVsRCCkrBeUWBV2tSJIJGh+tiSfgRGOKUgoOyi qiQPhLHrXt5y8hpcXYlL6hVsdiNZZ/6xKWTBFRCeGi8FJyWxRTw2AHdAAg2rnaPeoH vibgMDB7pocRQ== Received: by mail-pj1-f72.google.com with SMTP id o16-20020a17090ab89000b001d84104fc2cso2614759pjr.1 for ; Thu, 12 May 2022 02:45:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9nJxXzeYoeitdz3l+UFg4fQj0jKQVHiW2/L2b4k50qQ=; b=QLt2Ump/K0cswZJwgE/+rJ2LPWxv8B5RVa7AAC7Zj9WrbU6FZylJKNus76bHb3Ziaj gvcKKsLWWH7nwbpzhHCwxaYhwhDpz3AzsI5c1tU0aow6BODR5y0jx+IBlMauFCzWEwZs mr9sJZHm6+G2XLFPnBSGifnSBxvWcoVYf5KX9ERq/jBvpD5pu+RUJoWix6H+NYiumHCS DRSKQFiN+JOiCVDg2RFXX0UOn5oq27faRBerghYnYQ4kkMtyvvIav0u8qGJuosDuobmF vNanDm76pHyyxZzlxFVjvDc3Q6yRX0GpM+aceVN043igN61OmgMwLebJJsZ/OhjGs1Jh 1+WA== X-Gm-Message-State: AOAM530HbCWbt9pZKUPw4nqNq88aOmHemU1D/BHY6kLEaMugKuJ2xIb6 4F2pVgpXNbbSEDNnlyviNGeG9QJDF1YDjp4r6nPnXB6v7I5g24kZWoSO1PXdsbVGgXk7C3arw6d ddh1W8HHvH690v4wLvsfqSHeF5K+dnlvP7VhKo2uiJg== X-Received: by 2002:a17:90b:4b0e:b0:1dc:658c:ae89 with SMTP id lx14-20020a17090b4b0e00b001dc658cae89mr9921248pjb.82.1652348726572; Thu, 12 May 2022 02:45:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwr/SViMuOrdTdMu4OYHnY/Q7ieqrwRgrML0uiQlBdQ0abmafh14yunuhshOfBGn8bx1U5yKw== X-Received: by 2002:a17:90b:4b0e:b0:1dc:658c:ae89 with SMTP id lx14-20020a17090b4b0e00b001dc658cae89mr9921190pjb.82.1652348725719; Thu, 12 May 2022 02:45:25 -0700 (PDT) Received: from localhost.localdomain (36-230-93-232.dynamic-ip.hinet.net. [36.230.93.232]) by smtp.gmail.com with ESMTPSA id 1-20020a630901000000b003c18e0768e3sm1458038pgj.78.2022.05.12.02.45.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 02:45:25 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH v2 01/10] iio: accel: adxl345: Convert to use dev_err_probe() Date: Thu, 12 May 2022 17:44:31 +0800 Message-Id: <20220512094440.15310-2-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220512094440.15310-1-jianhui.lee@canonical.com> References: <20220512094440.15310-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Andy Shevchenko BugLink: https://launchpad.net/bugs/1962674 It's fine to call dev_err_probe() in ->probe() when error code is known. Convert the driver to use dev_err_probe(). Signed-off-by: Andy Shevchenko Tested-by: Kai-Heng Feng Link: https://lore.kernel.org/r/20220222090009.2060-1-andriy.shevchenko@linux.intel.com Signed-off-by: Jonathan Cameron (cherry picked from commit 01676b0f3b625a9aa608d5b716898e9dba2fb63e) Signed-off-by: Jian Hui Lee --- drivers/iio/accel/adxl345_core.c | 26 +++++++++----------------- drivers/iio/accel/adxl345_i2c.c | 7 ++----- drivers/iio/accel/adxl345_spi.c | 15 +++++---------- 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c index 4b275051ef61..59c508ac072e 100644 --- a/drivers/iio/accel/adxl345_core.c +++ b/drivers/iio/accel/adxl345_core.c @@ -222,16 +222,12 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap, int ret; ret = regmap_read(regmap, ADXL345_REG_DEVID, ®val); - if (ret < 0) { - dev_err(dev, "Error reading device ID: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Error reading device ID\n"); - if (regval != ADXL345_DEVID) { - dev_err(dev, "Invalid device ID: %x, expected %x\n", - regval, ADXL345_DEVID); - return -ENODEV; - } + if (regval != ADXL345_DEVID) + return dev_err_probe(dev, -ENODEV, "Invalid device ID: %x, expected %x\n", + regval, ADXL345_DEVID); indio_dev = devm_iio_device_alloc(dev, sizeof(*data)); if (!indio_dev) @@ -245,10 +241,8 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap, ret = regmap_write(data->regmap, ADXL345_REG_DATA_FORMAT, data->data_range); - if (ret < 0) { - dev_err(dev, "Failed to set data range: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to set data range\n"); indio_dev->name = name; indio_dev->info = &adxl345_info; @@ -259,10 +253,8 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap, /* Enable measurement mode */ ret = regmap_write(data->regmap, ADXL345_REG_POWER_CTL, ADXL345_POWER_CTL_MEASURE); - if (ret < 0) { - dev_err(dev, "Failed to enable measurement mode: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to enable measurement mode\n"); ret = devm_add_action_or_reset(dev, adxl345_powerdown, data->regmap); if (ret < 0) diff --git a/drivers/iio/accel/adxl345_i2c.c b/drivers/iio/accel/adxl345_i2c.c index a431cba216e6..4363d5bd2ee9 100644 --- a/drivers/iio/accel/adxl345_i2c.c +++ b/drivers/iio/accel/adxl345_i2c.c @@ -28,11 +28,8 @@ static int adxl345_i2c_probe(struct i2c_client *client, return -ENODEV; regmap = devm_regmap_init_i2c(client, &adxl345_i2c_regmap_config); - if (IS_ERR(regmap)) { - dev_err(&client->dev, "Error initializing i2c regmap: %ld\n", - PTR_ERR(regmap)); - return PTR_ERR(regmap); - } + if (IS_ERR(regmap)) + return dev_err_probe(&client->dev, PTR_ERR(regmap), "Error initializing regmap\n"); return adxl345_core_probe(&client->dev, regmap, id->driver_data, id->name); diff --git a/drivers/iio/accel/adxl345_spi.c b/drivers/iio/accel/adxl345_spi.c index ea559ac2e87d..f590215f0d52 100644 --- a/drivers/iio/accel/adxl345_spi.c +++ b/drivers/iio/accel/adxl345_spi.c @@ -26,18 +26,13 @@ static int adxl345_spi_probe(struct spi_device *spi) struct regmap *regmap; /* Bail out if max_speed_hz exceeds 5 MHz */ - if (spi->max_speed_hz > ADXL345_MAX_SPI_FREQ_HZ) { - dev_err(&spi->dev, "SPI CLK, %d Hz exceeds 5 MHz\n", - spi->max_speed_hz); - return -EINVAL; - } + if (spi->max_speed_hz > ADXL345_MAX_SPI_FREQ_HZ) + return dev_err_probe(&spi->dev, -EINVAL, "SPI CLK, %d Hz exceeds 5 MHz\n", + spi->max_speed_hz); regmap = devm_regmap_init_spi(spi, &adxl345_spi_regmap_config); - if (IS_ERR(regmap)) { - dev_err(&spi->dev, "Error initializing spi regmap: %ld\n", - PTR_ERR(regmap)); - return PTR_ERR(regmap); - } + if (IS_ERR(regmap)) + return dev_err_probe(&spi->dev, PTR_ERR(regmap), "Error initializing regmap\n"); return adxl345_core_probe(&spi->dev, regmap, id->driver_data, id->name); } From patchwork Thu May 12 09:44:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1630053 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=RLWJqayl; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KzRjQ40k7z9sGJ for ; Thu, 12 May 2022 19:45:45 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1np5O2-0005RU-LG; Thu, 12 May 2022 09:45:34 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1np5Nz-0005MY-4s for kernel-team@lists.ubuntu.com; Thu, 12 May 2022 09:45:31 +0000 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 9AAF23F1AA for ; Thu, 12 May 2022 09:45:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652348730; bh=DM/kMV4TTg7x2kjo23kC8XN98rMh38rhe2DRpunnZjM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RLWJqaylVZMg3jDCXbAcaYCfUxdxs/U7JYETzz/gvq8USvFC0j+f3Q2m62l/cQMDu Tr53OBkoaDsQM7HObSB/Meva8A0cQUDKCAp5pIKXmGcF/BFnbJJSXqE9bLoh7mBGTj 66Vbr2ExGXUeenVj3YmIwnAYqq02XFkC24iNNjwWKkTNtAh0qsDaoQRxH57xMb1Bgt tuaifCd6OjBq8f7/bpwAP2v1YiIhkTx5yM6gR/DHRrD6sEHnZ7SpEp9mSbx26VnwSO g4HlIU48DWBeXi1D6hKKY7dXu2sc+bJNGT+v+YmNcv9iCWDphCCs+81Ra5HACEv8jw n8MjcMmlYO1wA== Received: by mail-pj1-f69.google.com with SMTP id o7-20020a17090a0a0700b001d93c491131so4395617pjo.6 for ; Thu, 12 May 2022 02:45:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DM/kMV4TTg7x2kjo23kC8XN98rMh38rhe2DRpunnZjM=; b=qVipZp3nSZF/x2RrrsrK0oV6oS8PCEvrSf8ytmi902nFoF8yIMTMCsY/YIQ3f5gmki 6K8Scm5tQYnXxitiOtaHK8oHR/wCFDT2N4fkMehPRqQehWrTEJFwshBaedR76YDbQCTp L3U4TGXcnejzmPGUtp9BImPMRHMkp5Cv1+7SENocmNJ/Vg/fGsRJZYDnWoKlcAdJQxGc QkIsZDAjZlBYBtLCtqhNK1FcHNJ9mc1WEeX0+813f0nTCyynoTqtK8w64zfJpJHxDaV8 /aef7xqmL2yDlWwP91eDeiBH7Sp7PIf/8kn+N7wJR+Xes8jQUcDCNQPVX4PmXNvcG7yi Sizg== X-Gm-Message-State: AOAM532svvI9ITTvqnE913mtK8GSO41yIINKmgCJMhmHyw48HOkzuDKB ko+h6N7H1PugX74ZksPlNpUYyUbdsyjWqIiMqT53cViZdFSiUeM/8ZtSqPvXcfKt4yL7Bywve2F HeVPe0cD/myuapvMJcjYObKWobYR4vhEycjLXlWghbg== X-Received: by 2002:a63:2117:0:b0:3c2:85f9:1b6f with SMTP id h23-20020a632117000000b003c285f91b6fmr24470355pgh.66.1652348728079; Thu, 12 May 2022 02:45:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPTYL9nVH1PRYWHsMq0UYNjovGUTRIOcrdNKUQEDOnIeZzEOA48SKnfPrGU5Tv7FpYIstqdA== X-Received: by 2002:a63:2117:0:b0:3c2:85f9:1b6f with SMTP id h23-20020a632117000000b003c285f91b6fmr24470342pgh.66.1652348727829; Thu, 12 May 2022 02:45:27 -0700 (PDT) Received: from localhost.localdomain (36-230-93-232.dynamic-ip.hinet.net. [36.230.93.232]) by smtp.gmail.com with ESMTPSA id 1-20020a630901000000b003c18e0768e3sm1458038pgj.78.2022.05.12.02.45.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 02:45:27 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH v2 02/10] iio: accel: adxl345: Set driver_data for OF enumeration Date: Thu, 12 May 2022 17:44:32 +0800 Message-Id: <20220512094440.15310-3-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220512094440.15310-1-jianhui.lee@canonical.com> References: <20220512094440.15310-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Andy Shevchenko BugLink: https://launchpad.net/bugs/1962674 In order to enable this driver on mode platforms, assign driver_data field in the OF device ID table. While at it, make sure that device type is not 0 which may be wrongly interpreted by device property APIs in the future. Signed-off-by: Andy Shevchenko Tested-by: Kai-Heng Feng Link: https://lore.kernel.org/r/20220222090009.2060-2-andriy.shevchenko@linux.intel.com Signed-off-by: Jonathan Cameron (cherry picked from commit 024f5d4f0ac087f73732a3084bdea5029ab0ca6b) Signed-off-by: Jian Hui Lee --- drivers/iio/accel/adxl345.h | 4 ++-- drivers/iio/accel/adxl345_i2c.c | 4 ++-- drivers/iio/accel/adxl345_spi.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/iio/accel/adxl345.h b/drivers/iio/accel/adxl345.h index af0fdd02c4f2..5a68d4dac717 100644 --- a/drivers/iio/accel/adxl345.h +++ b/drivers/iio/accel/adxl345.h @@ -9,8 +9,8 @@ #define _ADXL345_H_ enum adxl345_device_type { - ADXL345, - ADXL375, + ADXL345 = 1, + ADXL375 = 2, }; int adxl345_core_probe(struct device *dev, struct regmap *regmap, diff --git a/drivers/iio/accel/adxl345_i2c.c b/drivers/iio/accel/adxl345_i2c.c index 4363d5bd2ee9..7feaaba865d3 100644 --- a/drivers/iio/accel/adxl345_i2c.c +++ b/drivers/iio/accel/adxl345_i2c.c @@ -44,8 +44,8 @@ static const struct i2c_device_id adxl345_i2c_id[] = { MODULE_DEVICE_TABLE(i2c, adxl345_i2c_id); static const struct of_device_id adxl345_of_match[] = { - { .compatible = "adi,adxl345" }, - { .compatible = "adi,adxl375" }, + { .compatible = "adi,adxl345", .data = (const void *)ADXL345 }, + { .compatible = "adi,adxl375", .data = (const void *)ADXL375 }, { }, }; diff --git a/drivers/iio/accel/adxl345_spi.c b/drivers/iio/accel/adxl345_spi.c index f590215f0d52..49625dfa109b 100644 --- a/drivers/iio/accel/adxl345_spi.c +++ b/drivers/iio/accel/adxl345_spi.c @@ -46,8 +46,8 @@ static const struct spi_device_id adxl345_spi_id[] = { MODULE_DEVICE_TABLE(spi, adxl345_spi_id); static const struct of_device_id adxl345_of_match[] = { - { .compatible = "adi,adxl345" }, - { .compatible = "adi,adxl375" }, + { .compatible = "adi,adxl345", .data = (const void *)ADXL345 }, + { .compatible = "adi,adxl375", .data = (const void *)ADXL375 }, { }, }; From patchwork Thu May 12 09:44:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1630054 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=pR5wfIYA; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KzRjW16Dwz9sG2 for ; Thu, 12 May 2022 19:45:51 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1np5O9-0005aK-3H; Thu, 12 May 2022 09:45:41 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1np5Nz-0005Ml-MJ for kernel-team@lists.ubuntu.com; Thu, 12 May 2022 09:45:31 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 41E1F3F1A1 for ; Thu, 12 May 2022 09:45:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652348731; bh=dZuwBHNda+F4ncUaCiyjWzsonRP8JOtU2vdwJ5Q9bA0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pR5wfIYAyXUf3Z03Y4MWz0vSimiwe6xnOjIIW0p3+iwVt5KrXD4uxO3zHvRdI04oJ PVoaGfPAXpk9T86p8uqhtaqPpTtsCADavFvmZo/vuVRRSiNXgiS3ZWf9f4aNR7qKCU rv7F2RALIE+zDxUGdyXd4qtE8x7Yh6ntHJVolMhslFiF7FUwpbz9SRruPZeC7eIYXs 1EGCAkDxHvZwXGESccnBfAhU6+RQumUiQtHsZlWlfiJ9DJu7Sp0yeV3LQsNihDYRJq 3S7LKHuXiFWLccwZH+LqEjgUjb8S7Ge3XBNRBsRRURrUG9eKp8GRXg/rxfJjXkUGFB 4QNM6Jm+H0AQw== Received: by mail-pl1-f200.google.com with SMTP id b10-20020a170902bd4a00b0015e7ee90842so2493738plx.8 for ; Thu, 12 May 2022 02:45:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dZuwBHNda+F4ncUaCiyjWzsonRP8JOtU2vdwJ5Q9bA0=; b=EqAUcvRgWE4YUEMqYOIQ9G3DZca12mT6ZruAyietJTxOcGqokUFcSmQ/T03hDAob/D DVCIzE+xvLGCxkCpD9BFr+vWWfsotUXK9KmWscp8hQbST+4tBRUnln+K08L6ICW4oGHz Zm6FbtJO0Zp20WptK9UptkVHQFLEDbYHhZDvyqP7Hp0jdN11hWRAhjwKiW7NYsSKw043 J4xxdnIqgCfDwqsqTpysKAOL9+9oiqtuwL5m7eLzwzek48JWldQzLhSA43MWj/CV4ATx 5GNhtCBQEUw5+Fwd311cfs2n3J/W/7jvAVsyKrC/BACaq2GueNN5DNGyNjhNo+PXDjT0 3HzA== X-Gm-Message-State: AOAM532kkDSZymmN4ehSjw3TWf5GmflEkGMtT/htT0YHo47YNY+D9LPa Vopz5Ap7AmnV1HkCYTR4o7Bm5JBQHzmYiSjRhq5/hwhJeFIaU1Fxs1rt/aJSgdB6zkCU6vG77Ms YG6ktdW/M4bt3f5G4zJXeoODtyyp10oel336XToE3uA== X-Received: by 2002:a05:6a00:2484:b0:510:7f57:30b7 with SMTP id c4-20020a056a00248400b005107f5730b7mr28934137pfv.70.1652348729764; Thu, 12 May 2022 02:45:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxEV8J1Vbr0BP/mYK3B6rMR7KJonpGJ2t/JKb4F073gks+wtrdg0akT5xJDqfkcQYYGO0mBKQ== X-Received: by 2002:a05:6a00:2484:b0:510:7f57:30b7 with SMTP id c4-20020a056a00248400b005107f5730b7mr28934105pfv.70.1652348729328; Thu, 12 May 2022 02:45:29 -0700 (PDT) Received: from localhost.localdomain (36-230-93-232.dynamic-ip.hinet.net. [36.230.93.232]) by smtp.gmail.com with ESMTPSA id 1-20020a630901000000b003c18e0768e3sm1458038pgj.78.2022.05.12.02.45.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 02:45:28 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH v2 03/10] iio: accel: adxl345: Get rid of name parameter in adxl345_core_probe() Date: Thu, 12 May 2022 17:44:33 +0800 Message-Id: <20220512094440.15310-4-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220512094440.15310-1-jianhui.lee@canonical.com> References: <20220512094440.15310-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Andy Shevchenko BugLink: https://launchpad.net/bugs/1962674 As a preparation to switch to use device properties, get rid of name parameter in adxl345_core_probe(). Instead, choose it based on the type. Signed-off-by: Andy Shevchenko Tested-by: Kai-Heng Feng Link: https://lore.kernel.org/r/20220222090009.2060-3-andriy.shevchenko@linux.intel.com Signed-off-by: Jonathan Cameron (cherry picked from commit c1db3d5cab03a79947736c44fd33f19f234b14a0) Signed-off-by: Jian Hui Lee --- drivers/iio/accel/adxl345.h | 4 ++-- drivers/iio/accel/adxl345_core.c | 15 +++++++++++++-- drivers/iio/accel/adxl345_i2c.c | 3 +-- drivers/iio/accel/adxl345_spi.c | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/iio/accel/adxl345.h b/drivers/iio/accel/adxl345.h index 5a68d4dac717..b01cb0ccf8dc 100644 --- a/drivers/iio/accel/adxl345.h +++ b/drivers/iio/accel/adxl345.h @@ -13,7 +13,7 @@ enum adxl345_device_type { ADXL375 = 2, }; -int adxl345_core_probe(struct device *dev, struct regmap *regmap, - enum adxl345_device_type type, const char *name); +int adxl345_core_probe(struct device *dev, struct regmap *regmap, enum adxl345_device_type type); +int adxl345_core_remove(struct device *dev); #endif /* _ADXL345_H_ */ diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c index 59c508ac072e..c616dc024f2f 100644 --- a/drivers/iio/accel/adxl345_core.c +++ b/drivers/iio/accel/adxl345_core.c @@ -213,14 +213,25 @@ static void adxl345_powerdown(void *regmap) regmap_write(regmap, ADXL345_REG_POWER_CTL, ADXL345_POWER_CTL_STANDBY); } -int adxl345_core_probe(struct device *dev, struct regmap *regmap, - enum adxl345_device_type type, const char *name) +int adxl345_core_probe(struct device *dev, struct regmap *regmap, enum adxl345_device_type type) { struct adxl345_data *data; struct iio_dev *indio_dev; + const char *name; u32 regval; int ret; + switch (type) { + case ADXL345: + name = "adxl345"; + break; + case ADXL375: + name = "adxl375"; + break; + default: + return -EINVAL; + } + ret = regmap_read(regmap, ADXL345_REG_DEVID, ®val); if (ret < 0) return dev_err_probe(dev, ret, "Error reading device ID\n"); diff --git a/drivers/iio/accel/adxl345_i2c.c b/drivers/iio/accel/adxl345_i2c.c index 7feaaba865d3..31abdf6cc596 100644 --- a/drivers/iio/accel/adxl345_i2c.c +++ b/drivers/iio/accel/adxl345_i2c.c @@ -31,8 +31,7 @@ static int adxl345_i2c_probe(struct i2c_client *client, if (IS_ERR(regmap)) return dev_err_probe(&client->dev, PTR_ERR(regmap), "Error initializing regmap\n"); - return adxl345_core_probe(&client->dev, regmap, id->driver_data, - id->name); + return adxl345_core_probe(&client->dev, regmap, id->driver_data); } static const struct i2c_device_id adxl345_i2c_id[] = { diff --git a/drivers/iio/accel/adxl345_spi.c b/drivers/iio/accel/adxl345_spi.c index 49625dfa109b..fefb99e00cb3 100644 --- a/drivers/iio/accel/adxl345_spi.c +++ b/drivers/iio/accel/adxl345_spi.c @@ -34,7 +34,7 @@ static int adxl345_spi_probe(struct spi_device *spi) if (IS_ERR(regmap)) return dev_err_probe(&spi->dev, PTR_ERR(regmap), "Error initializing regmap\n"); - return adxl345_core_probe(&spi->dev, regmap, id->driver_data, id->name); + return adxl345_core_probe(&spi->dev, regmap, id->driver_data); } static const struct spi_device_id adxl345_spi_id[] = { From patchwork Thu May 12 09:44:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1630052 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=MgN/Zw7v; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KzRjQ4nw6z9sGm for ; Thu, 12 May 2022 19:45:45 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1np5O2-0005Rl-T4; Thu, 12 May 2022 09:45:34 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1np5O0-0005OS-Rp for kernel-team@lists.ubuntu.com; Thu, 12 May 2022 09:45:32 +0000 Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 8E27B3F21D for ; Thu, 12 May 2022 09:45:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652348732; bh=WQsb0KMiueupjyg72BPPwwF+GcHTIM2aprO+WPrOYSU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MgN/Zw7vgKUFN92lSMgFPFFkmeGMoIPt7e3a1HN2hQveRM0E2YYvbbgGgKN7SjlSd 6BOGqsuX2SDXpCdpH76P79o4Qg4I8ukeCfz7utdW7r1IfHUMKGwiqYOiI0jyoUD2jh IiPk+LoRBT6pkwxLXCLGlBF42RAe3Ls6KgVjiN2Z3gEdcv5Sm1Dt2CnCSFMW1p+dXF 3p9Rq7ETxB1RbE7XNWA2vFbuH0rdhCuUdchICWD/EFPngPgoC2ieAc11Loi+kcen+X rrmsaGHtECGC7VUyYU+26Y6qL/0XpCFuYCgMi2YpDDsWN7Fa6RLVxOiUBHu49sEZol tCct+DAy69SKA== Received: by mail-pg1-f197.google.com with SMTP id q13-20020a638c4d000000b003821725ad66so2384873pgn.23 for ; Thu, 12 May 2022 02:45:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WQsb0KMiueupjyg72BPPwwF+GcHTIM2aprO+WPrOYSU=; b=yc1WKI6M3rKZaf1alZkpLiIBWMU9YkEvUrBh+MEuoKOP5CUvb1tEFPq64MvagNZOXG j2aVuoLNTxQtw+PxQYex81pFBfkleh21v4BqXj6Y3veHa53SbfuTlycEei//5muUs716 t6WjHDqlL9Ddq2j47RB2ZSyjGORbR+/zDzSj9HAvCRypK/rYFE/VXrzuLp85niPCsiQd l88W+Jg68HU3POE9CRvWSiFcDCzslJdEfoqKxzMxuZvcadYpCFVLcZKcFzOZHrsH2Hip Iza+JqJ4hbYf11JOfhTNF8WQXyyWa8ODbBQ9d2iPaYI7hgncrGfU9UNCJH3NDvNemUU+ smrQ== X-Gm-Message-State: AOAM530OQ5FLfLXe4Phcol4gH4vPI5d6x2tmBL7iwOI+xryL8adzJ3Hr 0dITJlabW2perqD72ekBsvY68EqqOj/mJwbXtuokbIBcuE6vzVVKhmZB6BChLhiIlG+WpHbAqEw pEfibe+L1XsXkm4CvpZaN4kz/hIBqg4He/GlEPuhshQ== X-Received: by 2002:a63:6aca:0:b0:3ab:a56:126a with SMTP id f193-20020a636aca000000b003ab0a56126amr24330002pgc.576.1652348731231; Thu, 12 May 2022 02:45:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeTWnl40+EoVutKai1ASpX7w2KeBduE5PHB1w3IZSMl8hCTPMW8sQGJ4m/+YnFNtsH13LkGg== X-Received: by 2002:a63:6aca:0:b0:3ab:a56:126a with SMTP id f193-20020a636aca000000b003ab0a56126amr24329985pgc.576.1652348730943; Thu, 12 May 2022 02:45:30 -0700 (PDT) Received: from localhost.localdomain (36-230-93-232.dynamic-ip.hinet.net. [36.230.93.232]) by smtp.gmail.com with ESMTPSA id 1-20020a630901000000b003c18e0768e3sm1458038pgj.78.2022.05.12.02.45.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 02:45:30 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH v2 04/10] iio: accel: adxl345: Make use of device properties Date: Thu, 12 May 2022 17:44:34 +0800 Message-Id: <20220512094440.15310-5-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220512094440.15310-1-jianhui.lee@canonical.com> References: <20220512094440.15310-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Andy Shevchenko BugLink: https://launchpad.net/bugs/1962674 Convert the module to be property provider agnostic and allow it to be used on non-OF platforms. Signed-off-by: Andy Shevchenko Tested-by: Kai-Heng Feng Link: https://lore.kernel.org/r/20220222090009.2060-4-andriy.shevchenko@linux.intel.com Signed-off-by: Jonathan Cameron (cherry picked from commit 266be7cb11c75f930a5902bc6199ff50ca4282a1) Signed-off-by: Jian Hui Lee --- drivers/iio/accel/adxl345.h | 2 +- drivers/iio/accel/adxl345_core.c | 5 ++++- drivers/iio/accel/adxl345_i2c.c | 11 ++++------- drivers/iio/accel/adxl345_spi.c | 3 +-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/iio/accel/adxl345.h b/drivers/iio/accel/adxl345.h index b01cb0ccf8dc..4d1699f7c182 100644 --- a/drivers/iio/accel/adxl345.h +++ b/drivers/iio/accel/adxl345.h @@ -13,7 +13,7 @@ enum adxl345_device_type { ADXL375 = 2, }; -int adxl345_core_probe(struct device *dev, struct regmap *regmap, enum adxl345_device_type type); +int adxl345_core_probe(struct device *dev, struct regmap *regmap); int adxl345_core_remove(struct device *dev); #endif /* _ADXL345_H_ */ diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c index c616dc024f2f..ad039fb0e1bd 100644 --- a/drivers/iio/accel/adxl345_core.c +++ b/drivers/iio/accel/adxl345_core.c @@ -8,6 +8,7 @@ */ #include +#include #include #include @@ -213,14 +214,16 @@ static void adxl345_powerdown(void *regmap) regmap_write(regmap, ADXL345_REG_POWER_CTL, ADXL345_POWER_CTL_STANDBY); } -int adxl345_core_probe(struct device *dev, struct regmap *regmap, enum adxl345_device_type type) +int adxl345_core_probe(struct device *dev, struct regmap *regmap) { + enum adxl345_device_type type; struct adxl345_data *data; struct iio_dev *indio_dev; const char *name; u32 regval; int ret; + type = (uintptr_t)device_get_match_data(dev); switch (type) { case ADXL345: name = "adxl345"; diff --git a/drivers/iio/accel/adxl345_i2c.c b/drivers/iio/accel/adxl345_i2c.c index 31abdf6cc596..cfb6179d1152 100644 --- a/drivers/iio/accel/adxl345_i2c.c +++ b/drivers/iio/accel/adxl345_i2c.c @@ -19,19 +19,15 @@ static const struct regmap_config adxl345_i2c_regmap_config = { .val_bits = 8, }; -static int adxl345_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int adxl345_i2c_probe(struct i2c_client *client) { struct regmap *regmap; - if (!id) - return -ENODEV; - regmap = devm_regmap_init_i2c(client, &adxl345_i2c_regmap_config); if (IS_ERR(regmap)) return dev_err_probe(&client->dev, PTR_ERR(regmap), "Error initializing regmap\n"); - return adxl345_core_probe(&client->dev, regmap, id->driver_data); + return adxl345_core_probe(&client->dev, regmap); } static const struct i2c_device_id adxl345_i2c_id[] = { @@ -55,7 +51,8 @@ static struct i2c_driver adxl345_i2c_driver = { .name = "adxl345_i2c", .of_match_table = adxl345_of_match, }, - .probe = adxl345_i2c_probe, + .remove = adxl345_i2c_remove, + .probe_new = adxl345_i2c_probe, .id_table = adxl345_i2c_id, }; diff --git a/drivers/iio/accel/adxl345_spi.c b/drivers/iio/accel/adxl345_spi.c index fefb99e00cb3..dbf0d538c1c1 100644 --- a/drivers/iio/accel/adxl345_spi.c +++ b/drivers/iio/accel/adxl345_spi.c @@ -22,7 +22,6 @@ static const struct regmap_config adxl345_spi_regmap_config = { static int adxl345_spi_probe(struct spi_device *spi) { - const struct spi_device_id *id = spi_get_device_id(spi); struct regmap *regmap; /* Bail out if max_speed_hz exceeds 5 MHz */ @@ -34,7 +33,7 @@ static int adxl345_spi_probe(struct spi_device *spi) if (IS_ERR(regmap)) return dev_err_probe(&spi->dev, PTR_ERR(regmap), "Error initializing regmap\n"); - return adxl345_core_probe(&spi->dev, regmap, id->driver_data); + return adxl345_core_probe(&spi->dev, regmap); } static const struct spi_device_id adxl345_spi_id[] = { From patchwork Thu May 12 09:44:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1630049 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=rclVhgaS; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KzRjQ4kJXz9sGh for ; Thu, 12 May 2022 19:45:46 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1np5O4-0005Tt-4R; Thu, 12 May 2022 09:45:36 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1np5O2-0005Qu-8f for kernel-team@lists.ubuntu.com; Thu, 12 May 2022 09:45:34 +0000 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id E3F993F21D for ; Thu, 12 May 2022 09:45:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652348733; bh=B7DrwQx0aXVcm8dIvdeNZfUPJvzL0Vj/Y5dJdBCTois=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rclVhgaSl+qZL5DMBEIcZm0l+p7PRwybbBl0jDsW4xVS/2f8Q+kdVuvGEkZlkcNC8 s1/u5Gt0k0T8b75almMAn8O7dt4+XFu8JRAjobq0dstul43Y8CSNudE0v5OAmUGekb GKXw6uyiH/3u3ZgotuDT8BNKA/H5ZoJr6Etfl2P2iDhyNeLLgEreo1r33J0hFvkvhK emNW5yh8PWZ3U+68vSIF/vBfrmDz7oy+e831r+InsEPBHiZEDqbQOmZIu6PjrNVr7Z qoBiMY/4QUPq4iSMOD5JwKfLI0UnpLASqPNym4Yr07w7PZWMLfdbn7qWnRj+hg3vPk mBwYLAMfY5mdw== Received: by mail-pj1-f69.google.com with SMTP id z24-20020a17090ab11800b001dd239fc177so2198207pjq.0 for ; Thu, 12 May 2022 02:45:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B7DrwQx0aXVcm8dIvdeNZfUPJvzL0Vj/Y5dJdBCTois=; b=NyWqIkWVEm7uKH3Z9JJKa+E6Ib03SpDBVnqUGd6k9lRJxcCzmcM8ani6GWTpiXVYEz we5GlE25zPmummmzA5QXcMJR12Hfh8whRYN4c34pSKhVsPs3kuckUhiSwphqc/2Nd8B2 cXZer5ilpFJQ2ms7aSGs/WuVlLvq2Wius9h8pjjU44kaMHD/b8Ne+RSfOJukkcwjKDtb WEIjSBeo9xAZ6pl8K/9qkaGBDi0Oa/MgNWOiCt5hpGV02A74BR9+M8YRxL99X2iegBOZ mAWnW+wwFWpTfvAHx6tDmHzK9wqqMMzpkG4LqGV+EhIOQqtEXHJ5FVGgsT/Qzb0KyN+G EZww== X-Gm-Message-State: AOAM532AJFD17B7C910ijKVVsD1kob9ZuoK39dh6kK2owtm84R125sjK 7BS75ysyp/2A0UQtsZwXihL80H9lpQfWTJsHEFl3J94co1FBwrBDRRWeSA7ffkNTgK+kKrm4eF8 aMj2LDqNSENmFN8ewat5BmPrM7Ryw2u2sIwxPbgISXg== X-Received: by 2002:a05:6a00:168a:b0:4f7:e161:83cd with SMTP id k10-20020a056a00168a00b004f7e16183cdmr29171723pfc.56.1652348732649; Thu, 12 May 2022 02:45:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMF+fIAeyVbaVKYf0dm5AugQSb2+23znFbQ8tXsvqR8EDp2eV89zpjbP2LER9+BxKL/7MdYw== X-Received: by 2002:a05:6a00:168a:b0:4f7:e161:83cd with SMTP id k10-20020a056a00168a00b004f7e16183cdmr29171694pfc.56.1652348732256; Thu, 12 May 2022 02:45:32 -0700 (PDT) Received: from localhost.localdomain (36-230-93-232.dynamic-ip.hinet.net. [36.230.93.232]) by smtp.gmail.com with ESMTPSA id 1-20020a630901000000b003c18e0768e3sm1458038pgj.78.2022.05.12.02.45.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 02:45:31 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH v2 05/10] iio: accel: adxl345: Add ACPI HID table Date: Thu, 12 May 2022 17:44:35 +0800 Message-Id: <20220512094440.15310-6-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220512094440.15310-1-jianhui.lee@canonical.com> References: <20220512094440.15310-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Kai-Heng Feng BugLink: https://launchpad.net/bugs/1962674 x86 boards may use ACPI HID "ADS0345" for adxl345 device. Analog replied: "ADS034X is not a valid PNP ID. ADS0345 would be. I'm not aware that this ID is already taken. Feel free to submit a mainline Linux input mailing list patch." So add an ACPI match table for that accordingly. Since ACPI device may not match to any I2C ID, use the name and type directly from ACPI ID table in absence of I2C ID. Suggested-by: Andy Shevchenko Signed-off-by: Kai-Heng Feng Signed-off-by: Andy Shevchenko Link: https://lore.kernel.org/r/20220222090009.2060-5-andriy.shevchenko@linux.intel.com Signed-off-by: Jonathan Cameron (cherry picked from commit b9493d595226b598ed79b3769f7038fda1a5391b) Signed-off-by: Jian Hui Lee --- drivers/iio/accel/adxl345_i2c.c | 7 +++++++ drivers/iio/accel/adxl345_spi.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/drivers/iio/accel/adxl345_i2c.c b/drivers/iio/accel/adxl345_i2c.c index cfb6179d1152..90f471add84c 100644 --- a/drivers/iio/accel/adxl345_i2c.c +++ b/drivers/iio/accel/adxl345_i2c.c @@ -46,10 +46,17 @@ static const struct of_device_id adxl345_of_match[] = { MODULE_DEVICE_TABLE(of, adxl345_of_match); +static const struct acpi_device_id adxl345_acpi_match[] = { + { "ADS0345", ADXL345 }, + { } +}; +MODULE_DEVICE_TABLE(acpi, adxl345_acpi_match); + static struct i2c_driver adxl345_i2c_driver = { .driver = { .name = "adxl345_i2c", .of_match_table = adxl345_of_match, + .acpi_match_table = adxl345_acpi_match, }, .remove = adxl345_i2c_remove, .probe_new = adxl345_i2c_probe, diff --git a/drivers/iio/accel/adxl345_spi.c b/drivers/iio/accel/adxl345_spi.c index dbf0d538c1c1..3943c71db77a 100644 --- a/drivers/iio/accel/adxl345_spi.c +++ b/drivers/iio/accel/adxl345_spi.c @@ -52,10 +52,17 @@ static const struct of_device_id adxl345_of_match[] = { MODULE_DEVICE_TABLE(of, adxl345_of_match); +static const struct acpi_device_id adxl345_acpi_match[] = { + { "ADS0345", ADXL345 }, + { } +}; +MODULE_DEVICE_TABLE(acpi, adxl345_acpi_match); + static struct spi_driver adxl345_spi_driver = { .driver = { .name = "adxl345_spi", .of_match_table = adxl345_of_match, + .acpi_match_table = adxl345_acpi_match, }, .probe = adxl345_spi_probe, .id_table = adxl345_spi_id, From patchwork Thu May 12 09:44:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1630055 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=noOxlr70; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KzRjb57hVz9sG2 for ; Thu, 12 May 2022 19:45:55 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1np5OE-0005kl-Tu; Thu, 12 May 2022 09:45:46 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1np5O3-0005SS-FL for kernel-team@lists.ubuntu.com; Thu, 12 May 2022 09:45:35 +0000 Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 217693F1A1 for ; Thu, 12 May 2022 09:45:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652348735; bh=hLac8A/1emrjVGhua43Zi3xeRWxJSB/6hvHSjZGX3jc=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=noOxlr70QHsoRCXDclNbwo6IHvaC65PWock9mJ0ctaimP7TTElJ6c0dCNO1DSkvy9 SDc4AS5dGG4saYhVaxoXVpADZxPL/SBycxUf2MwWdSQrQzk5psxbNk1jCHzq5MV6Mm OYa+bSQOqihZgnhm6ZQPlxZ4TeagiYhAx10j23xmTRPGyT5cdskp2f8kkm95VtO5f9 YTiMUTx//av8GPm+KQPi66fY1D9tld8BNRIRf+YyOHfWupP1Rrwog9smWhv0IhoqWP gBUS96vsM8TAW60+oGMbHn7KUCGh8B+vg7+jK8l4T2gPCH5aMrvIE7wTpqqUU02u1Y xgf3oom34pBkQ== Received: by mail-pj1-f72.google.com with SMTP id z14-20020a17090a66ce00b001dd05e92bb8so2176240pjl.4 for ; Thu, 12 May 2022 02:45:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hLac8A/1emrjVGhua43Zi3xeRWxJSB/6hvHSjZGX3jc=; b=sfvv/3nXX7cYvqn8PE/oaCYogSNs0M1If9QpY8+xk7mHclyvYg/FYFKocFNcD+Flac bB6I0nNY4ZhMGfpQmavn6drlTYcoz4dIu+Hu/Hij6GdyKPI2FKVVDA/uHQTYhvYxsEmc AI75PAPofvfEO/u340HwFI4O2jifzVmayef+ZDgoawT0ibLBvy0vNiE2rCU9K+BK/v5i yA2rD+swkWuQJM7qXvSM6/RoACnwRznoX5EyCeLsqpghaobL/Yz8hvnM6gaNclfRtMSZ ZM4LOb8RuJXlWQZKjIz9ATIh5Jxb3EVml9gt/uStS/aRBwUdiXoVQA9iaYq/KW4bu9lm 2ACg== X-Gm-Message-State: AOAM5329AUBlm/Q+rUmIc/PFMbCsWq7CryeDClD9p3FVdMZLajfODtC9 EO6lqaTNXo0LAh9z3Frf0Vdm+O2m57tU4r4gcCiFP45e102CfNzvPuW532ApEFFUCGm9Yrp4Rcf fSJvfRiJ5ADXIktwE3uo8K4T4BSz1F9eCGBGS3b1sbA== X-Received: by 2002:a63:6682:0:b0:3c2:2f7c:cc76 with SMTP id a124-20020a636682000000b003c22f7ccc76mr24703070pgc.253.1652348733821; Thu, 12 May 2022 02:45:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyL4TPU1jkQN8LKDDWSBA0vfFvlj+T+l5b3on4oXZhW3sGJEN4rdWQLRAr+QRkMazf5xPmD7Q== X-Received: by 2002:a63:6682:0:b0:3c2:2f7c:cc76 with SMTP id a124-20020a636682000000b003c22f7ccc76mr24703056pgc.253.1652348733591; Thu, 12 May 2022 02:45:33 -0700 (PDT) Received: from localhost.localdomain (36-230-93-232.dynamic-ip.hinet.net. [36.230.93.232]) by smtp.gmail.com with ESMTPSA id 1-20020a630901000000b003c18e0768e3sm1458038pgj.78.2022.05.12.02.45.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 02:45:33 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH v2 06/10] iio: accel: adxl345: Extract adxl345_powerup() helper Date: Thu, 12 May 2022 17:44:36 +0800 Message-Id: <20220512094440.15310-7-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220512094440.15310-1-jianhui.lee@canonical.com> References: <20220512094440.15310-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Andy Shevchenko BugLink: https://launchpad.net/bugs/1962674 For the sake of symmetry and possible reuse in the future extract adxl435_powerup() helper. Signed-off-by: Andy Shevchenko Tested-by: Kai-Heng Feng Link: https://lore.kernel.org/r/20220222090009.2060-6-andriy.shevchenko@linux.intel.com Signed-off-by: Jonathan Cameron (cherry picked from commit 5b4c63f691b848322166cace3be464a90b42065f) Signed-off-by: Jian Hui Lee --- drivers/iio/accel/adxl345_core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c index ad039fb0e1bd..f69141be7348 100644 --- a/drivers/iio/accel/adxl345_core.c +++ b/drivers/iio/accel/adxl345_core.c @@ -209,6 +209,11 @@ static const struct iio_info adxl345_info = { .write_raw_get_fmt = adxl345_write_raw_get_fmt, }; +static int adxl345_powerup(void *regmap) +{ + return regmap_write(regmap, ADXL345_REG_POWER_CTL, ADXL345_POWER_CTL_MEASURE); +} + static void adxl345_powerdown(void *regmap) { regmap_write(regmap, ADXL345_REG_POWER_CTL, ADXL345_POWER_CTL_STANDBY); @@ -265,8 +270,7 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap) indio_dev->num_channels = ARRAY_SIZE(adxl345_channels); /* Enable measurement mode */ - ret = regmap_write(data->regmap, ADXL345_REG_POWER_CTL, - ADXL345_POWER_CTL_MEASURE); + ret = adxl345_powerup(data->regmap); if (ret < 0) return dev_err_probe(dev, ret, "Failed to enable measurement mode\n"); From patchwork Thu May 12 09:44:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1630056 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=hILS/OhM; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KzRjf2QZkz9sG2 for ; Thu, 12 May 2022 19:45:58 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1np5OI-0005rf-D9; Thu, 12 May 2022 09:45:50 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1np5O6-0005WN-Lv for kernel-team@lists.ubuntu.com; Thu, 12 May 2022 09:45:38 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id A51103F1A1 for ; Thu, 12 May 2022 09:45:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652348736; bh=QteDyT1M52bLI+c2Zoqny7Mrhc5J9mdZ1akCVI7rxtA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hILS/OhMe4j/wEgUgewpK+OCt0DFBQfe0+rVSlyCnz6N+YSHbBe1auCd78e9J7pU6 cl7ELTYREQmhSKlIVYf0p04AWDJpDp29pGjc8+fizHj1LehOsOLB+PTps9Xrq+Db/U tYVjo51BK2wy0MQbylQwZzDuq/KV9IYKz7reMP81zulrYufg7gdQeHhvReURgRk/3O tP6isC5JC36s40kEMZrH6R9MA6KYmlr6MQrWD5cBROsAcPszu1yqaHBZErceFVoP30 PZ5v99kwp7BlSn8jB4yMzGvP7GJowaegKZm79swUe4F32i0zExXaxWnzx5Y1oumeK4 DZvE5a9kTPXbg== Received: by mail-pj1-f71.google.com with SMTP id q14-20020a17090a178e00b001dc970bf587so4408805pja.1 for ; Thu, 12 May 2022 02:45:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QteDyT1M52bLI+c2Zoqny7Mrhc5J9mdZ1akCVI7rxtA=; b=gpNWn9GFE0XJivCo+fqnWVGdRWLlw4oRoeJQ711nYwJTV13rbNJhkXRr+Z/f/+nGru T4vcpLDcFFAnWBLvxgvTgh3RdMk3wpexFJnffnE/bxDAegaOy1QBjAETlAMb6nhS6ZD9 ru2Jb1+DSnu0AkFsBfMdzX6qDD4eiuEpQjHxSfWV1I6VrSlVo4K4y5DoOHl5gdpgv92V YbcteQyeqNzz54fkbAQWcqmlqynTzOEgG8AY8cxstrDcPBx7GKFPVZ39n5dmXhWmeklz ebFCNQ87QupHmqbfNg/pg/dYYRucqqnKjQ/07Vx0sxf0ARQUhut8cOdIRc2UAWyW6Gjz 0H2A== X-Gm-Message-State: AOAM53191eFRmNr1bTgsRMuqN5/G1Tnud+0ryszRcig4Lr1RRK7pwepR vTh0pQ8AmDPJHPd97Fc0wSlK1SDy7U5oBau90e/zX0DFwHNcSHRiWgMSd1bDg8E+/ENT15Tpm1y 6O7FWhd96YeiTT3hKPhX2zINrVjlaU5mML5nl6Al1Rg== X-Received: by 2002:a17:903:240a:b0:14e:dad4:5ce4 with SMTP id e10-20020a170903240a00b0014edad45ce4mr30412433plo.125.1652348735328; Thu, 12 May 2022 02:45:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbcH/SRRC43D+ctoffZUhsUqa2gdntFUVzIK5BWBrjp3x7U5TOL9uwm6qH/kml3lsTLfISwg== X-Received: by 2002:a17:903:240a:b0:14e:dad4:5ce4 with SMTP id e10-20020a170903240a00b0014edad45ce4mr30412412plo.125.1652348735030; Thu, 12 May 2022 02:45:35 -0700 (PDT) Received: from localhost.localdomain (36-230-93-232.dynamic-ip.hinet.net. [36.230.93.232]) by smtp.gmail.com with ESMTPSA id 1-20020a630901000000b003c18e0768e3sm1458038pgj.78.2022.05.12.02.45.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 02:45:34 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH v2 07/10] iio: accel: adxl345: Drop comma in terminator entries Date: Thu, 12 May 2022 17:44:37 +0800 Message-Id: <20220512094440.15310-8-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220512094440.15310-1-jianhui.lee@canonical.com> References: <20220512094440.15310-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Andy Shevchenko BugLink: https://launchpad.net/bugs/1962674 Terminator entries are by definition should terminate the array. Dropping comma make this enforced at compile time. Signed-off-by: Andy Shevchenko Tested-by: Kai-Heng Feng Link: https://lore.kernel.org/r/20220222090009.2060-7-andriy.shevchenko@linux.intel.com Signed-off-by: Jonathan Cameron (cherry picked from commit b8f83abdd2dd5bb71a0ffb62dbd3fbfdcf9d79f7) Signed-off-by: Jian Hui Lee --- drivers/iio/accel/adxl345_core.c | 2 +- drivers/iio/accel/adxl345_i2c.c | 2 +- drivers/iio/accel/adxl345_spi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c index f69141be7348..fabbeec4ae75 100644 --- a/drivers/iio/accel/adxl345_core.c +++ b/drivers/iio/accel/adxl345_core.c @@ -195,7 +195,7 @@ static IIO_CONST_ATTR_SAMP_FREQ_AVAIL( static struct attribute *adxl345_attrs[] = { &iio_const_attr_sampling_frequency_available.dev_attr.attr, - NULL, + NULL }; static const struct attribute_group adxl345_attrs_group = { diff --git a/drivers/iio/accel/adxl345_i2c.c b/drivers/iio/accel/adxl345_i2c.c index 90f471add84c..c24f66690b6f 100644 --- a/drivers/iio/accel/adxl345_i2c.c +++ b/drivers/iio/accel/adxl345_i2c.c @@ -41,7 +41,7 @@ MODULE_DEVICE_TABLE(i2c, adxl345_i2c_id); static const struct of_device_id adxl345_of_match[] = { { .compatible = "adi,adxl345", .data = (const void *)ADXL345 }, { .compatible = "adi,adxl375", .data = (const void *)ADXL375 }, - { }, + { } }; MODULE_DEVICE_TABLE(of, adxl345_of_match); diff --git a/drivers/iio/accel/adxl345_spi.c b/drivers/iio/accel/adxl345_spi.c index 3943c71db77a..899a8a000823 100644 --- a/drivers/iio/accel/adxl345_spi.c +++ b/drivers/iio/accel/adxl345_spi.c @@ -47,7 +47,7 @@ MODULE_DEVICE_TABLE(spi, adxl345_spi_id); static const struct of_device_id adxl345_of_match[] = { { .compatible = "adi,adxl345", .data = (const void *)ADXL345 }, { .compatible = "adi,adxl375", .data = (const void *)ADXL375 }, - { }, + { } }; MODULE_DEVICE_TABLE(of, adxl345_of_match); From patchwork Thu May 12 09:44:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1630057 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=SL29pKkO; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KzRjg5mPRz9sG2 for ; Thu, 12 May 2022 19:45:59 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1np5OK-0005v2-0t; Thu, 12 May 2022 09:45:52 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1np5O7-0005X4-0v for kernel-team@lists.ubuntu.com; Thu, 12 May 2022 09:45:39 +0000 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 3F8183F1AA for ; Thu, 12 May 2022 09:45:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652348738; bh=NPWn25kCQAfMdXOAHXeP2XxO95mWW6BnCMunIIilD1A=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SL29pKkOZLo2yjSkMmNjBdb2zWGdqEPSP4BrJRj6BgIe5ZyvQK4o5pOLXjk4XIlwG 4sXPVuJ/fCchhCQ9IRSe28GMh16JFtHB/iMX/7Tzgjif6lZ9/fSk1CX5iSZ1gygYJ3 uyKvn4clWiTz/E9W0t95T6zMrFzGHAaj/OqEWL1PHv7iwEw2Y1mvexTPq9om024x7B U5IzYzJnnZOAHaaOAFDDoaI5R4dL8Jl9HV5ZyRBF9pqy48L9ZRdf/5rSGM6yBAKKpZ 5OBUXcWD+i/6hIvYpeM58ffPJi++goCAJ8ewY0F/UKuKwjeQEY0BqsNPJ5NASouyQQ +TeVrGCsd3x9g== Received: by mail-pg1-f200.google.com with SMTP id h128-20020a636c86000000b003c574b3422aso2391239pgc.12 for ; Thu, 12 May 2022 02:45:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NPWn25kCQAfMdXOAHXeP2XxO95mWW6BnCMunIIilD1A=; b=1bkrmD5vG5GKKjIT2+dHUnvuqDAGaoKFVMwEYPiJ9z8oooZGzLNWxVPwQ499mEnk0h R0SRL7T6a+c+8m7XJov+jAt4YD1dgSWD/ZWF0wWtdtnFbl6C11T/+YH8gHl+a8D8rDCo 9xprdXBMCChiLWc67Nx7U+1izITtuXj6oaC7Ls162ELsN1yrKkFzIfMvZIV8VTaUgOeT 3Mo2bsGijsJhSqpEG0EPUNtfCrZaU8u3GO9ojeRJoEnmO6bgm+oO3uZh7fcp/+oy4gRt gNYitkeLEdMvx10ZttT2N3qVEnTSWueY+zAOFTAzzQxafzNFEsdRCuHmrjNwAEB6oB1v L6Zg== X-Gm-Message-State: AOAM532GW3yInsIjD49UPbpvWHg4PaoUEeCU5oSDEtKuMTLYk1YPeRuf +dGLi8luM/R3ZVpp/MKb3gj8l/rB68HI/4Q7osbUKft5D+LXiXktRECe4UEtQ6UnGMpJUvbpvD/ e2Ty+KyOdJSNVloSdbsWKV8PHR5gYrhAwnMd4juMmgA== X-Received: by 2002:a17:902:a707:b0:15b:6ea2:8ea2 with SMTP id w7-20020a170902a70700b0015b6ea28ea2mr28731278plq.134.1652348736773; Thu, 12 May 2022 02:45:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/hERfCDEsAnk5o/+CTeZ39AT0wzvlmn2w01IE7yIzaf2gj754x8eOK4qN7yrYqSyBV9TvNg== X-Received: by 2002:a17:902:a707:b0:15b:6ea2:8ea2 with SMTP id w7-20020a170902a70700b0015b6ea28ea2mr28731266plq.134.1652348736472; Thu, 12 May 2022 02:45:36 -0700 (PDT) Received: from localhost.localdomain (36-230-93-232.dynamic-ip.hinet.net. [36.230.93.232]) by smtp.gmail.com with ESMTPSA id 1-20020a630901000000b003c18e0768e3sm1458038pgj.78.2022.05.12.02.45.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 02:45:36 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH v2 08/10] iio: accel: adxl345: Remove unneeded blank lines Date: Thu, 12 May 2022 17:44:38 +0800 Message-Id: <20220512094440.15310-9-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220512094440.15310-1-jianhui.lee@canonical.com> References: <20220512094440.15310-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Andy Shevchenko BugLink: https://launchpad.net/bugs/1962674 Remove unneeded blank lines where they separate the data type definitions and the macros which are using them. Signed-off-by: Andy Shevchenko Tested-by: Kai-Heng Feng Link: https://lore.kernel.org/r/20220222090009.2060-8-andriy.shevchenko@linux.intel.com Signed-off-by: Jonathan Cameron (cherry picked from commit 4781f3e0e6cadf332f49f723ba820f35960a058d) Signed-off-by: Jian Hui Lee --- drivers/iio/accel/adxl345_i2c.c | 3 --- drivers/iio/accel/adxl345_spi.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/drivers/iio/accel/adxl345_i2c.c b/drivers/iio/accel/adxl345_i2c.c index c24f66690b6f..fc8b7576e81e 100644 --- a/drivers/iio/accel/adxl345_i2c.c +++ b/drivers/iio/accel/adxl345_i2c.c @@ -35,7 +35,6 @@ static const struct i2c_device_id adxl345_i2c_id[] = { { "adxl375", ADXL375 }, { } }; - MODULE_DEVICE_TABLE(i2c, adxl345_i2c_id); static const struct of_device_id adxl345_of_match[] = { @@ -43,7 +42,6 @@ static const struct of_device_id adxl345_of_match[] = { { .compatible = "adi,adxl375", .data = (const void *)ADXL375 }, { } }; - MODULE_DEVICE_TABLE(of, adxl345_of_match); static const struct acpi_device_id adxl345_acpi_match[] = { @@ -62,7 +60,6 @@ static struct i2c_driver adxl345_i2c_driver = { .probe_new = adxl345_i2c_probe, .id_table = adxl345_i2c_id, }; - module_i2c_driver(adxl345_i2c_driver); MODULE_AUTHOR("Eva Rachel Retuya "); diff --git a/drivers/iio/accel/adxl345_spi.c b/drivers/iio/accel/adxl345_spi.c index 899a8a000823..93bd169cbafe 100644 --- a/drivers/iio/accel/adxl345_spi.c +++ b/drivers/iio/accel/adxl345_spi.c @@ -41,7 +41,6 @@ static const struct spi_device_id adxl345_spi_id[] = { { "adxl375", ADXL375 }, { } }; - MODULE_DEVICE_TABLE(spi, adxl345_spi_id); static const struct of_device_id adxl345_of_match[] = { @@ -49,7 +48,6 @@ static const struct of_device_id adxl345_of_match[] = { { .compatible = "adi,adxl375", .data = (const void *)ADXL375 }, { } }; - MODULE_DEVICE_TABLE(of, adxl345_of_match); static const struct acpi_device_id adxl345_acpi_match[] = { @@ -67,7 +65,6 @@ static struct spi_driver adxl345_spi_driver = { .probe = adxl345_spi_probe, .id_table = adxl345_spi_id, }; - module_spi_driver(adxl345_spi_driver); MODULE_AUTHOR("Eva Rachel Retuya "); From patchwork Thu May 12 09:44:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1630058 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=vIBsZ4jJ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KzRjk1pDSz9sG2 for ; Thu, 12 May 2022 19:46:02 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1np5OL-0005ya-UO; Thu, 12 May 2022 09:45:53 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1np5OA-0005Zz-F7 for kernel-team@lists.ubuntu.com; Thu, 12 May 2022 09:45:42 +0000 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 66E853F21D for ; Thu, 12 May 2022 09:45:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652348739; bh=jJw+r4lI39sV79ePkrCzBJvm42jjbupPKLPVLDld9uA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vIBsZ4jJgYnKAgxInkc+47wQ+bC0Um4QtrJgVYUMkLNpCgrWF1NyMfDti3aCnN23J ipB4RCVJz0oxDSgsA0cXyJPirivPDdZRc74dxcaktVSHTRQYfhXepUiJPfxmHSp7gc mJ0AOr/sbLAY1fDvL5VJxExgndiB88oaqF/BTZUThh8JiNda8c3AjdF1PTH/K/rC3e 5DiHROeZ/MnvC2mCDhAmUjAoFcyOYdzLh3BdETBVW2vcElNR3ck4gL+5Zq4I6KO1hh Zz7hIKdHOlFFntHaRjoE753oKc6quN5a0dtHmhDXNXeUjISOpwfCwOkPGgs1ITgB60 9yN4+/MvKqs7A== Received: by mail-pf1-f200.google.com with SMTP id cw22-20020a056a00451600b0050e09a0c53aso2412017pfb.2 for ; Thu, 12 May 2022 02:45:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jJw+r4lI39sV79ePkrCzBJvm42jjbupPKLPVLDld9uA=; b=JHoaG4Tyd9MlnHE69gay28LNj5RzVPVuEOhvSgzujzt6US9NCPtrETXXnhuxfxmitN P5CHo4QF7aFvd3y++TDey8njpKUlgyrrm87kkl61EN8VWeJaMmOtxtHZwjUEZf7kA/hF HbDzSE8zm6iMbDqTIziZPd+0qsgDRStFNN+TOtJaqt9UwmPNcjyZ/wvXKLtgVnobm1Ba NF6IQVgYzCH7tyPrj7ZSY+26Of7fengGEi7Wfr1jDzDiQBllArKAI0OdXURcVtMsxb79 E98YJTj68id2Z+pI2KcKSH4GR3z7sndzJHn9MEhk9vwzp+Koq1pdOb4tC2jthWmaKy9A XTPQ== X-Gm-Message-State: AOAM5306LvO/LwbSX+urKMCeteKePiAzZYIxW29oLY8AG8yHng8UNJJj nCD9KroCkCi1kAq6H1Gv/faOm2XwFY4j/JH++r8Th9gFjr2QKiGs9VAhcF6Qz8KfBIMYY19s3yj ZVfO663Zpjl1u1MhGRAOob8SWEAWS406eaPkZWnzydA== X-Received: by 2002:a17:902:9684:b0:158:b28c:41e0 with SMTP id n4-20020a170902968400b00158b28c41e0mr30061687plp.85.1652348738153; Thu, 12 May 2022 02:45:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxEbDWsjZzycwNT5AFIgXvMfoo5slycJSpk5RlMcCuPLrGQ9fVdh9fb1eWEs1gbwb8aGaQtuA== X-Received: by 2002:a17:902:9684:b0:158:b28c:41e0 with SMTP id n4-20020a170902968400b00158b28c41e0mr30061667plp.85.1652348737900; Thu, 12 May 2022 02:45:37 -0700 (PDT) Received: from localhost.localdomain (36-230-93-232.dynamic-ip.hinet.net. [36.230.93.232]) by smtp.gmail.com with ESMTPSA id 1-20020a630901000000b003c18e0768e3sm1458038pgj.78.2022.05.12.02.45.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 02:45:37 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH v2 09/10] iio: humidity: hdc100x: Add ACPI HID table Date: Thu, 12 May 2022 17:44:39 +0800 Message-Id: <20220512094440.15310-10-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220512094440.15310-1-jianhui.lee@canonical.com> References: <20220512094440.15310-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Kai-Heng Feng BugLink: https://launchpad.net/bugs/1962674 x86 boards may use ACPI HID "TXNW1010" for the hdc100x device. TI told us "The ACPI ID for TI is: https://uefi.org/node/1028 (TXNW), therefore it would most likely be appropriate to use TXNW1010." So add an ACPI match table for that accordingly. Signed-off-by: Kai-Heng Feng Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20220128042054.2062060-1-kai.heng.feng@canonical.com Signed-off-by: Jonathan Cameron (cherry picked from commit 711b6a3f4af137c4a7f759136ccd50d455095b95) Signed-off-by: Jian Hui Lee --- drivers/iio/humidity/hdc100x.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/iio/humidity/hdc100x.c b/drivers/iio/humidity/hdc100x.c index 9e0fce917ce4..47f8e8ef56d6 100644 --- a/drivers/iio/humidity/hdc100x.c +++ b/drivers/iio/humidity/hdc100x.c @@ -417,10 +417,17 @@ static const struct of_device_id hdc100x_dt_ids[] = { }; MODULE_DEVICE_TABLE(of, hdc100x_dt_ids); +static const struct acpi_device_id hdc100x_acpi_match[] = { + { "TXNW1010" }, + { } +}; +MODULE_DEVICE_TABLE(acpi, hdc100x_acpi_match); + static struct i2c_driver hdc100x_driver = { .driver = { .name = "hdc100x", .of_match_table = hdc100x_dt_ids, + .acpi_match_table = hdc100x_acpi_match, }, .probe = hdc100x_probe, .id_table = hdc100x_id, From patchwork Thu May 12 09:44:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1630059 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=pvf25w9k; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KzRjl3LZnz9sG2 for ; Thu, 12 May 2022 19:46:03 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1np5ON-00062R-LC; Thu, 12 May 2022 09:45:55 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1np5OB-0005cv-7N for kernel-team@lists.ubuntu.com; Thu, 12 May 2022 09:45:43 +0000 Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 05AED3F32E for ; Thu, 12 May 2022 09:45:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652348741; bh=JV+XKGGQMLwF//maWEaXuYj2J5HqKKmnqJegq7RnoBY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pvf25w9kY2s+273wqiQ5y7IiUCAAQZggPGbbQCWl66xQRJwu4GYyYVRfgoXkQOFwP nQXAMZ2Tnm8D4TmI2gqG9ETpFmcSQeX+Qa2HtnwVM8MQMhSAmS8Ippi/QycsazXVoi mSa7b3OkNUZSrXJvlKVUv3KbKjhv5bQ172t9lEZKTuyNadeOiUOt9042M7y7lqB5bs 2FSGfTEFkF5sIe1w3aI6IKt83Cz2jczjCaWAAggsWOrn/xbbfcIuE+B6lDTCDXnCSS u2O6UjHK9PJBjZIB3GBdPJIaPmJ9dQBAuRWwNHDak1xUuwYnBmDkF9mpbTE1FagAlI WDqtXd1dnTQUQ== Received: by mail-pg1-f198.google.com with SMTP id s68-20020a637747000000b003aaff19b95bso2394736pgc.1 for ; Thu, 12 May 2022 02:45:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JV+XKGGQMLwF//maWEaXuYj2J5HqKKmnqJegq7RnoBY=; b=DzprGoXpZ+3iZNRzlUEWtAXYy6WDW3qR5S6tGgiKqkK+bxx2jnlc2Z3m3dAwKwFhck 65x6pAg+iPwe0lQbcHoBNSSePDrlsFSuDV+wpXPwcWaCTe80pGJlkApJXCX2gEjAudnv UVXpr7s3fzS6F+SBLJWKcj13UPzAqrDDDrFrR3mjQuVz5SvkMQ/MOoNc+c8IS2he5i2e WwkJsVhswbe+yukTfRGCVYGM59imZ3l7lcyw5gyVAl0dSIdQNsZQ4pvfmzxg+nk8rNOE FyLXA02NfjFCnDgnzlK7Wsun38WoFsHEluD7ty7nVEn3sUigCyZUZcJrioDKRIv+EXZL AoiQ== X-Gm-Message-State: AOAM530AAivZOI4cjfpmrs0Nqra+gttBx5tpkvjl1FtZo5iwpXQu2CB7 tSmhtq16Z1ilFJyUfTzTrsH7M666IhfwKvyxMaYbrxaHFFUhJY6xpG7NspmX5BEt7dMx54JZK31 O9JTul+98Po63dmBqG2rb6Xz4GfDd4xB17tnJogr0CQ== X-Received: by 2002:a17:902:e746:b0:15e:b4f3:72e7 with SMTP id p6-20020a170902e74600b0015eb4f372e7mr29418387plf.8.1652348739745; Thu, 12 May 2022 02:45:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeLvsc78D0JUY/Oc7hP4KKgRyurZZMczUcEkQNIRqFxcUCp9iN8M7JWrpIAfueUNCcOMMUAA== X-Received: by 2002:a17:902:e746:b0:15e:b4f3:72e7 with SMTP id p6-20020a170902e74600b0015eb4f372e7mr29418367plf.8.1652348739507; Thu, 12 May 2022 02:45:39 -0700 (PDT) Received: from localhost.localdomain (36-230-93-232.dynamic-ip.hinet.net. [36.230.93.232]) by smtp.gmail.com with ESMTPSA id 1-20020a630901000000b003c18e0768e3sm1458038pgj.78.2022.05.12.02.45.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 02:45:39 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH v2 10/10] iio: pressure: dps310: Add ACPI HID table Date: Thu, 12 May 2022 17:44:40 +0800 Message-Id: <20220512094440.15310-11-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220512094440.15310-1-jianhui.lee@canonical.com> References: <20220512094440.15310-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Kai-Heng Feng BugLink: https://launchpad.net/bugs/1962674 x86 boards may use ACPI HID "IFX3100" for the dps310 device. Vendor told us feel free to add the ID and contact "Saumitra.Chafekar@infineon.com" for further questions. So add an ACPI match table for that accordingly. Reviewed-by: Andy Shevchenko Signed-off-by: Kai-Heng Feng Link: https://lore.kernel.org/r/20220128023144.2050615-1-kai.heng.feng@canonical.com Signed-off-by: Jonathan Cameron (cherry picked from commit 72ff282819d0526d3e4417c2a61414557981b5af) Signed-off-by: Jian Hui Lee --- drivers/iio/pressure/dps310.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/iio/pressure/dps310.c b/drivers/iio/pressure/dps310.c index 0730380ceb69..36fb7ae0d0a9 100644 --- a/drivers/iio/pressure/dps310.c +++ b/drivers/iio/pressure/dps310.c @@ -812,9 +812,16 @@ static const struct i2c_device_id dps310_id[] = { }; MODULE_DEVICE_TABLE(i2c, dps310_id); +static const struct acpi_device_id dps310_acpi_match[] = { + { "IFX3100" }, + {} +}; +MODULE_DEVICE_TABLE(acpi, dps310_acpi_match); + static struct i2c_driver dps310_driver = { .driver = { .name = DPS310_DEV_NAME, + .acpi_match_table = dps310_acpi_match, }, .probe = dps310_probe, .id_table = dps310_id,