diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-13 12:53:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-13 12:53:11 -0400 |
| commit | 541c9be880d601cb0230dc7452c398167ed1eaac (patch) | |
| tree | 0686261e2d2e4589c651d165026d4e678390915a /arch/arm/dts/zynq-zc706.dts | |
| parent | 3f8085e94ae3e8a2996e2f517ecdb608a4b4c09e (diff) | |
| parent | 58ed7f66939cbfb6e48656b3925aefd9f180a1a3 (diff) | |
| download | talos-obmc-uboot-541c9be880d601cb0230dc7452c398167ed1eaac.tar.gz talos-obmc-uboot-541c9be880d601cb0230dc7452c398167ed1eaac.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm/dts/zynq-zc706.dts')
| -rw-r--r-- | arch/arm/dts/zynq-zc706.dts | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/arch/arm/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts index 1610520f7a..d04880a2cd 100644 --- a/arch/arm/dts/zynq-zc706.dts +++ b/arch/arm/dts/zynq-zc706.dts @@ -27,7 +27,7 @@ }; chosen { - bootargs = "earlyprintk"; + bootargs = ""; stdout-path = "serial0:115200n8"; }; @@ -84,6 +84,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>; @@ -291,6 +306,11 @@ }; }; +&qspi { + u-boot,dm-pre-reloc; + status = "okay"; +}; + &sdhci0 { u-boot,dm-pre-reloc; status = "okay"; @@ -305,11 +325,6 @@ pinctrl-0 = <&pinctrl_uart1_default>; }; -&qspi { - u-boot,dm-pre-reloc; - status = "okay"; -}; - &usb0 { status = "okay"; dr_mode = "host"; |
