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

Commit 459a6a2f authored by Joel Stanley's avatar Joel Stanley
Browse files

ARM: dts: aspeed: Rename flash-controller nodes 



The device tree compiler has started spitting out warnings about these
names, insisting they be called 'spi':

 ../arch/arm/boot/dts/aspeed-g5.dtsi:108.35-128.5: Warning
 (spi_bus_bridge): /ahb/flash-controller@1e631000: node name for SPI
 buses should be 'spi'

Reviewed-by: default avatarCédric Le Goater <clg@kaod.org>
Reviewed-by: default avatarAndrew Jeffery <andrew@aj.id.au>
Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
parent a188339c

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

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
		#size-cells = <1>;

		ranges;



		fmc: flash-controller@1e620000 {

		fmc: spi@1e620000 {

			reg = < 0x1e620000 0x94

				0x20000000 0x10000000 >;

			#address-cells = <1>;
@@ -69,7 +69,7 @@ 
			};

		};



		spi: flash-controller@1e630000 {

		spi: spi@1e630000 {

			reg = < 0x1e630000 0x18

				0x30000000 0x10000000 >;

			#address-cells = <1>;

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

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
		#size-cells = <1>;

		ranges;



		fmc: flash-controller@1e620000 {

		fmc: spi@1e620000 {

			reg = < 0x1e620000 0xc4

				0x20000000 0x10000000 >;

			#address-cells = <1>;
@@ -86,7 +86,7 @@ 
			};

		};



		spi1: flash-controller@1e630000 {

		spi1: spi@1e630000 {

			reg = < 0x1e630000 0xc4

				0x30000000 0x08000000 >;

			#address-cells = <1>;
@@ -106,7 +106,7 @@ 
			};

		};



		spi2: flash-controller@1e631000 {

		spi2: spi@1e631000 {

			reg = < 0x1e631000 0xc4

				0x38000000 0x08000000 >;

			#address-cells = <1>;