From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9B8CCA9EC3 for ; Tue, 29 Oct 2019 12:57:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A01B9208E3 for ; Tue, 29 Oct 2019 12:57:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572353854; bh=L0Itmaavya1mySRDN+CxTsr5XPOuAtTRQ5Cr2WmVB3M=; h=From:To:Cc:Subject:In-Reply-To:Date:List-ID:From; b=Ww3YISRF++8kZmR2J/Azjw0p/7l/Q5PLvB+IfCf3uod8Mkjs66D1d1ZVK9ItPFXxK N4i6BBWlkdKQwRq9ZD/9y9Ds7xYjRFg7/TYw3xaUuwswdxPQrUUmdtrIz1XFhbHAgL NNlR1GGZFlt7PT2fktiKkN/2FNwqTE3FqTybqaM8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388165AbfJ2M5d (ORCPT ); Tue, 29 Oct 2019 08:57:33 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:57200 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388138AbfJ2M5a (ORCPT ); Tue, 29 Oct 2019 08:57:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=Wl+5/Qj/XhSNlZehVwD9qVk1hUUvfQ5iMLqz0DQGd0E=; b=Enb9SgsKSwwH 4l7KNx3nuvInMfXC5o/09C023lh/1CtRMwg8irjeb2vSpFbbOqYD+Ag/wrCyTSljba7Rlv2UapKx+ Mflf4De6z8aXfQL+mtEKqFpezAkzVPeLjL215UXSJYv03IcuePxdc9GTQImZKgbRi+oDJtic8qNUk BL3pY=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=ypsilon.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1iPR3U-0002DI-3j; Tue, 29 Oct 2019 12:57:00 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id 98B622742990; Tue, 29 Oct 2019 12:56:59 +0000 (GMT) From: Mark Brown To: Cheng-Yi Chiang Cc: alsa-devel@alsa-project.org, Andrzej Hajda , Daniel Vetter , David Airlie , devicetree@vger.kernel.org, dgreid@chromium.org, dianders@chromium.org, dri-devel@lists.freedesktop.org, Hans Verkuil , Heiko Stuebner , Jaroslav Kysela , Jernej Skrabec , Jerome Brunet , Jonas Karlman , Laurent Pinchart , Liam Girdwood , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Mark Brown , Mark Rutland , Neil Armstrong , Rob Herring , Russell King , Takashi Iwai , tzungbi@chromium.org Subject: Applied "ASoC: rockchip-max98090: Support usage with and without HDMI" to the asoc tree In-Reply-To: <20191028071930.145899-3-cychiang@chromium.org> X-Patchwork-Hint: ignore Message-Id: <20191029125659.98B622742990@ypsilon.sirena.org.uk> Date: Tue, 29 Oct 2019 12:56:59 +0000 (GMT) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The patch ASoC: rockchip-max98090: Support usage with and without HDMI has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.5 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From f03412b78a947857bbd20899e1423482fba55761 Mon Sep 17 00:00:00 2001 From: Cheng-Yi Chiang Date: Mon, 28 Oct 2019 15:19:26 +0800 Subject: [PATCH] ASoC: rockchip-max98090: Support usage with and without HDMI Add one optional property "rockchip,hdmi-codec" to let user specify HDMI device node in DTS so machine driver can find hdmi-codec device node for HDMI codec DAI. Use the presence of rockchip,audio-codec and rockchip,hdmi-codec to specify the use case. Use max98090 only : specify rockchip,audio-codec. Use HDMI only: specify rockchip,hdmi-codec. Use both max98090 and HDMI: specify rockchip,audio-codec and rockchip,hdmi-codec. Move these properties to optional because they are not needed for HDMI-only use case. "rockchip,audio-codec": The phandle of the MAX98090 audio codec "rockchip,headset-codec": The phandle of Ext chip for jack detection Signed-off-by: Cheng-Yi Chiang Link: https://lore.kernel.org/r/20191028071930.145899-3-cychiang@chromium.org Signed-off-by: Mark Brown --- .../bindings/sound/rockchip-max98090.txt | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/rockchip-max98090.txt b/Documentation/devicetree/bindings/sound/rockchip-max98090.txt index a805aa99ad75..e9c58b204399 100644 --- a/Documentation/devicetree/bindings/sound/rockchip-max98090.txt +++ b/Documentation/devicetree/bindings/sound/rockchip-max98090.txt @@ -5,15 +5,38 @@ Required properties: - rockchip,model: The user-visible name of this sound complex - rockchip,i2s-controller: The phandle of the Rockchip I2S controller that's connected to the CODEC -- rockchip,audio-codec: The phandle of the MAX98090 audio codec -- rockchip,headset-codec: The phandle of Ext chip for jack detection + +Optional properties: +- rockchip,audio-codec: The phandle of the MAX98090 audio codec. +- rockchip,headset-codec: The phandle of Ext chip for jack detection. This is + required if there is rockchip,audio-codec. +- rockchip,hdmi-codec: The phandle of HDMI device for HDMI codec. Example: +/* For max98090-only board. */ +sound { + compatible = "rockchip,rockchip-audio-max98090"; + rockchip,model = "ROCKCHIP-I2S"; + rockchip,i2s-controller = <&i2s>; + rockchip,audio-codec = <&max98090>; + rockchip,headset-codec = <&headsetcodec>; +}; + +/* For HDMI-only board. */ +sound { + compatible = "rockchip,rockchip-audio-max98090"; + rockchip,model = "ROCKCHIP-I2S"; + rockchip,i2s-controller = <&i2s>; + rockchip,hdmi-codec = <&hdmi>; +}; + +/* For max98090 plus HDMI board. */ sound { compatible = "rockchip,rockchip-audio-max98090"; rockchip,model = "ROCKCHIP-I2S"; rockchip,i2s-controller = <&i2s>; rockchip,audio-codec = <&max98090>; rockchip,headset-codec = <&headsetcodec>; + rockchip,hdmi-codec = <&hdmi>; }; -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DCBBCA9EAE for ; Tue, 29 Oct 2019 12:59:45 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 C71F8208E3 for ; Tue, 29 Oct 2019 12:59:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="mjpnBZPL"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sirena.org.uk header.i=@sirena.org.uk header.b="Enb9SgsK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C71F8208E3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 20DAC2222; Tue, 29 Oct 2019 13:58:53 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 20DAC2222 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1572353983; bh=cV+sKrJ6RN9jKbvqAZr/1uFn4YcJzAJvr4BVnaoYqKQ=; h=From:To:In-Reply-To:Date:Cc:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From; b=mjpnBZPLp4zlcINn0ye9cLePqSRHhdt1SK8JZPgZ1zTn59ty6q9PEiCJXn/GDx+EA t5R6m8oH5NOj7IVT4DtcADZgxsrVjxATDbPJmK/CMBNuYNMtIZ3ENSiygFbDH0VbTB fcsOwIcIz2V3O/yQ9/qsgjYrrTotWBj2H8+D7LSU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id B2899F80600; Tue, 29 Oct 2019 13:57:13 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 605BCF805FB; Tue, 29 Oct 2019 13:57:08 +0100 (CET) Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 94B41F8036C for ; Tue, 29 Oct 2019 13:57:02 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 94B41F8036C Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=sirena.org.uk header.i=@sirena.org.uk header.b="Enb9SgsK" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=Wl+5/Qj/XhSNlZehVwD9qVk1hUUvfQ5iMLqz0DQGd0E=; b=Enb9SgsKSwwH 4l7KNx3nuvInMfXC5o/09C023lh/1CtRMwg8irjeb2vSpFbbOqYD+Ag/wrCyTSljba7Rlv2UapKx+ Mflf4De6z8aXfQL+mtEKqFpezAkzVPeLjL215UXSJYv03IcuePxdc9GTQImZKgbRi+oDJtic8qNUk BL3pY=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=ypsilon.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1iPR3U-0002DI-3j; Tue, 29 Oct 2019 12:57:00 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id 98B622742990; Tue, 29 Oct 2019 12:56:59 +0000 (GMT) From: Mark Brown To: Cheng-Yi Chiang In-Reply-To: <20191028071930.145899-3-cychiang@chromium.org> X-Patchwork-Hint: ignore Message-Id: <20191029125659.98B622742990@ypsilon.sirena.org.uk> Date: Tue, 29 Oct 2019 12:56:59 +0000 (GMT) Cc: Mark Rutland , alsa-devel@alsa-project.org, dianders@chromium.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, devicetree@vger.kernel.org, tzungbi@chromium.org, Jonas Karlman , Russell King , Mark Brown , linux-arm-kernel@lists.infradead.org, Jernej Skrabec , linux-kernel@vger.kernel.org, Rob Herring , Daniel Vetter Subject: [alsa-devel] Applied "ASoC: rockchip-max98090: Support usage with and without HDMI" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" The patch ASoC: rockchip-max98090: Support usage with and without HDMI has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.5 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From f03412b78a947857bbd20899e1423482fba55761 Mon Sep 17 00:00:00 2001 From: Cheng-Yi Chiang Date: Mon, 28 Oct 2019 15:19:26 +0800 Subject: [PATCH] ASoC: rockchip-max98090: Support usage with and without HDMI Add one optional property "rockchip,hdmi-codec" to let user specify HDMI device node in DTS so machine driver can find hdmi-codec device node for HDMI codec DAI. Use the presence of rockchip,audio-codec and rockchip,hdmi-codec to specify the use case. Use max98090 only : specify rockchip,audio-codec. Use HDMI only: specify rockchip,hdmi-codec. Use both max98090 and HDMI: specify rockchip,audio-codec and rockchip,hdmi-codec. Move these properties to optional because they are not needed for HDMI-only use case. "rockchip,audio-codec": The phandle of the MAX98090 audio codec "rockchip,headset-codec": The phandle of Ext chip for jack detection Signed-off-by: Cheng-Yi Chiang Link: https://lore.kernel.org/r/20191028071930.145899-3-cychiang@chromium.org Signed-off-by: Mark Brown --- .../bindings/sound/rockchip-max98090.txt | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/rockchip-max98090.txt b/Documentation/devicetree/bindings/sound/rockchip-max98090.txt index a805aa99ad75..e9c58b204399 100644 --- a/Documentation/devicetree/bindings/sound/rockchip-max98090.txt +++ b/Documentation/devicetree/bindings/sound/rockchip-max98090.txt @@ -5,15 +5,38 @@ Required properties: - rockchip,model: The user-visible name of this sound complex - rockchip,i2s-controller: The phandle of the Rockchip I2S controller that's connected to the CODEC -- rockchip,audio-codec: The phandle of the MAX98090 audio codec -- rockchip,headset-codec: The phandle of Ext chip for jack detection + +Optional properties: +- rockchip,audio-codec: The phandle of the MAX98090 audio codec. +- rockchip,headset-codec: The phandle of Ext chip for jack detection. This is + required if there is rockchip,audio-codec. +- rockchip,hdmi-codec: The phandle of HDMI device for HDMI codec. Example: +/* For max98090-only board. */ +sound { + compatible = "rockchip,rockchip-audio-max98090"; + rockchip,model = "ROCKCHIP-I2S"; + rockchip,i2s-controller = <&i2s>; + rockchip,audio-codec = <&max98090>; + rockchip,headset-codec = <&headsetcodec>; +}; + +/* For HDMI-only board. */ +sound { + compatible = "rockchip,rockchip-audio-max98090"; + rockchip,model = "ROCKCHIP-I2S"; + rockchip,i2s-controller = <&i2s>; + rockchip,hdmi-codec = <&hdmi>; +}; + +/* For max98090 plus HDMI board. */ sound { compatible = "rockchip,rockchip-audio-max98090"; rockchip,model = "ROCKCHIP-I2S"; rockchip,i2s-controller = <&i2s>; rockchip,audio-codec = <&max98090>; rockchip,headset-codec = <&headsetcodec>; + rockchip,hdmi-codec = <&hdmi>; }; -- 2.20.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Brown Subject: Applied "ASoC: rockchip-max98090: Support usage with and without HDMI" to the asoc tree Date: Tue, 29 Oct 2019 12:56:59 +0000 (GMT) Message-ID: <20191029125659.98B622742990@ypsilon.sirena.org.uk> References: <20191028071930.145899-3-cychiang@chromium.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191028071930.145899-3-cychiang@chromium.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Cheng-Yi Chiang Cc: Mark Rutland , alsa-devel@alsa-project.org, dianders@chromium.org, Neil Armstrong , David Airlie , dri-devel@lists.freedesktop.org, Liam Girdwood , Hans Verkuil , Laurent Pinchart , Jerome Brunet , Takashi Iwai , linux-rockchip@lists.infradead.org, dgreid@chromium.org, devicetree@vger.kernel.org, tzungbi@chromium.org, Jonas Karlman , Russell King , Mark Brown , Jaroslav Kysela , linux-arm-kernel@lists.infradead.org, Jernej Skrabec , linux-kernel@vger.kernel.org, Rob Herring List-Id: linux-rockchip.vger.kernel.org VGhlIHBhdGNoCgogICBBU29DOiByb2NrY2hpcC1tYXg5ODA5MDogU3VwcG9ydCB1c2FnZSB3aXRo IGFuZCB3aXRob3V0IEhETUkKCmhhcyBiZWVuIGFwcGxpZWQgdG8gdGhlIGFzb2MgdHJlZSBhdAoK ICAgaHR0cHM6Ly9naXQua2VybmVsLm9yZy9wdWIvc2NtL2xpbnV4L2tlcm5lbC9naXQvYnJvb25p ZS9zb3VuZC5naXQgZm9yLTUuNQoKQWxsIGJlaW5nIHdlbGwgdGhpcyBtZWFucyB0aGF0IGl0IHdp bGwgYmUgaW50ZWdyYXRlZCBpbnRvIHRoZSBsaW51eC1uZXh0CnRyZWUgKHVzdWFsbHkgc29tZXRp bWUgaW4gdGhlIG5leHQgMjQgaG91cnMpIGFuZCBzZW50IHRvIExpbnVzIGR1cmluZwp0aGUgbmV4 dCBtZXJnZSB3aW5kb3cgKG9yIHNvb25lciBpZiBpdCBpcyBhIGJ1ZyBmaXgpLCBob3dldmVyIGlm CnByb2JsZW1zIGFyZSBkaXNjb3ZlcmVkIHRoZW4gdGhlIHBhdGNoIG1heSBiZSBkcm9wcGVkIG9y IHJldmVydGVkLiAgCgpZb3UgbWF5IGdldCBmdXJ0aGVyIGUtbWFpbHMgcmVzdWx0aW5nIGZyb20g YXV0b21hdGVkIG9yIG1hbnVhbCB0ZXN0aW5nCmFuZCByZXZpZXcgb2YgdGhlIHRyZWUsIHBsZWFz ZSBlbmdhZ2Ugd2l0aCBwZW9wbGUgcmVwb3J0aW5nIHByb2JsZW1zIGFuZApzZW5kIGZvbGxvd3Vw IHBhdGNoZXMgYWRkcmVzc2luZyBhbnkgaXNzdWVzIHRoYXQgYXJlIHJlcG9ydGVkIGlmIG5lZWRl ZC4KCklmIGFueSB1cGRhdGVzIGFyZSByZXF1aXJlZCBvciB5b3UgYXJlIHN1Ym1pdHRpbmcgZnVy dGhlciBjaGFuZ2VzIHRoZXkKc2hvdWxkIGJlIHNlbnQgYXMgaW5jcmVtZW50YWwgdXBkYXRlcyBh Z2FpbnN0IGN1cnJlbnQgZ2l0LCBleGlzdGluZwpwYXRjaGVzIHdpbGwgbm90IGJlIHJlcGxhY2Vk LgoKUGxlYXNlIGFkZCBhbnkgcmVsZXZhbnQgbGlzdHMgYW5kIG1haW50YWluZXJzIHRvIHRoZSBD Q3Mgd2hlbiByZXBseWluZwp0byB0aGlzIG1haWwuCgpUaGFua3MsCk1hcmsKCkZyb20gZjAzNDEy Yjc4YTk0Nzg1N2JiZDIwODk5ZTE0MjM0ODJmYmE1NTc2MSBNb24gU2VwIDE3IDAwOjAwOjAwIDIw MDEKRnJvbTogQ2hlbmctWWkgQ2hpYW5nIDxjeWNoaWFuZ0BjaHJvbWl1bS5vcmc+CkRhdGU6IE1v biwgMjggT2N0IDIwMTkgMTU6MTk6MjYgKzA4MDAKU3ViamVjdDogW1BBVENIXSBBU29DOiByb2Nr Y2hpcC1tYXg5ODA5MDogU3VwcG9ydCB1c2FnZSB3aXRoIGFuZCB3aXRob3V0IEhETUkKCkFkZCBv bmUgb3B0aW9uYWwgcHJvcGVydHkgInJvY2tjaGlwLGhkbWktY29kZWMiIHRvIGxldCB1c2VyIHNw ZWNpZnkgSERNSQpkZXZpY2Ugbm9kZSBpbiBEVFMgc28gbWFjaGluZSBkcml2ZXIgY2FuIGZpbmQg aGRtaS1jb2RlYyBkZXZpY2Ugbm9kZSBmb3IKSERNSSBjb2RlYyBEQUkuCgpVc2UgdGhlIHByZXNl bmNlIG9mIHJvY2tjaGlwLGF1ZGlvLWNvZGVjIGFuZCByb2NrY2hpcCxoZG1pLWNvZGVjIHRvCnNw ZWNpZnkgdGhlIHVzZSBjYXNlLgoKVXNlIG1heDk4MDkwIG9ubHkgOiBzcGVjaWZ5IHJvY2tjaGlw LGF1ZGlvLWNvZGVjLgpVc2UgSERNSSBvbmx5OiBzcGVjaWZ5IHJvY2tjaGlwLGhkbWktY29kZWMu ClVzZSBib3RoIG1heDk4MDkwIGFuZCBIRE1JOiBzcGVjaWZ5IHJvY2tjaGlwLGF1ZGlvLWNvZGVj IGFuZApyb2NrY2hpcCxoZG1pLWNvZGVjLgoKTW92ZSB0aGVzZSBwcm9wZXJ0aWVzIHRvIG9wdGlv bmFsIGJlY2F1c2UgdGhleSBhcmUgbm90IG5lZWRlZCBmb3IKSERNSS1vbmx5IHVzZSBjYXNlLgoi cm9ja2NoaXAsYXVkaW8tY29kZWMiOiBUaGUgcGhhbmRsZSBvZiB0aGUgTUFYOTgwOTAgYXVkaW8g Y29kZWMKInJvY2tjaGlwLGhlYWRzZXQtY29kZWMiOiBUaGUgcGhhbmRsZSBvZiBFeHQgY2hpcCBm b3IgamFjayBkZXRlY3Rpb24KClNpZ25lZC1vZmYtYnk6IENoZW5nLVlpIENoaWFuZyA8Y3ljaGlh bmdAY2hyb21pdW0ub3JnPgpMaW5rOiBodHRwczovL2xvcmUua2VybmVsLm9yZy9yLzIwMTkxMDI4 MDcxOTMwLjE0NTg5OS0zLWN5Y2hpYW5nQGNocm9taXVtLm9yZwpTaWduZWQtb2ZmLWJ5OiBNYXJr IEJyb3duIDxicm9vbmllQGtlcm5lbC5vcmc+Ci0tLQogLi4uL2JpbmRpbmdzL3NvdW5kL3JvY2tj aGlwLW1heDk4MDkwLnR4dCAgICAgIHwgMjcgKysrKysrKysrKysrKysrKystLQogMSBmaWxlIGNo YW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvRG9j dW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL3NvdW5kL3JvY2tjaGlwLW1heDk4MDkwLnR4 dCBiL0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9zb3VuZC9yb2NrY2hpcC1tYXg5 ODA5MC50eHQKaW5kZXggYTgwNWFhOTlhZDc1Li5lOWM1OGIyMDQzOTkgMTAwNjQ0Ci0tLSBhL0Rv Y3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9zb3VuZC9yb2NrY2hpcC1tYXg5ODA5MC50 eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL3NvdW5kL3JvY2tjaGlw LW1heDk4MDkwLnR4dApAQCAtNSwxNSArNSwzOCBAQCBSZXF1aXJlZCBwcm9wZXJ0aWVzOgogLSBy b2NrY2hpcCxtb2RlbDogVGhlIHVzZXItdmlzaWJsZSBuYW1lIG9mIHRoaXMgc291bmQgY29tcGxl eAogLSByb2NrY2hpcCxpMnMtY29udHJvbGxlcjogVGhlIHBoYW5kbGUgb2YgdGhlIFJvY2tjaGlw IEkyUyBjb250cm9sbGVyIHRoYXQncwogICBjb25uZWN0ZWQgdG8gdGhlIENPREVDCi0tIHJvY2tj aGlwLGF1ZGlvLWNvZGVjOiBUaGUgcGhhbmRsZSBvZiB0aGUgTUFYOTgwOTAgYXVkaW8gY29kZWMK LS0gcm9ja2NoaXAsaGVhZHNldC1jb2RlYzogVGhlIHBoYW5kbGUgb2YgRXh0IGNoaXAgZm9yIGph Y2sgZGV0ZWN0aW9uCisKK09wdGlvbmFsIHByb3BlcnRpZXM6CistIHJvY2tjaGlwLGF1ZGlvLWNv ZGVjOiBUaGUgcGhhbmRsZSBvZiB0aGUgTUFYOTgwOTAgYXVkaW8gY29kZWMuCistIHJvY2tjaGlw LGhlYWRzZXQtY29kZWM6IFRoZSBwaGFuZGxlIG9mIEV4dCBjaGlwIGZvciBqYWNrIGRldGVjdGlv bi4gVGhpcyBpcworICAgICAgICAgICAgICAgICAgICAgICAgICByZXF1aXJlZCBpZiB0aGVyZSBp cyByb2NrY2hpcCxhdWRpby1jb2RlYy4KKy0gcm9ja2NoaXAsaGRtaS1jb2RlYzogVGhlIHBoYW5k bGUgb2YgSERNSSBkZXZpY2UgZm9yIEhETUkgY29kZWMuCiAKIEV4YW1wbGU6CiAKKy8qIEZvciBt YXg5ODA5MC1vbmx5IGJvYXJkLiAqLworc291bmQgeworCWNvbXBhdGlibGUgPSAicm9ja2NoaXAs cm9ja2NoaXAtYXVkaW8tbWF4OTgwOTAiOworCXJvY2tjaGlwLG1vZGVsID0gIlJPQ0tDSElQLUky UyI7CisJcm9ja2NoaXAsaTJzLWNvbnRyb2xsZXIgPSA8Jmkycz47CisJcm9ja2NoaXAsYXVkaW8t Y29kZWMgPSA8Jm1heDk4MDkwPjsKKwlyb2NrY2hpcCxoZWFkc2V0LWNvZGVjID0gPCZoZWFkc2V0 Y29kZWM+OworfTsKKworLyogRm9yIEhETUktb25seSBib2FyZC4gKi8KK3NvdW5kIHsKKwljb21w YXRpYmxlID0gInJvY2tjaGlwLHJvY2tjaGlwLWF1ZGlvLW1heDk4MDkwIjsKKwlyb2NrY2hpcCxt b2RlbCA9ICJST0NLQ0hJUC1JMlMiOworCXJvY2tjaGlwLGkycy1jb250cm9sbGVyID0gPCZpMnM+ OworCXJvY2tjaGlwLGhkbWktY29kZWMgPSA8JmhkbWk+OworfTsKKworLyogRm9yIG1heDk4MDkw IHBsdXMgSERNSSBib2FyZC4gKi8KIHNvdW5kIHsKIAljb21wYXRpYmxlID0gInJvY2tjaGlwLHJv Y2tjaGlwLWF1ZGlvLW1heDk4MDkwIjsKIAlyb2NrY2hpcCxtb2RlbCA9ICJST0NLQ0hJUC1JMlMi OwogCXJvY2tjaGlwLGkycy1jb250cm9sbGVyID0gPCZpMnM+OwogCXJvY2tjaGlwLGF1ZGlvLWNv ZGVjID0gPCZtYXg5ODA5MD47CiAJcm9ja2NoaXAsaGVhZHNldC1jb2RlYyA9IDwmaGVhZHNldGNv ZGVjPjsKKwlyb2NrY2hpcCxoZG1pLWNvZGVjID0gPCZoZG1pPjsKIH07Ci0tIAoyLjIwLjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBt YWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D916CA9EAE for ; Tue, 29 Oct 2019 12:58:07 +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 E1E6021479 for ; Tue, 29 Oct 2019 12:58:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="s1rxtVXs"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sirena.org.uk header.i=@sirena.org.uk header.b="Enb9SgsK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1E6021479 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=7/pdk0kfoAh4xjd0Jza00IOoqJ9GCH1P1LIAL/Ah274=; b=s1r xtVXsDHdRH5lYU0lyT9jywMrKtqNEN+KBlWh2OxtgwRW2qloQKl+3l/F4FbyzGn3dCVMQUiUFq/R/ XM70Dt2FVi6NJg9Cw9iAqpZjRHmqEUU8SAvuLYwYEFzNn6O76M3nCqKaJRn/oLRTjb23penLlWme9 xN6khERddL64HYQJF8sTF/EkVoRJUwKd4W26MWqDDMdt2exSRojcSI6HsQqlHH3pYJu2d7YXNDnDc tXTO+CKL1Mt2+lkVOpBU96wEsu5kls0rqi88QG2DAJB9OnJfu8EmK2kTuy0NigJ/wfA5XVDv2BiKs voBd5pY3GuMeuLx/Vgw7W4JNTa/kDEA==; 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 1iPR4W-00040z-H4; Tue, 29 Oct 2019 12:58:04 +0000 Received: from heliosphere.sirena.org.uk ([172.104.155.198]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iPR3h-0003J8-Ta; Tue, 29 Oct 2019 12:57:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=Wl+5/Qj/XhSNlZehVwD9qVk1hUUvfQ5iMLqz0DQGd0E=; b=Enb9SgsKSwwH 4l7KNx3nuvInMfXC5o/09C023lh/1CtRMwg8irjeb2vSpFbbOqYD+Ag/wrCyTSljba7Rlv2UapKx+ Mflf4De6z8aXfQL+mtEKqFpezAkzVPeLjL215UXSJYv03IcuePxdc9GTQImZKgbRi+oDJtic8qNUk BL3pY=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=ypsilon.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1iPR3U-0002DI-3j; Tue, 29 Oct 2019 12:57:00 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id 98B622742990; Tue, 29 Oct 2019 12:56:59 +0000 (GMT) From: Mark Brown To: Cheng-Yi Chiang Subject: Applied "ASoC: rockchip-max98090: Support usage with and without HDMI" to the asoc tree In-Reply-To: <20191028071930.145899-3-cychiang@chromium.org> X-Patchwork-Hint: ignore Message-Id: <20191029125659.98B622742990@ypsilon.sirena.org.uk> Date: Tue, 29 Oct 2019 12:56:59 +0000 (GMT) X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191029_055713_953158_3BB5FE97 X-CRM114-Status: GOOD ( 14.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , alsa-devel@alsa-project.org, dianders@chromium.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, devicetree@vger.kernel.org, tzungbi@chromium.org, Jonas Karlman , Russell King , Mark Brown , Jaroslav Kysela , linux-arm-kernel@lists.infradead.org, Jernej Skrabec , linux-kernel@vger.kernel.org, Rob Herring , Daniel Vetter MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org The patch ASoC: rockchip-max98090: Support usage with and without HDMI has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.5 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From f03412b78a947857bbd20899e1423482fba55761 Mon Sep 17 00:00:00 2001 From: Cheng-Yi Chiang Date: Mon, 28 Oct 2019 15:19:26 +0800 Subject: [PATCH] ASoC: rockchip-max98090: Support usage with and without HDMI Add one optional property "rockchip,hdmi-codec" to let user specify HDMI device node in DTS so machine driver can find hdmi-codec device node for HDMI codec DAI. Use the presence of rockchip,audio-codec and rockchip,hdmi-codec to specify the use case. Use max98090 only : specify rockchip,audio-codec. Use HDMI only: specify rockchip,hdmi-codec. Use both max98090 and HDMI: specify rockchip,audio-codec and rockchip,hdmi-codec. Move these properties to optional because they are not needed for HDMI-only use case. "rockchip,audio-codec": The phandle of the MAX98090 audio codec "rockchip,headset-codec": The phandle of Ext chip for jack detection Signed-off-by: Cheng-Yi Chiang Link: https://lore.kernel.org/r/20191028071930.145899-3-cychiang@chromium.org Signed-off-by: Mark Brown --- .../bindings/sound/rockchip-max98090.txt | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/rockchip-max98090.txt b/Documentation/devicetree/bindings/sound/rockchip-max98090.txt index a805aa99ad75..e9c58b204399 100644 --- a/Documentation/devicetree/bindings/sound/rockchip-max98090.txt +++ b/Documentation/devicetree/bindings/sound/rockchip-max98090.txt @@ -5,15 +5,38 @@ Required properties: - rockchip,model: The user-visible name of this sound complex - rockchip,i2s-controller: The phandle of the Rockchip I2S controller that's connected to the CODEC -- rockchip,audio-codec: The phandle of the MAX98090 audio codec -- rockchip,headset-codec: The phandle of Ext chip for jack detection + +Optional properties: +- rockchip,audio-codec: The phandle of the MAX98090 audio codec. +- rockchip,headset-codec: The phandle of Ext chip for jack detection. This is + required if there is rockchip,audio-codec. +- rockchip,hdmi-codec: The phandle of HDMI device for HDMI codec. Example: +/* For max98090-only board. */ +sound { + compatible = "rockchip,rockchip-audio-max98090"; + rockchip,model = "ROCKCHIP-I2S"; + rockchip,i2s-controller = <&i2s>; + rockchip,audio-codec = <&max98090>; + rockchip,headset-codec = <&headsetcodec>; +}; + +/* For HDMI-only board. */ +sound { + compatible = "rockchip,rockchip-audio-max98090"; + rockchip,model = "ROCKCHIP-I2S"; + rockchip,i2s-controller = <&i2s>; + rockchip,hdmi-codec = <&hdmi>; +}; + +/* For max98090 plus HDMI board. */ sound { compatible = "rockchip,rockchip-audio-max98090"; rockchip,model = "ROCKCHIP-I2S"; rockchip,i2s-controller = <&i2s>; rockchip,audio-codec = <&max98090>; rockchip,headset-codec = <&headsetcodec>; + rockchip,hdmi-codec = <&hdmi>; }; -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel