| Message ID | 1341578598-9307-1-git-send-email-lee.jones@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Sam, I've just seen that you have a new for-next branch, but this patch is missing in it. Just making sure you didn't miss it: On 06/07/12 14:43, Lee Jones wrote: > A patch was recently submitted to stop all ab8500 devices from > being registered through Device Tree. Instead, only the db8500 > will be DT:ed and the rest will continue to be registered via > the MFD API, as they always were. > > Two patches have recently been applied which enable Device Tree > probing; one for rtc-ab8500 and the other for ponkey-ab8500. > These two need to be removed to prevent double-probing these > devices with Device Tree is enabled. > > Cc: Samuel Ortiz <sameo@linux.intel.com> > Signed-off-by: Lee Jones <lee.jones@linaro.org> > --- > drivers/input/misc/ab8500-ponkey.c | 8 -------- > drivers/rtc/rtc-ab8500.c | 6 ------ > 2 files changed, 14 deletions(-) > > diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c > index 84ec691..5ceb23e 100644 > --- a/drivers/input/misc/ab8500-ponkey.c > +++ b/drivers/input/misc/ab8500-ponkey.c > @@ -132,18 +132,10 @@ static int __devexit ab8500_ponkey_remove(struct platform_device *pdev) > return 0; > } > > -#ifdef CONFIG_OF > -static const struct of_device_id ab8500_ponkey_match[] = { > - { .compatible = "stericsson,ab8500-ponkey", }, > - {} > -}; > -#endif > - > static struct platform_driver ab8500_ponkey_driver = { > .driver = { > .name = "ab8500-poweron-key", > .owner = THIS_MODULE, > - .of_match_table = of_match_ptr(ab8500_ponkey_match), > }, > .probe = ab8500_ponkey_probe, > .remove = __devexit_p(ab8500_ponkey_remove), > diff --git a/drivers/rtc/rtc-ab8500.c b/drivers/rtc/rtc-ab8500.c > index bf3c2f6..2e5970f 100644 > --- a/drivers/rtc/rtc-ab8500.c > +++ b/drivers/rtc/rtc-ab8500.c > @@ -462,16 +462,10 @@ static int __devexit ab8500_rtc_remove(struct platform_device *pdev) > return 0; > } > > -static const struct of_device_id ab8500_rtc_match[] = { > - { .compatible = "stericsson,ab8500-rtc", }, > - {} > -}; > - > static struct platform_driver ab8500_rtc_driver = { > .driver = { > .name = "ab8500-rtc", > .owner = THIS_MODULE, > - .of_match_table = ab8500_rtc_match, > }, > .probe = ab8500_rtc_probe, > .remove = __devexit_p(ab8500_rtc_remove), > Kind regards, Lee
Hi Lee, On Fri, Jul 06, 2012 at 01:43:18PM +0100, Lee Jones wrote: > A patch was recently submitted to stop all ab8500 devices from > being registered through Device Tree. Instead, only the db8500 > will be DT:ed and the rest will continue to be registered via > the MFD API, as they always were. > > Two patches have recently been applied which enable Device Tree > probing; one for rtc-ab8500 and the other for ponkey-ab8500. > These two need to be removed to prevent double-probing these > devices with Device Tree is enabled. > > Cc: Samuel Ortiz <sameo@linux.intel.com> > Signed-off-by: Lee Jones <lee.jones@linaro.org> > --- > drivers/input/misc/ab8500-ponkey.c | 8 -------- > drivers/rtc/rtc-ab8500.c | 6 ------ > 2 files changed, 14 deletions(-) I don't know against which tree you generated those patches, but none of those 2 of_device_id arrays are in my for-next branch. So I can't apply this patch. Cheers, Samuel.
On 10/07/12 11:13, Samuel Ortiz wrote: > Hi Lee, > > On Fri, Jul 06, 2012 at 01:43:18PM +0100, Lee Jones wrote: >> A patch was recently submitted to stop all ab8500 devices from >> being registered through Device Tree. Instead, only the db8500 >> will be DT:ed and the rest will continue to be registered via >> the MFD API, as they always were. >> >> Two patches have recently been applied which enable Device Tree >> probing; one for rtc-ab8500 and the other for ponkey-ab8500. >> These two need to be removed to prevent double-probing these >> devices with Device Tree is enabled. >> >> Cc: Samuel Ortiz <sameo@linux.intel.com> >> Signed-off-by: Lee Jones <lee.jones@linaro.org> >> --- >> drivers/input/misc/ab8500-ponkey.c | 8 -------- >> drivers/rtc/rtc-ab8500.c | 6 ------ >> 2 files changed, 14 deletions(-) > I don't know against which tree you generated those patches, but none of those > 2 of_device_id arrays are in my for-next branch. So I can't apply this patch. I can rebase them on anything of your choosing. What is your for-next branch based on?
Hi Lee, On Tue, Jul 10, 2012 at 05:28:35PM +0200, Lee Jones wrote: > On 10/07/12 11:13, Samuel Ortiz wrote: > >Hi Lee, > > > >On Fri, Jul 06, 2012 at 01:43:18PM +0100, Lee Jones wrote: > >>A patch was recently submitted to stop all ab8500 devices from > >>being registered through Device Tree. Instead, only the db8500 > >>will be DT:ed and the rest will continue to be registered via > >>the MFD API, as they always were. > >> > >>Two patches have recently been applied which enable Device Tree > >>probing; one for rtc-ab8500 and the other for ponkey-ab8500. > >>These two need to be removed to prevent double-probing these > >>devices with Device Tree is enabled. > >> > >>Cc: Samuel Ortiz <sameo@linux.intel.com> > >>Signed-off-by: Lee Jones <lee.jones@linaro.org> > >>--- > >> drivers/input/misc/ab8500-ponkey.c | 8 -------- > >> drivers/rtc/rtc-ab8500.c | 6 ------ > >> 2 files changed, 14 deletions(-) > >I don't know against which tree you generated those patches, but none of those > >2 of_device_id arrays are in my for-next branch. So I can't apply this patch. > > I can rebase them on anything of your choosing. > > What is your for-next branch based on? On Linus' tree. And the of_device_id arrays are not there. Cheers, Samuel.
On 10/07/12 18:55, Samuel Ortiz wrote: > Hi Lee, > > On Tue, Jul 10, 2012 at 05:28:35PM +0200, Lee Jones wrote: >> On 10/07/12 11:13, Samuel Ortiz wrote: >>> Hi Lee, >>> >>> On Fri, Jul 06, 2012 at 01:43:18PM +0100, Lee Jones wrote: >>>> A patch was recently submitted to stop all ab8500 devices from >>>> being registered through Device Tree. Instead, only the db8500 >>>> will be DT:ed and the rest will continue to be registered via >>>> the MFD API, as they always were. >>>> >>>> Two patches have recently been applied which enable Device Tree >>>> probing; one for rtc-ab8500 and the other for ponkey-ab8500. >>>> These two need to be removed to prevent double-probing these >>>> devices with Device Tree is enabled. >>>> >>>> Cc: Samuel Ortiz <sameo@linux.intel.com> >>>> Signed-off-by: Lee Jones <lee.jones@linaro.org> >>>> --- >>>> drivers/input/misc/ab8500-ponkey.c | 8 -------- >>>> drivers/rtc/rtc-ab8500.c | 6 ------ >>>> 2 files changed, 14 deletions(-) >>> I don't know against which tree you generated those patches, but none of those >>> 2 of_device_id arrays are in my for-next branch. So I can't apply this patch. >> >> I can rebase them on anything of your choosing. >> >> What is your for-next branch based on? > On Linus' tree. And the of_device_id arrays are not there. Ah, that's why. These are patches based on the -next tree. The code we adapt here isn't in Mainline yet. I can wait and send them in the back-end of the merge window, or -rc1 instead?
Hi Lee, On Tue, Jul 10, 2012 at 08:19:26PM +0200, Lee Jones wrote: > On 10/07/12 18:55, Samuel Ortiz wrote: > >Hi Lee, > > > >On Tue, Jul 10, 2012 at 05:28:35PM +0200, Lee Jones wrote: > >>On 10/07/12 11:13, Samuel Ortiz wrote: > >>>Hi Lee, > >>> > >>>On Fri, Jul 06, 2012 at 01:43:18PM +0100, Lee Jones wrote: > >>>>A patch was recently submitted to stop all ab8500 devices from > >>>>being registered through Device Tree. Instead, only the db8500 > >>>>will be DT:ed and the rest will continue to be registered via > >>>>the MFD API, as they always were. > >>>> > >>>>Two patches have recently been applied which enable Device Tree > >>>>probing; one for rtc-ab8500 and the other for ponkey-ab8500. > >>>>These two need to be removed to prevent double-probing these > >>>>devices with Device Tree is enabled. > >>>> > >>>>Cc: Samuel Ortiz <sameo@linux.intel.com> > >>>>Signed-off-by: Lee Jones <lee.jones@linaro.org> > >>>>--- > >>>> drivers/input/misc/ab8500-ponkey.c | 8 -------- > >>>> drivers/rtc/rtc-ab8500.c | 6 ------ > >>>> 2 files changed, 14 deletions(-) > >>>I don't know against which tree you generated those patches, but none of those > >>>2 of_device_id arrays are in my for-next branch. So I can't apply this patch. > >> > >>I can rebase them on anything of your choosing. > >> > >>What is your for-next branch based on? > >On Linus' tree. And the of_device_id arrays are not there. > > Ah, that's why. > > These are patches based on the -next tree. > > The code we adapt here isn't in Mainline yet. > > I can wait and send them in the back-end of the merge window, or > -rc1 instead? Yes, I can send it as a post rc1 patch. Cheers, Samuel.
diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c index 84ec691..5ceb23e 100644 --- a/drivers/input/misc/ab8500-ponkey.c +++ b/drivers/input/misc/ab8500-ponkey.c @@ -132,18 +132,10 @@ static int __devexit ab8500_ponkey_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_OF -static const struct of_device_id ab8500_ponkey_match[] = { - { .compatible = "stericsson,ab8500-ponkey", }, - {} -}; -#endif - static struct platform_driver ab8500_ponkey_driver = { .driver = { .name = "ab8500-poweron-key", .owner = THIS_MODULE, - .of_match_table = of_match_ptr(ab8500_ponkey_match), }, .probe = ab8500_ponkey_probe, .remove = __devexit_p(ab8500_ponkey_remove), diff --git a/drivers/rtc/rtc-ab8500.c b/drivers/rtc/rtc-ab8500.c index bf3c2f6..2e5970f 100644 --- a/drivers/rtc/rtc-ab8500.c +++ b/drivers/rtc/rtc-ab8500.c @@ -462,16 +462,10 @@ static int __devexit ab8500_rtc_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id ab8500_rtc_match[] = { - { .compatible = "stericsson,ab8500-rtc", }, - {} -}; - static struct platform_driver ab8500_rtc_driver = { .driver = { .name = "ab8500-rtc", .owner = THIS_MODULE, - .of_match_table = ab8500_rtc_match, }, .probe = ab8500_rtc_probe, .remove = __devexit_p(ab8500_rtc_remove),
A patch was recently submitted to stop all ab8500 devices from being registered through Device Tree. Instead, only the db8500 will be DT:ed and the rest will continue to be registered via the MFD API, as they always were. Two patches have recently been applied which enable Device Tree probing; one for rtc-ab8500 and the other for ponkey-ab8500. These two need to be removed to prevent double-probing these devices with Device Tree is enabled. Cc: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/input/misc/ab8500-ponkey.c | 8 -------- drivers/rtc/rtc-ab8500.c | 6 ------ 2 files changed, 14 deletions(-)