aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kepplinger <martink@posteo.de>2016-06-03 08:51:52 -0400
committerJonathan Cameron <jic23@kernel.org>2016-06-11 12:25:18 -0400
commitf26ab1aad53bdc2c2fedb506fc2e1d2333a8680b (patch)
tree6d9d684585a6945158474f1784768fb6cb9769e1
parent16df666a99b9518980d0b6be3c3ffdcce6b28bf1 (diff)
iio: mma8452: update Freescale company information
NXP took over Freescale, so add NXP to the driver descriptions Signed-off-by: Martin Kepplinger <martink@posteo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r--drivers/iio/accel/Kconfig4
-rw-r--r--drivers/iio/accel/mma8452.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index 31325870a9ef..89d78208de3f 100644
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -157,12 +157,12 @@ config MMA7660
157 will be called mma7660. 157 will be called mma7660.
158 158
159config MMA8452 159config MMA8452
160 tristate "Freescale MMA8452Q and similar Accelerometers Driver" 160 tristate "Freescale / NXP MMA8452Q and similar Accelerometers Driver"
161 depends on I2C 161 depends on I2C
162 select IIO_BUFFER 162 select IIO_BUFFER
163 select IIO_TRIGGERED_BUFFER 163 select IIO_TRIGGERED_BUFFER
164 help 164 help
165 Say yes here to build support for the following Freescale 3-axis 165 Say yes here to build support for the following Freescale / NXP 3-axis
166 accelerometers: MMA8451Q, MMA8452Q, MMA8453Q, MMA8652FC, MMA8653FC, 166 accelerometers: MMA8451Q, MMA8452Q, MMA8453Q, MMA8652FC, MMA8653FC,
167 FXLS8471Q. 167 FXLS8471Q.
168 168
diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
index 4be2a1860ad2..799fe64fc286 100644
--- a/drivers/iio/accel/mma8452.c
+++ b/drivers/iio/accel/mma8452.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * mma8452.c - Support for following Freescale 3-axis accelerometers: 2 * mma8452.c - Support for following Freescale / NXP 3-axis accelerometers:
3 * 3 *
4 * device name digital output 7-bit I2C slave address (pin selectable) 4 * device name digital output 7-bit I2C slave address (pin selectable)
5 * --------------------------------------------------------------------- 5 * ---------------------------------------------------------------------
@@ -108,7 +108,7 @@ struct mma8452_data {
108}; 108};
109 109
110/** 110/**
111 * struct mma_chip_info - chip specific data for Freescale's accelerometers 111 * struct mma_chip_info - chip specific data
112 * @chip_id: WHO_AM_I register's value 112 * @chip_id: WHO_AM_I register's value
113 * @channels: struct iio_chan_spec matching the device's 113 * @channels: struct iio_chan_spec matching the device's
114 * capabilities 114 * capabilities
@@ -1693,5 +1693,5 @@ static struct i2c_driver mma8452_driver = {
1693module_i2c_driver(mma8452_driver); 1693module_i2c_driver(mma8452_driver);
1694 1694
1695MODULE_AUTHOR("Peter Meerwald <pmeerw@pmeerw.net>"); 1695MODULE_AUTHOR("Peter Meerwald <pmeerw@pmeerw.net>");
1696MODULE_DESCRIPTION("Freescale MMA8452 accelerometer driver"); 1696MODULE_DESCRIPTION("Freescale / NXP MMA8452 accelerometer driver");
1697MODULE_LICENSE("GPL"); 1697MODULE_LICENSE("GPL");