All of lore.kernel.org
 help / color / mirror / Atom feed
From: monstr@monstr.eu (Michal Simek)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Xilinx Zynq dt changes for v3.19
Date: Mon, 01 Dec 2014 09:31:20 +0100	[thread overview]
Message-ID: <547C2758.1020707@monstr.eu> (raw)

Hi,

please pull these 4 patches to your arm-soc tree.
There will be conflict in DT for parallella because of fix
"ARM: dts: zynq: Enable PL clocks for Parallella"
(sha1: 92c9e0c780e61f821ab8a08f0d4d4fd33ba1197c)

Resolution of this conflict is:
&clkc {
	ps-clk-frequency = <33333333>;
	fclk-enable = <0xf>;
};

Thanks,
Michal


The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:

  Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)

are available in the git repository at:

  https://github.com/Xilinx/linux-xlnx.git tags/zynq-dt-for-3.19

for you to fetch changes up to 7b01abb06c997e5431cdfc62267449aaef1d77c7:

  arm: dts: zynq: Add Digilent ZYBO board (2014-12-01 09:22:53 +0100)

----------------------------------------------------------------
arm: Xilinx Zynq dt patches for v3.19

- Declare Digilent and vendor
- Add Zybo board support
- Fix VDMA documentation to be align with the driver

----------------------------------------------------------------
Andreas F?rber (1):
      Documentation: devicetree: Fix Xilinx VDMA specification

Peter Crosthwaite (3):
      doc: dt: vendor-prefixes: Add Digilent Inc
      arm: dts: zynq: Move crystal freq. to board level
      arm: dts: zynq: Add Digilent ZYBO board

 Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt |  2 +-
 Documentation/devicetree/bindings/vendor-prefixes.txt        |  1 +
 arch/arm/boot/dts/Makefile                                   |  3 ++-
 arch/arm/boot/dts/zynq-7000.dtsi                             |  1 -
 arch/arm/boot/dts/zynq-parallella.dts                        |  4 ++++
 arch/arm/boot/dts/zynq-zc702.dts                             |  4 ++++
 arch/arm/boot/dts/zynq-zc706.dts                             |  4 ++++
 arch/arm/boot/dts/zynq-zed.dts                               |  4 ++++
 arch/arm/boot/dts/zynq-zybo.dts                              | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 arch/arm/boot/dts/zynq-zybo.dts

-- 
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: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141201/9f10c972/attachment.sig>

             reply	other threads:[~2014-12-01  8:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-01  8:31 Michal Simek [this message]
2014-12-04 15:52 ` [GIT PULL] Xilinx Zynq dt changes for v3.19 Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=547C2758.1020707@monstr.eu \
    --to=monstr@monstr.eu \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.