aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/devicetree/bindings/i2c/trivial-devices.txt1
-rw-r--r--drivers/iio/accel/mma8452.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
index bef86e57c388..1a794213f7d1 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -50,6 +50,7 @@ epson,rx8581 I2C-BUS INTERFACE REAL TIME CLOCK MODULE
50fsl,mag3110 MAG3110: Xtrinsic High Accuracy, 3D Magnetometer 50fsl,mag3110 MAG3110: Xtrinsic High Accuracy, 3D Magnetometer
51fsl,mc13892 MC13892: Power Management Integrated Circuit (PMIC) for i.MX35/51 51fsl,mc13892 MC13892: Power Management Integrated Circuit (PMIC) for i.MX35/51
52fsl,mma8450 MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer 52fsl,mma8450 MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer
53fsl,mma8452 MMA8452Q: 3-axis 12-bit / 8-bit Digital Accelerometer
53fsl,mpr121 MPR121: Proximity Capacitive Touch Sensor Controller 54fsl,mpr121 MPR121: Proximity Capacitive Touch Sensor Controller
54fsl,sgtl5000 SGTL5000: Ultra Low-Power Audio Codec 55fsl,sgtl5000 SGTL5000: Ultra Low-Power Audio Codec
55gmt,g751 G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface 56gmt,g751 G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface
diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
index 17aeea170566..9231f8a65e79 100644
--- a/drivers/iio/accel/mma8452.c
+++ b/drivers/iio/accel/mma8452.c
@@ -423,9 +423,15 @@ static const struct i2c_device_id mma8452_id[] = {
423}; 423};
424MODULE_DEVICE_TABLE(i2c, mma8452_id); 424MODULE_DEVICE_TABLE(i2c, mma8452_id);
425 425
426static const struct of_device_id mma8452_dt_ids[] = {
427 { .compatible = "fsl,mma8452" },
428 { }
429};
430
426static struct i2c_driver mma8452_driver = { 431static struct i2c_driver mma8452_driver = {
427 .driver = { 432 .driver = {
428 .name = "mma8452", 433 .name = "mma8452",
434 .of_match_table = of_match_ptr(mma8452_dt_ids),
429 .pm = MMA8452_PM_OPS, 435 .pm = MMA8452_PM_OPS,
430 }, 436 },
431 .probe = mma8452_probe, 437 .probe = mma8452_probe,