Skip to contentSkip to conversation

arm-soc: Xilinx Zynq cleanups for v3.12

DISCUSSION Michal Simek 3 participants 6 messages Aug 13, 2013 – Aug 15, 2013

lore
Share & tools
lore
#0 lore raw

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(-)
Signature · 14 lines
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>
#1 lore raw

+ Mike Turquette

Quoted 1 line · Michal Simek

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.

Quoted 25 lines

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

Quoted 7 lines

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

Quoted 6 lines

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(-)
#2 lore raw

Quoting Kevin Hilman (2013-08-13 16:27:10)

Quoted 42 lines

+ Mike Turquette

Quoted 1 line · Michal Simek

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.

Quoted 25 lines

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

Quoted 7 lines

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

Quoted 5 lines

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

Quoted 14 lines

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

Quoted 6 lines

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(-)
#3 lore raw
Quoted 49 lines · Mike Turquette

Quoting Kevin Hilman (2013-08-13 16:27:10)

Quoted 42 lines

+ Mike Turquette

Quoted 1 line · Michal Simek

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.

Quoted 25 lines

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

Quoted 7 lines

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

Quoted 5 lines

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.

Quoted 6 lines

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

Signature · 14 lines
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>
#4 lore raw

Quoting Michal Simek (2013-08-13 22:43:11)

Quoted 55 lines · Mike Turquette
Quoted 54 lines

Quoting Kevin Hilman (2013-08-13 16:27:10)

Quoted 42 lines

+ Mike Turquette

Quoted 1 line · Michal Simek

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.

Quoted 25 lines

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

Quoted 7 lines

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

Quoted 5 lines

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.

Quoted 8 lines
Quoted 1 line

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

Quoted 11 lines

Thanks,
Michal

Signature · 5 lines
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
#5 lore raw
Quoted 62 lines · Mike Turquette

Quoting Michal Simek (2013-08-13 22:43:11)

Quoted 61 lines · Mike Turquette
Quoted 49 lines

Quoting Kevin Hilman (2013-08-13 16:27:10)

Quoted 42 lines

+ Mike Turquette

Quoted 1 line · Michal Simek

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.

Quoted 25 lines

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

Quoted 7 lines

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

Quoted 5 lines

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.

Quoted 6 lines

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.

Quoted 6 lines
Quoted 2 lines

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