linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/1] ARM: ux500: Match Power-On-Key MFD and DTS compatible strings
@ 2012-08-09 15:57 Lee Jones
  2012-08-09 15:57 ` [PATCH 1/1] ARM: ux500: Remove unused snowball_of_platform_devs struct Lee Jones
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Lee Jones @ 2012-08-09 15:57 UTC (permalink / raw)
  To: linux-arm-kernel, linux-kernel
  Cc: STEricsson_nomadik_linux, linus.walleij, arnd, Lee Jones

The compatible string found in the Power-On-Key's MFD cell matches
the device name provided in the driver. Keeping this naming convention
seems like a good idea, so we're changing the one found in the DTS
file to match.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/dbx5x0.dtsi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index 5106662..7d84f46 100644
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -374,7 +374,7 @@
 				};
 
 				ab8500-ponkey {
-					compatible = "stericsson,ab8500-ponkey";
+					compatible = "stericsson,ab8500-poweron-key";
 					interrupts = <6 0x4
 						      7 0x4>;
 					interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
-- 
1.7.9.5


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH 1/1] ARM: ux500: Remove unused snowball_of_platform_devs struct
  2012-08-09 15:57 [PATCH 1/1] ARM: ux500: Match Power-On-Key MFD and DTS compatible strings Lee Jones
@ 2012-08-09 15:57 ` Lee Jones
  2012-08-14  8:33   ` Linus Walleij
  2012-08-09 15:57 ` [PATCH 1/1] drivers/rtc/rtc-ab8500.c: Revoke Device Tree enablement Lee Jones
  2012-08-14  8:32 ` [PATCH 1/1] ARM: ux500: Match Power-On-Key MFD and DTS compatible strings Linus Walleij
  2 siblings, 1 reply; 11+ messages in thread
From: Lee Jones @ 2012-08-09 15:57 UTC (permalink / raw)
  To: linux-arm-kernel, linux-kernel
  Cc: STEricsson_nomadik_linux, linus.walleij, arnd, Lee Jones

This was left over during a recent clean-up which removed Device Tree
helper structs. There is no longer a requirement for it, so we can just
remove it.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/board-mop500.c |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index a93b147..de10f8f 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -725,11 +725,6 @@ MACHINE_END
 
 #ifdef CONFIG_MACH_UX500_DT
 
-static struct platform_device *snowball_of_platform_devs[] __initdata = {
-	&snowball_led_dev,
-	&snowball_key_dev,
-};
-
 struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
 	/* Requires call-back bindings. */
 	OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata),
-- 
1.7.9.5


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH 1/1] drivers/rtc/rtc-ab8500.c: Revoke Device Tree enablement
  2012-08-09 15:57 [PATCH 1/1] ARM: ux500: Match Power-On-Key MFD and DTS compatible strings Lee Jones
  2012-08-09 15:57 ` [PATCH 1/1] ARM: ux500: Remove unused snowball_of_platform_devs struct Lee Jones
@ 2012-08-09 15:57 ` Lee Jones
  2012-08-14  8:32   ` [rtc-linux] " Linus Walleij
  2012-08-14  8:32 ` [PATCH 1/1] ARM: ux500: Match Power-On-Key MFD and DTS compatible strings Linus Walleij
  2 siblings, 1 reply; 11+ messages in thread
From: Lee Jones @ 2012-08-09 15:57 UTC (permalink / raw)
  To: linux-arm-kernel, linux-kernel
  Cc: STEricsson_nomadik_linux, linus.walleij, arnd, Lee Jones,
	Alessandro Zummo, rtc-linux

All AB8500 devices are now registered via MFD core, so Device Tree
capability is no longer required for probing. Here we pull the DT
match table to ensure we're no longer probed during Device Tree
start-up.

CC: Alessandro Zummo <a.zummo@towertech.it>
CC: rtc-linux@googlegroups.com
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/rtc/rtc-ab8500.c |    6 ------
 1 file changed, 6 deletions(-)

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


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [rtc-linux] [PATCH 1/1] drivers/rtc/rtc-ab8500.c: Revoke Device Tree enablement
  2012-08-09 15:57 ` [PATCH 1/1] drivers/rtc/rtc-ab8500.c: Revoke Device Tree enablement Lee Jones
@ 2012-08-14  8:32   ` Linus Walleij
  2012-08-31 11:08     ` Lee Jones
  0 siblings, 1 reply; 11+ messages in thread
From: Linus Walleij @ 2012-08-14  8:32 UTC (permalink / raw)
  To: rtc-linux
  Cc: linux-arm-kernel, linux-kernel, STEricsson_nomadik_linux,
	linus.walleij, arnd, Lee Jones, Alessandro Zummo

On Thu, Aug 9, 2012 at 5:57 PM, Lee Jones <lee.jones@linaro.org> wrote:

> All AB8500 devices are now registered via MFD core, so Device Tree
> capability is no longer required for probing. Here we pull the DT
> match table to ensure we're no longer probed during Device Tree
> start-up.
>
> CC: Alessandro Zummo <a.zummo@towertech.it>
> CC: rtc-linux@googlegroups.com
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/1] ARM: ux500: Match Power-On-Key MFD and DTS compatible strings
  2012-08-09 15:57 [PATCH 1/1] ARM: ux500: Match Power-On-Key MFD and DTS compatible strings Lee Jones
  2012-08-09 15:57 ` [PATCH 1/1] ARM: ux500: Remove unused snowball_of_platform_devs struct Lee Jones
  2012-08-09 15:57 ` [PATCH 1/1] drivers/rtc/rtc-ab8500.c: Revoke Device Tree enablement Lee Jones
@ 2012-08-14  8:32 ` Linus Walleij
  2 siblings, 0 replies; 11+ messages in thread
From: Linus Walleij @ 2012-08-14  8:32 UTC (permalink / raw)
  To: Lee Jones
  Cc: linux-arm-kernel, linux-kernel, STEricsson_nomadik_linux,
	linus.walleij, arnd

On Thu, Aug 9, 2012 at 5:57 PM, Lee Jones <lee.jones@linaro.org> wrote:

> The compatible string found in the Power-On-Key's MFD cell matches
> the device name provided in the driver. Keeping this naming convention
> seems like a good idea, so we're changing the one found in the DTS
> file to match.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/1] ARM: ux500: Remove unused snowball_of_platform_devs struct
  2012-08-09 15:57 ` [PATCH 1/1] ARM: ux500: Remove unused snowball_of_platform_devs struct Lee Jones
@ 2012-08-14  8:33   ` Linus Walleij
  0 siblings, 0 replies; 11+ messages in thread
From: Linus Walleij @ 2012-08-14  8:33 UTC (permalink / raw)
  To: Lee Jones
  Cc: linux-arm-kernel, linux-kernel, STEricsson_nomadik_linux,
	linus.walleij, arnd

On Thu, Aug 9, 2012 at 5:57 PM, Lee Jones <lee.jones@linaro.org> wrote:

> This was left over during a recent clean-up which removed Device Tree
> helper structs. There is no longer a requirement for it, so we can just
> remove it.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [rtc-linux] [PATCH 1/1] drivers/rtc/rtc-ab8500.c: Revoke Device Tree enablement
  2012-08-14  8:32   ` [rtc-linux] " Linus Walleij
@ 2012-08-31 11:08     ` Lee Jones
  2012-08-31 23:27       ` Linus Walleij
  0 siblings, 1 reply; 11+ messages in thread
From: Lee Jones @ 2012-08-31 11:08 UTC (permalink / raw)
  To: Linus Walleij, Alessandro Zummo
  Cc: rtc-linux, linux-arm-kernel, linux-kernel,
	STEricsson_nomadik_linux, linus.walleij, arnd

On Tue, Aug 14, 2012 at 10:32:02AM +0200, Linus Walleij wrote:
> On Thu, Aug 9, 2012 at 5:57 PM, Lee Jones <lee.jones@linaro.org> wrote:
> 
> > All AB8500 devices are now registered via MFD core, so Device Tree
> > capability is no longer required for probing. Here we pull the DT
> > match table to ensure we're no longer probed during Device Tree
> > start-up.
> >
> > CC: Alessandro Zummo <a.zummo@towertech.it>
> > CC: rtc-linux@googlegroups.com
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> 
> Acked-by: Linus Walleij <linus.walleij@linaro.org>

I'm guessing we still need Alessandro's Ack?

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [rtc-linux] [PATCH 1/1] drivers/rtc/rtc-ab8500.c: Revoke Device Tree enablement
  2012-08-31 11:08     ` Lee Jones
@ 2012-08-31 23:27       ` Linus Walleij
  2012-08-31 23:28         ` Linus Walleij
  0 siblings, 1 reply; 11+ messages in thread
From: Linus Walleij @ 2012-08-31 23:27 UTC (permalink / raw)
  To: Lee Jones
  Cc: Alessandro Zummo, rtc-linux, linux-arm-kernel, linux-kernel,
	STEricsson_nomadik_linux, linus.walleij, arnd

On Fri, Aug 31, 2012 at 1:08 PM, Lee Jones <lee.jones@linaro.org> wrote:
> On Tue, Aug 14, 2012 at 10:32:02AM +0200, Linus Walleij wrote:
>> On Thu, Aug 9, 2012 at 5:57 PM, Lee Jones <lee.jones@linaro.org> wrote:
>>
>> > All AB8500 devices are now registered via MFD core, so Device Tree
>> > capability is no longer required for probing. Here we pull the DT
>> > match table to ensure we're no longer probed during Device Tree
>> > start-up.
>> >
>> > CC: Alessandro Zummo <a.zummo@towertech.it>
>> > CC: rtc-linux@googlegroups.com
>> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
>>
>> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> I'm guessing we still need Alessandro's Ack?

Well, usually we have Andrew Morton merging patches for RTC, so
put him on CC.

If I was the MFD maintainer I'd just merge this though, it's quite
obvious.

Sam: do you agree?

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [rtc-linux] [PATCH 1/1] drivers/rtc/rtc-ab8500.c: Revoke Device Tree enablement
  2012-08-31 23:27       ` Linus Walleij
@ 2012-08-31 23:28         ` Linus Walleij
  2012-09-19 16:03           ` Samuel Ortiz
  0 siblings, 1 reply; 11+ messages in thread
From: Linus Walleij @ 2012-08-31 23:28 UTC (permalink / raw)
  To: Lee Jones, Samuel Ortiz
  Cc: Alessandro Zummo, rtc-linux, linux-arm-kernel, linux-kernel,
	STEricsson_nomadik_linux, linus.walleij, arnd

On Sat, Sep 1, 2012 at 1:27 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Fri, Aug 31, 2012 at 1:08 PM, Lee Jones <lee.jones@linaro.org> wrote:
>> On Tue, Aug 14, 2012 at 10:32:02AM +0200, Linus Walleij wrote:
>>> On Thu, Aug 9, 2012 at 5:57 PM, Lee Jones <lee.jones@linaro.org> wrote:
>>>
>>> > All AB8500 devices are now registered via MFD core, so Device Tree
>>> > capability is no longer required for probing. Here we pull the DT
>>> > match table to ensure we're no longer probed during Device Tree
>>> > start-up.
>>> >
>>> > CC: Alessandro Zummo <a.zummo@towertech.it>
>>> > CC: rtc-linux@googlegroups.com
>>> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
>>>
>>> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>>
>> I'm guessing we still need Alessandro's Ack?
>
> Well, usually we have Andrew Morton merging patches for RTC, so
> put him on CC.
>
> If I was the MFD maintainer I'd just merge this though, it's quite
> obvious.
>
> Sam: do you agree?

Or wait, Sam was not on the To: line...

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [rtc-linux] [PATCH 1/1] drivers/rtc/rtc-ab8500.c: Revoke Device Tree enablement
  2012-08-31 23:28         ` Linus Walleij
@ 2012-09-19 16:03           ` Samuel Ortiz
  2012-09-19 19:09             ` Lee Jones
  0 siblings, 1 reply; 11+ messages in thread
From: Samuel Ortiz @ 2012-09-19 16:03 UTC (permalink / raw)
  To: Linus Walleij
  Cc: Lee Jones, Alessandro Zummo, rtc-linux, linux-arm-kernel,
	linux-kernel, STEricsson_nomadik_linux, linus.walleij, arnd

Hi Linus,

On Sat, Sep 01, 2012 at 01:28:34AM +0200, Linus Walleij wrote:
> On Sat, Sep 1, 2012 at 1:27 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
> > On Fri, Aug 31, 2012 at 1:08 PM, Lee Jones <lee.jones@linaro.org> wrote:
> >> On Tue, Aug 14, 2012 at 10:32:02AM +0200, Linus Walleij wrote:
> >>> On Thu, Aug 9, 2012 at 5:57 PM, Lee Jones <lee.jones@linaro.org> wrote:
> >>>
> >>> > All AB8500 devices are now registered via MFD core, so Device Tree
> >>> > capability is no longer required for probing. Here we pull the DT
> >>> > match table to ensure we're no longer probed during Device Tree
> >>> > start-up.
> >>> >
> >>> > CC: Alessandro Zummo <a.zummo@towertech.it>
> >>> > CC: rtc-linux@googlegroups.com
> >>> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> >>>
> >>> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> >>
> >> I'm guessing we still need Alessandro's Ack?
> >
> > Well, usually we have Andrew Morton merging patches for RTC, so
> > put him on CC.
> >
> > If I was the MFD maintainer I'd just merge this though, it's quite
> > obvious.
> >
> > Sam: do you agree?
I'd love to see the patch first :)
Could you please bounce it to me ?

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [rtc-linux] [PATCH 1/1] drivers/rtc/rtc-ab8500.c: Revoke Device Tree enablement
  2012-09-19 16:03           ` Samuel Ortiz
@ 2012-09-19 19:09             ` Lee Jones
  0 siblings, 0 replies; 11+ messages in thread
From: Lee Jones @ 2012-09-19 19:09 UTC (permalink / raw)
  To: Samuel Ortiz
  Cc: Linus Walleij, Alessandro Zummo, rtc-linux, linux-arm-kernel,
	linux-kernel, STEricsson_nomadik_linux, linus.walleij, arnd

> > > Sam: do you agree?
> I'd love to see the patch first :)
> Could you please bounce it to me ?

I'll help. :)

Author: Lee Jones <lee.jones@linaro.org>
Date:   Thu Aug 9 13:28:19 2012 +0100

    drivers/rtc/rtc-ab8500.c: Revoke Device Tree enablement
    
    All AB8500 devices are now registered via MFD core, so Device Tree
    capability is no longer required for probing. Here we pull the DT
    match table to ensure we're no longer probed during Device Tree
    start-up.
    
    CC: Alessandro Zummo <a.zummo@towertech.it>
    CC: rtc-linux@googlegroups.com
    Acked-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>

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),

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2012-09-19 19:09 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-09 15:57 [PATCH 1/1] ARM: ux500: Match Power-On-Key MFD and DTS compatible strings Lee Jones
2012-08-09 15:57 ` [PATCH 1/1] ARM: ux500: Remove unused snowball_of_platform_devs struct Lee Jones
2012-08-14  8:33   ` Linus Walleij
2012-08-09 15:57 ` [PATCH 1/1] drivers/rtc/rtc-ab8500.c: Revoke Device Tree enablement Lee Jones
2012-08-14  8:32   ` [rtc-linux] " Linus Walleij
2012-08-31 11:08     ` Lee Jones
2012-08-31 23:27       ` Linus Walleij
2012-08-31 23:28         ` Linus Walleij
2012-09-19 16:03           ` Samuel Ortiz
2012-09-19 19:09             ` Lee Jones
2012-08-14  8:32 ` [PATCH 1/1] ARM: ux500: Match Power-On-Key MFD and DTS compatible strings Linus Walleij

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).