Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 342209
b: refs/heads/master
c: e06f1a9
h: refs/heads/master
i:
  342207: bc11618
v: v3
  • Loading branch information
Josh Cartwright authored and Michal Simek committed Nov 12, 2012
1 parent 36d140c commit 71b49be
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 18 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aaf5e0be79e37d5a8509f09852788fa6a82522b2
refs/heads/master: e06f1a9ed7ebff170ba05d2606d079fb36c6a52d
1 change: 1 addition & 0 deletions trunk/arch/arm/boot/dts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,6 @@ dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
wm8505-ref.dtb \
wm8650-mid.dtb
dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb

endif
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,16 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
/include/ "skeleton.dtsi"

/dts-v1/;
/ {
model = "Xilinx Zynq EP107";
compatible = "xlnx,zynq-ep107";
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&intc>;

memory {
device_type = "memory";
reg = <0x0 0x10000000>;
};

chosen {
bootargs = "console=ttyPS0,9600 root=/dev/ram rw initrd=0x800000,8M earlyprintk";
linux,stdout-path = &uart0;
};
compatible = "xlnx,zynq-7000";

amba {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&intc>;
ranges;

intc: interrupt-controller@f8f01000 {
Expand Down
30 changes: 30 additions & 0 deletions trunk/arch/arm/boot/dts/zynq-zc702.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
* Copyright (C) 2011 Xilinx
* Copyright (C) 2012 National Instruments Corp.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
* may be copied, distributed, and modified under those terms.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
/dts-v1/;
/include/ "zynq-7000.dtsi"

/ {
model = "Zynq ZC702 Development Board";
compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";

memory {
device_type = "memory";
reg = <0x0 0x40000000>;
};

chosen {
bootargs = "console=ttyPS1,115200 earlyprintk";
};

};
3 changes: 2 additions & 1 deletion trunk/arch/arm/mach-zynq/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ static void __init xilinx_map_io(void)
}

static const char *xilinx_dt_match[] = {
"xlnx,zynq-ep107",
"xlnx,zynq-zc702",
"xlnx,zynq-7000",
NULL
};

Expand Down

0 comments on commit 71b49be

Please sign in to comment.