Commit a05c51e0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'zynq-dt-for-v5.10' of https://github.com/Xilinx/linux-xlnx into arm/dt 

ARM: dts: zynq: DT changes for v5.11

- Adding support for Zturn-v5
- Small DT changes to clean errors from dt_binding_check

* tag 'zynq-dt-for-v5.10' of https://github.com/Xilinx/linux-xlnx:
  ARM: zynq: Fix incorrect reference to XM013 instead of XM011
  ARM: zynq: Convert at25 binding to new description on zc770-xm013
  ARM: zynq: Fix OCM mapping to be aligned with binding on zc702
  ARM: zynq: Fix leds subnode name for zc702/zybo-z7
  ARM: zynq: Rename bus to be align with simple-bus yaml
  ARM: zynq: Fix compatible string for adi,adxl345 chip
  ARM: zynq: Add Z-turn board V5
parents c87b013f a508f620

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1317,6 +1317,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \ 
	zynq-zc770-xm013.dtb \

	zynq-zed.dtb \

	zynq-zturn.dtb \

	zynq-zturn-v5.dtb \

	zynq-zybo.dtb \

	zynq-zybo-z7.dtb

dtb-$(CONFIG_MACH_ARMADA_370) += \

arch/arm/boot/dts/zynq-7000.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
		};

	};



	amba: amba {

	amba: axi {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

arch/arm/boot/dts/zynq-zc702.dts

+7 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
	leds {

		compatible = "gpio-leds";



		ds23 {

		led-ds23 {

			label = "ds23";

			gpios = <&gpio0 10 0>;

			linux,default-trigger = "heartbeat";
@@ -66,6 +66,12 @@ 
	ocm: sram@fffc0000 {

		compatible = "mmio-sram";

		reg = <0xfffc0000 0x10000>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0xfffc0000 0x10000>;

		ocm-sram@0 {

			reg = <0x0 0x10000>;

		};

	};

};

arch/arm/boot/dts/zynq-zc770-xm011.dts

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Xilinx ZC770 XM013 board DTS

 * Xilinx ZC770 XM011 board DTS

 *

 * Copyright (C) 2013-2018 Xilinx, Inc.

 */

arch/arm/boot/dts/zynq-zc770-xm013.dts

+3 −4
Original line number Diff line number Diff line
@@ -63,13 +63,12 @@ 
	num-cs = <4>;

	is-decoded-cs = <0>;

	eeprom: eeprom@2 {

		at25,byte-len = <8192>;

		at25,addr-mode = <2>;

		at25,page-size = <32>;



		compatible = "atmel,at25";

		reg = <2>;

		spi-max-frequency = <1000000>;

		size = <8192>;

		address-width = <16>;

		pagesize = <32>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE