On Fri, 11 May 2012 15:05:21 -0700, David Daney <ddaney.cavm@xxxxxxxxx> wrote: > From: David Daney <david.daney@xxxxxxxxxx> > > When generating MODALIASes, it is convenient to add things like "spi:" > or "i2c:" to the front of the strings. This allows the standard > modprobe to find the right driver when automatically populating bus > children from the device tree structure. > > Add a prefix parameter, and adjust callers. For > of_register_spi_devices() use the "spi:" prefix. > > Signed-off-by: David Daney <david.daney@xxxxxxxxxx> Applied, thanks. Some notes below... > Cc: Liam Girdwood <lrg@xxxxxx> > Cc: Timur Tabi <timur@xxxxxxxxxxxxx> > Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> > Cc: Jaroslav Kysela <perex@xxxxxxxx> > Cc: Takashi Iwai <tiwai@xxxxxxx> > Cc: alsa-devel@xxxxxxxxxxxxxxxx > Cc: linuxppc-dev@xxxxxxxxxxxxxxxx > --- > drivers/of/base.c | 22 ++++++++++++++++------ > drivers/of/of_i2c.c | 2 +- > drivers/of/of_spi.c | 2 +- > include/linux/of.h | 3 ++- > sound/soc/fsl/mpc8610_hpcd.c | 2 +- > sound/soc/fsl/p1022_ds.c | 2 +- > 6 files changed, 22 insertions(+), 11 deletions(-) > > diff --git a/drivers/of/base.c b/drivers/of/base.c > index 5806449..f05a520 100644 > --- a/drivers/of/base.c > +++ b/drivers/of/base.c > @@ -575,26 +575,36 @@ EXPORT_SYMBOL(of_find_matching_node); > /** > * of_modalias_node - Lookup appropriate modalias for a device node > * @node: pointer to a device tree node > + * @prefix: prefix to be added to the compatible property, may be NULL > * @modalias: Pointer to buffer that modalias value will be copied into > * @len: Length of modalias value > * > - * Based on the value of the compatible property, this routine will attempt > - * to choose an appropriate modalias value for a particular device tree node. > - * It does this by stripping the manufacturer prefix (as delimited by a ',') > - * from the first entry in the compatible list property. > + * Based on the value of the compatible property, this routine will > + * attempt to choose an appropriate modalias value for a particular > + * device tree node. It does this by stripping the manufacturer > + * prefix (as delimited by a ',') from the first entry in the > + * compatible list property, and appending it to the prefix. Not sure why this text block was reformatted. I've formatted it back to the way it was so the diff shows specifically what has changed in the content. I don't want to discourage cleanups, but I need to be careful that cleanups don't obscure important changes when looking at the diff. g.
