Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1579193
| Path | csiph.com!feeder.erje.net!2.eu.feeder.erje.net!newsfeed.fsmpi.rwth-aachen.de!newsfeed.straub-nv.de!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Brian Masney <masneyb@onstation.org> |
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 2/2] staging: iio: isl29028: move out of staging |
| Date | Sun, 12 Feb 2017 12:00:02 +0100 |
| Message-ID | <ta02S-5ge-9@gated-at.bofh.it> (permalink) |
| References | <ta02S-5ge-5@gated-at.bofh.it> |
| Dkim-Signature | v=1; a=rsa-sha256; c=simple/simple; d=onstation.org; s=default; t=1486896938; bh=pw36tHizgZ79y5uGjG/kagNmJ4lvplBV8F0AgG3vDFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sfsJF+k3R/fV6WTpNUJU6sbIZHc1D4xxpGXuJEenvrhem0GWcJxiHStf+MxSxLS1B waM1ibtbQ243sUYYE0U4xs0X0jf6qYIs6QzPjSi2/biBmXxtNLZhgGMAred3OCpljv 1l+FnIEIH1g2Mc2/btP0vt6N1nLtS5/T5VJiNMq8= |
| X-Mailer | git-send-email 2.9.3 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 82 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | gregkh@linuxfoundation.org, devel@driverdev.osuosl.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, linux-kernel@vger.kernel.org, ldewangan@nvidia.com |
| X-Original-Date | Sun, 12 Feb 2017 05:55:34 -0500 |
| X-Original-Message-ID | <20170212105534.5648-3-masneyb@onstation.org> |
| X-Original-References | <20170212105534.5648-1-masneyb@onstation.org> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1579193 |
Show key headers only | View raw
Move ISL29028 ALS / Proximity Sensor out of staging and into mainline.
Signed-off-by: Brian Masney <masneyb@onstation.org>
---
drivers/iio/light/Kconfig | 10 ++++++++++
drivers/iio/light/Makefile | 1 +
drivers/{staging => }/iio/light/isl29028.c | 0
drivers/staging/iio/light/Kconfig | 10 ----------
drivers/staging/iio/light/Makefile | 1 -
5 files changed, 11 insertions(+), 11 deletions(-)
rename drivers/{staging => }/iio/light/isl29028.c (100%)
diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
index 2afcbac..8b8c9e2 100644
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -172,6 +172,16 @@ config SENSORS_ISL29018
in lux, proximity infrared sensing and normal infrared sensing.
Data from sensor is accessible via sysfs.
+config SENSORS_ISL29028
+ tristate "Intersil ISL29028 Concurrent Light and Proximity Sensor"
+ depends on I2C
+ select REGMAP_I2C
+ help
+ Provides driver for the Intersil's ISL29028 device.
+ This driver supports the sysfs interface to get the ALS, IR intensity,
+ Proximity value via iio. The ISL29028 provides the concurrent sensing
+ of ambient light and proximity.
+
config ISL29125
tristate "Intersil ISL29125 digital color light sensor"
depends on I2C
diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile
index edfd69b..2e730af 100644
--- a/drivers/iio/light/Makefile
+++ b/drivers/iio/light/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_GP2AP020A00F) += gp2ap020a00f.o
obj-$(CONFIG_HID_SENSOR_ALS) += hid-sensor-als.o
obj-$(CONFIG_HID_SENSOR_PROX) += hid-sensor-prox.o
obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o
+obj-$(CONFIG_SENSORS_ISL29028) += isl29028.o
obj-$(CONFIG_ISL29125) += isl29125.o
obj-$(CONFIG_JSA1212) += jsa1212.o
obj-$(CONFIG_SENSORS_LM3533) += lm3533-als.o
diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/iio/light/isl29028.c
similarity index 100%
rename from drivers/staging/iio/light/isl29028.c
rename to drivers/iio/light/isl29028.c
diff --git a/drivers/staging/iio/light/Kconfig b/drivers/staging/iio/light/Kconfig
index 4fbf629..aacb0ae 100644
--- a/drivers/staging/iio/light/Kconfig
+++ b/drivers/staging/iio/light/Kconfig
@@ -3,16 +3,6 @@
#
menu "Light sensors"
-config SENSORS_ISL29028
- tristate "Intersil ISL29028 Concurrent Light and Proximity Sensor"
- depends on I2C
- select REGMAP_I2C
- help
- Provides driver for the Intersil's ISL29028 device.
- This driver supports the sysfs interface to get the ALS, IR intensity,
- Proximity value via iio. The ISL29028 provides the concurrent sensing
- of ambient light and proximity.
-
config TSL2x7x
tristate "TAOS TSL/TMD2x71 and TSL/TMD2x72 Family of light and proximity sensors"
depends on I2C
diff --git a/drivers/staging/iio/light/Makefile b/drivers/staging/iio/light/Makefile
index f8693e9..10286c3 100644
--- a/drivers/staging/iio/light/Makefile
+++ b/drivers/staging/iio/light/Makefile
@@ -2,5 +2,4 @@
# Makefile for industrial I/O Light sensors
#
-obj-$(CONFIG_SENSORS_ISL29028) += isl29028.o
obj-$(CONFIG_TSL2x7x) += tsl2x7x_core.o
--
2.9.3
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 0/2] staging: iio: isl29028: move out of staging Brian Masney <masneyb@onstation.org> - 2017-02-12 12:00 +0100
[PATCH v2 2/2] staging: iio: isl29028: move out of staging Brian Masney <masneyb@onstation.org> - 2017-02-12 12:00 +0100
Re: [PATCH v2 2/2] staging: iio: isl29028: move out of staging Brian Masney <masneyb@onstation.org> - 2017-02-12 12:10 +0100
[PATCH v2 1/2] staging: iio: isl29028: change sampling frequencies available to use decimals Brian Masney <masneyb@onstation.org> - 2017-02-12 12:00 +0100
csiph-web