Commit 6260304f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'juno-updates-4.15' of... 

Merge tag 'juno-updates-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/soc

Pull "ARMv8 Vexpress/Juno DT update for v4.15" from Sudeep Holla:

Just single update to enable PSCI support on Foundation models

* tag 'juno-updates-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  arm64: dts: foundation-v8: Enable PSCI mode
parents b966bb45 bc3d3447

arch/arm64/boot/dts/arm/Makefile

+3 −1
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_VEXPRESS) += foundation-v8.dtb foundation-v8-gicv3.dtb

dtb-$(CONFIG_ARCH_VEXPRESS) += \

	foundation-v8.dtb foundation-v8-psci.dtb \

	foundation-v8-gicv3.dtb foundation-v8-gicv3-psci.dtb

dtb-$(CONFIG_ARCH_VEXPRESS) += juno.dtb juno-r1.dtb juno-r2.dtb

dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb

dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2f-1xv7-ca53x2.dtb

arch/arm64/boot/dts/arm/foundation-v8-gicv2.dtsi

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * ARM Ltd.

 *

 * ARMv8 Foundation model DTS (GICv2 configuration)

 */



/ {

	gic: interrupt-controller@2c001000 {

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

		#interrupt-cells = <3>;

		#address-cells = <2>;

		interrupt-controller;

		reg = <0x0 0x2c001000 0 0x1000>,

		      <0x0 0x2c002000 0 0x2000>,

		      <0x0 0x2c004000 0 0x2000>,

		      <0x0 0x2c006000 0 0x2000>;

		interrupts = <1 9 0xf04>;

	};

};

arch/arm64/boot/dts/arm/foundation-v8-gicv3-psci.dts

0 → 100644
+9 −0
Original line number Diff line number Diff line 
/*

 * ARM Ltd.

 *

 * ARMv8 Foundation model DTS (GICv3+PSCI configuration)

 */



#include "foundation-v8.dtsi"

#include "foundation-v8-gicv3.dtsi"

#include "foundation-v8-psci.dtsi"

arch/arm64/boot/dts/arm/foundation-v8-gicv3.dts

+2 −23
Original line number Diff line number Diff line
@@ -5,26 +5,5 @@ 
 */



#include "foundation-v8.dtsi"



/ {

	gic: interrupt-controller@2f000000 {

		compatible = "arm,gic-v3";

		#interrupt-cells = <3>;

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;

		interrupt-controller;

		reg =	<0x0 0x2f000000 0x0 0x10000>,

			<0x0 0x2f100000 0x0 0x200000>,

			<0x0 0x2c000000 0x0 0x2000>,

			<0x0 0x2c010000 0x0 0x2000>,

			<0x0 0x2c02f000 0x0 0x2000>;

		interrupts = <1 9 4>;



		its: its@2f020000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			reg = <0x0 0x2f020000 0x0 0x20000>;

		};

	};

};
 
#include "foundation-v8-gicv3.dtsi"

#include "foundation-v8-spin-table.dtsi"

arch/arm64/boot/dts/arm/foundation-v8-gicv3.dtsi

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * ARM Ltd.

 *

 * ARMv8 Foundation model DTS (GICv3 configuration)

 */



/ {

	gic: interrupt-controller@2f000000 {

		compatible = "arm,gic-v3";

		#interrupt-cells = <3>;

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;

		interrupt-controller;

		reg =	<0x0 0x2f000000 0x0 0x10000>,

			<0x0 0x2f100000 0x0 0x200000>,

			<0x0 0x2c000000 0x0 0x2000>,

			<0x0 0x2c010000 0x0 0x2000>,

			<0x0 0x2c02f000 0x0 0x2000>;

		interrupts = <1 9 4>;



		its: its@2f020000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			reg = <0x0 0x2f020000 0x0 0x20000>;

		};

	};

};