iio: Add a comment to about alphabetical order to Kconfigs and Makefiles

Keeping Makefile and Kconfig entries in alphabetical order usually works better
than just appending new entries at the end, since it reduces the amount of
conflicts. This patch adds a comment to the IIO Kconfig and Makefile files to
document that the entries should be kept in alphabetical order.

Also reorder those  entries which weren't in alphabetical order yet.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index a00267525b661c877f92e135524e1776b523aa3e..61ca7ec0f3e717ba229b93d1a08dbd0c04b9f553 100644 (file)
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -1,6 +1,8 @@
 #
 # Accelerometer drivers
 #
+# When adding new entries keep the list in alphabetical order
+
 menu "Accelerometers"
 
 config HID_SENSOR_ACCEL_3D
@@ -14,13 +16,6 @@ config HID_SENSOR_ACCEL_3D
          Say yes here to build support for the HID SENSOR
          accelerometers 3D.
 
-config KXSD9
-       tristate "Kionix KXSD9 Accelerometer Driver"
-       depends on SPI
-       help
-         Say yes here to build support for the Kionix KXSD9 accelerometer.
-         Currently this only supports the device via an SPI interface.
-
 config IIO_ST_ACCEL_3AXIS
        tristate "STMicroelectronics accelerometers 3-Axis Driver"
        depends on (I2C || SPI_MASTER) && SYSFS
@@ -51,4 +46,11 @@ config IIO_ST_ACCEL_SPI_3AXIS
        depends on IIO_ST_ACCEL_3AXIS
        depends on IIO_ST_SENSORS_SPI
 
+config KXSD9
+       tristate "Kionix KXSD9 Accelerometer Driver"
+       depends on SPI
+       help
+         Say yes here to build support for the Kionix KXSD9 accelerometer.
+         Currently this only supports the device via an SPI interface.
+
 endmenu

diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile
index 87d8fa264894ff7547c43478476d0c6a9275677e..2f95a3dffa4741423e3802608ce0b141e314d361 100644 (file)
--- a/drivers/iio/accel/Makefile
+++ b/drivers/iio/accel/Makefile
@@ -2,7 +2,9 @@
 # Makefile for industrial I/O accelerometer drivers
 #
 
+# When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o
+obj-$(CONFIG_KXSD9)    += kxsd9.o
 
 obj-$(CONFIG_IIO_ST_ACCEL_3AXIS) += st_accel.o
 st_accel-y := st_accel_core.o
@@ -10,5 +12,3 @@ st_accel-$(CONFIG_IIO_BUFFER) += st_accel_buffer.o
 
 obj-$(CONFIG_IIO_ST_ACCEL_I2C_3AXIS) += st_accel_i2c.o
 obj-$(CONFIG_IIO_ST_ACCEL_SPI_3AXIS) += st_accel_spi.o
-
-obj-$(CONFIG_KXSD9)    += kxsd9.o

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 2eced9d53a0b583fc11ab202132e7c0a63e582cf..dd6bd1bff4b7e08e0d08ae91cea8cb2317f7d017 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -1,6 +1,8 @@
 #
 # ADC drivers
 #
+# When adding new entries keep the list in alphabetical order
+
 menu "Analog to digital converters"
 
 config AD_SIGMA_DELTA
@@ -30,17 +32,20 @@ config AD7298
          To compile this driver as a module, choose M here: the
          module will be called ad7298.
 
-config AD7923
-       tristate "Analog Devices AD7923 and similar ADCs driver"
+config AD7476
+       tristate "Analog Devices AD7476 and similar 1-channel ADCs driver"
        depends on SPI
        select IIO_BUFFER
        select IIO_TRIGGERED_BUFFER
        help
-         Say yes here to build support for Analog Devices
-         AD7904, AD7914, AD7923, AD7924 4 Channel ADCs.
+         Say yes here to build support for Analog Devices AD7273, AD7274, AD7276,
+         AD7277, AD7278, AD7475, AD7476, AD7477, AD7478, AD7466, AD7467, AD7468,
+         AD7495, AD7910, AD7920, AD7920 SPI analog to digital converters (ADC).
+
+         If unsure, say N (but it's safe to say "Y").
 
          To compile this driver as a module, choose M here: the
-         module will be called ad7923.
+         module will be called ad7476.
 
 config AD7791
        tristate "Analog Devices AD7791 ADC driver"
@@ -66,33 +71,30 @@ config AD7793
          To compile this driver as a module, choose M here: the
          module will be called AD7793.
 
-config AD7476
-       tristate "Analog Devices AD7476 and similar 1-channel ADCs driver"
+config AD7887
+       tristate "Analog Devices AD7887 ADC driver"
        depends on SPI
        select IIO_BUFFER
        select IIO_TRIGGERED_BUFFER
        help
-         Say yes here to build support for Analog Devices AD7273, AD7274, AD7276,
-         AD7277, AD7278, AD7475, AD7476, AD7477, AD7478, AD7466, AD7467, AD7468,
-         AD7495, AD7910, AD7920, AD7920 SPI analog to digital converters (ADC).
-
+         Say yes here to build support for Analog Devices
+         AD7887 SPI analog to digital converter (ADC).
          If unsure, say N (but it's safe to say "Y").
 
          To compile this driver as a module, choose M here: the
-         module will be called ad7476.
+         module will be called ad7887.
 
-config AD7887
-       tristate "Analog Devices AD7887 ADC driver"
+config AD7923
+       tristate "Analog Devices AD7923 and similar ADCs driver"
        depends on SPI
        select IIO_BUFFER
        select IIO_TRIGGERED_BUFFER
        help
          Say yes here to build support for Analog Devices
-         AD7887 SPI analog to digital converter (ADC).
-         If unsure, say N (but it's safe to say "Y").
+         AD7904, AD7914, AD7923, AD7924 4 Channel ADCs.
 
          To compile this driver as a module, choose M here: the
-         module will be called ad7887.
+         module will be called ad7923.
 
 config AT91_ADC
        tristate "Atmel AT91 ADC"

diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index d184139d1cd789ea285a3e09259652fa05252662..2a4324ec7f14a0cd110bf5b47e2aae94bf13d26f 100644 (file)
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -2,6 +2,7 @@
 # Makefile for IIO ADC drivers
 #
 
+# When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_AD_SIGMA_DELTA) += ad_sigma_delta.o
 obj-$(CONFIG_AD7266) += ad7266.o
 obj-$(CONFIG_AD7298) += ad7298.o

diff --git a/drivers/iio/amplifiers/Kconfig b/drivers/iio/amplifiers/Kconfig
index 05d707ed7d4f9a2341068d77dac73b7cdd21d55c..e9c5f2cd9257123b9a6f7a28ae9425bc972a1776 100644 (file)
--- a/drivers/iio/amplifiers/Kconfig
+++ b/drivers/iio/amplifiers/Kconfig
@@ -1,6 +1,8 @@
 #
 # Gain Amplifiers, etc.
 #
+# When adding new entries keep the list in alphabetical order
+
 menu "Amplifiers"
 
 config AD8366

diff --git a/drivers/iio/amplifiers/Makefile b/drivers/iio/amplifiers/Makefile
index a6ca366908e07f68d2a76bb0ce863e22e4384ae3..8da4b787898a9a45c8e7500d37221b755df2e0e3 100644 (file)
--- a/drivers/iio/amplifiers/Makefile
+++ b/drivers/iio/amplifiers/Makefile
@@ -2,4 +2,5 @@
 # Makefile iio/amplifiers
 #
 
+# When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_AD8366) += ad8366.o

diff --git a/drivers/iio/common/Makefile b/drivers/iio/common/Makefile
index c2352beb5d973540f37dcb0ad7a7057077a95013..3112df0060e91be1d740d11eb65d51307375ea4c 100644 (file)
--- a/drivers/iio/common/Makefile
+++ b/drivers/iio/common/Makefile
@@ -6,5 +6,6 @@
 # instead of duplicating in each module.
 #
 
+# When adding new entries keep the list in alphabetical order
 obj-y += hid-sensors/
 obj-y += st_sensors/

diff --git a/drivers/iio/dac/Kconfig b/drivers/iio/dac/Kconfig
index b9fd4c7bfd98269695fcb4a812286784030c5a8b..3c6a78a75b78879558ff472c519ab567b01550e9 100644 (file)
--- a/drivers/iio/dac/Kconfig
+++ b/drivers/iio/dac/Kconfig
@@ -1,6 +1,8 @@
 #
 # DAC drivers
 #
+# When adding new entries keep the list in alphabetical order
+
 menu "Digital to analog converters"
 
 config AD5064
@@ -48,13 +50,6 @@ config AD5421
          To compile this driver as module choose M here: the module will be called
          ad5421.
 
-config AD5624R_SPI
-       tristate "Analog Devices AD5624/44/64R DAC spi driver"
-       depends on SPI
-       help
-         Say yes here to build support for Analog Devices AD5624R, AD5644R and
-         AD5664R converters (DAC). This driver uses the common SPI interface.
-
 config AD5446
        tristate "Analog Devices AD5446 and similar single channel DACs driver"
        depends on (SPI_MASTER && I2C!=m) || I2C
@@ -87,6 +82,24 @@ config AD5504
          To compile this driver as a module, choose M here: the
          module will be called ad5504.
 
+config AD5624R_SPI
+       tristate "Analog Devices AD5624/44/64R DAC spi driver"
+       depends on SPI
+       help
+         Say yes here to build support for Analog Devices AD5624R, AD5644R and
+         AD5664R converters (DAC). This driver uses the common SPI interface.
+
+config AD5686
+       tristate "Analog Devices AD5686R/AD5685R/AD5684R DAC SPI driver"
+       depends on SPI
+       help
+         Say yes here to build support for Analog Devices AD5686R, AD5685R,
+         AD5684R, AD5791 Voltage Output Digital to
+         Analog Converter.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ad5686.
+
 config AD5755
        tristate "Analog Devices AD5755/AD5755-1/AD5757/AD5735/AD5737 DAC driver"
        depends on SPI_MASTER
@@ -119,17 +132,6 @@ config AD5791
          To compile this driver as a module, choose M here: the
          module will be called ad5791.
 
-config AD5686
-       tristate "Analog Devices AD5686R/AD5685R/AD5684R DAC SPI driver"
-       depends on SPI
-       help
-         Say yes here to build support for Analog Devices AD5686R, AD5685R,
-         AD5684R, AD5791 Voltage Output Digital to
-         Analog Converter.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ad5686.
-
 config AD7303
        tristate "Analog Devices AD7303 DAC driver"
        depends on SPI

diff --git a/drivers/iio/dac/Makefile b/drivers/iio/dac/Makefile
index c8d7ab6bff01b8b97ddbd3a020811a588a4f08c8..bb84ad64463f749c65e27570e5f7d89fce424f12 100644 (file)
--- a/drivers/iio/dac/Makefile
+++ b/drivers/iio/dac/Makefile
@@ -2,6 +2,7 @@
 # Makefile for industrial I/O DAC drivers
 #
 
+# When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_AD5360) += ad5360.o
 obj-$(CONFIG_AD5380) += ad5380.o
 obj-$(CONFIG_AD5421) += ad5421.o

diff --git a/drivers/iio/frequency/Kconfig b/drivers/iio/frequency/Kconfig
index 6aaa33ef4544abbbcbc5a96f5d916f63d3ec1b42..dc5e0b72882faaee23a0ecc673de40c8f794453a 100644 (file)
--- a/drivers/iio/frequency/Kconfig
+++ b/drivers/iio/frequency/Kconfig
@@ -4,6 +4,7 @@
 #      Clock Distribution device drivers
 #      Phase-Locked Loop (PLL) frequency synthesizers
 #
+# When adding new entries keep the list in alphabetical order
 
 menu "Frequency Synthesizers DDS/PLL"
 

diff --git a/drivers/iio/frequency/Makefile b/drivers/iio/frequency/Makefile
index 00d26e5d1dc2df850948b9b3bb1335e0892451a1..2bca03f3e2e3d377440dffe157be48018af3d9e0 100644 (file)
--- a/drivers/iio/frequency/Makefile
+++ b/drivers/iio/frequency/Makefile
@@ -2,5 +2,6 @@
 # Makefile iio/frequency
 #
 
+# When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_AD9523) += ad9523.o
 obj-$(CONFIG_ADF4350) += adf4350.o

diff --git a/drivers/iio/gyro/Kconfig b/drivers/iio/gyro/Kconfig
index 1fdcc8451fdf0cd50d1c8be485999102c878b36c..5913735bca9a3b67f385789fb2127aaa4a45eb96 100644 (file)
--- a/drivers/iio/gyro/Kconfig
+++ b/drivers/iio/gyro/Kconfig
@@ -1,6 +1,8 @@
 #
 # IIO Digital Gyroscope Sensor drivers configuration
 #
+# When adding new entries keep the list in alphabetical order
+
 menu "Digital gyroscope sensors"
 
 config ADIS16080

diff --git a/drivers/iio/gyro/Makefile b/drivers/iio/gyro/Makefile
index e9dc034aa18bc2deb6907c68b54e22b0b1490d26..36091d5a0f45eec6491cfedf3f61fbca73143f48 100644 (file)
--- a/drivers/iio/gyro/Makefile
+++ b/drivers/iio/gyro/Makefile
@@ -2,6 +2,7 @@
 # Makefile for industrial I/O gyroscope sensor drivers
 #
 
+# When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_ADIS16080) += adis16080.o
 obj-$(CONFIG_ADIS16130) += adis16130.o
 obj-$(CONFIG_ADIS16136) += adis16136.o

diff --git a/drivers/iio/imu/Kconfig b/drivers/iio/imu/Kconfig
index 4f40a10cb74f46478dfa7c755743ab6302d916af..663e88a1a3c13181061f363480a189d7bec35fad 100644 (file)
--- a/drivers/iio/imu/Kconfig
+++ b/drivers/iio/imu/Kconfig
@@ -1,6 +1,8 @@
 #
 # IIO imu drivers configuration
 #
+# When adding new entries keep the list in alphabetical order
+
 menu "Inertial measurement units"
 
 config ADIS16400

diff --git a/drivers/iio/imu/Makefile b/drivers/iio/imu/Makefile
index f2f56ceaed26a26c783fc34f30a7037108858a7d..114d2c17cbe204e9e60656c8880f85263d225648 100644 (file)
--- a/drivers/iio/imu/Makefile
+++ b/drivers/iio/imu/Makefile
@@ -2,6 +2,7 @@
 # Makefile for Inertial Measurement Units
 #
 
+# When adding new entries keep the list in alphabetical order
 adis16400-y             := adis16400_core.o
 adis16400-$(CONFIG_IIO_BUFFER) += adis16400_buffer.o
 obj-$(CONFIG_ADIS16400) += adis16400.o

diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
index 5ef1a396e0c9ba98f128f38277be9668af1ad80a..3bd29f810e6dfd8b016e3bc067ec1fd97ab7c13a 100644 (file)
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -1,6 +1,8 @@
 #
 # Light sensors
 #
+# When adding new entries keep the list in alphabetical order
+
 menu "Light sensors"
 
 config ADJD_S311
@@ -15,6 +17,17 @@ config ADJD_S311
         This driver can also be built as a module.  If so, the module
         will be called adjd_s311.
 
+config HID_SENSOR_ALS
+       depends on HID_SENSOR_HUB
+       select IIO_BUFFER
+       select IIO_TRIGGERED_BUFFER
+       select HID_SENSOR_IIO_COMMON
+       select HID_SENSOR_IIO_TRIGGER
+       tristate "HID ALS"
+       help
+         Say yes here to build support for the HID SENSOR
+         Ambient light sensor.
+
 config SENSORS_LM3533
        tristate "LM3533 ambient light sensor"
        depends on MFD_LM3533
@@ -52,15 +65,4 @@ config VCNL4000
         To compile this driver as a module, choose M here: the
         module will be called vcnl4000.
 
-config HID_SENSOR_ALS
-       depends on HID_SENSOR_HUB
-       select IIO_BUFFER
-       select IIO_TRIGGERED_BUFFER
-       select HID_SENSOR_IIO_COMMON
-       select HID_SENSOR_IIO_TRIGGER
-       tristate "HID ALS"
-       help
-         Say yes here to build support for the HID SENSOR
-         Ambient light sensor.
-
 endmenu

diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile
index 040d9c75f8e6277e964803676412240b328f51b6..edef939861f02ee4a0cfd594431c50cbf9503eb5 100644 (file)
--- a/drivers/iio/light/Makefile
+++ b/drivers/iio/light/Makefile
@@ -2,8 +2,9 @@
 # Makefile for IIO Light sensors
 #
 
+# When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_ADJD_S311)                += adjd_s311.o
+obj-$(CONFIG_HID_SENSOR_ALS)   += hid-sensor-als.o
 obj-$(CONFIG_SENSORS_LM3533)   += lm3533-als.o
 obj-$(CONFIG_SENSORS_TSL2563)  += tsl2563.o
 obj-$(CONFIG_VCNL4000)         += vcnl4000.o
-obj-$(CONFIG_HID_SENSOR_ALS)   += hid-sensor-als.o

diff --git a/drivers/iio/magnetometer/Kconfig b/drivers/iio/magnetometer/Kconfig
index 4d55b1b851b3135276f8f5749d9af6c97ab74eb3..4fa923f37b971e51a92942ccd0884b07a5fe8195 100644 (file)
--- a/drivers/iio/magnetometer/Kconfig
+++ b/drivers/iio/magnetometer/Kconfig
@@ -1,6 +1,8 @@
 #
 # Magnetometer sensors
 #
+# When adding new entries keep the list in alphabetical order
+
 menu "Magnetometer sensors"
 
 config AK8975

diff --git a/drivers/iio/magnetometer/Makefile b/drivers/iio/magnetometer/Makefile
index 7f328e37fbab0554bee7624d088687f43718a97e..f91b1b68d3924cb925e34710be91f1144bdca844 100644 (file)
--- a/drivers/iio/magnetometer/Makefile
+++ b/drivers/iio/magnetometer/Makefile
@@ -2,6 +2,7 @@
 # Makefile for industrial I/O Magnetometer sensor drivers
 #
 
+# When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_AK8975)   += ak8975.o
 obj-$(CONFIG_HID_SENSOR_MAGNETOMETER_3D) += hid-sensor-magn-3d.o
 

diff --git a/drivers/iio/pressure/Kconfig b/drivers/iio/pressure/Kconfig
index 56ae8905c8e116904f10c2990de2a0eca30d3547..26fdc0bdb99d59d8f8a956252d5d927f6b553551 100644 (file)
--- a/drivers/iio/pressure/Kconfig
+++ b/drivers/iio/pressure/Kconfig
@@ -1,6 +1,8 @@
 #
 # Pressure drivers
 #
+# When adding new entries keep the list in alphabetical order
+
 menu "Pressure sensors"
 
 config IIO_ST_PRESS

diff --git a/drivers/iio/pressure/Makefile b/drivers/iio/pressure/Makefile
index d4bb33e5c8461d361a3b332eaa31f864c83f7ce0..be71464c27525be86adcf577be3d04dea0978f6e 100644 (file)
--- a/drivers/iio/pressure/Makefile
+++ b/drivers/iio/pressure/Makefile
@@ -2,6 +2,7 @@
 # Makefile for industrial I/O pressure drivers
 #
 
+# When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_IIO_ST_PRESS) += st_pressure.o
 st_pressure-y := st_pressure_core.o
 st_pressure-$(CONFIG_IIO_BUFFER) += st_pressure_buffer.o

diff --git a/drivers/iio/trigger/Kconfig b/drivers/iio/trigger/Kconfig
index 0a4a5164963f61f41eddd67972173cae9c05265e..79996123a71b90d02bf109529db75c91bd78a1b4 100644 (file)
--- a/drivers/iio/trigger/Kconfig
+++ b/drivers/iio/trigger/Kconfig
@@ -1,6 +1,8 @@
 #
 # Industrial I/O standalone triggers
 #
+# When adding new entries keep the list in alphabetical order
+
 menu "Triggers - standalone"
 
 config IIO_INTERRUPT_TRIGGER

diff --git a/drivers/iio/trigger/Makefile b/drivers/iio/trigger/Makefile
index ce319a51b6afbfcd1699013843c0b46fecab3f5c..0694daecaf228d824ba4d652eb4a087fb8a2ba92 100644 (file)
--- a/drivers/iio/trigger/Makefile
+++ b/drivers/iio/trigger/Makefile
@@ -2,5 +2,6 @@
 # Makefile for triggers not associated with iio-devices
 #
 
+# When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_IIO_INTERRUPT_TRIGGER) += iio-trig-interrupt.o
 obj-$(CONFIG_IIO_SYSFS_TRIGGER) += iio-trig-sysfs.o