From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Antonino A. Daplas" Subject: [PATCH 2/7] [RESEND] rivafb/nvidiafb: Enable hardware monitoring Date: Tue, 10 Apr 2007 00:05:11 +0800 Message-ID: <461A6437.3010505@gmail.com> References: <461A2596.4090609@gmail.com> <20070409171419.6c2b9ccb@hyperion.delvare> Reply-To: linux-fbdev-devel@lists.sourceforge.net Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1HawUx-0007pA-Cc for linux-fbdev-devel@lists.sourceforge.net; Mon, 09 Apr 2007 09:13:44 -0700 Received: from wx-out-0506.google.com ([66.249.82.226]) by mail.sourceforge.net with esmtp (Exim 4.44) id 1HawUv-0006P0-Vx for linux-fbdev-devel@lists.sourceforge.net; Mon, 09 Apr 2007 09:13:43 -0700 Received: by wx-out-0506.google.com with SMTP id i30so2609259wxd for ; Mon, 09 Apr 2007 09:13:41 -0700 (PDT) In-Reply-To: <20070409171419.6c2b9ccb@hyperion.delvare> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-fbdev-devel-bounces@lists.sourceforge.net Errors-To: linux-fbdev-devel-bounces@lists.sourceforge.net To: Jean Delvare Cc: Andrew Morton , Linux Fbdev development list From: Jean Delvare Let the hardware monitoring drivers probe the second rivafb/nvidiafb I2C bus for devices. Signed-off-by: Jean Delvare Signed-off-by: Antonino Daplas --- >> par->chan[1].ddc_base = 0x3e; >> - nvidia_setup_i2c_bus(&par->chan[1], "nvidia #1"); >> + nvidia_setup_i2c_bus(&par->chan[1], "nvidia #0", 1); > > Err, this is not correct, and not what my original patch did. Andrew, please use this instead. Fixes a stupid typo I made. Tony drivers/video/nvidia/nv_i2c.c | 10 ++++++---- drivers/video/riva/rivafb-i2c.c | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c index bcde013..badc1a6 100644 --- a/drivers/video/nvidia/nv_i2c.c +++ b/drivers/video/nvidia/nv_i2c.c @@ -86,13 +86,15 @@ static int nvidia_gpio_getsda(void *data return val; } -static int nvidia_setup_i2c_bus(struct nvidia_i2c_chan *chan, const char *name) +static int nvidia_setup_i2c_bus(struct nvidia_i2c_chan *chan, const char *name, + unsigned int i2c_class) { int rc; strcpy(chan->adapter.name, name); chan->adapter.owner = THIS_MODULE; chan->adapter.id = I2C_HW_B_NVIDIA; + chan->adapter.class = i2c_class; chan->adapter.algo_data = &chan->algo; chan->adapter.dev.parent = &chan->par->pci_dev->dev; chan->algo.setsda = nvidia_gpio_setsda; @@ -132,13 +134,13 @@ void nvidia_create_i2c_busses(struct nvi par->chan[2].par = par; par->chan[0].ddc_base = 0x36; - nvidia_setup_i2c_bus(&par->chan[0], "nvidia #0"); + nvidia_setup_i2c_bus(&par->chan[0], "nvidia #0", I2C_CLASS_HWMON); par->chan[1].ddc_base = 0x3e; - nvidia_setup_i2c_bus(&par->chan[1], "nvidia #1"); + nvidia_setup_i2c_bus(&par->chan[1], "nvidia #1", 0); par->chan[2].ddc_base = 0x50; - nvidia_setup_i2c_bus(&par->chan[2], "nvidia #2"); + nvidia_setup_i2c_bus(&par->chan[2], "nvidia #2", 0); } void nvidia_delete_i2c_busses(struct nvidia_par *par) diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c index 0405e83..ca9e7e8 100644 --- a/drivers/video/riva/rivafb-i2c.c +++ b/drivers/video/riva/rivafb-i2c.c @@ -88,13 +88,15 @@ static int riva_gpio_getsda(void* data) return val; } -static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name) +static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name, + unsigned int i2c_class) { int rc; strcpy(chan->adapter.name, name); chan->adapter.owner = THIS_MODULE; chan->adapter.id = I2C_HW_B_RIVA; + chan->adapter.class = i2c_class; chan->adapter.algo_data = &chan->algo; chan->adapter.dev.parent = &chan->par->pdev->dev; chan->algo.setsda = riva_gpio_setsda; @@ -135,9 +137,9 @@ void riva_create_i2c_busses(struct riva_ par->chan[0].ddc_base = 0x3e; par->chan[1].ddc_base = 0x36; par->chan[2].ddc_base = 0x50; - riva_setup_i2c_bus(&par->chan[0], "BUS1"); - riva_setup_i2c_bus(&par->chan[1], "BUS2"); - riva_setup_i2c_bus(&par->chan[2], "BUS3"); + riva_setup_i2c_bus(&par->chan[0], "BUS1", 0); + riva_setup_i2c_bus(&par->chan[1], "BUS2", I2C_CLASS_HWMON); + riva_setup_i2c_bus(&par->chan[2], "BUS3", 0); } void riva_delete_i2c_busses(struct riva_par *par) ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV