Commit 1abf47ed authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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



ARM: dts: zynq: DT changes for v4.20

- Fix DTS spi/i2c warnings for zc702/zc770 boards

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a64240a6 f5054cee

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

+6 −6
Original line number Diff line number Diff line
@@ -174,17 +174,17 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			reg = <7>;

			hwmon@52 {

			hwmon@34 {

				compatible = "ti,ucd9248";

				reg = <52>;

				reg = <0x34>;

			};

			hwmon@53 {

			hwmon@35 {

				compatible = "ti,ucd9248";

				reg = <53>;

				reg = <0x35>;

			};

			hwmon@54 {

			hwmon@36 {

				compatible = "ti,ucd9248";

				reg = <54>;

				reg = <0x36>;

			};

		};

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
	status = "okay";

	num-cs = <4>;

	is-decoded-cs = <0>;

	flash@0 {

	flash@1 {

		compatible = "sst25wf080", "jedec,spi-nor";

		reg = <1>;

		spi-max-frequency = <1000000>;

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

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
	status = "okay";

	num-cs = <4>;

	is-decoded-cs = <0>;

	eeprom: eeprom@0 {

	eeprom: eeprom@2 {

		at25,byte-len = <8192>;

		at25,addr-mode = <2>;

		at25,page-size = <32>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE