* arm-soc: Xilinx Zynq cleanups for v3.12
@ 2013-08-13 14:50 Michal Simek
2013-08-13 23:27 ` Kevin Hilman
0 siblings, 1 reply; 6+ messages in thread
From: Michal Simek @ 2013-08-13 14:50 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd and Olof,
please pull these cleanup patches to your tree.
Thanks,
Michal
The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:
Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)
are available in the git repository at:
git://git.xilinx.com/linux-xlnx.git tags/zynq-cleanup-for-3.12
for you to fetch changes up to 060968ff9fa1a56b22cc2454906a233d302b1bd2:
arm: zynq: hotplug: Remove unreachable code (2013-08-13 16:09:12 +0200)
----------------------------------------------------------------
arm: Xilinx Zynq cleanup patches for v3.12
This branch contains these fixes:
- SLCR cleanup
- 2 minor zynq pll fixes
- Hotplug cleanup
----------------------------------------------------------------
Soren Brinkmann (6):
arm: zynq: slcr: Remove redundant header #includes
arm: zynq: slcr: Clean up #defines
arm: zynq: slcr: Use read-modify-write for register writes
clk/zynq/pll: Fix documentation for PLL register function
clk/zynq/pll: Use #defines for fbdiv min/max values
arm: zynq: hotplug: Remove unreachable code
arch/arm/mach-zynq/hotplug.c | 55 +++++--------------------------------------------------
arch/arm/mach-zynq/slcr.c | 45 +++++++++++++++++----------------------------
drivers/clk/zynq/pll.c | 18 +++++++++++++-----
3 files changed, 35 insertions(+), 83 deletions(-)
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130813/d7e6b013/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
* arm-soc: Xilinx Zynq cleanups for v3.12
2013-08-13 14:50 arm-soc: Xilinx Zynq cleanups for v3.12 Michal Simek
@ 2013-08-13 23:27 ` Kevin Hilman
2013-08-14 5:01 ` Mike Turquette
0 siblings, 1 reply; 6+ messages in thread
From: Kevin Hilman @ 2013-08-13 23:27 UTC (permalink / raw)
To: linux-arm-kernel
+ Mike Turquette
Michal Simek <monstr@monstr.eu> writes:
> Hi Arnd and Olof,
I'm helping out with arm-soc maintenance now too and I'm on the
arm at kernel.org alias, thanks for Cc'ing it.
> please pull these cleanup patches to your tree.
>
> Thanks,
> Michal
>
> The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:
>
> Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)
>
> are available in the git repository at:
>
> git://git.xilinx.com/linux-xlnx.git tags/zynq-cleanup-for-3.12
>
> for you to fetch changes up to 060968ff9fa1a56b22cc2454906a233d302b1bd2:
>
> arm: zynq: hotplug: Remove unreachable code (2013-08-13 16:09:12 +0200)
>
> ----------------------------------------------------------------
> arm: Xilinx Zynq cleanup patches for v3.12
>
> This branch contains these fixes:
> - SLCR cleanup
> - 2 minor zynq pll fixes
> - Hotplug cleanup
>
> ----------------------------------------------------------------
> Soren Brinkmann (6):
> arm: zynq: slcr: Remove redundant header #includes
> arm: zynq: slcr: Clean up #defines
> arm: zynq: slcr: Use read-modify-write for register writes
> clk/zynq/pll: Fix documentation for PLL register function
> clk/zynq/pll: Use #defines for fbdiv min/max values
These drivers/clk changes should go through the clock maintainer Mike
Turquette. Could you split them out into a separate pull request?
Alternatively, if Mike is confident there won't be any conflicts with
his tree, I'll happily merge them through arm-soc with his ack.
Otherwise, the rest of the stuff looks OK for v3.12 cleanups and I can
apply it when the path of the clock changes is cleared up.
Thanks,
Kevin
> arm: zynq: hotplug: Remove unreachable code
>
> arch/arm/mach-zynq/hotplug.c | 55 +++++--------------------------------------------------
> arch/arm/mach-zynq/slcr.c | 45 +++++++++++++++++----------------------------
> drivers/clk/zynq/pll.c | 18 +++++++++++++-----
> 3 files changed, 35 insertions(+), 83 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* arm-soc: Xilinx Zynq cleanups for v3.12
2013-08-13 23:27 ` Kevin Hilman
@ 2013-08-14 5:01 ` Mike Turquette
2013-08-14 5:43 ` Michal Simek
0 siblings, 1 reply; 6+ messages in thread
From: Mike Turquette @ 2013-08-14 5:01 UTC (permalink / raw)
To: linux-arm-kernel
Quoting Kevin Hilman (2013-08-13 16:27:10)
> + Mike Turquette
>
> Michal Simek <monstr@monstr.eu> writes:
>
> > Hi Arnd and Olof,
>
> I'm helping out with arm-soc maintenance now too and I'm on the
> arm at kernel.org alias, thanks for Cc'ing it.
>
> > please pull these cleanup patches to your tree.
> >
> > Thanks,
> > Michal
> >
> > The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:
> >
> > Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.xilinx.com/linux-xlnx.git tags/zynq-cleanup-for-3.12
> >
> > for you to fetch changes up to 060968ff9fa1a56b22cc2454906a233d302b1bd2:
> >
> > arm: zynq: hotplug: Remove unreachable code (2013-08-13 16:09:12 +0200)
> >
> > ----------------------------------------------------------------
> > arm: Xilinx Zynq cleanup patches for v3.12
> >
> > This branch contains these fixes:
> > - SLCR cleanup
> > - 2 minor zynq pll fixes
> > - Hotplug cleanup
> >
> > ----------------------------------------------------------------
> > Soren Brinkmann (6):
> > arm: zynq: slcr: Remove redundant header #includes
> > arm: zynq: slcr: Clean up #defines
> > arm: zynq: slcr: Use read-modify-write for register writes
> > clk/zynq/pll: Fix documentation for PLL register function
> > clk/zynq/pll: Use #defines for fbdiv min/max values
>
> These drivers/clk changes should go through the clock maintainer Mike
> Turquette. Could you split them out into a separate pull request?
>
> Alternatively, if Mike is confident there won't be any conflicts with
> his tree, I'll happily merge them through arm-soc with his ack.
This is my bad. I updated the clk-fixes branch this morning and then got
distracted and never sent the request to Linus.
Wait for it ... done.
Ok so the two clk patches will hopefully be pulled for -rc6.
Regards,
Mike
>
> Otherwise, the rest of the stuff looks OK for v3.12 cleanups and I can
> apply it when the path of the clock changes is cleared up.
>
> Thanks,
>
> Kevin
>
> > arm: zynq: hotplug: Remove unreachable code
> >
> > arch/arm/mach-zynq/hotplug.c | 55 +++++--------------------------------------------------
> > arch/arm/mach-zynq/slcr.c | 45 +++++++++++++++++----------------------------
> > drivers/clk/zynq/pll.c | 18 +++++++++++++-----
> > 3 files changed, 35 insertions(+), 83 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* arm-soc: Xilinx Zynq cleanups for v3.12
2013-08-14 5:01 ` Mike Turquette
@ 2013-08-14 5:43 ` Michal Simek
2013-08-15 3:16 ` Mike Turquette
0 siblings, 1 reply; 6+ messages in thread
From: Michal Simek @ 2013-08-14 5:43 UTC (permalink / raw)
To: linux-arm-kernel
On 08/14/2013 07:01 AM, Mike Turquette wrote:
> Quoting Kevin Hilman (2013-08-13 16:27:10)
>> + Mike Turquette
>>
>> Michal Simek <monstr@monstr.eu> writes:
>>
>>> Hi Arnd and Olof,
>>
>> I'm helping out with arm-soc maintenance now too and I'm on the
>> arm at kernel.org alias, thanks for Cc'ing it.
>>
>>> please pull these cleanup patches to your tree.
>>>
>>> Thanks,
>>> Michal
>>>
>>> The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:
>>>
>>> Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)
>>>
>>> are available in the git repository at:
>>>
>>> git://git.xilinx.com/linux-xlnx.git tags/zynq-cleanup-for-3.12
>>>
>>> for you to fetch changes up to 060968ff9fa1a56b22cc2454906a233d302b1bd2:
>>>
>>> arm: zynq: hotplug: Remove unreachable code (2013-08-13 16:09:12 +0200)
>>>
>>> ----------------------------------------------------------------
>>> arm: Xilinx Zynq cleanup patches for v3.12
>>>
>>> This branch contains these fixes:
>>> - SLCR cleanup
>>> - 2 minor zynq pll fixes
>>> - Hotplug cleanup
>>>
>>> ----------------------------------------------------------------
>>> Soren Brinkmann (6):
>>> arm: zynq: slcr: Remove redundant header #includes
>>> arm: zynq: slcr: Clean up #defines
>>> arm: zynq: slcr: Use read-modify-write for register writes
>>> clk/zynq/pll: Fix documentation for PLL register function
>>> clk/zynq/pll: Use #defines for fbdiv min/max values
>>
>> These drivers/clk changes should go through the clock maintainer Mike
>> Turquette. Could you split them out into a separate pull request?
>>
>> Alternatively, if Mike is confident there won't be any conflicts with
>> his tree, I'll happily merge them through arm-soc with his ack.
>
> This is my bad. I updated the clk-fixes branch this morning and then got
> distracted and never sent the request to Linus.
>
> Wait for it ... done.
>
> Ok so the two clk patches will hopefully be pulled for -rc6.
These two clk patches in this pull request are different than that 2 patches
which should go to this kernel version and which you correctly added
to pull request to Linus.
Mike: Are you ok to add these 2 patches to mainline via arm-soc tree?
Both changes are cosmetic. If not, I will separate this pull request.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130814/19bdf2af/attachment-0001.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
* arm-soc: Xilinx Zynq cleanups for v3.12
2013-08-14 5:43 ` Michal Simek
@ 2013-08-15 3:16 ` Mike Turquette
2013-08-15 14:30 ` Kevin Hilman
0 siblings, 1 reply; 6+ messages in thread
From: Mike Turquette @ 2013-08-15 3:16 UTC (permalink / raw)
To: linux-arm-kernel
Quoting Michal Simek (2013-08-13 22:43:11)
> On 08/14/2013 07:01 AM, Mike Turquette wrote:
> > Quoting Kevin Hilman (2013-08-13 16:27:10)
> >> + Mike Turquette
> >>
> >> Michal Simek <monstr@monstr.eu> writes:
> >>
> >>> Hi Arnd and Olof,
> >>
> >> I'm helping out with arm-soc maintenance now too and I'm on the
> >> arm at kernel.org alias, thanks for Cc'ing it.
> >>
> >>> please pull these cleanup patches to your tree.
> >>>
> >>> Thanks,
> >>> Michal
> >>>
> >>> The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:
> >>>
> >>> Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)
> >>>
> >>> are available in the git repository at:
> >>>
> >>> git://git.xilinx.com/linux-xlnx.git tags/zynq-cleanup-for-3.12
> >>>
> >>> for you to fetch changes up to 060968ff9fa1a56b22cc2454906a233d302b1bd2:
> >>>
> >>> arm: zynq: hotplug: Remove unreachable code (2013-08-13 16:09:12 +0200)
> >>>
> >>> ----------------------------------------------------------------
> >>> arm: Xilinx Zynq cleanup patches for v3.12
> >>>
> >>> This branch contains these fixes:
> >>> - SLCR cleanup
> >>> - 2 minor zynq pll fixes
> >>> - Hotplug cleanup
> >>>
> >>> ----------------------------------------------------------------
> >>> Soren Brinkmann (6):
> >>> arm: zynq: slcr: Remove redundant header #includes
> >>> arm: zynq: slcr: Clean up #defines
> >>> arm: zynq: slcr: Use read-modify-write for register writes
> >>> clk/zynq/pll: Fix documentation for PLL register function
> >>> clk/zynq/pll: Use #defines for fbdiv min/max values
> >>
> >> These drivers/clk changes should go through the clock maintainer Mike
> >> Turquette. Could you split them out into a separate pull request?
> >>
> >> Alternatively, if Mike is confident there won't be any conflicts with
> >> his tree, I'll happily merge them through arm-soc with his ack.
> >
> > This is my bad. I updated the clk-fixes branch this morning and then got
> > distracted and never sent the request to Linus.
> >
> > Wait for it ... done.
> >
> > Ok so the two clk patches will hopefully be pulled for -rc6.
>
> These two clk patches in this pull request are different than that 2 patches
> which should go to this kernel version and which you correctly added
> to pull request to Linus.
>
> Mike: Are you ok to add these 2 patches to mainline via arm-soc tree?
> Both changes are cosmetic. If not, I will separate this pull request.
Oops. Well it's good to get the fixes merged anyways. I'm still taking
patches towards 3.12 so it would be better for me to take them in. Can
you rebase them on top of clk-next and send me a pull request?
Regards,
Mike
>
> Thanks,
> Michal
>
>
> --
> Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
> w: www.monstr.eu p: +42-0-721842854
> Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
> Maintainer of Linux kernel - Xilinx Zynq ARM architecture
> Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
^ permalink raw reply [flat|nested] 6+ messages in thread
* arm-soc: Xilinx Zynq cleanups for v3.12
2013-08-15 3:16 ` Mike Turquette
@ 2013-08-15 14:30 ` Kevin Hilman
0 siblings, 0 replies; 6+ messages in thread
From: Kevin Hilman @ 2013-08-15 14:30 UTC (permalink / raw)
To: linux-arm-kernel
Mike Turquette <mturquette@linaro.org> writes:
> Quoting Michal Simek (2013-08-13 22:43:11)
>> On 08/14/2013 07:01 AM, Mike Turquette wrote:
>> > Quoting Kevin Hilman (2013-08-13 16:27:10)
>> >> + Mike Turquette
>> >>
>> >> Michal Simek <monstr@monstr.eu> writes:
>> >>
>> >>> Hi Arnd and Olof,
>> >>
>> >> I'm helping out with arm-soc maintenance now too and I'm on the
>> >> arm at kernel.org alias, thanks for Cc'ing it.
>> >>
>> >>> please pull these cleanup patches to your tree.
>> >>>
>> >>> Thanks,
>> >>> Michal
>> >>>
>> >>> The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:
>> >>>
>> >>> Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)
>> >>>
>> >>> are available in the git repository at:
>> >>>
>> >>> git://git.xilinx.com/linux-xlnx.git tags/zynq-cleanup-for-3.12
>> >>>
>> >>> for you to fetch changes up to 060968ff9fa1a56b22cc2454906a233d302b1bd2:
>> >>>
>> >>> arm: zynq: hotplug: Remove unreachable code (2013-08-13 16:09:12 +0200)
>> >>>
>> >>> ----------------------------------------------------------------
>> >>> arm: Xilinx Zynq cleanup patches for v3.12
>> >>>
>> >>> This branch contains these fixes:
>> >>> - SLCR cleanup
>> >>> - 2 minor zynq pll fixes
>> >>> - Hotplug cleanup
>> >>>
>> >>> ----------------------------------------------------------------
>> >>> Soren Brinkmann (6):
>> >>> arm: zynq: slcr: Remove redundant header #includes
>> >>> arm: zynq: slcr: Clean up #defines
>> >>> arm: zynq: slcr: Use read-modify-write for register writes
>> >>> clk/zynq/pll: Fix documentation for PLL register function
>> >>> clk/zynq/pll: Use #defines for fbdiv min/max values
>> >>
>> >> These drivers/clk changes should go through the clock maintainer Mike
>> >> Turquette. Could you split them out into a separate pull request?
>> >>
>> >> Alternatively, if Mike is confident there won't be any conflicts with
>> >> his tree, I'll happily merge them through arm-soc with his ack.
>> >
>> > This is my bad. I updated the clk-fixes branch this morning and then got
>> > distracted and never sent the request to Linus.
>> >
>> > Wait for it ... done.
>> >
>> > Ok so the two clk patches will hopefully be pulled for -rc6.
>>
>> These two clk patches in this pull request are different than that 2 patches
>> which should go to this kernel version and which you correctly added
>> to pull request to Linus.
>>
>> Mike: Are you ok to add these 2 patches to mainline via arm-soc tree?
>> Both changes are cosmetic. If not, I will separate this pull request.
>
> Oops. Well it's good to get the fixes merged anyways. I'm still taking
> patches towards 3.12 so it would be better for me to take them in. Can
> you rebase them on top of clk-next and send me a pull request?
... and then resend $SUBJECT pull request to arm at kernel.org without the
drivers/clk changes. Thanks.
Kevin
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-08-15 14:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-13 14:50 arm-soc: Xilinx Zynq cleanups for v3.12 Michal Simek
2013-08-13 23:27 ` Kevin Hilman
2013-08-14 5:01 ` Mike Turquette
2013-08-14 5:43 ` Michal Simek
2013-08-15 3:16 ` Mike Turquette
2013-08-15 14:30 ` Kevin Hilman
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).