Commit e8c276d9 authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Kevin Hilman
Browse files

ARM: dts: meson: group the Cortex-A5 / Cortex-A9 peripherals 



The public Meson8b (S805) datasheet describes a memory region called "A9
Periph base" which starts at 0xC4300000 and ends at 0xC430FFFF. Add a
simple-bus node and move all peripherals that are part of this memory
region.
This makes the .dts a bit easier to read. No functional changes.

Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 2ad4cff7

arch/arm/boot/dts/meson.dtsi

+16 −8
Original line number Diff line number Diff line
@@ -59,14 +59,6 @@ 
		cache-level = <2>;

	};



	gic: interrupt-controller@c4301000 {

		compatible = "arm,cortex-a9-gic";

		reg = <0xc4301000 0x1000>,

		      <0xc4300100 0x0100>;

		interrupt-controller;

		#interrupt-cells = <3>;

	};



	soc {

		compatible = "simple-bus";

		#address-cells = <1>;
@@ -207,6 +199,22 @@ 
			};

		};



		periph: bus@c4300000 {

			compatible = "simple-bus";

			reg = <0xc4300000 0x10000>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0xc4300000 0x10000>;



			gic: interrupt-controller@1000 {

				compatible = "arm,cortex-a9-gic";

				reg = <0x1000 0x1000>,

				      <0x100 0x100>;

				interrupt-controller;

				#interrupt-cells = <3>;

			};

		};



		aobus: aobus@c8100000 {

			compatible = "simple-bus";

			reg = <0xc8100000 0x100000>;

arch/arm/boot/dts/meson8.dtsi

+7 −5
Original line number Diff line number Diff line
@@ -129,11 +129,6 @@ 
			no-map;

		};

	};



	scu@c4300000 {

		compatible = "arm,cortex-a9-scu";

		reg = <0xc4300000 0x100>;

	};

}; /* end of / */



&aobus {
@@ -362,6 +357,13 @@ 
	arm,shared-override;

};



&periph {

	scu@0 {

		compatible = "arm,cortex-a9-scu";

		reg = <0x0 0x100>;

	};

};



&pwm_ab {

	compatible = "amlogic,meson8-pwm", "amlogic,meson8b-pwm";

};

arch/arm/boot/dts/meson8b.dtsi

+7 −5
Original line number Diff line number Diff line
@@ -112,11 +112,6 @@ 
			no-map;

		};

	};



	scu@c4300000 {

		compatible = "arm,cortex-a5-scu";

		reg = <0xc4300000 0x100>;

	};

}; /* end of / */



&aobus {
@@ -349,6 +344,13 @@ 
	arm,shared-override;

};



&periph {

	scu@0 {

		compatible = "arm,cortex-a5-scu";

		reg = <0x0 0x100>;

	};

};



&pwm_ab {

	compatible = "amlogic,meson8b-pwm";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE