* linux-next: manual merge of the akpm tree with the arm-soc tree
@ 2013-03-12 3:47 Stephen Rothwell
2013-03-12 6:25 ` Andrew Lunn
0 siblings, 1 reply; 17+ messages in thread
From: Stephen Rothwell @ 2013-03-12 3:47 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Jingoo Han, Andrew Lunn, Jason Cooper,
Olof Johansson, Arnd Bergmann, linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 1615 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/rtc/rtc-mv.c between commit 89c58c198b25 ("rtc: rtc-mv: Add
support for clk to avoid lockups") from the arm-soc tree and commit "rtc:
rtc-mv: use devm_rtc_device_register()" from the akpm tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/rtc/rtc-mv.c
index f378e17,1ee8551..0000000
--- a/drivers/rtc/rtc-mv.c
+++ b/drivers/rtc/rtc-mv.c
@@@ -272,16 -262,15 +272,17 @@@ static int __init mv_rtc_probe(struct p
if (pdata->irq >= 0) {
device_init_wakeup(&pdev->dev, 1);
- pdata->rtc = rtc_device_register(pdev->name, &pdev->dev,
+ pdata->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&mv_rtc_alarm_ops,
THIS_MODULE);
- } else
- pdata->rtc = rtc_device_register(pdev->name, &pdev->dev,
+ } else {
+ pdata->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&mv_rtc_ops, THIS_MODULE);
+ }
- if (IS_ERR(pdata->rtc))
- return PTR_ERR(pdata->rtc);
+ if (IS_ERR(pdata->rtc)) {
+ ret = PTR_ERR(pdata->rtc);
+ goto out;
+ }
if (pdata->irq >= 0) {
writel(0, pdata->ioaddr + RTC_ALARM_INTERRUPT_MASK_REG_OFFS);
@@@ -308,10 -292,6 +309,9 @@@ static int __exit mv_rtc_remove(struct
if (pdata->irq >= 0)
device_init_wakeup(&pdev->dev, 0);
- rtc_device_unregister(pdata->rtc);
+ if (!IS_ERR(pdata->clk))
+ clk_disable_unprepare(pdata->clk);
+
return 0;
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: linux-next: manual merge of the akpm tree with the arm-soc tree
2013-03-12 3:47 linux-next: manual merge of the akpm tree with the arm-soc tree Stephen Rothwell
@ 2013-03-12 6:25 ` Andrew Lunn
2013-03-12 11:12 ` Jason Cooper
0 siblings, 1 reply; 17+ messages in thread
From: Andrew Lunn @ 2013-03-12 6:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, Jingoo Han, Andrew Lunn,
Jason Cooper, Olof Johansson, Arnd Bergmann, linux-arm-kernel
On Tue, Mar 12, 2013 at 02:47:14PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/rtc/rtc-mv.c between commit 89c58c198b25 ("rtc: rtc-mv: Add
> support for clk to avoid lockups") from the arm-soc tree and commit "rtc:
> rtc-mv: use devm_rtc_device_register()" from the akpm tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).
Hi Stephan
Looks O.K. to me.
Acked-by: Andrew Lunn <andrew@lunn.ch>
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/rtc/rtc-mv.c
> index f378e17,1ee8551..0000000
> --- a/drivers/rtc/rtc-mv.c
> +++ b/drivers/rtc/rtc-mv.c
> @@@ -272,16 -262,15 +272,17 @@@ static int __init mv_rtc_probe(struct p
>
> if (pdata->irq >= 0) {
> device_init_wakeup(&pdev->dev, 1);
> - pdata->rtc = rtc_device_register(pdev->name, &pdev->dev,
> + pdata->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
> &mv_rtc_alarm_ops,
> THIS_MODULE);
> - } else
> - pdata->rtc = rtc_device_register(pdev->name, &pdev->dev,
> + } else {
> + pdata->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
> &mv_rtc_ops, THIS_MODULE);
> + }
> - if (IS_ERR(pdata->rtc))
> - return PTR_ERR(pdata->rtc);
> + if (IS_ERR(pdata->rtc)) {
> + ret = PTR_ERR(pdata->rtc);
> + goto out;
> + }
>
> if (pdata->irq >= 0) {
> writel(0, pdata->ioaddr + RTC_ALARM_INTERRUPT_MASK_REG_OFFS);
> @@@ -308,10 -292,6 +309,9 @@@ static int __exit mv_rtc_remove(struct
> if (pdata->irq >= 0)
> device_init_wakeup(&pdev->dev, 0);
>
> - rtc_device_unregister(pdata->rtc);
> + if (!IS_ERR(pdata->clk))
> + clk_disable_unprepare(pdata->clk);
> +
> return 0;
> }
>
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: linux-next: manual merge of the akpm tree with the arm-soc tree
2013-03-12 6:25 ` Andrew Lunn
@ 2013-03-12 11:12 ` Jason Cooper
2013-03-12 11:37 ` Olof Johansson
0 siblings, 1 reply; 17+ messages in thread
From: Jason Cooper @ 2013-03-12 11:12 UTC (permalink / raw)
To: Andrew Lunn
Cc: Stephen Rothwell, Andrew Morton, linux-next, linux-kernel,
Jingoo Han, Olof Johansson, Arnd Bergmann, linux-arm-kernel
On Tue, Mar 12, 2013 at 07:25:09AM +0100, Andrew Lunn wrote:
> On Tue, Mar 12, 2013 at 02:47:14PM +1100, Stephen Rothwell wrote:
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm tree got a conflict in
> > drivers/rtc/rtc-mv.c between commit 89c58c198b25 ("rtc: rtc-mv: Add
> > support for clk to avoid lockups") from the arm-soc tree and commit "rtc:
> > rtc-mv: use devm_rtc_device_register()" from the akpm tree.
> >
> > I fixed it up (I think - see below) and can carry the fix as necessary
> > (no action is required).
>
> Hi Stephan
>
> Looks O.K. to me.
>
> Acked-by: Andrew Lunn <andrew@lunn.ch>
Same here,
Acked-by: Jason Cooper <jason@lakedaemon.net>
>
> >
> > --
> > Cheers,
> > Stephen Rothwell sfr@canb.auug.org.au
> >
> > diff --cc drivers/rtc/rtc-mv.c
> > index f378e17,1ee8551..0000000
> > --- a/drivers/rtc/rtc-mv.c
> > +++ b/drivers/rtc/rtc-mv.c
> > @@@ -272,16 -262,15 +272,17 @@@ static int __init mv_rtc_probe(struct p
> >
> > if (pdata->irq >= 0) {
> > device_init_wakeup(&pdev->dev, 1);
> > - pdata->rtc = rtc_device_register(pdev->name, &pdev->dev,
> > + pdata->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
> > &mv_rtc_alarm_ops,
> > THIS_MODULE);
> > - } else
> > - pdata->rtc = rtc_device_register(pdev->name, &pdev->dev,
> > + } else {
> > + pdata->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
> > &mv_rtc_ops, THIS_MODULE);
> > + }
> > - if (IS_ERR(pdata->rtc))
> > - return PTR_ERR(pdata->rtc);
> > + if (IS_ERR(pdata->rtc)) {
> > + ret = PTR_ERR(pdata->rtc);
> > + goto out;
> > + }
> >
> > if (pdata->irq >= 0) {
> > writel(0, pdata->ioaddr + RTC_ALARM_INTERRUPT_MASK_REG_OFFS);
> > @@@ -308,10 -292,6 +309,9 @@@ static int __exit mv_rtc_remove(struct
> > if (pdata->irq >= 0)
> > device_init_wakeup(&pdev->dev, 0);
> >
> > - rtc_device_unregister(pdata->rtc);
> > + if (!IS_ERR(pdata->clk))
> > + clk_disable_unprepare(pdata->clk);
> > +
> > return 0;
> > }
> >
>
>
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: linux-next: manual merge of the akpm tree with the arm-soc tree
2013-03-12 11:12 ` Jason Cooper
@ 2013-03-12 11:37 ` Olof Johansson
2013-03-12 11:53 ` Jason Cooper
0 siblings, 1 reply; 17+ messages in thread
From: Olof Johansson @ 2013-03-12 11:37 UTC (permalink / raw)
To: Jason Cooper
Cc: Andrew Lunn, Stephen Rothwell, Andrew Morton, linux-next,
linux-kernel, Jingoo Han, Arnd Bergmann, linux-arm-kernel
On Tue, Mar 12, 2013 at 4:12 AM, Jason Cooper <jason@lakedaemon.net> wrote:
> On Tue, Mar 12, 2013 at 07:25:09AM +0100, Andrew Lunn wrote:
>> On Tue, Mar 12, 2013 at 02:47:14PM +1100, Stephen Rothwell wrote:
>> > Hi Andrew,
>> >
>> > Today's linux-next merge of the akpm tree got a conflict in
>> > drivers/rtc/rtc-mv.c between commit 89c58c198b25 ("rtc: rtc-mv: Add
>> > support for clk to avoid lockups") from the arm-soc tree and commit "rtc:
>> > rtc-mv: use devm_rtc_device_register()" from the akpm tree.
>> >
>> > I fixed it up (I think - see below) and can carry the fix as necessary
>> > (no action is required).
>>
>> Hi Stephan
>>
>> Looks O.K. to me.
>>
>> Acked-by: Andrew Lunn <andrew@lunn.ch>
>
> Same here,
>
> Acked-by: Jason Cooper <jason@lakedaemon.net>
We should make sure that future RTC changes get queued through AKPM
and not through us to avoid these kind of conflicts. Same as other
driver subsystems..
-Olof
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: linux-next: manual merge of the akpm tree with the arm-soc tree
2013-03-12 11:37 ` Olof Johansson
@ 2013-03-12 11:53 ` Jason Cooper
2013-03-12 12:48 ` Arnd Bergmann
2013-03-12 20:20 ` Andrew Morton
0 siblings, 2 replies; 17+ messages in thread
From: Jason Cooper @ 2013-03-12 11:53 UTC (permalink / raw)
To: Olof Johansson
Cc: Andrew Lunn, Stephen Rothwell, Andrew Morton, linux-next,
linux-kernel, Jingoo Han, Arnd Bergmann, linux-arm-kernel
On Tue, Mar 12, 2013 at 04:37:39AM -0700, Olof Johansson wrote:
> On Tue, Mar 12, 2013 at 4:12 AM, Jason Cooper <jason@lakedaemon.net> wrote:
> > On Tue, Mar 12, 2013 at 07:25:09AM +0100, Andrew Lunn wrote:
> >> On Tue, Mar 12, 2013 at 02:47:14PM +1100, Stephen Rothwell wrote:
> >> > Hi Andrew,
> >> >
> >> > Today's linux-next merge of the akpm tree got a conflict in
> >> > drivers/rtc/rtc-mv.c between commit 89c58c198b25 ("rtc: rtc-mv: Add
> >> > support for clk to avoid lockups") from the arm-soc tree and commit "rtc:
> >> > rtc-mv: use devm_rtc_device_register()" from the akpm tree.
> >> >
> >> > I fixed it up (I think - see below) and can carry the fix as necessary
> >> > (no action is required).
> >>
> >> Hi Stephan
> >>
> >> Looks O.K. to me.
> >>
> >> Acked-by: Andrew Lunn <andrew@lunn.ch>
> >
> > Same here,
> >
> > Acked-by: Jason Cooper <jason@lakedaemon.net>
>
> We should make sure that future RTC changes get queued through AKPM
> and not through us to avoid these kind of conflicts. Same as other
> driver subsystems..
I agree, however, this patch is part of a four patch series fixing a
single problem reported by Simon Baatz:
89c58c1 rtc: rtc-mv: Add support for clk to avoid lockups
de88747 gpio: mvebu: Add clk support to prevent lockup
7bf5b40 ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels
93fff4c ARM: kirkwood: of_serial: fix clock gating by removing clock-frequency
Basically, if the user builds a kernel with most everything as modules
(eg copying the debian config), it will fail to boot. All four fixes
are needed together to solve the problem.
I chose to keep them together to maintain bisectability. Either you
have all of the fix (you landed on this branch), or you don't. Was this
the correct decision in this case, or did I miss something?
Also, this series is CC'd to stable for inclusion in v3.8
thx,
Jason.
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: linux-next: manual merge of the akpm tree with the arm-soc tree
2013-03-12 11:53 ` Jason Cooper
@ 2013-03-12 12:48 ` Arnd Bergmann
2013-03-12 13:32 ` Jason Cooper
2013-03-12 20:20 ` Andrew Morton
1 sibling, 1 reply; 17+ messages in thread
From: Arnd Bergmann @ 2013-03-12 12:48 UTC (permalink / raw)
To: Jason Cooper
Cc: Olof Johansson, Andrew Lunn, Stephen Rothwell, Andrew Morton,
linux-next, linux-kernel, Jingoo Han, linux-arm-kernel
On Tuesday 12 March 2013, Jason Cooper wrote:
> I chose to keep them together to maintain bisectability. Either you
> have all of the fix (you landed on this branch), or you don't. Was this
> the correct decision in this case, or did I miss something?
I think you don't need to worry about bisection in this case, especially
as you mentioned that 3.8 is already broken.
>From all I can tell, these are four separate fixes, and you want to have
all of them get merged, but applying just one of them will not make the
state of the kernel tree any worse than what it is before the patches.
Arnd
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the arm-soc tree
2013-03-12 12:48 ` Arnd Bergmann
@ 2013-03-12 13:32 ` Jason Cooper
0 siblings, 0 replies; 17+ messages in thread
From: Jason Cooper @ 2013-03-12 13:32 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Andrew Lunn, Stephen Rothwell, Jingoo Han, linux-kernel,
linux-next, Olof Johansson, Andrew Morton, linux-arm-kernel
On Tue, Mar 12, 2013 at 12:48:24PM +0000, Arnd Bergmann wrote:
> On Tuesday 12 March 2013, Jason Cooper wrote:
> > I chose to keep them together to maintain bisectability. Either you
> > have all of the fix (you landed on this branch), or you don't. Was this
> > the correct decision in this case, or did I miss something?
>
> I think you don't need to worry about bisection in this case, especially
> as you mentioned that 3.8 is already broken.
>
> From all I can tell, these are four separate fixes, and you want to have
> all of them get merged, but applying just one of them will not make the
> state of the kernel tree any worse than what it is before the patches.
Ok, thanks for the clarification. I'll ease up on the bisectability
requirement for fixes in the future.
thx,
Jason.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the arm-soc tree
2013-03-12 11:53 ` Jason Cooper
2013-03-12 12:48 ` Arnd Bergmann
@ 2013-03-12 20:20 ` Andrew Morton
1 sibling, 0 replies; 17+ messages in thread
From: Andrew Morton @ 2013-03-12 20:20 UTC (permalink / raw)
To: Jason Cooper
Cc: Olof Johansson, Andrew Lunn, Stephen Rothwell, linux-next,
linux-kernel, Jingoo Han, Arnd Bergmann, linux-arm-kernel
On Tue, 12 Mar 2013 07:53:39 -0400 Jason Cooper <jason@lakedaemon.net> wrote:
> On Tue, Mar 12, 2013 at 04:37:39AM -0700, Olof Johansson wrote:
> > On Tue, Mar 12, 2013 at 4:12 AM, Jason Cooper <jason@lakedaemon.net> wrote:
> > > On Tue, Mar 12, 2013 at 07:25:09AM +0100, Andrew Lunn wrote:
> > >> On Tue, Mar 12, 2013 at 02:47:14PM +1100, Stephen Rothwell wrote:
> > >> > Hi Andrew,
> > >> >
> > >> > Today's linux-next merge of the akpm tree got a conflict in
> > >> > drivers/rtc/rtc-mv.c between commit 89c58c198b25 ("rtc: rtc-mv: Add
> > >> > support for clk to avoid lockups") from the arm-soc tree and commit "rtc:
> > >> > rtc-mv: use devm_rtc_device_register()" from the akpm tree.
> > >> >
> > >> > I fixed it up (I think - see below) and can carry the fix as necessary
> > >> > (no action is required).
> > >>
> > >> Hi Stephan
> > >>
> > >> Looks O.K. to me.
> > >>
> > >> Acked-by: Andrew Lunn <andrew@lunn.ch>
> > >
> > > Same here,
> > >
> > > Acked-by: Jason Cooper <jason@lakedaemon.net>
> >
> > We should make sure that future RTC changes get queued through AKPM
> > and not through us to avoid these kind of conflicts. Same as other
> > driver subsystems..
>
> I agree, however, this patch is part of a four patch series fixing a
> single problem reported by Simon Baatz:
>
> 89c58c1 rtc: rtc-mv: Add support for clk to avoid lockups
> de88747 gpio: mvebu: Add clk support to prevent lockup
> 7bf5b40 ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels
> 93fff4c ARM: kirkwood: of_serial: fix clock gating by removing clock-frequency
Yep, don't go out of your way to avoid the cross-tree conflicts - we
fix those up all the time. It's best to keep a patch series like this
all in one place.
^ permalink raw reply [flat|nested] 17+ messages in thread
* linux-next: manual merge of the akpm tree with the arm-soc tree
@ 2013-06-21 7:36 Stephen Rothwell
0 siblings, 0 replies; 17+ messages in thread
From: Stephen Rothwell @ 2013-06-21 7:36 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Lad, Prabhakar, Sekhar Nori,
Olof Johansson, Arnd Bergmann, linux-arm-kernel, Robin Holt
[-- Attachment #1: Type: text/plain, Size: 1333 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/arm/mach-davinci/include/mach/tnetv107x.h between commit
b464e3cb2945 ("ARM: davinci: remove __init atrribute from function
declaration") from the arm-soc tree and commit "reboot: arm: change
reboot_mode to use enum reboot_mode" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-davinci/include/mach/tnetv107x.h
index 366e975,bc9479d..0000000
--- a/arch/arm/mach-davinci/include/mach/tnetv107x.h
+++ b/arch/arm/mach-davinci/include/mach/tnetv107x.h
@@@ -51,10 -52,10 +52,10 @@@ struct tnetv107x_device_info
extern struct platform_device tnetv107x_wdt_device;
extern struct platform_device tnetv107x_serial_device;
-extern void __init tnetv107x_init(void);
-extern void __init tnetv107x_devices_init(struct tnetv107x_device_info *);
-extern void __init tnetv107x_irq_init(void);
+extern void tnetv107x_init(void);
+extern void tnetv107x_devices_init(struct tnetv107x_device_info *);
+extern void tnetv107x_irq_init(void);
- void tnetv107x_restart(char mode, const char *cmd);
+ void tnetv107x_restart(enum reboot_mode mode, const char *cmd);
#endif
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread* linux-next: manual merge of the akpm tree with the arm-soc tree
@ 2013-06-21 7:33 Stephen Rothwell
0 siblings, 0 replies; 17+ messages in thread
From: Stephen Rothwell @ 2013-06-21 7:33 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Maxime Ripard, Jamie Iles,
Olof Johansson, Arnd Bergmann, linux-arm-kernel, Robin Holt
[-- Attachment #1: Type: text/plain, Size: 1020 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/arm/mach-picoxcell/common.c between commit 4b83f75a7af3 ("ARM:
picoxcell: Remove init_irq declaration in machine description") from the
arm-soc tree and commit "reboot: arm: change reboot_mode to use enum
reboot_mode" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-picoxcell/common.c
index b13f51b,37add6d..0000000
--- a/arch/arm/mach-picoxcell/common.c
+++ b/arch/arm/mach-picoxcell/common.c
@@@ -8,8 -8,13 +8,9 @@@
* All enquiries to support@picochip.com
*/
#include <linux/delay.h>
-#include <linux/irq.h>
-#include <linux/irqchip.h>
-#include <linux/irqdomain.h>
+ #include <linux/reboot.h>
#include <linux/of.h>
#include <linux/of_address.h>
-#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread* linux-next: manual merge of the akpm tree with the arm-soc tree
@ 2012-05-17 7:18 Stephen Rothwell
0 siblings, 0 replies; 17+ messages in thread
From: Stephen Rothwell @ 2012-05-17 7:18 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Andrew Lunn, Olof Johansson,
Arnd Bergmann, linux-arm-kernel, Viresh Kumar
[-- Attachment #1: Type: text/plain, Size: 3539 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/ata/sata_mv.c between commit eee989902aab ("ARM: Orion: SATA: Add
per channel clk/clkdev support") from the arm-soc tree and commit
"ata/sata_mv: remove conditional compilation of clk code" from the akpm
tree.
I fixed it up (see below) and can carry the fix as necessary.
[I used the arm-soc version with all the conditionals on CONFIG_HAVE_CLK
removed.]
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/ata/sata_mv.c
index 24712ad,37503b8..0000000
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@@ -551,10 -551,7 +551,8 @@@ struct mv_host_priv
u32 irq_mask_offset;
u32 unmask_all_irqs;
- #if defined(CONFIG_HAVE_CLK)
struct clk *clk;
+ struct clk **port_clks;
- #endif
/*
* These consistent DMA memory pools give us guaranteed
* alignment for hardware-accessed data structures,
@@@ -4028,9 -4025,6 +4026,7 @@@ static int mv_platform_probe(struct pla
struct resource *res;
int n_ports = 0;
int rc;
- #if defined(CONFIG_HAVE_CLK)
+ int port;
- #endif
ata_print_version_once(&pdev->dev, DRV_VERSION);
@@@ -4058,13 -4052,6 +4054,11 @@@
if (!host || !hpriv)
return -ENOMEM;
- #if defined(CONFIG_HAVE_CLK)
+ hpriv->port_clks = devm_kzalloc(&pdev->dev,
+ sizeof(struct clk *) * n_ports,
+ GFP_KERNEL);
+ if (!hpriv->port_clks)
+ return -ENOMEM;
- #endif
host->private_data = hpriv;
hpriv->n_ports = n_ports;
hpriv->board_idx = chip_soc;
@@@ -4074,21 -4061,11 +4068,19 @@@
resource_size(res));
hpriv->base -= SATAHC0_REG_BASE;
- #if defined(CONFIG_HAVE_CLK)
hpriv->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(hpriv->clk))
- dev_notice(&pdev->dev, "cannot get clkdev\n");
+ dev_notice(&pdev->dev, "cannot get optional clkdev\n");
else
- clk_enable(hpriv->clk);
+ clk_prepare_enable(hpriv->clk);
+
+ for (port = 0; port < n_ports; port++) {
+ char port_number[16];
+ sprintf(port_number, "%d", port);
+ hpriv->port_clks[port] = clk_get(&pdev->dev, port_number);
+ if (!IS_ERR(hpriv->port_clks[port]))
+ clk_prepare_enable(hpriv->port_clks[port]);
+ }
- #endif
/*
* (Re-)program MBUS remapping windows if we are asked to.
@@@ -4115,18 -4092,10 +4107,16 @@@
return 0;
err:
- #if defined(CONFIG_HAVE_CLK)
if (!IS_ERR(hpriv->clk)) {
- clk_disable(hpriv->clk);
+ clk_disable_unprepare(hpriv->clk);
clk_put(hpriv->clk);
}
+ for (port = 0; port < n_ports; port++) {
+ if (!IS_ERR(hpriv->port_clks[port])) {
+ clk_disable_unprepare(hpriv->port_clks[port]);
+ clk_put(hpriv->port_clks[port]);
+ }
+ }
- #endif
return rc;
}
@@@ -4142,24 -4111,13 +4132,20 @@@
static int __devexit mv_platform_remove(struct platform_device *pdev)
{
struct ata_host *host = platform_get_drvdata(pdev);
- #if defined(CONFIG_HAVE_CLK)
struct mv_host_priv *hpriv = host->private_data;
+ int port;
- #endif
ata_host_detach(host);
- #if defined(CONFIG_HAVE_CLK)
if (!IS_ERR(hpriv->clk)) {
- clk_disable(hpriv->clk);
+ clk_disable_unprepare(hpriv->clk);
clk_put(hpriv->clk);
}
+ for (port = 0; port < host->n_ports; port++) {
+ if (!IS_ERR(hpriv->port_clks[port])) {
+ clk_disable_unprepare(hpriv->port_clks[port]);
+ clk_put(hpriv->port_clks[port]);
+ }
+ }
- #endif
return 0;
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread* linux-next: manual merge of the akpm tree with the arm-soc tree
@ 2012-05-14 9:24 Stephen Rothwell
2012-05-14 21:57 ` Turquette, Mike
0 siblings, 1 reply; 17+ messages in thread
From: Stephen Rothwell @ 2012-05-14 9:24 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Mike Turquette, Olof Johansson,
Arnd Bergmann, linux-arm-kernel, Viresh Kumar
[-- Attachment #1: Type: text/plain, Size: 1214 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/clk/Kconfig between commit d269b974e32c ("clk: remove
COMMON_CLK_DISABLE_UNUSED") from the arm-soc tree and commit "clk: remove
redundant depends on from drivers/Kconfig" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/clk/Kconfig
index 4864407,4f10a21..0000000
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -23,9 -22,18 +23,8 @@@ config COMMON_CL
menu "Common Clock Framework"
depends on COMMON_CLK
-config COMMON_CLK_DISABLE_UNUSED
- bool "Disabled unused clocks at boot"
- ---help---
- Traverses the entire clock tree and disables any clocks that are
- enabled in hardware but have not been enabled by any device drivers.
- This saves power and keeps the software model of the clock in line
- with reality.
-
- If in doubt, say "N".
-
config COMMON_CLK_DEBUG
bool "DebugFS representation of clock tree"
- depends on COMMON_CLK
select DEBUG_FS
---help---
Creates a directory hierchy in debugfs for visualizing the clk
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: linux-next: manual merge of the akpm tree with the arm-soc tree
2012-05-14 9:24 Stephen Rothwell
@ 2012-05-14 21:57 ` Turquette, Mike
0 siblings, 0 replies; 17+ messages in thread
From: Turquette, Mike @ 2012-05-14 21:57 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, Arnd Bergmann, linux-kernel, linux-next,
Olof Johansson, linux-arm-kernel
On Mon, May 14, 2012 at 2:24 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/clk/Kconfig between commit d269b974e32c ("clk: remove
> COMMON_CLK_DISABLE_UNUSED") from the arm-soc tree and commit "clk: remove
> redundant depends on from drivers/Kconfig" from the akpm tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Hi Stephen,
The fix-up is correct.
Thanks,
Mike
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/clk/Kconfig
> index 4864407,4f10a21..0000000
> --- a/drivers/clk/Kconfig
> +++ b/drivers/clk/Kconfig
> @@@ -23,9 -22,18 +23,8 @@@ config COMMON_CL
> menu "Common Clock Framework"
> depends on COMMON_CLK
>
> -config COMMON_CLK_DISABLE_UNUSED
> - bool "Disabled unused clocks at boot"
> - ---help---
> - Traverses the entire clock tree and disables any clocks that are
> - enabled in hardware but have not been enabled by any device drivers.
> - This saves power and keeps the software model of the clock in line
> - with reality.
> -
> - If in doubt, say "N".
> -
> config COMMON_CLK_DEBUG
> bool "DebugFS representation of clock tree"
> - depends on COMMON_CLK
> select DEBUG_FS
> ---help---
> Creates a directory hierchy in debugfs for visualizing the clk
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* linux-next: manual merge of the akpm tree with the arm-soc tree
@ 2012-02-29 6:21 Stephen Rothwell
2012-02-29 6:32 ` Yong Zhang
0 siblings, 1 reply; 17+ messages in thread
From: Stephen Rothwell @ 2012-02-29 6:21 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Haojian Zhuang, Olof Johansson,
Arnd Bergmann, linux-arm-kernel, Yong Zhang
[-- Attachment #1: Type: text/plain, Size: 1772 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/rtc/rtc-sa1100.c between commit 3888c09074db ("rtc: sa1100:
declare irq in resource") from the arm-soc tree and commit "drivers/rtc:
remove IRQF_DISABLED" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/rtc/rtc-sa1100.c
index c105774,e70b4e6..0000000
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@@ -102,23 -156,20 +102,23 @@@ static irqreturn_t sa1100_rtc_interrupt
static int sa1100_rtc_open(struct device *dev)
{
+ struct sa1100_rtc *info = dev_get_drvdata(dev);
+ struct rtc_device *rtc = info->rtc;
int ret;
- struct platform_device *plat_dev = to_platform_device(dev);
- struct rtc_device *rtc = platform_get_drvdata(plat_dev);
- ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, 0,
+ ret = clk_prepare_enable(info->clk);
+ if (ret)
+ goto fail_clk;
- ret = request_irq(info->irq_1hz, sa1100_rtc_interrupt, IRQF_DISABLED,
++ ret = request_irq(info->irq_1hz, sa1100_rtc_interrupt, 0,
"rtc 1Hz", dev);
if (ret) {
- dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);
+ dev_err(dev, "IRQ %d already in use.\n", info->irq_1hz);
goto fail_ui;
}
- ret = request_irq(info->irq_alarm, sa1100_rtc_interrupt, IRQF_DISABLED,
- ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, 0,
++ ret = request_irq(info->irq_alarm, sa1100_rtc_interrupt, 0,
"rtc Alrm", dev);
if (ret) {
- dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);
+ dev_err(dev, "IRQ %d already in use.\n", info->irq_alarm);
goto fail_ai;
}
rtc->max_user_freq = RTC_FREQ;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: linux-next: manual merge of the akpm tree with the arm-soc tree
2012-02-29 6:21 Stephen Rothwell
@ 2012-02-29 6:32 ` Yong Zhang
2012-02-29 6:54 ` Haojian Zhuang
0 siblings, 1 reply; 17+ messages in thread
From: Yong Zhang @ 2012-02-29 6:32 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, Haojian Zhuang,
Olof Johansson, Arnd Bergmann, linux-arm-kernel
On Wed, Feb 29, 2012 at 05:21:27PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/rtc/rtc-sa1100.c between commit 3888c09074db ("rtc: sa1100:
> declare irq in resource") from the arm-soc tree and commit "drivers/rtc:
> remove IRQF_DISABLED" from the akpm tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Your fix looks good to me.
Thanks,
Yong
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/rtc/rtc-sa1100.c
> index c105774,e70b4e6..0000000
> --- a/drivers/rtc/rtc-sa1100.c
> +++ b/drivers/rtc/rtc-sa1100.c
> @@@ -102,23 -156,20 +102,23 @@@ static irqreturn_t sa1100_rtc_interrupt
>
> static int sa1100_rtc_open(struct device *dev)
> {
> + struct sa1100_rtc *info = dev_get_drvdata(dev);
> + struct rtc_device *rtc = info->rtc;
> int ret;
> - struct platform_device *plat_dev = to_platform_device(dev);
> - struct rtc_device *rtc = platform_get_drvdata(plat_dev);
>
> - ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, 0,
> + ret = clk_prepare_enable(info->clk);
> + if (ret)
> + goto fail_clk;
> - ret = request_irq(info->irq_1hz, sa1100_rtc_interrupt, IRQF_DISABLED,
> ++ ret = request_irq(info->irq_1hz, sa1100_rtc_interrupt, 0,
> "rtc 1Hz", dev);
> if (ret) {
> - dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);
> + dev_err(dev, "IRQ %d already in use.\n", info->irq_1hz);
> goto fail_ui;
> }
> - ret = request_irq(info->irq_alarm, sa1100_rtc_interrupt, IRQF_DISABLED,
> - ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, 0,
> ++ ret = request_irq(info->irq_alarm, sa1100_rtc_interrupt, 0,
> "rtc Alrm", dev);
> if (ret) {
> - dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);
> + dev_err(dev, "IRQ %d already in use.\n", info->irq_alarm);
> goto fail_ai;
> }
> rtc->max_user_freq = RTC_FREQ;
--
Only stand for myself
^ permalink raw reply [flat|nested] 17+ messages in thread* RE: linux-next: manual merge of the akpm tree with the arm-soc tree
2012-02-29 6:32 ` Yong Zhang
@ 2012-02-29 6:54 ` Haojian Zhuang
2012-02-29 7:11 ` Stephen Rothwell
0 siblings, 1 reply; 17+ messages in thread
From: Haojian Zhuang @ 2012-02-29 6:54 UTC (permalink / raw)
To: Yong Zhang, Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, Olof Johansson,
Arnd Bergmann, linux-arm-kernel
Hi Stephen & Arnd,
Since there's the conflict on code. Does it mean that I need to re-submit those patches in arm-soc that should be based on commit "drivers/rtc: remove IRQF_DISABLED" from the akpm tree?
Best Regards
Haojian
________________________________________
From: Yong Zhang [yong.zhang0@gmail.com]
Sent: Wednesday, February 29, 2012 2:32 PM
To: Stephen Rothwell
Cc: Andrew Morton; linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Haojian Zhuang; Olof Johansson; Arnd Bergmann; linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the akpm tree with the arm-soc tree
On Wed, Feb 29, 2012 at 05:21:27PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/rtc/rtc-sa1100.c between commit 3888c09074db ("rtc: sa1100:
> declare irq in resource") from the arm-soc tree and commit "drivers/rtc:
> remove IRQF_DISABLED" from the akpm tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Your fix looks good to me.
Thanks,
Yong
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/rtc/rtc-sa1100.c
> index c105774,e70b4e6..0000000
> --- a/drivers/rtc/rtc-sa1100.c
> +++ b/drivers/rtc/rtc-sa1100.c
> @@@ -102,23 -156,20 +102,23 @@@ static irqreturn_t sa1100_rtc_interrupt
>
> static int sa1100_rtc_open(struct device *dev)
> {
> + struct sa1100_rtc *info = dev_get_drvdata(dev);
> + struct rtc_device *rtc = info->rtc;
> int ret;
> - struct platform_device *plat_dev = to_platform_device(dev);
> - struct rtc_device *rtc = platform_get_drvdata(plat_dev);
>
> - ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, 0,
> + ret = clk_prepare_enable(info->clk);
> + if (ret)
> + goto fail_clk;
> - ret = request_irq(info->irq_1hz, sa1100_rtc_interrupt, IRQF_DISABLED,
> ++ ret = request_irq(info->irq_1hz, sa1100_rtc_interrupt, 0,
> "rtc 1Hz", dev);
> if (ret) {
> - dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);
> + dev_err(dev, "IRQ %d already in use.\n", info->irq_1hz);
> goto fail_ui;
> }
> - ret = request_irq(info->irq_alarm, sa1100_rtc_interrupt, IRQF_DISABLED,
> - ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, 0,
> ++ ret = request_irq(info->irq_alarm, sa1100_rtc_interrupt, 0,
> "rtc Alrm", dev);
> if (ret) {
> - dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);
> + dev_err(dev, "IRQ %d already in use.\n", info->irq_alarm);
> goto fail_ai;
> }
> rtc->max_user_freq = RTC_FREQ;
--
Only stand for myself
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: linux-next: manual merge of the akpm tree with the arm-soc tree
2012-02-29 6:54 ` Haojian Zhuang
@ 2012-02-29 7:11 ` Stephen Rothwell
0 siblings, 0 replies; 17+ messages in thread
From: Stephen Rothwell @ 2012-02-29 7:11 UTC (permalink / raw)
To: Haojian Zhuang
Cc: Yong Zhang, Andrew Morton, linux-next, linux-kernel,
Olof Johansson, Arnd Bergmann, linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 490 bytes --]
Hi,
On Tue, 28 Feb 2012 22:54:06 -0800 Haojian Zhuang <hzhuang1@marvell.com> wrote:
>
> Since there's the conflict on code. Does it mean that I need to re-submit
> those patches in arm-soc that should be based on commit "drivers/rtc:
> remove IRQF_DISABLED" from the akpm tree?
No, that conflict can be resolved by Linus during the next merge window
(unless someone else wants to do something about it).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2013-06-21 7:36 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-12 3:47 linux-next: manual merge of the akpm tree with the arm-soc tree Stephen Rothwell
2013-03-12 6:25 ` Andrew Lunn
2013-03-12 11:12 ` Jason Cooper
2013-03-12 11:37 ` Olof Johansson
2013-03-12 11:53 ` Jason Cooper
2013-03-12 12:48 ` Arnd Bergmann
2013-03-12 13:32 ` Jason Cooper
2013-03-12 20:20 ` Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2013-06-21 7:36 Stephen Rothwell
2013-06-21 7:33 Stephen Rothwell
2012-05-17 7:18 Stephen Rothwell
2012-05-14 9:24 Stephen Rothwell
2012-05-14 21:57 ` Turquette, Mike
2012-02-29 6:21 Stephen Rothwell
2012-02-29 6:32 ` Yong Zhang
2012-02-29 6:54 ` Haojian Zhuang
2012-02-29 7:11 ` Stephen Rothwell
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).