[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    [ARM] Orion: activate lm75 driver on DNS-323
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2008-08-28 20:02:45
Message-ID: 200808282002.m7SK2jSl006819 () hera ! kernel ! org
[Download RAW message or body]

Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c0fe819baf86979a5801387ccd7d8df0dc2f34e2
Commit:     c0fe819baf86979a5801387ccd7d8df0dc2f34e2
Parent:     35228e840acc70b49a2eab4eb308ca3d544efdcf
Author:     Martin Michlmayr <tbm@cyrius.com>
AuthorDate: Tue Aug 12 12:50:14 2008 +0300
Committer:  Nicolas Pitre <nico@cam.org>
CommitDate: Thu Aug 21 22:15:17 2008 -0400

    [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>
---
 arch/arm/configs/orion5x_defconfig   |    2 +-
 arch/arm/mach-orion5x/dns323-setup.c |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig
index 1464ffe..113a455 100644
--- a/arch/arm/configs/orion5x_defconfig
+++ b/arch/arm/configs/orion5x_defconfig
@@ -884,7 +884,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM75 is not set
+CONFIG_SENSORS_LM75=y
 # CONFIG_SENSORS_LM77 is not set
 # CONFIG_SENSORS_LM78 is not set
 # CONFIG_SENSORS_LM80 is not set
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index 1a1d84b..b38c65c 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -245,12 +245,8 @@ static struct orion5x_mpp_mode dns323_mpp_modes[] __initdata = {
 static struct i2c_board_info __initdata dns323_i2c_devices[] = {
 	{
 		I2C_BOARD_INFO("g760a", 0x3e),
-#if 0
-	/* this entry requires the new-style driver model lm75 driver,
-	 * for the meantime "insmod lm75.ko force_lm75=0,0x48" is needed */
 	}, {
-		I2C_BOARD_INFO("g751", 0x48),
-#endif
+		I2C_BOARD_INFO("lm75", 0x48),
 	}, {
 		I2C_BOARD_INFO("m41t80", 0x68),
 	},
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]