Skip to content
Draft
4 changes: 3 additions & 1 deletion Documentation/devicetree/bindings/iommu/apple,dart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ properties:
- apple,t8110-dart
- apple,t6000-dart
- items:
- const: apple,t6020-dart
- enum:
- apple,t6020-dart
- apple,t8122-dart
- const: apple,t8110-dart

reg:
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/iommu/apple,sart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ properties:
- enum:
- apple,t6020-sart
- apple,t8112-sart
- apple,t8122-sart
- const: apple,t6000-sart
- enum:
- apple,t6000-sart
Expand Down
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ maintainers:
- Hector Martin <marcan@marcan.st>
- Sven Peter <sven@svenpeter.dev>

description:
The Apple mailbox consists of two FIFOs used to exchange 64+32 bit
description: The Apple mailbox consists of two FIFOs used to exchange 64+32 bit
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated whitespace change

messages between the main CPU and a co-processor. Multiple instances
of this mailbox can be found on Apple SoCs.
One of the two FIFOs is used to send data to a co-processor while the other
Expand All @@ -30,6 +29,7 @@ properties:
- enum:
- apple,t8103-asc-mailbox
- apple,t8112-asc-mailbox
- apple,t8122-asc-mailbox
- apple,t6000-asc-mailbox
- apple,t6020-asc-mailbox
- const: apple,asc-mailbox-v4
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/apple/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,4 @@ dtb-$(CONFIG_ARCH_APPLE) += t8112-j415.dtb
dtb-$(CONFIG_ARCH_APPLE) += t8112-j473.dtb
dtb-$(CONFIG_ARCH_APPLE) += t8112-j493.dtb
dtb-$(CONFIG_ARCH_APPLE) += t8122-j504.dtb
dtb-$(CONFIG_ARCH_APPLE) += t8122-j613.dtb
84 changes: 84 additions & 0 deletions arch/arm64/boot/dts/apple/t8122-j613.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
// SPDX-License-Identifier: GPL-2.0+ OR MIT
/*
* Apple MacBook Air (13-inch, M3, 2024)
*
* target-type: J613
*
* Copyright The Asahi Linux Contributors
*/

/dts-v1/;

#include "t8122.dtsi"
#include "t8122-jxxx.dtsi"
#include <dt-bindings/leds/common.h>

/ {
compatible = "apple,j613", "apple,t8122", "apple,arm-platform";
model = "Apple MacBook Air (13-inch, M3, 2024)";

led-controller {
compatible = "pwm-leds";
led-0 {
pwms = <&fpwm1 0 40000>;
label = "kbd_backlight";
function = LED_FUNCTION_KBD_BACKLIGHT;
color = <LED_COLOR_ID_WHITE>;
max-brightness = <255>;
default-state = "keep";
};
};
};

&framebuffer0 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can be removed. I moved the power-domains to t8122-jxxx.dtsi

// panel = &panel;
power-domains = <&ps_disp_cpu>, <&ps_dptx_ext_phy>;
};

&port00 {
bus-range = <1 1>;
pwren-gpios = <&smc_gpio 13 GPIO_ACTIVE_HIGH>;
};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm missing sub nodes for the wifi and bluetooth functions for the board type and mac adresses


&fpwm1 {
status = "okay";
};

&mtp {
status = "okay";
};

&mtp_mbox {
status = "okay";
};

&mtp_dart {
status = "okay";
};

&mtp_dockchannel {
status = "okay";
};

&mtp_hid {
apple,afe-reset-gpios = <&smc_gpio 8 GPIO_ACTIVE_LOW>;
apple,stm-reset-gpios = <&smc_gpio 24 GPIO_ACTIVE_LOW>;

multi-touch {
firmware-name = "apple/tpmtfw-j613.bin";
};

keyboard: keyboard {
hid-country-code = <0>;
apple,keyboard-layout-id = <0>;
};

stm {
};

actuator {
};

tp_accel {
};
};
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/apple/t8122-jxxx.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* This file contains parts common to all Apple M3 devices using the t8122.
*
* target-type: J433, J434, J504, J513, J515
* target-type: J433, J434, J504, J613, J615
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sigh, these inconsistent identifiers. I'll create a fixup commit for these. I wonder if I got it right in the arm/apple dt-bindings

*
* Copyright The Asahi Linux Contributors
*/
Expand Down
Loading