Commit 48f3a832 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'aspeed-5.4-devicetree-2' of... 

Merge tag 'aspeed-5.4-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into arm/dt

ASPEED device tree updates for 5.4, second round

 - Alternate flash support for Vesnin
 - Minor cleanups and fixes

* tag 'aspeed-5.4-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: aspeed-g5: Fixe gpio-ranges upper limit
  ARM; dts: aspeed: mihawk: File should not be executable
  ARM: dts: aspeed: swift: Change power supplies to version 2
  ARM: dts: aspeed: vesnin: Add secondary SPI flash chip
  ARM: dts: aspeed: vesnin: Add wdt2 with alt-boot option
  ARM: dts: aspeed-g4: Add all flash chips

Link: https://lore.kernel.org/r/CACPK8Xdp4gVuetmiu2bRTTH6oHhRrC7FELHWKVB2ZGSbPbH7HQ@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 72146720 89b97c42

arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

arch/arm/boot/dts/aspeed-bmc-opp-swift.dts

+2 −2
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ 
	};



	power-supply@68 {

		compatible = "ibm,cffps1";

		compatible = "ibm,cffps2";

		reg = <0x68>;

	};
@@ -504,7 +504,7 @@ 
	};



	power-supply@69 {

		compatible = "ibm,cffps1";

		compatible = "ibm,cffps2";

		reg = <0x69>;

	};

arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts

+10 −0
Original line number Diff line number Diff line
@@ -81,6 +81,12 @@ 
        label = "bmc";

#include "openbmc-flash-layout.dtsi"

	};



	flash@1 {

		status = "okay";

		m25p,fast-read;

		label = "alt";

	};

};



&spi {
@@ -222,3 +228,7 @@ 
&vuart {

	status = "okay";

};



&wdt2 {

	aspeed,alt-boot;

};

arch/arm/boot/dts/aspeed-g4.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -67,6 +67,26 @@ 
				compatible = "jedec,spi-nor";

				status = "disabled";

			};

			flash@1 {

				reg = < 1 >;

				compatible = "jedec,spi-nor";

				status = "disabled";

			};

			flash@2 {

				reg = < 2 >;

				compatible = "jedec,spi-nor";

				status = "disabled";

			};

			flash@3 {

				reg = < 3 >;

				compatible = "jedec,spi-nor";

				status = "disabled";

			};

			flash@4 {

				reg = < 4 >;

				compatible = "jedec,spi-nor";

				status = "disabled";

			};

		};



		spi: spi@1e630000 {

arch/arm/boot/dts/aspeed-g5.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ 
				compatible = "aspeed,ast2500-gpio";

				reg = <0x1e780000 0x1000>;

				interrupts = <20>;

				gpio-ranges = <&pinctrl 0 0 220>;

				gpio-ranges = <&pinctrl 0 0 232>;

				clocks = <&syscon ASPEED_CLK_APB>;

				interrupt-controller;

				#interrupt-cells = <2>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE