* [GIT PULL] arm-soc: Xilinx zynq changes for v3.8
@ 2012-11-05 11:09 Michal Simek
2012-11-06 15:52 ` Olof Johansson
2012-11-16 10:59 ` Michal Simek
0 siblings, 2 replies; 6+ messages in thread
From: Michal Simek @ 2012-11-05 11:09 UTC (permalink / raw)
To: Arnd Bergmann, arm, LKML, linux-arm; +Cc: Josh Cartwright
Hi Arnd and Olof,
please add these patches to your arm-soc trees. All these patches are
for xilinx zynq arm platform.
You shouldn't have any problem to merge it there are no conficts with v3.7-rc4.
Please let me know if you find out any problem.
Thanks,
Michal
The following changes since commit 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64:
Linus Torvalds (1):
Linux 3.7-rc3
are available in the git repository at:
git://git.xilinx.com/linux-xlnx.git arm-next
Josh Cartwright (4):
zynq: use GIC device tree bindings
zynq: use pl310 device tree bindings
zynq: remove use of CLKDEV_LOOKUP
zynq: move static peripheral mappings
arch/arm/Kconfig | 1 -
arch/arm/Makefile | 1 -
arch/arm/boot/dts/zynq-ep107.dts | 19 +++++++++++++---
arch/arm/mach-zynq/common.c | 23 ++++++++-----------
arch/arm/mach-zynq/include/mach/clkdev.h | 32 ----------------------------
arch/arm/mach-zynq/include/mach/zynq_soc.h | 31 +++++++++++++--------------
6 files changed, 40 insertions(+), 67 deletions(-)
delete mode 100644 arch/arm/mach-zynq/include/mach/clkdev.h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] arm-soc: Xilinx zynq changes for v3.8
2012-11-05 11:09 [GIT PULL] arm-soc: Xilinx zynq changes for v3.8 Michal Simek
@ 2012-11-06 15:52 ` Olof Johansson
2012-11-16 10:59 ` Michal Simek
1 sibling, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2012-11-06 15:52 UTC (permalink / raw)
To: Michal Simek; +Cc: Arnd Bergmann, arm, LKML, linux-arm, Josh Cartwright
On Mon, Nov 05, 2012 at 12:09:10PM +0100, Michal Simek wrote:
> Hi Arnd and Olof,
>
> please add these patches to your arm-soc trees. All these patches are
> for xilinx zynq arm platform.
> You shouldn't have any problem to merge it there are no conficts with v3.7-rc4.
>
> Please let me know if you find out any problem.
>
> Thanks,
> Michal
>
> The following changes since commit 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64:
> Linus Torvalds (1):
> Linux 3.7-rc3
>
> are available in the git repository at:
>
> git://git.xilinx.com/linux-xlnx.git arm-next
Thanks, pulled into next/cleanup (local version in zynq/cleanup).
-Olof
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] arm-soc: Xilinx zynq changes for v3.8
2012-11-05 11:09 [GIT PULL] arm-soc: Xilinx zynq changes for v3.8 Michal Simek
2012-11-06 15:52 ` Olof Johansson
@ 2012-11-16 10:59 ` Michal Simek
2012-11-16 16:54 ` Arnd Bergmann
1 sibling, 1 reply; 6+ messages in thread
From: Michal Simek @ 2012-11-16 10:59 UTC (permalink / raw)
To: Arnd Bergmann, arm, LKML, linux-arm, Olof Johansson, Nick Bowler
Cc: Josh Cartwright, John Linn
Hi Arnd and Olof,
I have 7 new follow up patches for zynq. They are based on previous patches
(arm-soc zynq/cleanup branch).
The branch is still based on rc3 but I have also tried to merged it
with the v3.7-rc5 and there is no issue.
It should be the last pull request for v3.8.
Thanks for pulling.
Michal
The following changes since commit f58007762f537ba13674a3138b3f4c20fff1cba9:
Josh Cartwright (1):
zynq: move static peripheral mappings
are available in the git repository at:
git://git.xilinx.com/linux-xlnx.git arm-next
Josh Cartwright (6):
ARM: zynq: move arm-specific sys_timer out of ttc
ARM: zynq: dts: add description of the second uart
ARM: zynq: dts: split up device tree
clk: Add support for fundamental zynq clks
ARM: zynq: use zynq clk bindings
ARM: zynq: add clk binding support to the ttc
Nick Bowler (1):
ARM: zynq: Allow UART1 to be used as DEBUG_LL console.
.../devicetree/bindings/clock/zynq-7000.txt | 55 +++
arch/arm/Kconfig | 1 +
arch/arm/Kconfig.debug | 17 +
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/zynq-7000.dtsi | 166 +++++++++
arch/arm/boot/dts/zynq-ep107.dts | 63 ----
arch/arm/boot/dts/zynq-zc702.dts | 44 +++
arch/arm/mach-zynq/common.c | 33 ++-
arch/arm/mach-zynq/common.h | 4 +-
arch/arm/mach-zynq/include/mach/zynq_soc.h | 16 +-
arch/arm/mach-zynq/timer.c | 297 +++++++++-------
drivers/clk/Makefile | 1 +
drivers/clk/clk-zynq.c | 383 ++++++++++++++++++++
include/linux/clk/zynq.h | 24 ++
14 files changed, 899 insertions(+), 206 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/zynq-7000.txt
create mode 100644 arch/arm/boot/dts/zynq-7000.dtsi
delete mode 100644 arch/arm/boot/dts/zynq-ep107.dts
create mode 100644 arch/arm/boot/dts/zynq-zc702.dts
create mode 100644 drivers/clk/clk-zynq.c
create mode 100644 include/linux/clk/zynq.h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] arm-soc: Xilinx zynq changes for v3.8
2012-11-16 10:59 ` Michal Simek
@ 2012-11-16 16:54 ` Arnd Bergmann
2012-11-16 17:13 ` Michal Simek
0 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2012-11-16 16:54 UTC (permalink / raw)
To: Michal Simek
Cc: arm, LKML, linux-arm, Olof Johansson, Nick Bowler,
Josh Cartwright, John Linn
On Friday 16 November 2012, Michal Simek wrote:
> I have 7 new follow up patches for zynq. They are based on previous patches
> (arm-soc zynq/cleanup branch).
> The branch is still based on rc3 but I have also tried to merged it
> with the v3.7-rc5 and there is no issue.
>
> It should be the last pull request for v3.8.
>
Pulled into next/dt, thanks!
This was a small set of patches and you're new to the job, so there is
no problem with what you sent me, but I have a few comments for the
future:
* Please provide a description of the series that I can put into the
merge changeset, either in the introductory mail or (better) into
the signed tag that you send (git tag -s). Have a look at how
Tony Lindgren does this, he writes the best descriptions.
* I've used the next/dt branch, since that is what most of the patches
from this series best fit in. However, some of the patches would
have made more sense in a different branch (clock, cleanup, ...).
When you have things that are logically separate, just send separate
pull requests. This takes some practice to get the dependencies
right, so please ask if you are not sure how to do it.
* It seems the zynq multiplatform changes didn't make it for 3.8. I
hope you can do this for 3.9, as this should not be too hard.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [GIT PULL] arm-soc: Xilinx zynq changes for v3.8
2012-11-16 16:54 ` Arnd Bergmann
@ 2012-11-16 17:13 ` Michal Simek
2012-11-16 17:46 ` Arnd Bergmann
0 siblings, 1 reply; 6+ messages in thread
From: Michal Simek @ 2012-11-16 17:13 UTC (permalink / raw)
To: Arnd Bergmann
Cc: arm, LKML, linux-arm, Olof Johansson, Nick Bowler,
Josh Cartwright, John Linn
Hi Arnd,
> -----Original Message-----
> From: Arnd Bergmann [mailto:arnd@arndb.de]
> Sent: Friday, November 16, 2012 5:54 PM
> To: Michal Simek
> Cc: arm@kernel.org; LKML; linux-arm; Olof Johansson; Nick Bowler; Josh
> Cartwright; John Linn
> Subject: Re: [GIT PULL] arm-soc: Xilinx zynq changes for v3.8
>
> On Friday 16 November 2012, Michal Simek wrote:
> > I have 7 new follow up patches for zynq. They are based on previous
> > patches (arm-soc zynq/cleanup branch).
> > The branch is still based on rc3 but I have also tried to merged it
> > with the v3.7-rc5 and there is no issue.
> >
> > It should be the last pull request for v3.8.
> >
>
> Pulled into next/dt, thanks!
>
> This was a small set of patches and you're new to the job, so there is no problem
> with what you sent me, but I have a few comments for the
> future:
Yeah, need to learn more how arm-soc works.
>
> * Please provide a description of the series that I can put into the merge
> changeset, either in the introductory mail or (better) into the signed tag that
> you send (git tag -s). Have a look at how Tony Lindgren does this, he writes the
> best descriptions.
No. Do you have a link?
> * I've used the next/dt branch, since that is what most of the patches from this
> series best fit in. However, some of the patches would have made more sense
> in a different branch (clock, cleanup, ...).
> When you have things that are logically separate, just send separate pull
> requests. This takes some practice to get the dependencies right, so please ask
> if you are not sure how to do it.
yeah. I forget.
> * It seems the zynq multiplatform changes didn't make it for 3.8. I hope you can
> do this for 3.9, as this should not be too hard.
We have done a lot of changes and I believe I will have more time to do it soon.
Thanks,
Michal
This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] arm-soc: Xilinx zynq changes for v3.8
2012-11-16 17:13 ` Michal Simek
@ 2012-11-16 17:46 ` Arnd Bergmann
0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2012-11-16 17:46 UTC (permalink / raw)
To: Michal Simek
Cc: arm, LKML, linux-arm, Olof Johansson, Nick Bowler,
Josh Cartwright, John Linn
On Friday 16 November 2012, Michal Simek wrote:
> > * Please provide a description of the series that I can put into the merge
> > changeset, either in the introductory mail or (better) into the signed tag that
> > you send (git tag -s). Have a look at how Tony Lindgren does this, he writes the
> > best descriptions.
>
> No. Do you have a link?
See for example http://www.spinics.net/lists/arm-kernel/msg207098.html
This is a particularly long explanation, it doesn't normally have to
be that verbose, but I probably won't ever complain about a changeset
text being too long rather than too short, independent of whether
it's a patch or a pull request.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-11-16 17:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-05 11:09 [GIT PULL] arm-soc: Xilinx zynq changes for v3.8 Michal Simek
2012-11-06 15:52 ` Olof Johansson
2012-11-16 10:59 ` Michal Simek
2012-11-16 16:54 ` Arnd Bergmann
2012-11-16 17:13 ` Michal Simek
2012-11-16 17:46 ` Arnd Bergmann
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).