misc: retire the old BMP085 driver (832c8232) · Commits · 戴 / test

Documentation/ABI/testing/sysfs-i2c-bmp085

deleted100644 → 0

+0 −31

Original line number	Diff line number	Diff line
		What: /sys/bus/i2c/devices/<busnum>-<devaddr>/pressure0_input
		Date: June 2010
		Contact: Christoph Mair <christoph.mair@gmail.com>
		Description: Start a pressure measurement and read the result. Values
		represent the ambient air pressure in pascal (0.01 millibar).

		Reading: returns the current air pressure.


		What: /sys/bus/i2c/devices/<busnum>-<devaddr>/temp0_input
		Date: June 2010
		Contact: Christoph Mair <christoph.mair@gmail.com>
		Description: Measure the ambient temperature. The returned value represents
		the ambient temperature in units of 0.1 degree celsius.

		Reading: returns the current temperature.


		What: /sys/bus/i2c/devices/<busnum>-<devaddr>/oversampling
		Date: June 2010
		Contact: Christoph Mair <christoph.mair@gmail.com>
		Description: Tell the bmp085 to use more samples to calculate a pressure
		value. When writing to this file the chip will use 2^x samples
		to calculate the next pressure value with x being the value
		written. Using this feature will decrease RMS noise and
		increase the measurement time.

		Reading: returns the current oversampling setting.

		Writing: sets a new oversampling setting.
		Accepted values: 0..3.

drivers/iio/pressure/Kconfig

+0 −2

Original line number	Diff line number	Diff line
		@@ -8,8 +8,6 @@ menu "Pressure sensors"
		config BMP280
		tristate "Bosch Sensortec BMP180/BMP280 pressure sensor I2C driver"
		depends on (I2C \|\| SPI_MASTER)
		depends on !(BMP085_I2C=y \|\| BMP085_I2C=m)
		depends on !(BMP085_SPI=y \|\| BMP085_SPI=m)
		select REGMAP
		select BMP280_I2C if (I2C)
		select BMP280_SPI if (SPI_MASTER)

drivers/misc/Kconfig

+0 −28

Original line number	Diff line number	Diff line
		@@ -439,34 +439,6 @@ config ARM_CHARLCD
		line and the Linux version on the second line, but that's
		still useful.

		config BMP085
		tristate
		depends on SYSFS

		config BMP085_I2C
		tristate "BMP085 digital pressure sensor on I2C"
		select BMP085
		select REGMAP_I2C
		depends on I2C && SYSFS
		help
		Say Y here if you want to support Bosch Sensortec's digital pressure
		sensor hooked to an I2C bus.

		To compile this driver as a module, choose M here: the
		module will be called bmp085-i2c.

		config BMP085_SPI
		tristate "BMP085 digital pressure sensor on SPI"
		select BMP085
		select REGMAP_SPI
		depends on SPI_MASTER && SYSFS
		help
		Say Y here if you want to support Bosch Sensortec's digital pressure
		sensor hooked to an SPI bus.

		To compile this driver as a module, choose M here: the
		module will be called bmp085-spi.

		config PCH_PHUB
		tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) PHUB"
		select GENERIC_NET_UTILS

drivers/misc/Makefile

+0 −3

Original line number	Diff line number	Diff line
		@@ -9,9 +9,6 @@ obj-$(CONFIG_AD525X_DPOT_SPI) += ad525x_dpot-spi.o
		obj-$(CONFIG_INTEL_MID_PTI) += pti.o
		obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o
		obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib.o
		obj-$(CONFIG_BMP085) += bmp085.o
		obj-$(CONFIG_BMP085_I2C) += bmp085-i2c.o
		obj-$(CONFIG_BMP085_SPI) += bmp085-spi.o
		obj-$(CONFIG_DUMMY_IRQ) += dummy-irq.o
		obj-$(CONFIG_ICS932S401) += ics932s401.o
		obj-$(CONFIG_LKDTM) += lkdtm.o

drivers/misc/bmp085-i2c.c

deleted100644 → 0

+0 −83

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012 Bosch Sensortec GmbH
		* Copyright (c) 2012 Unixphere AB
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
		*/

		#include <linux/module.h>
		#include <linux/i2c.h>
		#include <linux/err.h>
		#include "bmp085.h"

		#define BMP085_I2C_ADDRESS 0x77

		static const unsigned short normal_i2c[] = { BMP085_I2C_ADDRESS,
		I2C_CLIENT_END };

		static int bmp085_i2c_detect(struct i2c_client *client,
		struct i2c_board_info *info)
		{
		if (client->addr != BMP085_I2C_ADDRESS)
		return -ENODEV;

		return bmp085_detect(&client->dev);
		}

		static int bmp085_i2c_probe(struct i2c_client *client,
		const struct i2c_device_id *id)
		{
		int err;
		struct regmap *regmap = devm_regmap_init_i2c(client,
		&bmp085_regmap_config);

		if (IS_ERR(regmap)) {
		err = PTR_ERR(regmap);
		dev_err(&client->dev, "Failed to init regmap: %d\n", err);
		return err;
		}

		return bmp085_probe(&client->dev, regmap, client->irq);
		}

		static int bmp085_i2c_remove(struct i2c_client *client)
		{
		return bmp085_remove(&client->dev);
		}

		static const struct i2c_device_id bmp085_id[] = {
		{ BMP085_NAME, 0 },
		{ "bmp180", 0 },
		{ }
		};
		MODULE_DEVICE_TABLE(i2c, bmp085_id);

		static struct i2c_driver bmp085_i2c_driver = {
		.driver = {
		.name = BMP085_NAME,
		},
		.id_table = bmp085_id,
		.probe = bmp085_i2c_probe,
		.remove = bmp085_i2c_remove,

		.detect = bmp085_i2c_detect,
		.address_list = normal_i2c
		};

		module_i2c_driver(bmp085_i2c_driver);

		MODULE_AUTHOR("Eric Andersson <eric.andersson@unixphere.com>");
		MODULE_DESCRIPTION("BMP085 I2C bus driver");
		MODULE_LICENSE("GPL");

Admin message