From patchwork Sun Mar 18 13:37:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Veenstra X-Patchwork-Id: 10291175 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 47C26600F6 for ; Sun, 18 Mar 2018 13:37:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3583628E11 for ; Sun, 18 Mar 2018 13:37:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 288D02900F; Sun, 18 Mar 2018 13:37:28 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham 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 99AE828E11 for ; Sun, 18 Mar 2018 13:37:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752372AbeCRNh0 (ORCPT ); Sun, 18 Mar 2018 09:37:26 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:51272 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753790AbeCRNh0 (ORCPT ); Sun, 18 Mar 2018 09:37:26 -0400 Received: by mail-wm0-f68.google.com with SMTP id h21so10724549wmd.1 for ; Sun, 18 Mar 2018 06:37:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=ejUIOpxQOKSr3NGwGzpoVPHnQAZ8rlWjlep/+cCTWk4=; b=Wum/DLlxUWvDldBTSCftZwvF6696amzXkJcDoEcCr+SXDwlG6yB20AFLs97maB7agy C01sMk3a04MPlHzQW2p4ctcuehQprgzbKTN6jaHE5D7Wfl7r2Sig/W/z0O+F1wf6uBj4 1pCfsdQjWAHRHyBQ6+J8lyxGdJ3GhuT1dTHdNAX+nqftm2ycCHcy2oulUW2OXXU8T3BH n6sdLz/LDoKscF2T1h9ERMvE9xgl6f2AYcxs9F+WLAf6kVdQGnvt54yqevOFHEseOMYd EQal5kNhlICFDqHd4pmgDLe79HfaO1aK6zKMlagdrDQR5oBnITwyOkzxxfFUAMBSFRTX Yk4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=ejUIOpxQOKSr3NGwGzpoVPHnQAZ8rlWjlep/+cCTWk4=; b=InwmV0xSFTPMB3mE2imzDdBcN7e3JgX7tG0trFuvnXLb0Vr1nOg+Tv3y5Aw448/tyf hOhRRSZlIVkyfnAmFdiOzenM7Cff2vSzFctIC/Pi/HbU64fINQIAbPe+v1Un0WEDbM08 sjfstZ6oRoQZM7JGuLyLxY0QCVcaHGEhYUcizLGchRfkHRRR9RJR2Qykxy8g8tedrACX qQXhmi5d5qWHCnkuyl137u8IpS6nu/tYIuNe6es/+16RWtmI3ixG6yFOsIgnWlCP9oaE dZzXpSATLFT0ObPyc/SjJr5qbzMiynDowNbELdoA5ZaxVuLqMoBPJ57VXpNiU1iZlfbH t3Lg== X-Gm-Message-State: AElRT7Em3S1gaGxg/CV9UPbQWrY2VT++1S9C6kF1z7Hk9R9t6TyTv3Oi /4f1XPxX7e66OEZ6dGPVItElwdlr X-Google-Smtp-Source: AG47ELuaRXzy5fEPjpDLqCmwrzrAHKAhidC3bLDovAYfllZTBGb0cgvOmBgBALI6AVJkVzQNm2CULQ== X-Received: by 10.80.226.5 with SMTP id n5mr9968869edl.264.1521380244710; Sun, 18 Mar 2018 06:37:24 -0700 (PDT) Received: from zenbook-arch (s559434a1.adsl.online.nl. [85.148.52.161]) by smtp.gmail.com with ESMTPSA id j90sm6246021edb.37.2018.03.18.06.37.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 18 Mar 2018 06:37:24 -0700 (PDT) Date: Sun, 18 Mar 2018 14:37:22 +0100 From: David Veenstra To: lars@metafoo.de, jic23@kernel.org Cc: Michael.Hennerich@analog.com, knaack.h@gmx.de, linux-iio@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH 11/11] Move resolver ad2c1200 driver out of staging to mainline iio Message-ID: <58a756a65d15d9d7e9032476c963e6aaea238cf9.1521379685.git.davidjulianveenstra@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) 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 Signed-off-by: David Veenstra --- drivers/iio/Kconfig | 1 + drivers/iio/Makefile | 1 + drivers/iio/resolver/Kconfig | 17 +++++++++++++++++ drivers/iio/resolver/Makefile | 5 +++++ drivers/{staging => }/iio/resolver/ad2s1200.c | 0 drivers/staging/iio/resolver/Kconfig | 12 ------------ drivers/staging/iio/resolver/Makefile | 1 - 7 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 drivers/iio/resolver/Kconfig create mode 100644 drivers/iio/resolver/Makefile rename drivers/{staging => }/iio/resolver/ad2s1200.c (100%) diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig index b3c8c6ef0dff..4bec3ccbf4a1 100644 --- a/drivers/iio/Kconfig +++ b/drivers/iio/Kconfig @@ -92,6 +92,7 @@ source "drivers/iio/potentiometer/Kconfig" source "drivers/iio/potentiostat/Kconfig" source "drivers/iio/pressure/Kconfig" source "drivers/iio/proximity/Kconfig" +source "drivers/iio/resolver/Kconfig" source "drivers/iio/temperature/Kconfig" endif # IIO diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile index b16b2e9ddc40..1865361b8714 100644 --- a/drivers/iio/Makefile +++ b/drivers/iio/Makefile @@ -35,5 +35,6 @@ obj-y += potentiometer/ obj-y += potentiostat/ obj-y += pressure/ obj-y += proximity/ +obj-y += resolver/ obj-y += temperature/ obj-y += trigger/ diff --git a/drivers/iio/resolver/Kconfig b/drivers/iio/resolver/Kconfig new file mode 100644 index 000000000000..2ced9f22aa70 --- /dev/null +++ b/drivers/iio/resolver/Kconfig @@ -0,0 +1,17 @@ +# +# Resolver/Synchro drivers +# +menu "Resolver to digital converters" + +config AD2S1200 + tristate "Analog Devices ad2s1200/ad2s1205 driver" + depends on SPI + depends on GPIOLIB || COMPILE_TEST + help + Say yes here to build support for Analog Devices spi resolver + to digital converters, ad2s1200 and ad2s1205, provides direct access + via sysfs. + + To compile this driver as a module, choose M here: the + module will be called ad2s1200. +endmenu diff --git a/drivers/iio/resolver/Makefile b/drivers/iio/resolver/Makefile new file mode 100644 index 000000000000..4e1dccae07e7 --- /dev/null +++ b/drivers/iio/resolver/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for Resolver/Synchro drivers +# + +obj-$(CONFIG_AD2S1200) += ad2s1200.o diff --git a/drivers/staging/iio/resolver/ad2s1200.c b/drivers/iio/resolver/ad2s1200.c similarity index 100% rename from drivers/staging/iio/resolver/ad2s1200.c rename to drivers/iio/resolver/ad2s1200.c diff --git a/drivers/staging/iio/resolver/Kconfig b/drivers/staging/iio/resolver/Kconfig index 1c7e2860d6b7..6a469ee6101f 100644 --- a/drivers/staging/iio/resolver/Kconfig +++ b/drivers/staging/iio/resolver/Kconfig @@ -13,18 +13,6 @@ config AD2S90 To compile this driver as a module, choose M here: the module will be called ad2s90. -config AD2S1200 - tristate "Analog Devices ad2s1200/ad2s1205 driver" - depends on SPI - depends on GPIOLIB || COMPILE_TEST - help - Say yes here to build support for Analog Devices spi resolver - to digital converters, ad2s1200 and ad2s1205, provides direct access - via sysfs. - - To compile this driver as a module, choose M here: the - module will be called ad2s1200. - config AD2S1210 tristate "Analog Devices ad2s1210 driver" depends on SPI diff --git a/drivers/staging/iio/resolver/Makefile b/drivers/staging/iio/resolver/Makefile index 14375e444ebf..8d901dc7500b 100644 --- a/drivers/staging/iio/resolver/Makefile +++ b/drivers/staging/iio/resolver/Makefile @@ -3,5 +3,4 @@ # obj-$(CONFIG_AD2S90) += ad2s90.o -obj-$(CONFIG_AD2S1200) += ad2s1200.o obj-$(CONFIG_AD2S1210) += ad2s1210.o