leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: Xilinx Zynq DT fixes for v4.14

Browse Source 
- Remove earlycon
 - Use C pre-processor
 - Add fpga full region
 - Add ethernet-phy as device-type
 - Add adv7511 nodes to zc70x
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlmaypgACgkQykllyylKDCEpkACgkWAijGmJRMDb5HvrH7npUkwz
 QRkAnjQCUrRIO5RbuXob5fIZurV2kMwn
 =7Ggj
 -----END PGP SIGNATURE-----

Merge tag 'zynq-dt-for-4.14' of https://github.com/Xilinx/linux-xlnx into next/dt

Pull "arm: Xilinx Zynq DT fixes for v4.14" from Michal Simek:

- Remove earlycon
- Use C pre-processor
- Add fpga full region
- Add ethernet-phy as device-type
- Add adv7511 nodes to zc70x

* tag 'zynq-dt-for-4.14' of https://github.com/Xilinx/linux-xlnx:
  arm: zynq: Remove earlycon from bootargs
  arm: zynq: Use C pre-processor for includes in dts
  arm: zynq: Label whole PL part as fpga_full region
  arm: zynq: Add device-type property for zynq ethernet phy nodes
  arm: zynq: Add adv7511 on i2c bus for zc70x
This commit is contained in:
Arnd Bergmann 2017-08-22 15:31:38 +02:00
commit 840fa4a080
6 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/zynq-7000.dtsi
View File

@ -42,6 +42,14 @@
};
};
fpga_full: fpga-full {
compatible = "fpga-region";
fpga-mgr = <&devcfg>;
#address-cells = <1>;
#size-cells = <1>;
ranges;
};
pmu@f8891000 {
compatible = "arm,cortex-a9-pmu";
interrupts = <0 5 4>, <0 6 4>;

3
arch/arm/boot/dts/zynq-parallella.dts
View File

@ -34,7 +34,7 @@
};
chosen {
bootargs = "earlycon root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait";
bootargs = "root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait";
stdout-path = "serial0:115200n8";
};
};
@ -54,6 +54,7 @@
compatible = "ethernet-phy-id0141.0e90",
"ethernet-phy-ieee802.3-c22";
reg = <0>;
device_type = "ethernet-phy";
marvell,reg-init = <0x3 0x10 0xff00 0x1e>,
<0x3 0x11 0xfff0 0xa>;
};

20
arch/arm/boot/dts/zynq-zc702.dts
View File

@ -12,7 +12,7 @@
* GNU General Public License for more details.
*/
/dts-v1/;
/include/ "zynq-7000.dtsi"
#include "zynq-7000.dtsi"
/ {
model = "Zynq ZC702 Development Board";
@ -30,7 +30,7 @@
};
chosen {
bootargs = "earlycon";
bootargs = "";
stdout-path = "serial0:115200n8";
};
@ -97,6 +97,7 @@
ethernet_phy: ethernet-phy@7 {
reg = <7>;
device_type = "ethernet-phy";
};
};
@ -131,6 +132,21 @@
};
};
i2c@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
adv7511: hdmi-tx@39 {
compatible = "adi,adv7511";
reg = <0x39>;
adi,input-depth = <8>;
adi,input-colorspace = "yuv422";
adi,input-clock = "1x";
adi,input-style = <3>;
adi,input-justification = "right";
};
};
i2c@2 {
#address-cells = <1>;
#size-cells = <0>;

20
arch/arm/boot/dts/zynq-zc706.dts
View File

@ -12,7 +12,7 @@
* GNU General Public License for more details.
*/
/dts-v1/;
/include/ "zynq-7000.dtsi"
#include "zynq-7000.dtsi"
/ {
model = "Zynq ZC706 Development Board";
@ -30,7 +30,7 @@
};
chosen {
bootargs = "earlycon";
bootargs = "";
stdout-path = "serial0:115200n8";
};
@ -53,6 +53,7 @@
ethernet_phy: ethernet-phy@7 {
reg = <7>;
device_type = "ethernet-phy";
};
};
@ -87,6 +88,21 @@
};
};
i2c@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
adv7511: hdmi-tx@39 {
compatible = "adi,adv7511";
reg = <0x39>;
adi,input-depth = <8>;
adi,input-colorspace = "yuv422";
adi,input-clock = "1x";
adi,input-style = <3>;
adi,input-justification = "evenly";
};
};
i2c@2 {
#address-cells = <1>;
#size-cells = <0>;

5
arch/arm/boot/dts/zynq-zed.dts
View File

@ -12,7 +12,7 @@
* GNU General Public License for more details.
*/
/dts-v1/;
/include/ "zynq-7000.dtsi"
#include "zynq-7000.dtsi"
/ {
model = "Zynq Zed Development Board";
@ -29,7 +29,7 @@
};
chosen {
bootargs = "earlycon";
bootargs = "";
stdout-path = "serial0:115200n8";
};
@ -50,6 +50,7 @@
ethernet_phy: ethernet-phy@0 {
reg = <0>;
device_type = "ethernet-phy";
};
};

5
arch/arm/boot/dts/zynq-zybo.dts
View File

@ -12,7 +12,7 @@
* GNU General Public License for more details.
*/
/dts-v1/;
/include/ "zynq-7000.dtsi"
#include "zynq-7000.dtsi"
/ {
model = "Zynq ZYBO Development Board";
@ -29,7 +29,7 @@
};
chosen {
bootargs = "earlycon";
bootargs = "";
stdout-path = "serial0:115200n8";
};
@ -51,6 +51,7 @@
ethernet_phy: ethernet-phy@0 {
reg = <0>;
device_type = "ethernet-phy";
};
};