diff options
| author | Tom Rini <trini@konsulko.com> | 2018-04-09 11:06:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-09 11:06:21 -0400 |
| commit | 2600df4f8ef12ece9cec13030005919e0ba2b0d5 (patch) | |
| tree | 993f32ce9c39fadc2effffb3690dc60cd1add303 /arch/arm/dts/zynqmp-zcu102-revB.dts | |
| parent | 844fb498cc978608ec88bdf29913c0d46c85bfff (diff) | |
| parent | f190eaf002bf1434587d57c726b3dabfabbc8074 (diff) | |
Merge tag 'xilinx-for-v2018.05-rc2' of git://git.denx.de/u-boot-microblaze
Xilinx changes for v2018.05-rc2
- Various DT changes and sync with mainline kernel
- Various defconfig updates
- Add SPL init for zcu102 revA
- Add new zynqmp boards zcu100/zcu104/zcu106/zcu111/zc12XX
and zc1751-dc3
- Net fixes - xlnx,phy-type
- 64bit axi ethernet support
- arasan: Fix nand write issue
- fpga fixes
- Maintainer file updates
Diffstat (limited to 'arch/arm/dts/zynqmp-zcu102-revB.dts')
| -rw-r--r-- | arch/arm/dts/zynqmp-zcu102-revB.dts | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/dts/zynqmp-zcu102-revB.dts b/arch/arm/dts/zynqmp-zcu102-revB.dts index c771a946b2..af4d86882a 100644 --- a/arch/arm/dts/zynqmp-zcu102-revB.dts +++ b/arch/arm/dts/zynqmp-zcu102-revB.dts @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * dts file for Xilinx ZynqMP ZCU102 RevB * - * (C) Copyright 2016, Xilinx, Inc. + * (C) Copyright 2016 - 2018, Xilinx, Inc. * * Michal Simek <michal.simek@xilinx.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "zynqmp-zcu102-revA.dts" @@ -27,14 +26,12 @@ /delete-node/ phy@21; }; -/* Different qspi 512Mbit version */ - /* Fix collision with u61 */ &i2c0 { - i2cswitch@75 { + i2c-mux@75 { i2c@2 { max15303@1b { /* u8 */ - compatible = "max15303"; + compatible = "maxim,max15303"; reg = <0x1b>; }; /delete-node/ max15303@20; |