RyanTheTide · Nov 2, 2026 · Oct 31, 2026 · Nov 1, 2026 · Nov 1, 2026 · Nov 1, 2026
diff --git a/Documentation/ABI/testing/sysfs-driver-aop-als b/Documentation/ABI/testing/sysfs-driver-aop-als
@@ -1,8 +1,9 @@
-What:           /sys/bus/iio/devices/iio:deviceX/in_cct_input
+What:           /sys/bus/iio/devices/iio:deviceX/in_colortemp_input
 Date:           October 2026
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Firmware-computed correlated colour temperature in Kelvin on
+                Firmware-computed light colour temperature (correlated colour
+                temperature) in Kelvin, processed, on
                 aop-sensors-als devices with a Redbird (VD6286) sensor.
                 Fractional Kelvin are reported with micro resolution. There
                 is no raw photodiode-to-CCT conversion in the host driver.

diff --git a/Documentation/accel/apple-ane.rst b/Documentation/accel/apple-ane.rst
@@ -334,7 +334,12 @@ cannot distinguish a control request; its lookup request layout remains
 unproved. No control reply is invented.
 
 IRQ service reads pending once, rejects bits above 7 and writes the exact
-nonzero snapshot to acknowledge. The wait helper services one allocation at
+nonzero snapshot to acknowledge. Only a SHAREDMALLOC notification authorizes
+allocation service: a fresh slot and an allocation request both have a zero
+header, so the body becoming visible does not establish publication. After
+acknowledging, the transport captures the number of queued entries before
+answering any of them. This handles coalesced notifications without admitting
+a later request using an earlier notification. The wait helper services one allocation at
 a time and checks the original absolute monotonic deadline, including time
 spent inside the allocation callback. Servicing never starts a new timeout.
 

diff --git a/Documentation/devicetree/bindings/opp/operating-points-v2-apple-dcs.yaml b/Documentation/devicetree/bindings/opp/operating-points-v2-apple-dcs.yaml
@@ -13,6 +13,8 @@ allOf:
   - $ref: opp-v2-base.yaml#
 
 description: |
+  T6000 DCS raw states are 5, 6, 7 and 9. State 8 is invalid; fabric
+  states are a separate controller and are not DCS states.
   Each OPP maps a verified raw PMGR desired performance state to measured
   sustainable bandwidth. Values are decimal kB/s, not DRAM clock frequencies,
   theoretical peak bandwidth or firmware policy thresholds. State codes and
@@ -31,8 +33,7 @@ patternProperties:
       turbo-mode: false
       opp-level:
         description: Verified raw PMGR desired state, without a state-index bias
-        minimum: 7
-        maximum: 15
+        enum: [5, 6, 7, 9]
       opp-peak-kBps:
         description: Measured sustainable bandwidth at this raw state
         items:

diff --git a/Documentation/devicetree/bindings/sound/apple,macaudio.yaml b/Documentation/devicetree/bindings/sound/apple,macaudio.yaml
@@ -20,6 +20,8 @@ properties:
           - apple,j274-macaudio
           - apple,j293-macaudio
           - apple,j314-macaudio
+          - apple,j614-macaudio
+          - apple,j614-macaudio-jack
           - apple,j616-macaudio
           - apple,j616-macaudio-jack
           - apple,j700-macaudio

diff --git a/Documentation/driver-api/apple-pmgr-dcs.rst b/Documentation/driver-api/apple-pmgr-dcs.rst
@@ -14,17 +14,22 @@ The provider is enabled only by an explicit ``operating-points-v2`` phandle
 and ``#interconnect-cells = <1>`` on the existing PMGR miscellaneous node. Its
 table uses ``operating-points-v2-apple-dcs``. Each enabled OPP supplies a raw
 ``opp-level`` and one ``opp-peak-kBps`` value. The driver validates duplicate
-states, zero or decreasing capacities, the T600x sleep floor of 7, and the
-boot-state ceiling before publishing the provider. It does not derive states
+states, zero or decreasing capacities, the sparse T6000 raw state set
+``{5, 6, 7, 9}``, and the boot-state ceiling before publishing the provider. It does not derive states
 from child order or convert firmware thresholds to bandwidth. Existing DTs
 without this table retain their boot and suspend policy.
 
 The highest table entry must equal the boot desired state. That entry remains
 the initial vote until interconnect sync_state releases boot constraints.
 Nonzero bandwidth also holds the fabric at its boot state so untracked DMA
 clients cannot lose their fabric bandwidth to the idle governor. Requests
-change only the desired low nibble and wait for the actual field to
-confirm the requested state. A timeout restores the previous confirmed vote.
+write the raw state as one complete 32-bit command word, with all upper
+bits zero, and wait for the actual field to confirm it. Readback status
+bits must not be preserved in the command. Raw 8 is invalid; raw 9 is the
+highest DCS state. Fabric has a separate state map. A timeout restores the
+previous confirmed vote with the same complete-word command. The current
+desired and actual fields must agree with the last confirmed vote before
+a new request.
 If restoration also times out, the fabric hold remains asserted and subsequent requests and system sleep fail with
 ``-EIO`` until reboot. Errors propagate to consumers, which must not start work requiring a
 bandwidth request that failed. Firmware ownership and system sleep reject

diff --git a/Documentation/iio/apple-aop-als.rst b/Documentation/iio/apple-aop-als.rst
@@ -17,7 +17,8 @@ must not be distributed with test fixtures.
 The `public Redbird report description
 <https://github.com/triutama133/ubuntu_asahi_patch/blob/3cb6569aaa56815e86b487111725a4d05406bd00/kernel-patches/README.md>`_
 identifies a 122-byte report carrying a firmware-computed CCT float at byte
-0x45. The driver exports that layout as ``in_cct_input``, in Kelvin, without
+0x45. The driver exports that value as the standard IIO colour temperature
+channel, ``in_colortemp_input``, processed and in Kelvin, without
 recalculating colour temperature from raw channels. Other lengths do not
 supply a CCT reading. This layout must be verified on each firmware family
 before its CCT readings are used for display policy. The existing CT720 and
@@ -29,7 +30,7 @@ device number::
     for d in /sys/bus/iio/devices/iio:device*; do
         [ "$(cat "$d/name" 2>/dev/null)" = aop-sensors-als ] || continue
         cat "$d/in_illuminance_input"
-        [ ! -e "$d/in_cct_input" ] || cat "$d/in_cct_input"
+        [ ! -e "$d/in_colortemp_input" ] || cat "$d/in_colortemp_input"
     done
 
 These attributes contain the last valid reading, not a sample counter. Polling

diff --git a/arch/arm64/boot/dts/apple/Makefile b/arch/arm64/boot/dts/apple/Makefile
@@ -94,6 +94,7 @@ dtb-$(CONFIG_ARCH_APPLE) += t6031-j516c.dtb
 dtb-$(CONFIG_ARCH_APPLE) += t6032-j575d.dtb
 dtb-$(CONFIG_ARCH_APPLE) += t6034-j514m.dtb
 dtb-$(CONFIG_ARCH_APPLE) += t6034-j516m.dtb
+dtb-$(CONFIG_ARCH_APPLE) += t6040-j614s.dtb
 dtb-$(CONFIG_ARCH_APPLE) += t6040-j616s.dtb
 dtb-$(CONFIG_ARCH_APPLE) += t6040-j616s-tether.dtb
 dtb-$(CONFIG_ARCH_APPLE) += t8112-j413.dtb

diff --git a/arch/arm64/boot/dts/apple/t6040-j614s.dts b/arch/arm64/boot/dts/apple/t6040-j614s.dts
@@ -0,0 +1,119 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/*
+ * MacBook Pro (14-inch, M4 Pro)
+ *
+ * target-type: J614s
+ *
+ * Copyright The Asahi Linux Contributors
+ */
+
+/dts-v1/;
+
+#include "t6040.dtsi"
+#include "t604x-j614-j616.dtsi"
+
+/ {
+	compatible = "apple,j614s", "apple,t6040", "apple,arm-platform";
+	model = "Apple MacBook Pro (14-inch, M4 Pro)";
+};
+
+/* ADT /arm-io/wlan module-instance */
+&wifi0 {
+	brcm,board-type = "apple,mriya";
+};
+
+&bluetooth0 {
+	brcm,board-type = "apple,mriya";
+};
+
+&panel {
+	compatible = "apple,panel-j614", "apple,panel-mini-led", "apple,panel";
+	width-mm = <302>;
+	height-mm = <196>;
+	adj-height-mm = <189>;
+};
+
+&aop_audio {
+	apple,chassis-name = "J614";
+};
+
+/*
+ * The speakers wait for their own bring-up and a J614 protection profile.
+ * Until then the speaker card and the six amps stay disabled, so nothing
+ * can drive them; the headphone jack card is unaffected.
+ */
+&sound {
+	compatible = "apple,j614-macaudio", "apple,macaudio";
+	model = "MacBook Pro J614";
+	status = "disabled";
+};
+
+&speaker_left_woof1 {
+	status = "disabled";
+};
+
+&speaker_left_woof2 {
+	status = "disabled";
+};
+
+&speaker_left_tweet {
+	status = "disabled";
+};
+
+&speaker_right_woof1 {
+	status = "disabled";
+};
+
+&speaker_right_woof2 {
+	status = "disabled";
+};
+
+&speaker_right_tweet {
+	status = "disabled";
+};
+
+&sound_jack {
+	compatible = "apple,j614-macaudio-jack", "apple,macaudio";
+	model = "MacBook Pro J614 Jack";
+};
+
+&mtp_mt {
+	firmware-name = "apple/tpmtfw-j614s.bin";
+};
+
+/*
+ * Per-device factory data from this Mac's own iBoot system container: the
+ * sealed calibration and the sealed root key.
+ */
+&mesa {
+	firmware-name = "apple/mesacal-j614s.bin", "apple/msrk-j614s.bin";
+};
+
+/*
+ * The GL9755 SD reader. Its supply is the SMC's gP19 output, which the
+ * J614s firmware describes as active high. Both CLKREQ pins go on the
+ * controller so that the Wi-Fi and SD ports do not claim the same pins.
+ */
+&apcie1_dart {
+	status = "okay";
+};
+
+&pcie0 {
+	bus-range = <0 2>;
+	pinctrl-0 = <&wifi_clkreq_pins &sd_clkreq_pins>;
+};
+
+&port01 {
+	/delete-property/ pinctrl-0;
+	/delete-property/ pinctrl-names;
+	bus-range = <2 2>;
+	pwren-gpios = <&smc_gpio 0x19 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+
+	mmc@0,0 {
+		compatible = "pci17a0,9755";
+		reg = <0x20000 0 0 0 0>;
+		cd-inverted;
+		wp-inverted;
+	};
+};