Re: [patch] fix ucb1x00 support on collie

[Russell King]

On Sun, Jul 31, 2005 at 04:42:45PM +0100, Russell King wrote:
> On Sun, Jul 31, 2005 at 03:46:17PM +0200, Pavel Machek wrote:
> > Collie is slightly strange; it does not seem to have proper ucb1x00
> > ID. With this patch, basic ucb support seems to work and I can get
> > interrupts from battery.
> 
> Out of interest, what ID does it appear to have?
> 
> > diff --git a/drivers/misc/mcp-sa1100.c b/drivers/misc/mcp-sa1100.c
> > --- a/drivers/misc/mcp-sa1100.c
> > +++ b/drivers/misc/mcp-sa1100.c
> > @@ -149,7 +149,7 @@ static int mcp_sa1100_probe(struct devic
> >  	    !machine_is_graphicsmaster() && !machine_is_lart()           &&
> >  	    !machine_is_omnimeter()      && !machine_is_pfs168()         &&
> >  	    !machine_is_shannon()        && !machine_is_simpad()         &&
> > -	    !machine_is_yopy())
> > +	    !machine_is_yopy()		 && !machine_is_collie())
> 
> I think it's about time we did something better with this, like only
> registering the platform device on those which use it.
> 
> > @@ -181,7 +187,10 @@ static int mcp_sa1100_probe(struct devic
> >  
> >  	Ser4MCSR = -1;
> >  	Ser4MCCR1 = 0;
> > -	Ser4MCCR0 = 0x00007f7f | MCCR0_ADM;
> > +	if (machine_is_collie()) 
> > +		Ser4MCCR0 = MCCR0_ADM | MCCR0_ExtClk;
> > +	else
> > +		Ser4MCCR0 = 0x00007f7f | MCCR0_ADM;
> 
> And this setup should probably be passed as part of the platform device
> data.

Ok, new set of patches on the ftp site with the above two items resolved.
I've also moved it into drivers/mfd and linked that directory into kbuild.

Of course, the audio driver isn't expected to build without Nico's sa11x0
audio support.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/