Unverified Commit 1b29d1c1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'juno-update-5.18' of... 

Merge tag 'juno-update-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/dt

Arm Juno update for v5.18

Just a single update adding long waited support for SCMI firmware variant
as separate devicetrees. I wanted to deal with this differences in the
firmware interface within the bootloader for long time. But with variety
of bootloaders (u-boot, UEFI, ..etc) and need to add SCMI and SCPI
support for sake of discovery with discrepancies in shared memory layout,
it turned out difficult.

So, finally we are adding it as separate files so that we don't break
support for older SCPI firmware interface.

* tag 'juno-update-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  arm64: dts: juno: Add separate SCMI variants
  arm64: dts: juno: Remove GICv2m dma-range

Link: https://lore.kernel.org/r/20220222201812.3338619-1-sudeep.holla@arm.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 52e71a47 96bb0954

arch/arm64/boot/dts/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
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) += juno.dtb juno-r1.dtb juno-r2.dtb juno-scmi.dtb juno-r1-scmi.dtb juno-r2-scmi.dtb

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

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

dtb-$(CONFIG_ARCH_VEXPRESS) += fvp-base-revc.dtb

arch/arm64/boot/dts/arm/juno-base.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -543,8 +543,7 @@ pcie_ctlr: pcie@40000000 { 
			 <0x02000000 0x00 0x50000000 0x00 0x50000000 0x0 0x08000000>,

			 <0x42000000 0x40 0x00000000 0x40 0x00000000 0x1 0x00000000>;

		/* Standard AXI Translation entries as programmed by EDK2 */

		dma-ranges = <0x02000000 0x0 0x2c1c0000 0x0 0x2c1c0000 0x0 0x00040000>,

			     <0x02000000 0x0 0x80000000 0x0 0x80000000 0x0 0x80000000>,

		dma-ranges = <0x02000000 0x0 0x80000000 0x0 0x80000000 0x0 0x80000000>,

			     <0x43000000 0x8 0x00000000 0x8 0x00000000 0x2 0x00000000>;

		#interrupt-cells = <1>;

		interrupt-map-mask = <0 0 0 7>;

arch/arm64/boot/dts/arm/juno-r1-scmi.dts

0 → 100644
+23 −0
Original line number Diff line number Diff line 
#include "juno-r1.dts"

#include "juno-scmi.dtsi"



/ {

	funnel@20130000 {

		power-domains = <&scmi_devpd 8>;

	};



	etf@20140000 {

		power-domains = <&scmi_devpd 0>;

	};



	funnel@20150000 {

		power-domains = <&scmi_devpd 0>;

	};

};



&A57_0 {

	clocks = <&scmi_dvfs 0>;

};

&A57_1 {

	clocks = <&scmi_dvfs 0>;

};

arch/arm64/boot/dts/arm/juno-r2-scmi.dts

0 → 100644
+23 −0
Original line number Diff line number Diff line 
#include "juno-r2.dts"

#include "juno-scmi.dtsi"



/ {

	funnel@20130000 {

		power-domains = <&scmi_devpd 8>;

	};



	etf@20140000 {

		power-domains = <&scmi_devpd 0>;

	};



	funnel@20150000 {

		power-domains = <&scmi_devpd 0>;

	};

};



&A72_0 {

	clocks = <&scmi_dvfs 0>;

};

&A72_1 {

	clocks = <&scmi_dvfs 0>;

};

arch/arm64/boot/dts/arm/juno-scmi.dts

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#include "juno.dts"

#include "juno-scmi.dtsi"



&A57_0 {

	clocks = <&scmi_dvfs 0>;

};

&A57_1 {

	clocks = <&scmi_dvfs 0>;

};