diff --git a/drivers/media/platform/apple/isp/isp-cam.c b/drivers/media/platform/apple/isp/isp-cam.c index c2fb237789403..e3c39232e727b 100644 --- a/drivers/media/platform/apple/isp/isp-cam.c +++ b/drivers/media/platform/apple/isp/isp-cam.c @@ -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); diff --git a/drivers/soc/apple/profile.rs b/drivers/soc/apple/profile.rs index ac5f573455b91..c87d46f44eb9f 100644 --- a/drivers/soc/apple/profile.rs +++ b/drivers/soc/apple/profile.rs @@ -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 @@ -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. @@ -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); } diff --git a/sound/soc/codecs/tas2764.c b/sound/soc/codecs/tas2764.c index d038e0424659f..887de36981653 100644 --- a/sound/soc/codecs/tas2764.c +++ b/sound/soc/codecs/tas2764.c @@ -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)