diff --git a/Documentation/devicetree/bindings/soc/apple/apple,t8140-mcc.yaml b/Documentation/devicetree/bindings/soc/apple/apple,t8140-mcc.yaml index 1c12662a07091..08f2f7431b6c4 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,t8140-mcc.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,t8140-mcc.yaml @@ -34,6 +34,7 @@ select: - apple,t8122-mcc - apple,t8132-mcc - apple,t8140-mcc + - apple,t8142-mcc required: - compatible @@ -92,6 +93,7 @@ allOf: - items: - enum: - apple,t6041-mcc + - apple,t8142-mcc - const: apple,t8140-mcc reg: diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts index d7ef154a20c6c..9ce5fe5cd7e99 100644 --- a/arch/arm64/boot/dts/apple/t8142-j815.dts +++ b/arch/arm64/boot/dts/apple/t8142-j815.dts @@ -130,3 +130,8 @@ }; /* Unexposed chassis port instances remain described and disabled. */ + +/* aura (mcc_init_m5) turns the system level cache on; the driver confirms it and flushes on shutdown. */ +&mcc { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/apple/t8142.dtsi b/arch/arm64/boot/dts/apple/t8142.dtsi index 13cae26f21d96..e66333affe83e 100644 --- a/arch/arm64/boot/dts/apple/t8142.dtsi +++ b/arch/arm64/boot/dts/apple/t8142.dtsi @@ -151,6 +151,23 @@ reg-names = "core", "event"; }; + /* + * System level cache planes: ADT mcc,t8142 reg[1] (amcc-reg-idx 1, + * one AMCC, amcc-plane-enable-mask 0xf), four planes 0x40000 apart, + * T8140's register layout (ways 0x2800, power 0x2804, allocation + * disable 0x82c, flush 0x2844; m1n1/aura mcc_init_m5). aura enables + * the ways and allocation before the kernel, so the driver only + * checks that and flushes the cache on shutdown. + */ + mcc: memory-controller@220000000 { + compatible = "apple,t8142-mcc", "apple,t8140-mcc"; + reg = <0x2 0x20000000 0x0 0x4000>, + <0x2 0x20040000 0x0 0x4000>, + <0x2 0x20080000 0x0 0x4000>, + <0x2 0x200c0000 0x0 0x4000>; + status = "disabled"; + }; + serial0: serial@3a5200000 { status = "disabled"; compatible = "apple,s5l-uart";