Unverified Commit 87df0cec authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'asahi-soc-dt-5.20' of https://github.com/AsahiLinux/linux into arm/late 

Apple SoC DT updates for 5.20.

This round just adds the NVMe controller nodes, since that driver is
finally upstream. Includes one related power domain fixup.

* tag 'asahi-soc-dt-5.20' of https://github.com/AsahiLinux/linux:
  arm64: dts: apple: t8103: Add ANS2 NVMe nodes
  arm64: dts: apple: Re-parent ANS2 power domains

Link: https://lore.kernel.org/r/6de8649c-9795-54a1-fa45-8dd50355061f@marcan.st


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d2fd1ddd 5316d73b

arch/arm64/boot/dts/apple/t8103-pmgr.dtsi

+1 −6
Original line number Diff line number Diff line
@@ -725,11 +725,6 @@ 
		#power-domain-cells = <0>;

		#reset-cells = <0>;

		label = "ans2";

		/*

		 * The ADT makes ps_apcie_st depend on ps_ans2 instead, but this

		 * doesn't make much sense since ANS2 uses APCIE_ST.

		 */

		power-domains = <&ps_apcie_st>;

	};



	ps_gfx: power-controller@3f8 {
@@ -836,7 +831,7 @@ 
		#power-domain-cells = <0>;

		#reset-cells = <0>;

		label = "apcie_st";

		power-domains = <&ps_apcie>;

		power-domains = <&ps_apcie>, <&ps_ans2>;

	};



	ps_ane_sys: power-controller@470 {

arch/arm64/boot/dts/apple/t8103.dtsi

+34 −0
Original line number Diff line number Diff line
@@ -378,6 +378,40 @@ 
				     <AIC_IRQ 274 IRQ_TYPE_LEVEL_HIGH>;

		};



		ans_mbox: mbox@277408000 {

			compatible = "apple,t8103-asc-mailbox", "apple,asc-mailbox-v4";

			reg = <0x2 0x77408000 0x0 0x4000>;

			interrupt-parent = <&aic>;

			interrupts = <AIC_IRQ 583 IRQ_TYPE_LEVEL_HIGH>,

				<AIC_IRQ 584 IRQ_TYPE_LEVEL_HIGH>,

				<AIC_IRQ 585 IRQ_TYPE_LEVEL_HIGH>,

				<AIC_IRQ 586 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "send-empty", "send-not-empty",

				"recv-empty", "recv-not-empty";

			#mbox-cells = <0>;

			power-domains = <&ps_ans2>;

		};



		sart: iommu@27bc50000 {

			compatible = "apple,t8103-sart";

			reg = <0x2 0x7bc50000 0x0 0x10000>;

			power-domains = <&ps_ans2>;

		};



		nvme@27bcc0000 {

			compatible = "apple,t8103-nvme-ans2", "apple,nvme-ans2";

			reg = <0x2 0x7bcc0000 0x0 0x40000>,

				<0x2 0x77400000 0x0 0x4000>;

			reg-names = "nvme", "ans";

			interrupt-parent = <&aic>;

			interrupts = <AIC_IRQ 590 IRQ_TYPE_LEVEL_HIGH>;

			mboxes = <&ans_mbox>;

			apple,sart = <&sart>;

			power-domains = <&ps_ans2>, <&ps_apcie_st>;

			power-domain-names = "ans", "apcie0";

			resets = <&ps_ans2>;

		};



		pcie0_dart_0: dart@681008000 {

			compatible = "apple,t8103-dart";

			reg = <0x6 0x81008000 0x0 0x4000>;