Commit f2791ed7 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: dts: ixp4xx: Use the expansion bus 



Replace the "simple-bus" simplification by the proper bus for
IXP4xx memory or device expansion.

Use chip-select addressing with two address cells on all the
flashes mounted on the IXP4xx devices. This includes all flash
chips.

Change the unit-name from @50000000 to @c4000000 as the DTS
validation screams. The registers for controlling the bus are
at c4000000 but the actual memory windows and ranges are at
50000000. Well it is just syntax, we can live with it.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent e6471679

arch/arm/boot/dts/intel-ixp42x-dlink-dsm-g600.dts

+3 −3
Original line number Diff line number Diff line
@@ -99,16 +99,16 @@ 
	};



	soc {

		bus@50000000 {

		bus@c4000000 {

			/* The first 16MB region at CS0 on the expansion bus */

			flash@0 {

			flash@0,0 {

				compatible = "intel,ixp4xx-flash", "cfi-flash";

				bank-width = <2>;

				/*

				 * 16 MB of Flash in 128 0x20000 sized blocks

				 * mapped in at CS0.

				 */

				reg = <0x00000000 0x1000000>;

				reg = <0 0x00000000 0x1000000>;



				partitions {

					compatible = "redboot-fis";

arch/arm/boot/dts/intel-ixp42x-iomega-nas100d.dts

+3 −3
Original line number Diff line number Diff line
@@ -89,16 +89,16 @@ 
	};



	soc {

		bus@50000000 {

		bus@c4000000 {

			/* The first 16MB region at CS0 on the expansion bus */

			flash@0 {

			flash@0,0 {

				compatible = "intel,ixp4xx-flash", "cfi-flash";

				bank-width = <2>;

				/*

				 * 8 MB of Flash in 0x20000 byte blocks

				 * mapped in at CS0.

				 */

				reg = <0x00000000 0x800000>;

				reg = <0 0x00000000 0x800000>;



				partitions {

					compatible = "redboot-fis";

arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts

+3 −3
Original line number Diff line number Diff line
@@ -96,16 +96,16 @@ 
	};



	soc {

		bus@50000000 {

		bus@c4000000 {

			/* The first 16MB region at CS0 on the expansion bus */

			flash@0 {

			flash@0,0 {

				compatible = "intel,ixp4xx-flash", "cfi-flash";

				bank-width = <2>;

				/*

				 * 8 MB of Flash in 0x20000 byte blocks

				 * mapped in at CS0.

				 */

				reg = <0x00000000 0x800000>;

				reg = <0 0x00000000 0x800000>;



				partitions {

					compatible = "redboot-fis";

arch/arm/boot/dts/intel-ixp42x-welltech-epbx100.dts

+3 −3
Original line number Diff line number Diff line
@@ -29,14 +29,14 @@ 
	};



	soc {

		bus@50000000 {

			flash@0 {

		bus@c4000000 {

			flash@0,0 {

				compatible = "intel,ixp4xx-flash", "cfi-flash";

				bank-width = <2>;

				/*

				 * 16 MB of Flash

				 */

				reg = <0x00000000 0x1000000>;

				reg = <0 0x00000000 0x1000000>;



				partitions {

					compatible = "fixed-partitions";

arch/arm/boot/dts/intel-ixp42x.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -7,6 +7,11 @@ 


/ {

	soc {

		bus@c4000000 {

			compatible = "intel,ixp42x-expansion-bus-controller", "syscon";

			reg = <0xc4000000 0x28>;

		};



		pci@c0000000 {

			compatible = "intel,ixp42x-pci";

		};