From patchwork Wed Mar 21 14:28:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Hern=C3=A1n_Gonzalez?= X-Patchwork-Id: 10299549 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 369CF60385 for ; Wed, 21 Mar 2018 14:31:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A14A2986C for ; Wed, 21 Mar 2018 14:31:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E55A29890; Wed, 21 Mar 2018 14:31:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13B4329892 for ; Wed, 21 Mar 2018 14:31:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752458AbeCUOao (ORCPT ); Wed, 21 Mar 2018 10:30:44 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:43979 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752530AbeCUOak (ORCPT ); Wed, 21 Mar 2018 10:30:40 -0400 Received: by mail-qt0-f193.google.com with SMTP id s48so5430198qtb.10 for ; Wed, 21 Mar 2018 07:30:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vanguardiasur-com-ar.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=XvgSozR9Dn+BKymzumz+sBjK49cIKNvt4Qf1ZGeCOro=; b=Wqr2ok2WYH5LL7sARBOvZ1wtKkN8OzjI1r/7xhZXVfGp8MjhIcSyVOIdbJkVC4xDqe XLpvqJpDImD6y+C7eJ616QGrKzLQ/LsM78Yl5xFbsTLYjNW2P5cYjw4gSeYK89IZXBC9 95htVQWm7f+KefidlNWlpo9mpYaAh7C92KBEh0kX34/XUzk8pxq2wnpZPOddF3e0TJNf 8jU9IOKzMOyzyIsJrv3CTf1SsZSRxoavF3LAF5UfRi1WONzaOPIh+I2lDyE5fJOI0PKF 2grgvtqteeyj+jPyhOJ3Y5/BDONohF8qC9LfTGoaeFZ3JAFu31Xv90Cf4Jh6QMXAdwWh LFLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XvgSozR9Dn+BKymzumz+sBjK49cIKNvt4Qf1ZGeCOro=; b=ZG/elaXQTvDdmeVlqEXX6QXkGExQAKUpQzv7Lcm6QWguXTfznwwGWlahcY5oFQZWSl FXCDYIk8DrZRUx77BsAX0wQcEgS+zQJYy4dCyoT8+2AQswo7DNS/J0Vf2GMka+v1H+hV Q1uhTZAIcmdvQ5qMrZUthIm1ctP+OYl58c8XnCA041geaAXJUEGbRI4FmsKiByHsPXPG nuWjVBeCmtJhNyVJrmPN0us8KPu4XFpV3A5ygyh77mwPKLWUeBfQB66Xwhivkxx30pRJ W65+FPRd8EUE2RSzXk+yWT0hMAK43qQjUkVsLzmOSS4Q17GVOlpYlLU3s09t5ojiB2Gr 14BA== X-Gm-Message-State: AElRT7G5gkI/LPtE52fflZu4q16SQ7iT2mKbvk8hZSFOn/Dvmrqx1+Xv cuZcTnt31BPJvKrEw76vpPJEWHhI X-Google-Smtp-Source: AG47ELvbWk+IrHh5jig/y0pyZKnum5lEQG/Ycs/AHOl+INqDSHRXYCkdFu/hN9U8oRM9JUirrnTbuQ== X-Received: by 10.200.47.26 with SMTP id j26mr29821417qta.185.1521642639413; Wed, 21 Mar 2018 07:30:39 -0700 (PDT) Received: from localhost.localdomain ([190.210.56.45]) by smtp.gmail.com with ESMTPSA id g14sm3118592qtk.71.2018.03.21.07.30.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Mar 2018 07:30:38 -0700 (PDT) From: =?UTF-8?q?Hern=C3=A1n=20Gonzalez?= To: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, knaack.h@gmx.de, pmeerw@pmeerw.net, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, hernan@vanguardiasur.com.ar Subject: [PATCH 11/11] Move cdc ad7746 driver out of staging to mainline iio Date: Wed, 21 Mar 2018 11:28:59 -0300 Message-Id: <1521642539-4845-12-git-send-email-hernan@vanguardiasur.com.ar> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521642539-4845-1-git-send-email-hernan@vanguardiasur.com.ar> References: <1521642539-4845-1-git-send-email-hernan@vanguardiasur.com.ar> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Also modify the proper Kconfigs and move documentation. Signed-off-by: Hernán Gonzalez --- .../devicetree/bindings/{staging => }/iio/cdc/ad7746.txt | 0 drivers/iio/Kconfig | 1 + drivers/iio/cdc/Kconfig | 16 ++++++++++++++++ drivers/{staging => }/iio/cdc/ad7746.c | 2 +- drivers/staging/iio/cdc/Kconfig | 10 ---------- {drivers/staging => include/linux}/iio/cdc/ad7746.h | 4 ---- 6 files changed, 18 insertions(+), 15 deletions(-) rename Documentation/devicetree/bindings/{staging => }/iio/cdc/ad7746.txt (100%) create mode 100644 drivers/iio/cdc/Kconfig rename drivers/{staging => }/iio/cdc/ad7746.c (99%) rename {drivers/staging => include/linux}/iio/cdc/ad7746.h (88%) diff --git a/Documentation/devicetree/bindings/staging/iio/cdc/ad7746.txt b/Documentation/devicetree/bindings/iio/cdc/ad7746.txt similarity index 100% rename from Documentation/devicetree/bindings/staging/iio/cdc/ad7746.txt rename to Documentation/devicetree/bindings/iio/cdc/ad7746.txt diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig index b3c8c6e..d1c309b 100644 --- a/drivers/iio/Kconfig +++ b/drivers/iio/Kconfig @@ -71,6 +71,7 @@ config IIO_TRIGGERED_EVENT source "drivers/iio/accel/Kconfig" source "drivers/iio/adc/Kconfig" source "drivers/iio/amplifiers/Kconfig" +source "drivers/iio/cdc/Kconfig" source "drivers/iio/chemical/Kconfig" source "drivers/iio/common/Kconfig" source "drivers/iio/counter/Kconfig" diff --git a/drivers/iio/cdc/Kconfig b/drivers/iio/cdc/Kconfig new file mode 100644 index 0000000..d3a8600 --- /dev/null +++ b/drivers/iio/cdc/Kconfig @@ -0,0 +1,16 @@ +# +# CDC drivers +# +menu "Capacitance to digital converters" + +config AD7746 + tristate "Analog Devices AD7745, AD7746 AD7747 capacitive sensor driver" + depends on I2C + help + Say yes here to build support for Analog Devices capacitive sensors. + (AD7745, AD7746, AD7747) Provides direct access via sysfs. + + To compile this driver as a module, choose M here: the + module will be called ad7746. + +endmenu diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/iio/cdc/ad7746.c similarity index 99% rename from drivers/staging/iio/cdc/ad7746.c rename to drivers/iio/cdc/ad7746.c index c1f76fc..23c9f61 100644 --- a/drivers/staging/iio/cdc/ad7746.c +++ b/drivers/iio/cdc/ad7746.c @@ -18,8 +18,8 @@ #include #include +#include -#include "ad7746.h" /* * AD7746 Register Definition diff --git a/drivers/staging/iio/cdc/Kconfig b/drivers/staging/iio/cdc/Kconfig index 80211df..a170ab3 100644 --- a/drivers/staging/iio/cdc/Kconfig +++ b/drivers/staging/iio/cdc/Kconfig @@ -23,14 +23,4 @@ config AD7152 To compile this driver as a module, choose M here: the module will be called ad7152. -config AD7746 - tristate "Analog Devices AD7745, AD7746 AD7747 capacitive sensor driver" - depends on I2C - help - Say yes here to build support for Analog Devices capacitive sensors. - (AD7745, AD7746, AD7747) Provides direct access via sysfs. - - To compile this driver as a module, choose M here: the - module will be called ad7746. - endmenu diff --git a/drivers/staging/iio/cdc/ad7746.h b/include/linux/iio/cdc/ad7746.h similarity index 88% rename from drivers/staging/iio/cdc/ad7746.h rename to include/linux/iio/cdc/ad7746.h index 2fbcee8..46ff25e 100644 --- a/drivers/staging/iio/cdc/ad7746.h +++ b/include/linux/iio/cdc/ad7746.h @@ -9,10 +9,6 @@ #ifndef IIO_CDC_AD7746_H_ #define IIO_CDC_AD7746_H_ -/* - * TODO: struct ad7746_platform_data needs to go into include/linux/iio - */ - struct ad7746_platform_data { unsigned char exclvl; /*Excitation Voltage Level */ bool exca_en; /* enables EXCA pin as the excitation output */