Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp793453pxb; Fri, 14 Jan 2022 16:58:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJwFP/qtUT5+Ny7NoneRLhzzcZkCVeFwvavnf8mHyrj7xqLrAHpt5xtOCNWHPLHKWztEI31y X-Received: by 2002:a62:8784:0:b0:4bd:b012:5299 with SMTP id i126-20020a628784000000b004bdb0125299mr11630214pfe.37.1642208316956; Fri, 14 Jan 2022 16:58:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642208316; cv=none; d=google.com; s=arc-20160816; b=UkIMJ8HlRoNfcZmAijCmZ02WQvoDwvFkpewCA/yTNKxXSsThltdNua+kyjPuGGe8k0 yxUzgH0seiblvCprUDySzYKWUYGhddXGUef4hc7hB11e0Q+1pOtZjbcZmq2QEG1mCqut kfl7GhDNGCPHDf8JjsEKwT2IbbCRVByfLknqPNX78r1WU1/EHl6tbjWfHVstHB80aUzQ 1y8Wy1E0a7w59hTKkZdgGPXKdWtsrpBY9X0MvUHLOafjyRVSk7lgXLRxk5LfdxmVlTK4 qeDGhSmaDOgx2Fr2RHXizccT11vJJ6yDWBXs43diz20W0tJdh42okiEGWt5SJewdic3a UQmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=BVKiFbTgrN+4dfFsvMUyjh+c0889xN5w0pTkQdz39q4=; b=PZUaENqKqXAmEjqDEn40BAWjKAlnNLHkwVEJ/00r/PHTEEzqPgsfCrtOl+AqORzifb EMi8B+W2Sfj6QCMkMLnZ6VGNCGfBak7ik87j2TlMDJmIp6Qv4YztFrQHjlo9KtbU7eax yjW/TxkW8y3oypjX9TZ0iySPpw7OKGieuDJ0Cl6FydbBukO8XFO7EmJeVoELCGf81kF1 Iw9eomfMq5njQJgIlpxwwFy4/JLV7Y8YAvqlGUCPiGIiLOa62rZRR94H+33MnFeHibVm 4c38/l2YGI3zmsAzr1mqe7EsmFpyV4LoAHab7hpul3lSIF8xycMe4ottTilKLzp1AUOp HA0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=RlhP0wuS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v70si2072655pgd.562.2022.01.14.16.58.25; Fri, 14 Jan 2022 16:58:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=RlhP0wuS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229758AbiANXC1 (ORCPT + 99 others); Fri, 14 Jan 2022 18:02:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231239AbiANXC0 (ORCPT ); Fri, 14 Jan 2022 18:02:26 -0500 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0354EC061574 for ; Fri, 14 Jan 2022 15:02:26 -0800 (PST) Received: by mail-pg1-x534.google.com with SMTP id v25so3917747pge.2 for ; Fri, 14 Jan 2022 15:02:25 -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:mime-version :content-transfer-encoding; bh=BVKiFbTgrN+4dfFsvMUyjh+c0889xN5w0pTkQdz39q4=; b=RlhP0wuSMGhXyZ0phG35Nuw+vFNDE+c2d0FJlvmi0+5DgQ5O5JmdPQeR7DqGCdMJCC /VlrAAmzilfFOfy2kC38ITfTjtJpZv4kTsfB7s/L1ganW6OWvpHUVXoHEafET0oHBu4M Ppj9Vq7LGVUguy0vkS7dCTqHlj8W7ppW3F7jo= 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:mime-version :content-transfer-encoding; bh=BVKiFbTgrN+4dfFsvMUyjh+c0889xN5w0pTkQdz39q4=; b=4CK2e9DHZENcAreLnViyNsxYoLCmhqpQK5C2p+la7Wx2yKE/jU/hDzJVd/kjCW8+br wWZ8+zJh01t50f1q+9YNPwfPrGjHsdpTll8fv1gktudSAomudBNsFf0hLVcloS625Sbr MeBN7uz7+9SOvMPru2JS3tMhsi8cAjQ0Ld1obYdMhOfoygTAbsDPg+OTw9Og+4blzgo4 3XoP8fm7vpJVSxVmxLVqVFRFWAnc8Vpnv16lAS1AXg41uLOTIXsxd2ZdSqQPpDdfivPF yqtwDs6LnrmznpaYrjfudd7Q9LsZEfjr60l8suCbj++FupJMPh2pi6xPEtN0PEWiLkDg C/Sg== X-Gm-Message-State: AOAM531+ZWWXsJ+KGX6i72Xx0VUDAtShNAvOeLSo2IpowI7ZXCriPPg/ GvG0+4avcb/3cuEjEz6g/9URjg== X-Received: by 2002:a05:6a00:890:b0:4bd:347d:8aaf with SMTP id q16-20020a056a00089000b004bd347d8aafmr11000008pfj.61.1642201345551; Fri, 14 Jan 2022 15:02:25 -0800 (PST) Received: from localhost ([2620:15c:202:201:76ab:ede1:503d:1c39]) by smtp.gmail.com with UTF8SMTPSA id c10sm6750264pfl.200.2022.01.14.15.02.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 Jan 2022 15:02:24 -0800 (PST) From: Brian Norris To: Heiko Stuebner , Liam Girdwood , Mark Brown , David Airlie , Daniel Vetter Cc: linux-rockchip@lists.infradead.org, Lin Huang , linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, Rob Herring , Sandy Huang , linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, Brian Norris Subject: [PATCH v2 0/3] (Re)enable DP/HDMI audio for RK3399 Gru Date: Fri, 14 Jan 2022 15:02:06 -0800 Message-Id: <20220114230209.4091727-1-briannorris@chromium.org> X-Mailer: git-send-email 2.34.1.703.g22d0c6ccf7-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This series fixes DP/HDMI audio for RK3399 Gru systems. First, there was a regression with the switch to SPDIF. Patch 1 can be taken separately as a regression fix if desired. But it's not quite so useful (at least on Chrome OS systems) without the second part. Second, jack detection was never upstreamed, because the hdmi-codec dependencies were still being worked out when this platform was first supported. Patches cover a few subsystems. Perhaps this is something for arm-soc? Changes in v2: - (Un)set pinctrl, because the default assumes we're routing out to external pins Brian Norris (3): arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output drm/rockchip: cdn-dp: Support HDMI codec plug-change callback ASoC: rk3399_gru_sound: Wire up DP jack detection arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 17 ++++++++---- drivers/gpu/drm/rockchip/cdn-dp-core.c | 28 ++++++++++++++++++++ drivers/gpu/drm/rockchip/cdn-dp-core.h | 4 +++ sound/soc/rockchip/rk3399_gru_sound.c | 20 ++++++++++++++ 4 files changed, 64 insertions(+), 5 deletions(-) -- 2.34.1.703.g22d0c6ccf7-goog