From patchwork Fri Jan 14 23:02:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 12714194 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9EE60C433F5 for ; Fri, 14 Jan 2022 23:03:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Z7Yfq2ax8Ee3uXNRmFI+5Ps4nmtYFcUY4jhil9OZs0A=; b=wZ8GdjSm+l3neQ cATjrYT1QcsQWyQRuqFEYr7H507wR6sKfj9rSJ+39jedV2jdErHoeEQpHmgBJRjB0TDRHTZYZObBY Qdw0mzSKeRddsPjI9oc2zNY5CQnFV5Uax5/AbgCjW0Q/nufb0dYGdQ2uD/QQOYK5Ap8aSzV/nHC8y 0/6cLF3PM21t0dATcntx5QImXpm7oH6J1ON5F/8sBxo3GvOZN67jStf/124q6Oa9wE38HEA07O6Qf t75BVpws4AyVEqZDubEClxucm4ZycsIrCH3cAB4JnvGqJswvuut9jOFTZuvKGJiVSsoQcRYErZ04m IsUDdlrzvDk0CAIc17HA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n8Vab-00ANHT-Ie; Fri, 14 Jan 2022 23:02:34 +0000 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n8VaW-00ANDe-Rf for linux-arm-kernel@lists.infradead.org; Fri, 14 Jan 2022 23:02:30 +0000 Received: by mail-pf1-x430.google.com with SMTP id s15so4059886pfw.1 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=LMz/Pgd8N+fheXZwmzzSyXfU/FkUSUQujbiWgVyU8j+mnOhE/QwuPlWg/Whmho9zD5 ak/SH9rZbbCj3HDWZdw9YGFGZnaLJ810J5tVwWtNXJPHZZW1b9+OF4DJxg0P71B98o9S fAVJ0Blb38MAaK74LIIZsBsvE1OKa8pUZa1uM3a9Q5z1O8u6P0Vhr6FonBOGupHSLaZc R8e1+DUhPjXgzGNrZuWN+dthOXfeNo6gVtQHLOtDfFBkn4U4/IuEJM35jhg4Cmt2+G7P 2nn3FaFnRjOP8xc9XR0GrLoPI7+NcE8u7k0gQdz2lb2Odm0hv2L+Dxdpbw+mTEqlr864 guwA== X-Gm-Message-State: AOAM532lzJyOv4rB8s7JnzcTcHG/sf9CJb+TsyoB00617Y+qFjwsRs0u MOVkguKz4fQIzX/U/BqKfiS+aw== X-Google-Smtp-Source: ABdhPJygQAhOjz++7gMBKAe+FDohBuatX363kR5ClyepF85gLiZS7G/unLnFqdy+/LSmnjDXX93GWQ== 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220114_150228_915524_9C65BC5A X-CRM114-Status: GOOD ( 12.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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(-)