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

[ARM] Orion: activate lm75 driver on DNS-323

The lm75 driver was recently converted to the new-style binding,
so now it can be loaded from the DNS-323 support code.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Tested-by: Tobias Poschwatta <tp@fonz.de>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>

authored by Martin Michlmayr and committed by Nicolas Pitre c0fe819b 35228e84

+2 -6
unified split
+1 -1
arch/arm/configs/orion5x_defconfig
··· 884 # CONFIG_SENSORS_GL520SM is not set 885 # CONFIG_SENSORS_IT87 is not set 886 # CONFIG_SENSORS_LM63 is not set 887 - # CONFIG_SENSORS_LM75 is not set 888 # CONFIG_SENSORS_LM77 is not set 889 # CONFIG_SENSORS_LM78 is not set 890 # CONFIG_SENSORS_LM80 is not set
··· 884 # CONFIG_SENSORS_GL520SM is not set 885 # CONFIG_SENSORS_IT87 is not set 886 # CONFIG_SENSORS_LM63 is not set 887 + CONFIG_SENSORS_LM75=y 888 # CONFIG_SENSORS_LM77 is not set 889 # CONFIG_SENSORS_LM78 is not set 890 # CONFIG_SENSORS_LM80 is not set
+1 -5
arch/arm/mach-orion5x/dns323-setup.c
··· 245 static struct i2c_board_info __initdata dns323_i2c_devices[] = { 246 { 247 I2C_BOARD_INFO("g760a", 0x3e), 248 - #if 0 249 - /* this entry requires the new-style driver model lm75 driver, 250 - * for the meantime "insmod lm75.ko force_lm75=0,0x48" is needed */ 251 }, { 252 - I2C_BOARD_INFO("g751", 0x48), 253 - #endif 254 }, { 255 I2C_BOARD_INFO("m41t80", 0x68), 256 },
··· 245 static struct i2c_board_info __initdata dns323_i2c_devices[] = { 246 { 247 I2C_BOARD_INFO("g760a", 0x3e), 248 }, { 249 + I2C_BOARD_INFO("lm75", 0x48), 250 }, { 251 I2C_BOARD_INFO("m41t80", 0x68), 252 },