From patchwork Mon Oct 28 07:19:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cheng-yi Chiang X-Patchwork-Id: 11214689 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7B3B717D5 for ; Mon, 28 Oct 2019 07:20:00 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5858820862 for ; Mon, 28 Oct 2019 07:20:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ZCg81ROM"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="P4SRp8hs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5858820862 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=jbQrw0Q0gLoibOKE9WcqfZIUXTlq44E5CwnXnnHQ2F4=; b=ZCg81ROMzJfKk9 RorOBN6iX1Bo2soj3HTBBcxBTpIWqmg/aLtmTNJrO19A4jjH2NgDcwX7ngU1PlDw7498Gv0IIIVor ZMo9RRZmDpcy3FZLOpTpg7B2JlJHjton5MnV7S+qrn4hYQ5cL+rbBttDWJ39MpAfEFtvmv5oCK6ns AkAVB/k9ZER//alQDHZjkfgFEBmMJRweoZiVfCcmGNTADoWK1PCDGTNiyPHxi8gMGPy7QQPFPlUD/ SH3YNI4XZE+LUWQJnYonkGC3JK7vkY3qj9DhNCe1ZgM7md6WH1fzFmh4GBpfDNJJuaFk5sXTRK6GM NWZ+i+P9+8TBBoYi8QkQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iOzJk-0004fB-00; Mon, 28 Oct 2019 07:19:56 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iOzJX-0004VE-Qt for linux-rockchip@lists.infradead.org; Mon, 28 Oct 2019 07:19:45 +0000 Received: by mail-pg1-x541.google.com with SMTP id r1so6269361pgj.12 for ; Mon, 28 Oct 2019 00:19:40 -0700 (PDT) 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=1kARxN4zXqzFWFi9Hzge3EGrR8GY2GeJ7Yqz9IBjLtM=; b=P4SRp8hsDD5IeFRKKfwF24MUFSYWQUG8Pifned/ZXWMMwEDxyNi2fo2IBqSZemeTIr YXzLkF57dbipVFhFy74e+kfK6A+vvnGLJ9qcYvXjfL/f0CZKSBWPERoIjFznbevPjcKy 2Yr0AWo8FKDfZP5ZaXkh/LIexFunlbxZ+g2ns= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1kARxN4zXqzFWFi9Hzge3EGrR8GY2GeJ7Yqz9IBjLtM=; b=RO3YD+pKcpDDQX4OS9HAEIfPQ10Q4u5dF37RCXUMVTLc7N58pT4E7B5rzeCf4nwWvq nK4zu68pT7ae9J2wjOBdFLocB8h4XAF24SMwTPuIYU+rBKl/4cOX/kuwHmXkMmtWuJ9L AmJy94WgmS1ebwtMDrCeaiDHjxi6RQgSR+YMTUsDv4X0h+AEqqta3U6CvEr4++PUSX9E wj/5cANjyuWGwBv91PUpaPYTvGzZ2Bdu/jctWrwBQ07a4SDL95Hed2+FcZZ6YF/3pZ+b 6gc/bS6Vng7IadSHGkO200zxRSoGCmyAZa7yq3N/OlwdON78Q0vndmtIu84URH5ipEvA QN4w== X-Gm-Message-State: APjAAAXRsI2xjbwgJiJaFNVt7NTDldUzKVWevtLYt0lQWmo2sHDO2iAW dhsoR4Zv+fIrJsqXqp6j49wxMg== X-Google-Smtp-Source: APXvYqyQ6aIEt1WbaZMUGlnrW1jFW16UZAwHLIo+j1unzlK77i3d3XcL512n21QVNwPfdFP+R7kEQQ== X-Received: by 2002:a63:ff56:: with SMTP id s22mr19089316pgk.44.1572247179560; Mon, 28 Oct 2019 00:19:39 -0700 (PDT) Received: from localhost ([2401:fa00:1:10:79b4:bd83:e4a5:a720]) by smtp.gmail.com with ESMTPSA id h28sm12513742pgn.14.2019.10.28.00.19.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 28 Oct 2019 00:19:38 -0700 (PDT) From: Cheng-Yi Chiang To: linux-kernel@vger.kernel.org Subject: [PATCH v9 0/6] Add HDMI jack support on RK3288 Date: Mon, 28 Oct 2019 15:19:24 +0800 Message-Id: <20191028071930.145899-1-cychiang@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191028_001943_873173_67FFFE79 X-CRM114-Status: UNSURE ( 9.96 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:541 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , alsa-devel@alsa-project.org, Heiko Stuebner , Neil Armstrong , David Airlie , dri-devel@lists.freedesktop.org, Liam Girdwood , Hans Verkuil , Andrzej Hajda , Laurent Pinchart , Jerome Brunet , Takashi Iwai , linux-rockchip@lists.infradead.org, dgreid@chromium.org, Cheng-Yi Chiang , devicetree@vger.kernel.org, tzungbi@chromium.org, Jonas Karlman , Russell King , Rob Herring , Jaroslav Kysela , linux-arm-kernel@lists.infradead.org, Jernej Skrabec , dianders@chromium.org, Mark Brown , Daniel Vetter Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org This patch series supports HDMI jack reporting on RK3288, which uses DRM dw-hdmi driver and hdmi-codec codec driver. The previous discussion about reporting jack status using hdmi-notifier and drm_audio_component is at https://lore.kernel.org/patchwork/patch/1083027/ The new approach is to use a callback mechanism that is specific to hdmi-codec. The dependent change on hdmi-codec.c commit 6fa5963c37a2 ("ASoC: hdmi-codec: Add an op to set callback function for plug event") has been merged to upstream. Changes from v8 to v9: 1. rockchip_max98090: Use the presence of rockchip,audio-codec to determine the presense of max98090 in sound card. Use the presence of rockchip,hdmi-codec to determine the presence of HDMI in sound card. Remove the compatible strings added in v8. 2. #include should be in the patch of adding HDMI jack support. Cheng-Yi Chiang (6): drm: bridge: dw-hdmi: Report connector status using callback ASoC: rockchip-max98090: Support usage with and without HDMI ASoC: rockchip_max98090: Optionally support HDMI use case ASoC: rockchip_max98090: Add HDMI jack support ARM: dts: rockchip: Add HDMI support to rk3288-veyron-analog-audio ARM: dts: rockchip: Add HDMI audio support to rk3288-veyron-mickey.dts .../bindings/sound/rockchip-max98090.txt | 27 +- .../boot/dts/rk3288-veyron-analog-audio.dtsi | 1 + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 7 + .../drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 11 + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 41 ++- include/drm/bridge/dw_hdmi.h | 4 + sound/soc/rockchip/Kconfig | 3 +- sound/soc/rockchip/rockchip_max98090.c | 313 ++++++++++++++---- 8 files changed, 338 insertions(+), 69 deletions(-)