Re: [PATCH 2/7] rivafb/nvidiafb: Enable hardware monitoring

["Antonino A. Daplas" <adaplas@gmail.com>]

On Mon, 2007-04-09 at 17:14 +0200, Jean Delvare wrote:
> Hi Antonino,
> 
> On Mon, 09 Apr 2007 19:37:58 +0800, Antonino A. Daplas wrote:
> > From: Jean Delvare <khali@linux-fr>
> > 
> > Let the hardware monitoring drivers probe the second rivafb/nvidiafb
> > I2C bus for devices.
> > 
> > Signed-off-by: Jean Delvare <khali@linux-fr>
> > Signed-off-by: Antonino Daplas <adaplas@gmail.com>
> > ---
> > 
> >  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..2674259 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 #0", 1);
> 
> Err, this is not correct, and not what my original patch did.

I submitted a previous patch to akpm where I reversed the order of
assignment of the ddc_bases (from 0x3e, 0x36 to 0x36, 0x3e). Just made
your patch match that.

Tony



-------------------------------------------------------------------------
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