* [PATCH 0/3] iio: adc: at91 fixes @ 2014-03-05 16:57 Alexandre Belloni 2014-03-05 16:57 ` [PATCH 1/3] iio: adc: at91_adc: Repair broken platform_data support Alexandre Belloni ` (3 more replies) 0 siblings, 4 replies; 14+ messages in thread From: Alexandre Belloni @ 2014-03-05 16:57 UTC (permalink / raw) To: linux-arm-kernel This series fixes a kernel crash at probe time when using the at91_adc driver through platform_data. This crash appeared in 3.13. The first patch fixes the crash. While it is already quite late, I think it would be good to get it in 3.14. The next patches restore support for at91_adc on the at91sam9g45 and at91sam9260 based boards. It would be great if they could make it in 3.14. But I'm not sure it is worth applying them to 3.13. Alexandre Belloni (3): iio: adc: at91_adc: Repair broken platform_data support ARM: at91: at91sam9g45: change at91_adc name ARM: at91: at91sam9260: change at91_adc name arch/arm/mach-at91/at91sam9260_devices.c | 2 +- arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- drivers/iio/adc/at91_adc.c | 26 ++++++++++++++++++++++---- 3 files changed, 24 insertions(+), 6 deletions(-) -- 1.8.3.2 ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/3] iio: adc: at91_adc: Repair broken platform_data support 2014-03-05 16:57 [PATCH 0/3] iio: adc: at91 fixes Alexandre Belloni @ 2014-03-05 16:57 ` Alexandre Belloni 2014-03-06 19:15 ` Jonathan Cameron 2014-03-05 16:57 ` [PATCH 2/3] ARM: at91: at91sam9g45: change at91_adc name Alexandre Belloni ` (2 subsequent siblings) 3 siblings, 1 reply; 14+ messages in thread From: Alexandre Belloni @ 2014-03-05 16:57 UTC (permalink / raw) To: linux-arm-kernel Trying to use the at91_adc driver while not using device tree is ending up in a kernel crash: Unable to handle kernel NULL pointer dereference at virtual address 00000004 [...] [<c01f3510>] (at91_adc_probe) from [<c0183828>] (platform_drv_probe+0x18/0x48) [<c0183828>] (platform_drv_probe) from [<c01824a4>] (driver_probe_device+0x100/0x218) [<c01824a4>] (driver_probe_device) from [<c0182648>] (__driver_attach+0x8c/0x90) [<c0182648>] (__driver_attach) from [<c0180de4>] (bus_for_each_dev+0x58/0x88) [<c0180de4>] (bus_for_each_dev) from [<c0181c7c>] (bus_add_driver+0xd4/0x1d4) [<c0181c7c>] (bus_add_driver) from [<c0182c40>] (driver_register+0x78/0xf4) [<c0182c40>] (driver_register) from [<c0008998>] (do_one_initcall+0xe8/0x14c) [<c0008998>] (do_one_initcall) from [<c02f0b50>] (kernel_init_freeable+0xec/0x1b4) [<c02f0b50>] (kernel_init_freeable) from [<c022acdc>] (kernel_init+0x8/0xe4) [<c022acdc>] (kernel_init) from [<c0009670>] (ret_from_fork+0x14/0x24) This is because the at91_adc_caps structure is mandatory but is not filled when using platform_data. Correct that by using an id_table. It ensues that the driver will not match "at91_adc" anymore but it was crashing anyway. Fixes: c46016665fff (iio: at91: ADC start-up time calculation changed since at91sam9x5) Cc: stable at vger.kernel.org # v3.13+ Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> --- drivers/iio/adc/at91_adc.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c index 5b1aa027c034..bbba014c9939 100644 --- a/drivers/iio/adc/at91_adc.c +++ b/drivers/iio/adc/at91_adc.c @@ -765,14 +765,17 @@ static int at91_adc_probe_pdata(struct at91_adc_state *st, if (!pdata) return -EINVAL; + st->caps = (struct at91_adc_caps *) + platform_get_device_id(pdev)->driver_data; + st->use_external = pdata->use_external_triggers; st->vref_mv = pdata->vref; st->channels_mask = pdata->channels_used; - st->num_channels = pdata->num_channels; + st->num_channels = st->caps->num_channels; st->startup_time = pdata->startup_time; st->trigger_number = pdata->trigger_number; st->trigger_list = pdata->trigger_list; - st->registers = pdata->registers; + st->registers = &st->caps->registers; return 0; } @@ -1101,7 +1104,6 @@ static int at91_adc_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_OF static struct at91_adc_caps at91sam9260_caps = { .calc_startup_ticks = calc_startup_ticks_9260, .num_channels = 4, @@ -1154,11 +1156,27 @@ static const struct of_device_id at91_adc_dt_ids[] = { {}, }; MODULE_DEVICE_TABLE(of, at91_adc_dt_ids); -#endif + +static const struct platform_device_id at91_adc_ids[] = { + { + .name = "at91sam9260-adc", + .driver_data = (unsigned long)&at91sam9260_caps, + }, { + .name = "at91sam9g45-adc", + .driver_data = (unsigned long)&at91sam9g45_caps, + }, { + .name = "at91sam9x5-adc", + .driver_data = (unsigned long)&at91sam9x5_caps, + }, { + /* terminator */ + } +}; +MODULE_DEVICE_TABLE(platform, at91_adc_ids); static struct platform_driver at91_adc_driver = { .probe = at91_adc_probe, .remove = at91_adc_remove, + .id_table = at91_adc_ids, .driver = { .name = DRIVER_NAME, .of_match_table = of_match_ptr(at91_adc_dt_ids), -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 1/3] iio: adc: at91_adc: Repair broken platform_data support 2014-03-05 16:57 ` [PATCH 1/3] iio: adc: at91_adc: Repair broken platform_data support Alexandre Belloni @ 2014-03-06 19:15 ` Jonathan Cameron 2014-03-12 10:57 ` Alexandre Belloni 0 siblings, 1 reply; 14+ messages in thread From: Jonathan Cameron @ 2014-03-06 19:15 UTC (permalink / raw) To: linux-arm-kernel On 05/03/14 16:57, Alexandre Belloni wrote: > Trying to use the at91_adc driver while not using device tree is ending up in a > kernel crash: > > Unable to handle kernel NULL pointer dereference at virtual address 00000004 > [...] > [<c01f3510>] (at91_adc_probe) from [<c0183828>] (platform_drv_probe+0x18/0x48) > [<c0183828>] (platform_drv_probe) from [<c01824a4>] (driver_probe_device+0x100/0x218) > [<c01824a4>] (driver_probe_device) from [<c0182648>] (__driver_attach+0x8c/0x90) > [<c0182648>] (__driver_attach) from [<c0180de4>] (bus_for_each_dev+0x58/0x88) > [<c0180de4>] (bus_for_each_dev) from [<c0181c7c>] (bus_add_driver+0xd4/0x1d4) > [<c0181c7c>] (bus_add_driver) from [<c0182c40>] (driver_register+0x78/0xf4) > [<c0182c40>] (driver_register) from [<c0008998>] (do_one_initcall+0xe8/0x14c) > [<c0008998>] (do_one_initcall) from [<c02f0b50>] (kernel_init_freeable+0xec/0x1b4) > [<c02f0b50>] (kernel_init_freeable) from [<c022acdc>] (kernel_init+0x8/0xe4) > [<c022acdc>] (kernel_init) from [<c0009670>] (ret_from_fork+0x14/0x24) > > This is because the at91_adc_caps structure is mandatory but is not filled when > using platform_data. Correct that by using an id_table. It ensues that the > driver will not match "at91_adc" anymore but it was crashing anyway. > > Fixes: c46016665fff (iio: at91: ADC start-up time calculation changed since at91sam9x5) > Cc: stable at vger.kernel.org # v3.13+ > > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Ouch. It's late in the cycle so I'll send this on to Greg KH with a note to say either send it to Linus if he is happy doing so - or send it early in 3.15, then it'll get picked up for stable. I'll give it a day or so to see if I the at91 maintainers are happy with the other two parts as it is probably cleaner if all 3 go together. Applied to the fixes-togreg branch of iio.git Thanks, Jonathan > --- > drivers/iio/adc/at91_adc.c | 26 ++++++++++++++++++++++---- > 1 file changed, 22 insertions(+), 4 deletions(-) > > diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c > index 5b1aa027c034..bbba014c9939 100644 > --- a/drivers/iio/adc/at91_adc.c > +++ b/drivers/iio/adc/at91_adc.c > @@ -765,14 +765,17 @@ static int at91_adc_probe_pdata(struct at91_adc_state *st, > if (!pdata) > return -EINVAL; > > + st->caps = (struct at91_adc_caps *) > + platform_get_device_id(pdev)->driver_data; > + > st->use_external = pdata->use_external_triggers; > st->vref_mv = pdata->vref; > st->channels_mask = pdata->channels_used; > - st->num_channels = pdata->num_channels; > + st->num_channels = st->caps->num_channels; > st->startup_time = pdata->startup_time; > st->trigger_number = pdata->trigger_number; > st->trigger_list = pdata->trigger_list; > - st->registers = pdata->registers; > + st->registers = &st->caps->registers; > > return 0; > } > @@ -1101,7 +1104,6 @@ static int at91_adc_remove(struct platform_device *pdev) > return 0; > } > > -#ifdef CONFIG_OF > static struct at91_adc_caps at91sam9260_caps = { > .calc_startup_ticks = calc_startup_ticks_9260, > .num_channels = 4, > @@ -1154,11 +1156,27 @@ static const struct of_device_id at91_adc_dt_ids[] = { > {}, > }; > MODULE_DEVICE_TABLE(of, at91_adc_dt_ids); > -#endif > + > +static const struct platform_device_id at91_adc_ids[] = { > + { > + .name = "at91sam9260-adc", > + .driver_data = (unsigned long)&at91sam9260_caps, > + }, { > + .name = "at91sam9g45-adc", > + .driver_data = (unsigned long)&at91sam9g45_caps, > + }, { > + .name = "at91sam9x5-adc", > + .driver_data = (unsigned long)&at91sam9x5_caps, > + }, { > + /* terminator */ > + } > +}; > +MODULE_DEVICE_TABLE(platform, at91_adc_ids); > > static struct platform_driver at91_adc_driver = { > .probe = at91_adc_probe, > .remove = at91_adc_remove, > + .id_table = at91_adc_ids, > .driver = { > .name = DRIVER_NAME, > .of_match_table = of_match_ptr(at91_adc_dt_ids), > ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/3] iio: adc: at91_adc: Repair broken platform_data support 2014-03-06 19:15 ` Jonathan Cameron @ 2014-03-12 10:57 ` Alexandre Belloni 2014-03-12 17:21 ` Jonathan Cameron 0 siblings, 1 reply; 14+ messages in thread From: Alexandre Belloni @ 2014-03-12 10:57 UTC (permalink / raw) To: linux-arm-kernel Hi Jonathan, On 06/03/2014 at 19:15:28 +0000, Jonathan Cameron wrote : > It's late in the cycle so I'll send this on to Greg KH with a note > to say either send it to Linus if he is happy doing so - or send > it early in 3.15, then it'll get picked up for stable. > > I'll give it a day or so to see if I the at91 maintainers are happy > with the other two parts as it is probably cleaner if all 3 go together. > > Applied to the fixes-togreg branch of iio.git > I don't recall seeing you sending that to Greg. Could you do that, along with the two other patches that got acked by Nicolas ? Anyway, if it is too late, we'll push for stable. Thanks ! -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/3] iio: adc: at91_adc: Repair broken platform_data support 2014-03-12 10:57 ` Alexandre Belloni @ 2014-03-12 17:21 ` Jonathan Cameron 0 siblings, 0 replies; 14+ messages in thread From: Jonathan Cameron @ 2014-03-12 17:21 UTC (permalink / raw) To: linux-arm-kernel On March 12, 2014 10:57:46 AM GMT+00:00, Alexandre Belloni <alexandre.belloni@free-electrons.com> wrote: >Hi Jonathan, > >On 06/03/2014 at 19:15:28 +0000, Jonathan Cameron wrote : >> It's late in the cycle so I'll send this on to Greg KH with a note >> to say either send it to Linus if he is happy doing so - or send >> it early in 3.15, then it'll get picked up for stable. >> >> I'll give it a day or so to see if I the at91 maintainers are happy >> with the other two parts as it is probably cleaner if all 3 go >together. >> >> Applied to the fixes-togreg branch of iio.git >> > >I don't recall seeing you sending that to Greg. Could you do that, >along >with the two other patches that got acked by Nicolas ? Sorry spot of man flu, messy weekend and manic day job have made for an interesting week. Given regression has already snuck out in a release and Greg doesn't have other fixes queued I think we are talking soon after merge window and rc1. I'll check with Greg though... > >Anyway, if it is too late, we'll push for stable. > >Thanks ! -- Sent from my Android phone with K-9 Mail. Please excuse my brevity. ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/3] ARM: at91: at91sam9g45: change at91_adc name 2014-03-05 16:57 [PATCH 0/3] iio: adc: at91 fixes Alexandre Belloni 2014-03-05 16:57 ` [PATCH 1/3] iio: adc: at91_adc: Repair broken platform_data support Alexandre Belloni @ 2014-03-05 16:57 ` Alexandre Belloni 2014-03-06 19:16 ` Jonathan Cameron 2014-03-05 16:57 ` [PATCH 3/3] ARM: at91: at91sam9260: " Alexandre Belloni 2014-03-06 7:28 ` [PATCH 0/3] iio: adc: at91 fixes Josh Wu 3 siblings, 1 reply; 14+ messages in thread From: Alexandre Belloni @ 2014-03-05 16:57 UTC (permalink / raw) To: linux-arm-kernel 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(-) 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, -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/3] ARM: at91: at91sam9g45: change at91_adc name 2014-03-05 16:57 ` [PATCH 2/3] ARM: at91: at91sam9g45: change at91_adc name Alexandre Belloni @ 2014-03-06 19:16 ` Jonathan Cameron 2014-03-10 13:26 ` Nicolas Ferre 0 siblings, 1 reply; 14+ messages in thread From: Jonathan Cameron @ 2014-03-06 19:16 UTC (permalink / raw) To: linux-arm-kernel 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, > ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/3] ARM: at91: at91sam9g45: change at91_adc name 2014-03-06 19:16 ` Jonathan Cameron @ 2014-03-10 13:26 ` Nicolas Ferre 2014-03-15 15:33 ` Jonathan Cameron 0 siblings, 1 reply; 14+ messages in thread From: Nicolas Ferre @ 2014-03-10 13:26 UTC (permalink / raw) To: linux-arm-kernel 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, >> > > -- Nicolas Ferre ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/3] ARM: at91: at91sam9g45: change at91_adc name 2014-03-10 13:26 ` Nicolas Ferre @ 2014-03-15 15:33 ` Jonathan Cameron 2014-04-22 21:49 ` Nicolas Ferre 0 siblings, 1 reply; 14+ messages in thread From: Jonathan Cameron @ 2014-03-15 15:33 UTC (permalink / raw) To: linux-arm-kernel 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, >>> >> >> > > ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/3] ARM: at91: at91sam9g45: change at91_adc name 2014-03-15 15:33 ` Jonathan Cameron @ 2014-04-22 21:49 ` Nicolas Ferre 2014-04-23 0:01 ` Greg Kroah-Hartman 0 siblings, 1 reply; 14+ messages in thread From: Nicolas Ferre @ 2014-04-22 21:49 UTC (permalink / raw) To: linux-arm-kernel 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, >>>> >>> >>> >> >> > > -- Nicolas Ferre ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/3] ARM: at91: at91sam9g45: change at91_adc name 2014-04-22 21:49 ` Nicolas Ferre @ 2014-04-23 0:01 ` Greg Kroah-Hartman 0 siblings, 0 replies; 14+ messages in thread From: Greg Kroah-Hartman @ 2014-04-23 0:01 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/3] ARM: at91: at91sam9260: change at91_adc name 2014-03-05 16:57 [PATCH 0/3] iio: adc: at91 fixes Alexandre Belloni 2014-03-05 16:57 ` [PATCH 1/3] iio: adc: at91_adc: Repair broken platform_data support Alexandre Belloni 2014-03-05 16:57 ` [PATCH 2/3] ARM: at91: at91sam9g45: change at91_adc name Alexandre Belloni @ 2014-03-05 16:57 ` Alexandre Belloni 2014-03-06 7:28 ` [PATCH 0/3] iio: adc: at91 fixes Josh Wu 3 siblings, 0 replies; 14+ messages in thread From: Alexandre Belloni @ 2014-03-05 16:57 UTC (permalink / raw) To: linux-arm-kernel 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/at91sam9260_devices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index eda8d1679d40..0a0315920963 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -1292,7 +1292,7 @@ static struct resource adc_resources[] = { }; static struct platform_device at91_adc_device = { - .name = "at91_adc", + .name = "at91sam9260-adc", .id = -1, .dev = { .platform_data = &adc_data, -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 0/3] iio: adc: at91 fixes 2014-03-05 16:57 [PATCH 0/3] iio: adc: at91 fixes Alexandre Belloni ` (2 preceding siblings ...) 2014-03-05 16:57 ` [PATCH 3/3] ARM: at91: at91sam9260: " Alexandre Belloni @ 2014-03-06 7:28 ` Josh Wu 2014-03-10 10:52 ` Nicolas Ferre 3 siblings, 1 reply; 14+ messages in thread From: Josh Wu @ 2014-03-06 7:28 UTC (permalink / raw) To: linux-arm-kernel Hi, Alexandre On 3/6/2014 12:57 AM, Alexandre Belloni wrote: > This series fixes a kernel crash at probe time when using the at91_adc driver > through platform_data. This crash appeared in 3.13. > > The first patch fixes the crash. While it is already quite late, I think it > would be good to get it in 3.14. > > The next patches restore support for at91_adc on the at91sam9g45 and at91sam9260 > based boards. It would be great if they could make it in 3.14. But I'm not sure > it is worth applying them to 3.13. > > Alexandre Belloni (3): > iio: adc: at91_adc: Repair broken platform_data support > ARM: at91: at91sam9g45: change at91_adc name > ARM: at91: at91sam9260: change at91_adc name > > arch/arm/mach-at91/at91sam9260_devices.c | 2 +- > arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- > drivers/iio/adc/at91_adc.c | 26 ++++++++++++++++++++++---- > 3 files changed, 24 insertions(+), 6 deletions(-) > Thank you for the fixes. I tested the patch series in at91sam9m10g45ek and works fine. so here is my: Tested-by: Josh Wu <josh.wu@atmel.com> Acked-by: Josh Wu <josh.wu@atmel.com> Best Regards, Josh Wu ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 0/3] iio: adc: at91 fixes 2014-03-06 7:28 ` [PATCH 0/3] iio: adc: at91 fixes Josh Wu @ 2014-03-10 10:52 ` Nicolas Ferre 0 siblings, 0 replies; 14+ messages in thread From: Nicolas Ferre @ 2014-03-10 10:52 UTC (permalink / raw) To: linux-arm-kernel On 06/03/2014 08:28, Josh Wu : > Hi, Alexandre > > On 3/6/2014 12:57 AM, Alexandre Belloni wrote: >> This series fixes a kernel crash at probe time when using the at91_adc driver >> through platform_data. This crash appeared in 3.13. >> >> The first patch fixes the crash. While it is already quite late, I think it >> would be good to get it in 3.14. >> >> The next patches restore support for at91_adc on the at91sam9g45 and at91sam9260 >> based boards. It would be great if they could make it in 3.14. But I'm not sure >> it is worth applying them to 3.13. >> >> Alexandre Belloni (3): >> iio: adc: at91_adc: Repair broken platform_data support >> ARM: at91: at91sam9g45: change at91_adc name >> ARM: at91: at91sam9260: change at91_adc name >> >> arch/arm/mach-at91/at91sam9260_devices.c | 2 +- >> arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- >> drivers/iio/adc/at91_adc.c | 26 ++++++++++++++++++++++---- >> 3 files changed, 24 insertions(+), 6 deletions(-) >> > > Thank you for the fixes. > I tested the patch series in at91sam9m10g45ek and works fine. > > so here is my: > Tested-by: Josh Wu <josh.wu@atmel.com> > Acked-by: Josh Wu <josh.wu@atmel.com> Ok, fine with me: Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> -- Nicolas Ferre ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2014-04-23 0:01 UTC | newest] Thread overview: 14+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-03-05 16:57 [PATCH 0/3] iio: adc: at91 fixes Alexandre Belloni 2014-03-05 16:57 ` [PATCH 1/3] iio: adc: at91_adc: Repair broken platform_data support Alexandre Belloni 2014-03-06 19:15 ` Jonathan Cameron 2014-03-12 10:57 ` Alexandre Belloni 2014-03-12 17:21 ` Jonathan Cameron 2014-03-05 16:57 ` [PATCH 2/3] ARM: at91: at91sam9g45: change at91_adc name Alexandre Belloni 2014-03-06 19:16 ` Jonathan Cameron 2014-03-10 13:26 ` Nicolas Ferre 2014-03-15 15:33 ` Jonathan Cameron 2014-04-22 21:49 ` Nicolas Ferre 2014-04-23 0:01 ` Greg Kroah-Hartman 2014-03-05 16:57 ` [PATCH 3/3] ARM: at91: at91sam9260: " Alexandre Belloni 2014-03-06 7:28 ` [PATCH 0/3] iio: adc: at91 fixes Josh Wu 2014-03-10 10:52 ` Nicolas Ferre
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).