diff --git a/arch/arm64/boot/dts/apple/t6041-j616c.dts b/arch/arm64/boot/dts/apple/t6041-j616c.dts index fdbf55c085136..d3d10ff5cc77e 100644 --- a/arch/arm64/boot/dts/apple/t6041-j616c.dts +++ b/arch/arm64/boot/dts/apple/t6041-j616c.dts @@ -22,6 +22,7 @@ disp0 = &display; disp0-piodma = &disp0_piodma; gpu = &gpu; + sep = &sep; }; chosen { @@ -882,6 +883,24 @@ }; }; +&sep_mbox { + status = "okay"; +}; + +&spi2 { + status = "okay"; +}; + +&mesa { + status = "okay"; + enable-gpios = <&pinctrl_nub 53 GPIO_ACTIVE_HIGH>; + interrupt-parent = <&pinctrl>; + interrupts = <116 IRQ_TYPE_EDGE_RISING>; + spi-cs-setup-delay-ns = <20>; + spi-cs-hold-delay-ns = <20>; + firmware-name = "apple/mesacal-j616c.bin", "apple/msrk-j616c.bin"; +}; + &aop { memory-region = <&aop_mmio_pmgr>; }; diff --git a/drivers/soc/apple/profile.rs b/drivers/soc/apple/profile.rs index aaefc62b9528b..11035c92c03d5 100644 --- a/drivers/soc/apple/profile.rs +++ b/drivers/soc/apple/profile.rs @@ -450,6 +450,13 @@ pub(crate) const T6040: PlatformProfile = PlatformProfile { ..T8140 }; +/// MacBook Pro 16" M4 Max (J616c). Its ADT describes the SEP and the sensor as +/// J616s's does. +pub(crate) const T6041: PlatformProfile = PlatformProfile { + name: "T6041/J616c", + ..T6040 +}; + static_assert!(T8103.shmem_capacity == 0x30000); static_assert!(T6020.shmem_capacity == 0x40000); static_assert!(T8140.shmem_capacity == 0x40000); @@ -619,6 +626,9 @@ pub(crate) fn detect() -> Result<&'static PlatformProfile> { { return Ok(&T6040); } + if machine_has(b"apple,t6041") && machine_has(b"apple,j616c") { + return Ok(&T6041); + } Err(ENODEV) }