diff --git a/arch/arm64/boot/dts/apple/t6050-j716c-isp.dtsi b/arch/arm64/boot/dts/apple/t6050-isp.dtsi similarity index 90% rename from arch/arm64/boot/dts/apple/t6050-j716c-isp.dtsi rename to arch/arm64/boot/dts/apple/t6050-isp.dtsi index b6b1675d26022..1c0084fb91265 100644 --- a/arch/arm64/boot/dts/apple/t6050-j716c-isp.dtsi +++ b/arch/arm64/boot/dts/apple/t6050-isp.dtsi @@ -1,5 +1,11 @@ // SPDX-License-Identifier: GPL-2.0+ OR MIT -/* J716c camera: enabled only after the loader reserves the current firmware. */ +/* + * The T6050 laptop camera (ISP, its three DARTs and power states). Every T6050 + * laptop's ADT has the same isp0, dart-isp0 and ISP power states; only the + * sensor-type differs per board. The loader reads that sensor-type, reserves the + * firmware segments and enables the nodes; until then everything stays disabled. + * The sensor presets are a default a board may replace. + */ / { aliases { isp = &isp0; diff --git a/arch/arm64/boot/dts/apple/t6050-j714c.dts b/arch/arm64/boot/dts/apple/t6050-j714c.dts index cf1d62c690fcc..22f7e3e58b484 100644 --- a/arch/arm64/boot/dts/apple/t6050-j714c.dts +++ b/arch/arm64/boot/dts/apple/t6050-j714c.dts @@ -460,3 +460,6 @@ &avd { status = "okay"; }; + +/* The camera. The loader sets the platform ID from the ADT isp0 sensor-type (0x73). */ +#include "t6050-isp.dtsi" diff --git a/arch/arm64/boot/dts/apple/t6050-j714s.dts b/arch/arm64/boot/dts/apple/t6050-j714s.dts index 383ec08bedbe2..63d8c735b11c8 100644 --- a/arch/arm64/boot/dts/apple/t6050-j714s.dts +++ b/arch/arm64/boot/dts/apple/t6050-j714s.dts @@ -638,7 +638,7 @@ }; /* The same T6050 camera as J716c (J714sAP ADT); the loader sets the J714s sensor type. */ -#include "t6050-j716c-isp.dtsi" +#include "t6050-isp.dtsi" /* * The J714s camera sizes: sensor config 6 (two stacked 3040x2880 frames; the ISP processes diff --git a/arch/arm64/boot/dts/apple/t6050-j716c.dts b/arch/arm64/boot/dts/apple/t6050-j716c.dts index 8fdea5242027b..98bbc177e1541 100644 --- a/arch/arm64/boot/dts/apple/t6050-j716c.dts +++ b/arch/arm64/boot/dts/apple/t6050-j716c.dts @@ -246,7 +246,7 @@ 63 2e 00 06 02 69 4f 53 00 00 00 00]; }; -#include "t6050-j716c-isp.dtsi" +#include "t6050-isp.dtsi" #include "t6050-j716c-gpu-panel.dtsi" #include "t6050-j716c-display.dtsi" diff --git a/arch/arm64/boot/dts/apple/t6050-j716s.dts b/arch/arm64/boot/dts/apple/t6050-j716s.dts index 43747a4ce6be7..76ca0e8ab5b86 100644 --- a/arch/arm64/boot/dts/apple/t6050-j716s.dts +++ b/arch/arm64/boot/dts/apple/t6050-j716s.dts @@ -570,3 +570,6 @@ #define T6050_J716S #include "t6050-peripherals.dtsi" + +/* The camera. The loader sets the platform ID from the ADT isp0 sensor-type (0x76). */ +#include "t6050-isp.dtsi" diff --git a/arch/arm64/boot/dts/apple/t6050-k114s.dts b/arch/arm64/boot/dts/apple/t6050-k114s.dts index caa609babef0d..559d7d48c93c5 100644 --- a/arch/arm64/boot/dts/apple/t6050-k114s.dts +++ b/arch/arm64/boot/dts/apple/t6050-k114s.dts @@ -22,3 +22,6 @@ #define T6050_K114S #include "t6050-peripherals.dtsi" + +/* The camera. The loader sets the platform ID from the ADT isp0 sensor-type (0xba). */ +#include "t6050-isp.dtsi" diff --git a/arch/arm64/boot/dts/apple/t6050-k116c.dts b/arch/arm64/boot/dts/apple/t6050-k116c.dts index ff9e875fb1951..c068c3be73138 100644 --- a/arch/arm64/boot/dts/apple/t6050-k116c.dts +++ b/arch/arm64/boot/dts/apple/t6050-k116c.dts @@ -22,3 +22,6 @@ #define T6050_K116C #include "t6050-peripherals.dtsi" + +/* The camera. The loader sets the platform ID from the ADT isp0 sensor-type (0xbb). */ +#include "t6050-isp.dtsi" diff --git a/arch/arm64/boot/dts/apple/t6050-k116s.dts b/arch/arm64/boot/dts/apple/t6050-k116s.dts index fe6468edc72c1..e14c965933609 100644 --- a/arch/arm64/boot/dts/apple/t6050-k116s.dts +++ b/arch/arm64/boot/dts/apple/t6050-k116s.dts @@ -869,7 +869,7 @@ * J714s's sensor. The sensor type is 0xbc and the connection scheme 0x10; the loader passes * both. Everything stays disabled until the loader has reserved the firmware. */ -#include "t6050-j716c-isp.dtsi" +#include "t6050-isp.dtsi" /* * Two things the shared T6050 files now turn on for every board are held back here until