Mailing List Archive: Linux: Kernel

[PATCH 1/1] mfd: ab8500: Clean-up the last two ab8500 related DT match tables

Index | Next | Previous | View Threaded

lee.jones at linaro

Jul 6, 2012, 5:43 AM

Post #1 of 7 (63 views)
Permalink

[PATCH 1/1] mfd: ab8500: Clean-up the last two ab8500 related DT match tables

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 [at] linux>
Signed-off-by: Lee Jones <lee.jones [at] linaro>
---
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),
--
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

lee.jones at linaro

Jul 9, 2012, 1:48 PM

Post #2 of 7 (60 views)
Permalink

Re: [PATCH 1/1] mfd: ab8500: Clean-up the last two ab8500 related DT match tables [In reply to]

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 [at] linux>
> Signed-off-by: Lee Jones <lee.jones [at] linaro>
> ---
> 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

--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

sameo at linux

Jul 10, 2012, 2:13 AM

Post #3 of 7 (56 views)
Permalink

Re: [PATCH 1/1] mfd: ab8500: Clean-up the last two ab8500 related DT match tables [In reply to]

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 [at] linux>
> Signed-off-by: Lee Jones <lee.jones [at] linaro>
> ---
> 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.

--
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

lee.jones at linaro

Jul 10, 2012, 8:28 AM

Post #4 of 7 (62 views)
Permalink

Re: [PATCH 1/1] mfd: ab8500: Clean-up the last two ab8500 related DT match tables [In reply to]

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 [at] linux>
>> Signed-off-by: Lee Jones <lee.jones [at] linaro>
>> ---
>> 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?

--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

sameo at linux

Jul 10, 2012, 9:55 AM

Post #5 of 7 (58 views)
Permalink

Re: [PATCH 1/1] mfd: ab8500: Clean-up the last two ab8500 related DT match tables [In reply to]

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 [at] linux>
> >>Signed-off-by: Lee Jones <lee.jones [at] linaro>
> >>---
> >> 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.

--
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

lee.jones at linaro

Jul 10, 2012, 11:19 AM

Post #6 of 7 (54 views)
Permalink

Re: [PATCH 1/1] mfd: ab8500: Clean-up the last two ab8500 related DT match tables [In reply to]

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 [at] linux>
>>>> Signed-off-by: Lee Jones <lee.jones [at] linaro>
>>>> ---
>>>> 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?

--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

sameo at linux

Jul 16, 2012, 5:38 AM

Post #7 of 7 (43 views)
Permalink

Re: [PATCH 1/1] mfd: ab8500: Clean-up the last two ab8500 related DT match tables [In reply to]

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 [at] linux>
> >>>>Signed-off-by: Lee Jones <lee.jones [at] linaro>
> >>>>---
> >>>> 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.

--
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Index | Next | Previous | View Threaded

Interested in having your list archived? Contact Gossamer Threads