| Message ID | 1394038675-15809-3-git-send-email-alexandre.belloni@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/03/14 16:57, Alexandre Belloni wrote: > We can't use "at91_adc" to refer to the at91_adc driver anymore as the name is > used to match an id_table. > > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> As stated in previous email, I'll take this along with the fix that 'broke' this, if I get an Ack from one of the at91 maintainers. Thanks, Jonathan > --- > arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c > index cb36fa872d30..88554024eb2d 100644 > --- a/arch/arm/mach-at91/at91sam9g45_devices.c > +++ b/arch/arm/mach-at91/at91sam9g45_devices.c > @@ -1203,7 +1203,7 @@ static struct resource adc_resources[] = { > }; > > static struct platform_device at91_adc_device = { > - .name = "at91_adc", > + .name = "at91sam9g45-adc", > .id = -1, > .dev = { > .platform_data = &adc_data, >
On 06/03/2014 20:16, Jonathan Cameron : > On 05/03/14 16:57, Alexandre Belloni wrote: >> We can't use "at91_adc" to refer to the at91_adc driver anymore as the name is >> used to match an id_table. >> >> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > As stated in previous email, I'll take this along with the fix that 'broke' > this, if I get an Ack from one of the at91 maintainers. Jonathan, It is maybe more clear if I answer here: - so, yes, you can take the 3 patches yourself (if you do not mind) - you have, for the whole series:: Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Thanks for your help with this issue. Bye, >> --- >> arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c >> index cb36fa872d30..88554024eb2d 100644 >> --- a/arch/arm/mach-at91/at91sam9g45_devices.c >> +++ b/arch/arm/mach-at91/at91sam9g45_devices.c >> @@ -1203,7 +1203,7 @@ static struct resource adc_resources[] = { >> }; >> >> static struct platform_device at91_adc_device = { >> - .name = "at91_adc", >> + .name = "at91sam9g45-adc", >> .id = -1, >> .dev = { >> .platform_data = &adc_data, >> > >
On 10/03/14 13:26, Nicolas Ferre wrote: > On 06/03/2014 20:16, Jonathan Cameron : >> On 05/03/14 16:57, Alexandre Belloni wrote: >>> We can't use "at91_adc" to refer to the at91_adc driver anymore as the name is >>> used to match an id_table. >>> >>> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> >> As stated in previous email, I'll take this along with the fix that 'broke' >> this, if I get an Ack from one of the at91 maintainers. > > Jonathan, > > It is maybe more clear if I answer here: > - so, yes, you can take the 3 patches yourself (if you do not mind) > - you have, for the whole series:: > > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Applied to the fixes-togreg branch of iio.git Timing wise, these will now hit immediately after the merge window closes. Jonathan > > Thanks for your help with this issue. > > Bye, > >>> --- >>> arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c >>> index cb36fa872d30..88554024eb2d 100644 >>> --- a/arch/arm/mach-at91/at91sam9g45_devices.c >>> +++ b/arch/arm/mach-at91/at91sam9g45_devices.c >>> @@ -1203,7 +1203,7 @@ static struct resource adc_resources[] = { >>> }; >>> >>> static struct platform_device at91_adc_device = { >>> - .name = "at91_adc", >>> + .name = "at91sam9g45-adc", >>> .id = -1, >>> .dev = { >>> .platform_data = &adc_data, >>> >> >> > >
On 15/03/2014 16:33, Jonathan Cameron : > On 10/03/14 13:26, Nicolas Ferre wrote: >> On 06/03/2014 20:16, Jonathan Cameron : >>> On 05/03/14 16:57, Alexandre Belloni wrote: >>>> We can't use "at91_adc" to refer to the at91_adc driver anymore as the name is >>>> used to match an id_table. >>>> >>>> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> >>> As stated in previous email, I'll take this along with the fix that 'broke' >>> this, if I get an Ack from one of the at91 maintainers. >> >> Jonathan, >> >> It is maybe more clear if I answer here: >> - so, yes, you can take the 3 patches yourself (if you do not mind) >> - you have, for the whole series:: >> >> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > Applied to the fixes-togreg branch of iio.git > > Timing wise, these will now hit immediately after the merge window closes. Greg, Jonathan, I saw the IIO pull request a week ago ([PULL] IIO fixes for 3.15 round 1) but I do not see it in Linus' tree for the moment: http://article.gmane.org/gmane.linux.kernel.iio/11764 (sorry, I can't reply to the pull-request itself as I am not subscriber to iio mailing-list) As the series contains a fix for a kernel Oops and that is was already delayed at the end of 3.14 cycle, will it be possible to include it pretty soon in 3.15 cycle? Thanks for your help, bye. > Jonathan >> >> Thanks for your help with this issue. >> >> Bye, >> >>>> --- >>>> arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c >>>> index cb36fa872d30..88554024eb2d 100644 >>>> --- a/arch/arm/mach-at91/at91sam9g45_devices.c >>>> +++ b/arch/arm/mach-at91/at91sam9g45_devices.c >>>> @@ -1203,7 +1203,7 @@ static struct resource adc_resources[] = { >>>> }; >>>> >>>> static struct platform_device at91_adc_device = { >>>> - .name = "at91_adc", >>>> + .name = "at91sam9g45-adc", >>>> .id = -1, >>>> .dev = { >>>> .platform_data = &adc_data, >>>> >>> >>> >> >> > >
On Tue, Apr 22, 2014 at 11:49:58PM +0200, Nicolas Ferre wrote: > On 15/03/2014 16:33, Jonathan Cameron : > > On 10/03/14 13:26, Nicolas Ferre wrote: > >> On 06/03/2014 20:16, Jonathan Cameron : > >>> On 05/03/14 16:57, Alexandre Belloni wrote: > >>>> We can't use "at91_adc" to refer to the at91_adc driver anymore as the name is > >>>> used to match an id_table. > >>>> > >>>> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > >>> As stated in previous email, I'll take this along with the fix that 'broke' > >>> this, if I get an Ack from one of the at91 maintainers. > >> > >> Jonathan, > >> > >> It is maybe more clear if I answer here: > >> - so, yes, you can take the 3 patches yourself (if you do not mind) > >> - you have, for the whole series:: > >> > >> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > Applied to the fixes-togreg branch of iio.git > > > > Timing wise, these will now hit immediately after the merge window closes. > > Greg, Jonathan, > > I saw the IIO pull request a week ago ([PULL] IIO fixes for 3.15 round > 1) but I do not see it in Linus' tree for the moment: > http://article.gmane.org/gmane.linux.kernel.iio/11764 I don't have a copy of that pull request anywhere in my inboxes. Was it sent to me? Did I loose it somewhere? Oh crap, it ended up in my spam folder, very odd. Gotta love gmail at times... I'll pull these in this week and get this to Linus for -rc3, sorry about that. greg k-h
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index cb36fa872d30..88554024eb2d 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -1203,7 +1203,7 @@ static struct resource adc_resources[] = { }; static struct platform_device at91_adc_device = { - .name = "at91_adc", + .name = "at91sam9g45-adc", .id = -1, .dev = { .platform_data = &adc_data,
We can't use "at91_adc" to refer to the at91_adc driver anymore as the name is used to match an id_table. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> --- arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)