Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bf53b96 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'aspeed-4.14-devicetree' of... 

Merge tag 'aspeed-4.14-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into next/dt

Pull "Aspeed devicetree updates for 4.14" from Joel Stanley:

 - fix to expose the full flash windows on ast2400.

* tag 'aspeed-4.14-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: aspeed-g4: fix AHB window size of the SMC controllers
parents cea92099 bcbd328d

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

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


		fmc: flash-controller@1e620000 {

			reg = < 0x1e620000 0x94

				0x20000000 0x02000000 >;

				0x20000000 0x10000000 >;

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "aspeed,ast2400-fmc";
@@ -41,7 +41,7 @@ 


		spi: flash-controller@1e630000 {

			reg = < 0x1e630000 0x18

				0x30000000 0x02000000 >;

				0x30000000 0x10000000 >;

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "aspeed,ast2400-spi";