Skip to content

isp: add t6030 support #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WhatAmISupposedToPutHere wants to merge 2 commits into
base: asahi-wip
Choose a base branch
from
Open

isp: add t6030 support #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
227bf32
media: apple: isp: add t6030 support
WhatAmISupposedToPutHere Jul 14, 2026
50b09c9
dts: apple: t6030: Add isp nodes
WhatAmISupposedToPutHere Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/apple/t6030-j514s.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,7 @@
compatible = "apple,j514-macaudio", "apple,j314-macaudio", "apple,macaudio";
model = "MacBook Pro J514";
};

&isp {
apple,platform-id = <16>;
};
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/apple/t6030-j516s.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,7 @@
compatible = "apple,j516-macaudio", "apple,j316-macaudio", "apple,macaudio";
model = "MacBook Pro J516";
};

&isp {
apple,platform-id = <16>;
};
50 changes: 48 additions & 2 deletions arch/arm64/boot/dts/apple/t6030.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
#include <dt-bindings/pinctrl/apple.h>
#include <dt-bindings/spmi/spmi.h>

#define NO_ISP_YET 1

/ {
#address-cells = <2>;
#size-cells = <2>;
Expand Down Expand Up @@ -644,6 +642,54 @@
status = "disabled";
};

isp: isp@2c8000000 {
compatible = "apple,t6030-isp";
iommus = <&isp_dart0 0>, <&isp_dart1 0>, <&isp_dart2 0>;
reg-names = "coproc", "mbox", "gpio", "mbox2";
reg = <0x2 0xc8000000 0x0 0x2000000>,
<0x2 0xca4c4000 0x0 0x100>,
<0x2 0xca4c41d0 0x0 0x100>,
<0x2 0xca4c4458 0x0 0x100>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 359 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_isp_sys>, <&ps_ispsens0>,
<&ps_isp_cpu>, <&ps_isp_fe>, <&ps_dprx>,
<&ps_isp_secure>, <&ps_isp_be>, <&ps_isp_clr>;
apple,dart-vm-size = <0x0 0xa0000000>;

status = "disabled";
};

isp_dart0: iommu@2ca4a8000 {
compatible = "apple,t6030-dart", "apple,t8110-dart";
reg = <0x2 0xca4a8000 0x0 0x4000>;
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 364 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_isp_sys>;
status = "disabled";
};

isp_dart1: iommu@2ca4b4000 {
compatible = "apple,t6030-dart", "apple,t8110-dart";
reg = <0x2 0xca4b4000 0x0 0x4000>;
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 364 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_isp_sys>;
status = "disabled";
};

isp_dart2: iommu@2ca4bc000 {
compatible = "apple,t6030-dart", "apple,t8110-dart";
reg = <0x2 0xca4bc000 0x0 0x4000>;
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 364 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_isp_sys>;
status = "disabled";
};

avd: avd@30a000000 {
compatible = "apple,t6030-avd", "apple,t8122-avd";
interrupt-parent = <&aic>;
Expand Down
2 changes: 0 additions & 2 deletions arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,13 +288,11 @@
};
};

#ifndef NO_ISP_YET
&isp {
apple,platform-id = <9>;
};

#include "isp-imx558-cfg0.dtsi"
#endif

#include "spi1-nvram.dtsi"
#include "hwmon-common.dtsi"
Expand Down
24 changes: 24 additions & 0 deletions drivers/media/platform/apple/isp/isp-drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,29 @@ static const struct apple_isp_hw apple_isp_hw_t6020 = {
.meta_size = ISP_META_SIZE_T8112,
};

static const struct apple_isp_hw apple_isp_hw_t6030 = {
.gen = ISP_GEN_T6031,
.pmu_base = 0x350704000,

.dsid_count = 1,
.dsid_clr_base0 = 0x200f14000,
.dsid_clr_range0 = 0x1000,

.clock_scratch = 0x3503d0920,
.clock_base = 0x0,
.clock_bit = 0x0,
.clock_size = 0x8,
.bandwidth_scratch = 0x3503d0980,
.bandwidth_base = 0x0,
.bandwidth_bit = 0x0,
.bandwidth_size = 0x8,
.mbox_irq_enable = ISP_MBOX_IRQ_ENABLE_T6031,

.scl1 = true,
.lpdp = false,
.meta_size = ISP_META_SIZE_T6031,
};

static const struct apple_isp_hw apple_isp_hw_t6031 = {
.gen = ISP_GEN_T6031,
.pmu_base = 0x292284008,
Expand All @@ -562,6 +585,7 @@ static const struct of_device_id apple_isp_of_match[] = {
{ .compatible = "apple,t8112-isp", .data = &apple_isp_hw_t8112 },
{ .compatible = "apple,t6000-isp", .data = &apple_isp_hw_t6000 },
{ .compatible = "apple,t6020-isp", .data = &apple_isp_hw_t6020 },
{ .compatible = "apple,t6030-isp", .data = &apple_isp_hw_t6030 },
{ .compatible = "apple,t6031-isp", .data = &apple_isp_hw_t6031 },
{},
};
Expand Down