Skip to contentSkip to conversation

Xilinx Zynq clk changes for v3.14

GIT PULL Michal Simek 2 participants 5 messages Dec 18, 2013 – Dec 20, 2013

lore
Share & tools
lore
#0 lore raw

Hi Mike,

As we discussed it is better for you to get pull request with signed tags. That's why I am sending you pull request for 2 patches which we have in queue which should go to v3.14.

Thanks,
Michal

The following changes since commit dc1ccc48159d63eca5089e507c82c7d22ef60839:

Linux 3.13-rc2 (2013-11-29 12:57:14 -0800)

are available in the git repository at:

git://git.xilinx.com/linux-xlnx.git tags/zynq-clk-for-3.14

for you to fetch changes up to eda9488d741085f79318884690db139712a1b019:

arm: dt: zynq: Add fclk-enable property to clkc node (2013-12-11 17:48:48 +0100)

----------------------------------------------------------------
arm: Xilinx Zynq clk patches for v3.14

- Add support for fclk-enable feature

----------------------------------------------------------------
Soren Brinkmann (2):
clk/zynq/clkc: Add 'fclk-enable' feature
arm: dt: zynq: Add fclk-enable property to clkc node

 Documentation/devicetree/bindings/clock/zynq-7000.txt |  4 ++++
 arch/arm/boot/dts/zynq-7000.dtsi                      |  1 +
 drivers/clk/zynq/clkc.c                               | 18 +++++++++++++++---
 3 files changed, 20 insertions(+), 3 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/20131218/1ab529f7/attachment.sig>
#1 lore raw

Quoting Michal Simek (2013-12-18 01:26:35)

Quoted 5 lines

Hi Mike,

As we discussed it is better for you to get pull request with signed tags. That's why I am sending you pull request for 2 patches which we have in queue which should go to v3.14.

Michal,

Thanks much for the pull request. In the future it is a bit easier if you base your pull request on the tip of clk-next, but it's not a big deal.

Shouldn't the change to zynq-7000.dtsi go through the arm-soc tree instead of the clk tree?

Regards,
Mike

Quoted 41 lines

Thanks,
Michal

The following changes since commit dc1ccc48159d63eca5089e507c82c7d22ef60839:

Linux 3.13-rc2 (2013-11-29 12:57:14 -0800)

are available in the git repository at:

git://git.xilinx.com/linux-xlnx.git tags/zynq-clk-for-3.14

for you to fetch changes up to eda9488d741085f79318884690db139712a1b019:

arm: dt: zynq: Add fclk-enable property to clkc node (2013-12-11 17:48:48 +0100)

----------------------------------------------------------------
arm: Xilinx Zynq clk patches for v3.14

- Add support for fclk-enable feature

----------------------------------------------------------------
Soren Brinkmann (2):
clk/zynq/clkc: Add 'fclk-enable' feature
arm: dt: zynq: Add fclk-enable property to clkc node

 Documentation/devicetree/bindings/clock/zynq-7000.txt |  4 ++++
 arch/arm/boot/dts/zynq-7000.dtsi                      |  1 +
 drivers/clk/zynq/clkc.c                               | 18 +++++++++++++++---
 3 files changed, 20 insertions(+), 3 deletions(-)
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
#2 lore raw

Hi Mike,

Quoted 7 lines · Mike Turquette

Quoting Michal Simek (2013-12-18 01:26:35)

Quoted 5 lines

Hi Mike,

As we discussed it is better for you to get pull request with signed tags. That's why I am sending you pull request for 2 patches which we have in queue which should go to v3.14.

Quoted 5 lines

Michal,

Thanks much for the pull request. In the future it is a bit easier if you base your pull request on the tip of clk-next, but it's not a big deal.

ok. No problem to do.

Quoted 3 lines

Shouldn't the change to zynq-7000.dtsi go through the arm-soc tree instead of the clk tree?

It is here because it is related to clock and there is no conflict with others DT changes we made for 3.14.
But if you prefer not to have this change here I have no problem to add it to our zynq/clk branch and go through arm-soc tree.

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/20131219/9c8b2985/attachment.sig>
#3 lore raw

Quoting Michal Simek (2013-12-18 23:37:17)

Quoted 19 lines

Hi Mike,

Quoted 7 lines · Mike Turquette

Quoting Michal Simek (2013-12-18 01:26:35)

Quoted 5 lines

Hi Mike,

As we discussed it is better for you to get pull request with signed tags. That's why I am sending you pull request for 2 patches which we have in queue which should go to v3.14.

Quoted 5 lines

Michal,

Thanks much for the pull request. In the future it is a bit easier if you base your pull request on the tip of clk-next, but it's not a big deal.

ok. No problem to do.

Quoted 1 line
Quoted 7 lines
Quoted 2 lines

Shouldn't the change to zynq-7000.dtsi go through the arm-soc tree instead of the clk tree?

It is here because it is related to clock and there is no conflict with others DT changes we made for 3.14.
But if you prefer not to have this change here I have no problem to add it to our zynq/clk branch and go through arm-soc tree.

I think it is better to take the dts patch through arm-soc. Merge conflicts seem unlikely now, but it's best to err on the side of caution and send that patch through the correct tree.

Regards,
Mike

Quoted 12 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
#4 lore raw
Quoted 23 lines · Mike Turquette

Quoting Michal Simek (2013-12-18 23:37:17)

Quoted 22 lines

Hi Mike,

Quoted 7 lines · Mike Turquette

Quoting Michal Simek (2013-12-18 01:26:35)

Quoted 5 lines

Hi Mike,

As we discussed it is better for you to get pull request with signed tags. That's why I am sending you pull request for 2 patches which we have in queue which should go to v3.14.

Quoted 5 lines

Michal,

Thanks much for the pull request. In the future it is a bit easier if you base your pull request on the tip of clk-next, but it's not a big deal.

ok. No problem to do.

Quoted 3 lines

Shouldn't the change to zynq-7000.dtsi go through the arm-soc tree instead of the clk tree?

Quoted 8 lines
Quoted 4 lines

It is here because it is related to clock and there is no conflict with others DT changes we made for 3.14.
But if you prefer not to have this change here I have no problem to add it to our zynq/clk branch and go through arm-soc tree.

I think it is better to take the dts patch through arm-soc. Merge conflicts seem unlikely now, but it's best to err on the side of caution and send that patch through the correct tree.

ok. No problem with that.

Will send you new pull request based on clk-next branch.

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/20131220/d1a554bf/attachment-0001.sig>