Skip to content

K116s: SEP profile, ISP camera log line, tas2764 brownout log level #1649

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

Merged
RyanTheTide merged 3 commits into from
Nov 12, 2026
+9 −3
Merged

K116s: SEP profile, ISP camera log line, tas2764 brownout log level #1649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9163001
soc: apple: sep: Admit the K116s to the T6050 profile
axboe Nov 11, 2026
8cb0782
media: apple: isp: Report the detected camera
axboe Nov 11, 2026
e177002
ASoC: tas2764: log a missing brownout configuration at debug level
axboe Nov 11, 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
5 changes: 5 additions & 0 deletions drivers/media/platform/apple/isp/isp-cam.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,11 @@ static int isp_ch_cache_sensor_info(struct apple_isp *isp, u32 ch)
goto exit;
}

/* Once, when the camera is detected: which one it is, and its setfile. */
dev_info(isp->dev, "ch %u: sensor 0x%x, %u configs, platform 0x%x, setfile %s\n",
ch, fmt->version, args->num_presets, isp->platform_id,
isp_setfiles[fmt->id].path);

err = isp_check_presets(isp, args->num_presets);
if (!err)
err = isp_ch_cache_sensor_configs(isp, ch, args->num_presets);
Expand Down
5 changes: 3 additions & 2 deletions drivers/soc/apple/profile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ pub(crate) const T6041: PlatformProfile = PlatformProfile {
/// 0x3356) on spi2 at `0x505108000`, 8 MHz, chip select 0. That is J616s's
/// SEP, so T6040's profile with this sensor bus.
pub(crate) const T6050: PlatformProfile = PlatformProfile {
name: "T6050/J714s",
name: "T6050/J714s, K116s",
sensor: SensorProfile {
controller_base: 0x5_0510_8000,
..T6040.sensor
Expand Down Expand Up @@ -703,7 +703,7 @@ fn select(
if has(b"apple,t6041") && (has(b"apple,j616c") || has(b"apple,j614c")) {
return Ok(&T6041);
}
if has(b"apple,t6050") && has(b"apple,j714s") {
if has(b"apple,t6050") && (has(b"apple,j714s") || has(b"apple,k116s")) {
return Ok(&T6050);
}
// Only the M4 MacBook Airs: the other T8132 Macs are unread.
Expand Down Expand Up @@ -795,6 +795,7 @@ mod tests {
assert_eq!(picked(&[b"apple,t6041"]), None);
assert_eq!(picked(&[b"apple,j713", b"apple,t6041"]), None);
assert_eq!(picked(&[b"apple,j714s", b"apple,t6050"]), Some(T6050.name));
assert_eq!(picked(&[b"apple,k116s", b"apple,t6050"]), Some(T6050.name));
assert_eq!(picked(&[b"apple,t6050"]), None);
}

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/tas2764.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1435,7 +1435,7 @@ static int tas2764_parse_bop_config(struct device *dev, struct tas2764_priv *tas

len = of_property_count_u8_elems(dev->of_node, "apple,bop-config");
if (len == -EINVAL) {
dev_info(dev, "no brownout configuration in the device tree\n");
dev_dbg(dev, "no brownout configuration in the device tree\n");
return 0;
}
if (len != TAS2764_BOP_CFG_LEN)
Expand Down
Loading