From nobody Tue Jun 30 14:04:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3EDFC433EF for ; Fri, 14 Jan 2022 20:17:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244232AbiANURO (ORCPT ); Fri, 14 Jan 2022 15:17:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234714AbiANURN (ORCPT ); Fri, 14 Jan 2022 15:17:13 -0500 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5F3BC06161C for ; Fri, 14 Jan 2022 12:17:12 -0800 (PST) Received: by mail-pj1-x102a.google.com with SMTP id pf13so14470382pjb.0 for ; Fri, 14 Jan 2022 12:17:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NHI4YdJkg3blWqPelJAYTO4ml6hVxIePrSWCG1B/xFA=; b=EEigY38b1fTu+aiEP3SmQ0r0AcAMPN99i8wrAOaTvKy4ytD/0GOOBLLlpl+WXnajij X3Nu9yfWhzPIYpKmaOpgO0vwkP1Y7RDErmL2kBD1EAZt9n3wXWYMtNw602JoVR5bLHN4 vUF+EV32uGddQTHPmX5WBu3o20sB8//KqZoXE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NHI4YdJkg3blWqPelJAYTO4ml6hVxIePrSWCG1B/xFA=; b=1X8Fg2RSaWXgxrbTAkcQ6ngsGg5XKwwTPJAd4vnRYnk1xKqHtTCa6BUjldgwaUpETl VLLrZogDrmgefLYRojDncu8RXmxbW4+OAlTIOf0zULz5ccW7PfB8FkRWzyIvI8p5NAV4 jUOcorWBWd+FXOB0NpXT4EKGFcv0eUMQLPHTkqvdvJJDmWY8JDkx5mu2CPWE+FItPQET gicv7Q1ox39KvADBL98hM8ULXJ7K71Rkgp2hwBHIADsR4KHLTuMHmqnhtGYqzVb2sRmi Sw9CGNKNQe6bFQfT1lWo9EDM5ECRHbQ8GgiRRCrj/IWLQFo+zAQt8lj6Brnfr64rb6Uj X7aw== X-Gm-Message-State: AOAM5314u5P6kYGDRCODFHMUJyI1iesYo5Yxo+tHoWscuCWrYuO5u3wQ fRWiGz9cllMGNDbvvnIIT0zMxQ== X-Google-Smtp-Source: ABdhPJyANqLFSMw/ah46py8E9k5uIE2DiLUf4ryo5wQMT8muBxJU4jdXvlE8Hx0LhnJYKQTgOC1SiQ== X-Received: by 2002:a17:90b:4a92:: with SMTP id lp18mr12273149pjb.123.1642191432492; Fri, 14 Jan 2022 12:17:12 -0800 (PST) Received: from localhost ([2620:15c:202:201:76ab:ede1:503d:1c39]) by smtp.gmail.com with UTF8SMTPSA id l13sm5300187pgq.34.2022.01.14.12.17.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 Jan 2022 12:17:12 -0800 (PST) From: Brian Norris To: Heiko Stuebner , Liam Girdwood , Mark Brown , David Airlie , Daniel Vetter Cc: alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, Sandy Huang , linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, Rob Herring , linux-kernel@vger.kernel.org, Lin Huang , Brian Norris Subject: [PATCH 1/3] arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output Date: Fri, 14 Jan 2022 12:16:50 -0800 Message-Id: <20220114121515.1.I46f64b00508d9dff34abe1c3e8d2defdab4ea1e5@changeid> X-Mailer: git-send-email 2.34.1.703.g22d0c6ccf7-goog In-Reply-To: <20220114201652.3875838-1-briannorris@chromium.org> References: <20220114201652.3875838-1-briannorris@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Commit b18c6c3c7768 ("ASoC: rockchip: cdn-dp sound output use spdif") switched the platform to SPDIF, but we didn't fix up the device tree. Fixes: b18c6c3c7768 ("ASoC: rockchip: cdn-dp sound output use spdif") Signed-off-by: Brian Norris --- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot= /dts/rockchip/rk3399-gru.dtsi index 45a5ae5d2027..21ec073f4d51 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -286,7 +286,7 @@ max98357a: max98357a { =20 sound: sound { compatible =3D "rockchip,rk3399-gru-sound"; - rockchip,cpu =3D <&i2s0 &i2s2>; + rockchip,cpu =3D <&i2s0 &spdif>; }; }; =20 @@ -437,10 +437,6 @@ &i2s0 { status =3D "okay"; }; =20 -&i2s2 { - status =3D "okay"; -}; - &io_domains { status =3D "okay"; =20 @@ -537,6 +533,10 @@ &sdmmc { vqmmc-supply =3D <&ppvar_sd_card_io>; }; =20 +&spdif { + status =3D "okay"; +}; + &spi1 { status =3D "okay"; =20 --=20 2.34.1.703.g22d0c6ccf7-goog From nobody Tue Jun 30 14:04:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54F75C433EF for ; Fri, 14 Jan 2022 20:17:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244245AbiANURS (ORCPT ); Fri, 14 Jan 2022 15:17:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244237AbiANURP (ORCPT ); Fri, 14 Jan 2022 15:17:15 -0500 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 852C4C06161C for ; Fri, 14 Jan 2022 12:17:15 -0800 (PST) Received: by mail-pg1-x52e.google.com with SMTP id x20so3619349pgk.1 for ; Fri, 14 Jan 2022 12:17:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WzNR7uSNnSdg4hsXrt3ZJe57Rjz9RsU1uoLFUYgup5s=; b=CrBAAcV6rcqYR96Cru/pA8UOx2tnvMIIOfcqFcAownzSFPyuPgvkhzfxi/+POTmI6F s3dystHa98fH+SbgMv8XKpF0nN2hyQmJRb/usWgQVAeEMKkFbOl1RLbU6G0QKyJYa1cp atbPBFu4vpIdYe+oAsO4YZx7Pu3BhgN/ev32M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WzNR7uSNnSdg4hsXrt3ZJe57Rjz9RsU1uoLFUYgup5s=; b=cybs6oeJMNtDHz7BFfq5AbYwrBq3L+mNEMoUTNmzA/yWGA++aFEl9Q+xVeTuuJUxUt qoXniW2bvOFDMgkLs1lO1EuL6xw31Ds5sOvGS3PQX4H+4zqfTfXOC4GKFhbi3+InBvIa nvdoZ0lKn1qglqifBBdz+Tw57fO3rpg2nhMq6W0JKqWjQujG+VDxRELrJuVfqyrTytCD dDqSyJcXJtJhRsk5jZIs+wYwbfgXH74G2lUr3JpdawzWLsLnT51/K1UQUP9x/S5G+wCH AF4qADWWHmeZlNSSIENWoogYX3F/lpMCkG/Dg8cMOGOSxOms5NPgdrKkkBTNBM/6mMiX Cdxg== X-Gm-Message-State: AOAM532zDcWJEgKf/kGYCmU9t7DtzYvUjC+m2s69RbAKGunxH2LCzJEG aK+MugBVYf/bdglb86M6ep11KQ== X-Google-Smtp-Source: ABdhPJyHj22cXTGtfbh2J7pBTC9HY1zTyXX803MbP2uAPR8gM88DcF40tdq9nbUgQqifT6xthI1Ncw== X-Received: by 2002:a63:4620:: with SMTP id t32mr3538422pga.531.1642191435052; Fri, 14 Jan 2022 12:17:15 -0800 (PST) Received: from localhost ([2620:15c:202:201:76ab:ede1:503d:1c39]) by smtp.gmail.com with UTF8SMTPSA id p50sm5982690pfw.51.2022.01.14.12.17.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 Jan 2022 12:17:14 -0800 (PST) From: Brian Norris To: Heiko Stuebner , Liam Girdwood , Mark Brown , David Airlie , Daniel Vetter Cc: alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, Sandy Huang , linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, Rob Herring , linux-kernel@vger.kernel.org, Lin Huang , Brian Norris Subject: [PATCH 2/3] drm/rockchip: cdn-dp: Support HDMI codec plug-change callback Date: Fri, 14 Jan 2022 12:16:51 -0800 Message-Id: <20220114121515.2.I20d754a1228aa5c51a18c8eb15a2c60dec25b639@changeid> X-Mailer: git-send-email 2.34.1.703.g22d0c6ccf7-goog In-Reply-To: <20220114201652.3875838-1-briannorris@chromium.org> References: <20220114201652.3875838-1-briannorris@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some audio servers like to monitor a jack device (perhaps combined with EDID, for audio-presence info) to determine DP/HDMI audio presence. Signed-off-by: Brian Norris --- drivers/gpu/drm/rockchip/cdn-dp-core.c | 28 ++++++++++++++++++++++++++ drivers/gpu/drm/rockchip/cdn-dp-core.h | 4 ++++ 2 files changed, 32 insertions(+) diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockc= hip/cdn-dp-core.c index 16497c31d9f9..edd6a1fc46cd 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -586,6 +586,13 @@ static bool cdn_dp_check_link_status(struct cdn_dp_dev= ice *dp) return drm_dp_channel_eq_ok(link_status, min(port->lanes, sink_lanes)); } =20 +static void cdn_dp_audio_handle_plugged_change(struct cdn_dp_device *dp, + bool plugged) +{ + if (dp->codec_dev) + dp->plugged_cb(dp->codec_dev, plugged); +} + static void cdn_dp_encoder_enable(struct drm_encoder *encoder) { struct cdn_dp_device *dp =3D encoder_to_dp(encoder); @@ -641,6 +648,9 @@ static void cdn_dp_encoder_enable(struct drm_encoder *e= ncoder) DRM_DEV_ERROR(dp->dev, "Failed to valid video %d\n", ret); goto out; } + + cdn_dp_audio_handle_plugged_change(dp, true); + out: mutex_unlock(&dp->lock); } @@ -651,6 +661,8 @@ static void cdn_dp_encoder_disable(struct drm_encoder *= encoder) int ret; =20 mutex_lock(&dp->lock); + cdn_dp_audio_handle_plugged_change(dp, false); + if (dp->active) { ret =3D cdn_dp_disable(dp); if (ret) { @@ -846,11 +858,27 @@ static int cdn_dp_audio_get_eld(struct device *dev, v= oid *data, return 0; } =20 +static int cdn_dp_audio_hook_plugged_cb(struct device *dev, void *data, + hdmi_codec_plugged_cb fn, + struct device *codec_dev) +{ + struct cdn_dp_device *dp =3D dev_get_drvdata(dev); + + mutex_lock(&dp->lock); + dp->plugged_cb =3D fn; + dp->codec_dev =3D codec_dev; + cdn_dp_audio_handle_plugged_change(dp, dp->connected); + mutex_unlock(&dp->lock); + + return 0; +} + static const struct hdmi_codec_ops audio_codec_ops =3D { .hw_params =3D cdn_dp_audio_hw_params, .audio_shutdown =3D cdn_dp_audio_shutdown, .mute_stream =3D cdn_dp_audio_mute_stream, .get_eld =3D cdn_dp_audio_get_eld, + .hook_plugged_cb =3D cdn_dp_audio_hook_plugged_cb, .no_capture_mute =3D 1, }; =20 diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockc= hip/cdn-dp-core.h index 81ac9b658a70..d808a9de45ed 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.h +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h @@ -10,6 +10,7 @@ #include #include #include +#include =20 #include "rockchip_drm_drv.h" =20 @@ -101,5 +102,8 @@ struct cdn_dp_device { =20 u8 dpcd[DP_RECEIVER_CAP_SIZE]; bool sink_has_audio; + + hdmi_codec_plugged_cb plugged_cb; + struct device *codec_dev; }; #endif /* _CDN_DP_CORE_H */ --=20 2.34.1.703.g22d0c6ccf7-goog From nobody Tue Jun 30 14:04:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72BB8C433F5 for ; Fri, 14 Jan 2022 20:17:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244265AbiANURV (ORCPT ); Fri, 14 Jan 2022 15:17:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244251AbiANURR (ORCPT ); Fri, 14 Jan 2022 15:17:17 -0500 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1342C061574 for ; Fri, 14 Jan 2022 12:17:17 -0800 (PST) Received: by mail-pf1-x430.google.com with SMTP id x83so3736259pfc.0 for ; Fri, 14 Jan 2022 12:17:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=10U/YKtex+AND9dtDxjk3FYBvBwLFUl9f2fbhlUXUs0=; b=XQy4pyO/wUwsYqGsKtflTgY0GMz4pfjd2qpY31JHWTpxrdp5kycdY6uXSFa3MXVWe6 wq/hlaXeACBG7Euq/bmzfc3SM6AC4Pu4laUwxAAWlVJsx2bVy0Izg+KtkO5gPiaBeCOw LsILH7rVPeqwj+OUGJjnT/KYlOKhVhKT8tdiA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=10U/YKtex+AND9dtDxjk3FYBvBwLFUl9f2fbhlUXUs0=; b=kUhC9XJteLpi7IL+AM8aPmIut2mPAqilKjOuKQirMErplll02L4ALq7tIa70wTqAXE loRpcYqffKbrXobvub0em5f8NByUE4Gw/TdegtuYxn+k/QZ0a0lcqF7Xnm9nU/LHTQ19 InPuELmWgYWw87zv0btQ0b6dtXKHDoE3FHDg2zMbQ9pmj2KL6OJuhZpFsJvu9XcXPx/N ckRo6JgHY7ueQqleX+/c1MZfD6/y91DeXmU58ObVCqhPsM40iIARvLj0sF5QpfmSj24j ZElR4MJSWKy9DchZqJSSxw2OJKNx6E4VX7L/HqJyeFIzc6/TOqssGtq4ou5O7zy88JWG mCjA== X-Gm-Message-State: AOAM5327tvmkCiV82fxAADTUUq91jJ9FQCM90I929djo1i7SuxxnVaHY 8HkJ0m/Aq33vQgbSBRLzcZxbbQ== X-Google-Smtp-Source: ABdhPJxqbQOjbira1atGPpNHzh9Q82DXtSjtZWs+75WZcndu3r13+lzxdf+ODqr/TYUZIBqpyhshZg== X-Received: by 2002:a63:6b81:: with SMTP id g123mr9615156pgc.140.1642191437321; Fri, 14 Jan 2022 12:17:17 -0800 (PST) Received: from localhost ([2620:15c:202:201:76ab:ede1:503d:1c39]) by smtp.gmail.com with UTF8SMTPSA id g15sm2354365pfm.142.2022.01.14.12.17.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 Jan 2022 12:17:16 -0800 (PST) From: Brian Norris To: Heiko Stuebner , Liam Girdwood , Mark Brown , David Airlie , Daniel Vetter Cc: alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, Sandy Huang , linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, Rob Herring , linux-kernel@vger.kernel.org, Lin Huang , Brian Norris Subject: [PATCH 3/3] ASoC: rk3399_gru_sound: Wire up DP jack detection Date: Fri, 14 Jan 2022 12:16:52 -0800 Message-Id: <20220114121515.3.I3c79b1466c14b02980071221e5b99283cd26ec77@changeid> X-Mailer: git-send-email 2.34.1.703.g22d0c6ccf7-goog In-Reply-To: <20220114201652.3875838-1-briannorris@chromium.org> References: <20220114201652.3875838-1-briannorris@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Now that the cdn-dp driver supports plug-change callbacks, let's wire it up. Signed-off-by: Brian Norris --- sound/soc/rockchip/rk3399_gru_sound.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3= 399_gru_sound.c index e2d52d8d0ff9..eeef3ed70037 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -164,6 +164,25 @@ static int rockchip_sound_da7219_hw_params(struct snd_= pcm_substream *substream, return 0; } =20 +static struct snd_soc_jack cdn_dp_card_jack; + +static int rockchip_sound_cdndp_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_component *component =3D asoc_rtd_to_codec(rtd, 0)->compon= ent; + struct snd_soc_card *card =3D rtd->card; + int ret; + + /* Enable jack detection. */ + ret =3D snd_soc_card_jack_new(card, "DP Jack", SND_JACK_LINEOUT, + &cdn_dp_card_jack, NULL, 0); + if (ret) { + dev_err(card->dev, "Can't create DP Jack %d\n", ret); + return ret; + } + + return snd_soc_component_set_jack(component, &cdn_dp_card_jack, NULL); +} + static int rockchip_sound_da7219_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_component *component =3D asoc_rtd_to_codec(rtd, 0)->compon= ent; @@ -315,6 +334,7 @@ static const struct snd_soc_dai_link rockchip_dais[] = =3D { [DAILINK_CDNDP] =3D { .name =3D "DP", .stream_name =3D "DP PCM", + .init =3D rockchip_sound_cdndp_init, .dai_fmt =3D SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAILINK_REG(cdndp), --=20 2.34.1.703.g22d0c6ccf7-goog