Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

i2c/chips: Move max6875 to drivers/misc/eeprom

This driver only reads the user EEPROM of that chip, so we can move it
to the eeprom-directory in order to further clean up (and later remove)
drivers/i2c/chips.

The Kconfig text was updated to match the current functionality,
dropping the meanwhile obsoleted parts.

Defconfigs have been adapted.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Ben Gardner <gardner.ben@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

authored by

Wolfram Sang and committed by
Jean Delvare
4b364f23 c52cf01f

+19 -20
+1 -1
arch/mips/configs/bigsur_defconfig
··· 963 963 CONFIG_SENSORS_PCF8574=y 964 964 # CONFIG_PCF8575 is not set 965 965 CONFIG_SENSORS_PCF8591=y 966 - CONFIG_SENSORS_MAX6875=y 966 + CONFIG_EEPROM_MAX6875=y 967 967 # CONFIG_SENSORS_TSL2550 is not set 968 968 CONFIG_I2C_DEBUG_CORE=y 969 969 CONFIG_I2C_DEBUG_ALGO=y
+1 -1
arch/mips/configs/mtx1_defconfig
··· 1849 1849 CONFIG_SENSORS_PCF8574=m 1850 1850 CONFIG_SENSORS_PCA9539=m 1851 1851 CONFIG_SENSORS_PCF8591=m 1852 - CONFIG_SENSORS_MAX6875=m 1852 + CONFIG_EEPROM_MAX6875=m 1853 1853 # CONFIG_SENSORS_TSL2550 is not set 1854 1854 # CONFIG_I2C_DEBUG_CORE is not set 1855 1855 # CONFIG_I2C_DEBUG_ALGO is not set
+1 -1
arch/powerpc/configs/ppc6xx_defconfig
··· 1808 1808 CONFIG_SENSORS_PCA9539=m 1809 1809 CONFIG_SENSORS_PCF8591=m 1810 1810 # CONFIG_TPS65010 is not set 1811 - CONFIG_SENSORS_MAX6875=m 1811 + CONFIG_EEPROM_MAX6875=m 1812 1812 CONFIG_SENSORS_TSL2550=m 1813 1813 CONFIG_MCU_MPC8349EMITX=m 1814 1814 # CONFIG_I2C_DEBUG_CORE is not set
-15
drivers/i2c/chips/Kconfig
··· 64 64 This driver is deprecated and will be dropped soon. Use 65 65 drivers/gpio/pca953x.c instead. 66 66 67 - config SENSORS_MAX6875 68 - tristate "Maxim MAX6875 Power supply supervisor" 69 - depends on EXPERIMENTAL 70 - help 71 - If you say yes here you get support for the Maxim MAX6875 72 - EEPROM-programmable, quad power-supply sequencer/supervisor. 73 - 74 - This provides an interface to program the EEPROM and reset the chip. 75 - 76 - This driver also supports the Maxim MAX6874 hex power-supply 77 - sequencer/supervisor if found at a compatible address. 78 - 79 - This driver can also be built as a module. If so, the module 80 - will be called max6875. 81 - 82 67 config SENSORS_TSL2550 83 68 tristate "Taos TSL2550 ambient light sensor" 84 69 depends on EXPERIMENTAL
-1
drivers/i2c/chips/Makefile
··· 11 11 # 12 12 13 13 obj-$(CONFIG_DS1682) += ds1682.o 14 - obj-$(CONFIG_SENSORS_MAX6875) += max6875.o 15 14 obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o 16 15 obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o 17 16 obj-$(CONFIG_PCF8575) += pcf8575.o
+1 -1
drivers/i2c/chips/max6875.c drivers/misc/eeprom/max6875.c
··· 3 3 4 4 Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com> 5 5 6 - Based on i2c/chips/eeprom.c 6 + Based on eeprom.c 7 7 8 8 The MAX6875 has a bank of registers and two banks of EEPROM. 9 9 Address ranges are defined as follows:
+14
drivers/misc/eeprom/Kconfig
··· 48 48 This driver can also be built as a module. If so, the module 49 49 will be called eeprom. 50 50 51 + config EEPROM_MAX6875 52 + tristate "Maxim MAX6874/5 power supply supervisor" 53 + depends on I2C && EXPERIMENTAL 54 + help 55 + If you say yes here you get read-only support for the user EEPROM of 56 + the Maxim MAX6874/5 EEPROM-programmable, quad power-supply 57 + sequencer/supervisor. 58 + 59 + All other features of this chip should be accessed via i2c-dev. 60 + 61 + This driver can also be built as a module. If so, the module 62 + will be called max6875. 63 + 64 + 51 65 config EEPROM_93CX6 52 66 tristate "EEPROM 93CX6 support" 53 67 help
+1
drivers/misc/eeprom/Makefile
··· 1 1 obj-$(CONFIG_EEPROM_AT24) += at24.o 2 2 obj-$(CONFIG_EEPROM_AT25) += at25.o 3 3 obj-$(CONFIG_EEPROM_LEGACY) += eeprom.o 4 + obj-$(CONFIG_EEPROM_MAX6875) += max6875.o 4 5 obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o