From patchwork Tue May 12 09:26:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xing Zheng X-Patchwork-Id: 6386761 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8CB6B9F32B for ; Tue, 12 May 2015 09:32:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B43B4203EB for ; Tue, 12 May 2015 09:32:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D84B5203B5 for ; Tue, 12 May 2015 09:32:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ys6YL-0004rI-FB; Tue, 12 May 2015 09:32:41 +0000 Received: from mail-pa0-x22e.google.com ([2607:f8b0:400e:c03::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ys6XS-0004H7-0R; Tue, 12 May 2015 09:31:46 +0000 Received: by pacyx8 with SMTP id yx8so2288642pac.1; Tue, 12 May 2015 02:31:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cD8Q2FPJU8saO6pyQSIdETcY5MnNeZWTdFJ8CYjy3CA=; b=E7SQcVFvM0HIDzzEHZtjcsfFiVh5ijz+3QsQ+ZAVD/ca/y36lHUGUeIEYcvfvcDjJf 4+s80rECFp8qh6FzwIaad6C16vV3ZxnZHAvI+wKFmTzmxFzpmWxjGZg+HARu7NWCajjr SOgM/7wKnqkrjW6giDnY0YGg4m/22M01bpSS02ZSEVg6MiaJ/r3/sILA+u0P05dPAsyj UtA2vu9nVjOeRJ+O7Vv9aowoAH9tfFzYZmQ01r3AUb9DgT55rllAvNcwxGhTwqdV+7bY Hhvc8C5/rze8g2DT4Fh0QFMlbPnuhDWA84LhXypCIloKQWNthNIZ9yGgro8A9OKDWHLP qmNw== X-Received: by 10.70.35.171 with SMTP id i11mr26597060pdj.103.1431423085034; Tue, 12 May 2015 02:31:25 -0700 (PDT) Received: from localhost.localdomain ([103.47.144.18]) by mx.google.com with ESMTPSA id pw9sm15635818pac.27.2015.05.12.02.31.17 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 May 2015 02:31:24 -0700 (PDT) From: Xing Zheng X-Google-Original-From: Xing Zheng To: dgreid@chromium.org, dianders@chromium.org, heiko@sntech.de, sonnyrao@chromium.org Subject: [PATCH 4/4] ASoC: rockchip-audio-machine: add rockchip machine driver bindings Date: Tue, 12 May 2015 17:26:37 +0800 Message-Id: <1431422797-31903-5-git-send-email-zhengxing@rock-chips.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1431422797-31903-1-git-send-email-zhengxing@rock-chips.com> References: <1431422797-31903-1-git-send-email-zhengxing@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150512_023146_154091_52A79B64 X-CRM114-Status: GOOD ( 10.26 ) X-Spam-Score: 0.9 (/) Cc: Mark Rutland , devicetree@vger.kernel.org, zhengxing , Pawel Moll , Ian Campbell , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Rob Herring , Kumar Gala , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY,URIBL_BLACK autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: zhengxing Add documentation to the machine driver of the device-tree bindings for the soundcard of the Rockchip board. Signed-off-by: zhengxing --- .../sound/rockchip,rockchip-audio-machine.txt | 38 ++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-machine.txt \ No newline at end of file diff --git a/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-machine.txt b/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-machine.txt new file mode 100644 index 0000000..36864fd --- /dev/null +++ b/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-machine.txt @@ -0,0 +1,38 @@ +ROCKCHIP rk3288 audio complex, with AUDIO CODEC + +Required properties: +- (machine) compatible : "rockchip,rockchip-audio-machine" +- (codec) compatible : The child node name of compatible. +- 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 audio codec. +- rockchip,headset-codec : The phandle of the jack detection ic. + +Optional properties: +- rockchip,hp-det-gpios : The GPIO that detect headphones are plugged in +- rockchip,mic-det-gpios : The GPIO that detect microphones are plugged in + +Example: + +sound { + compatible = "rockchip,rockchip-audio-machine"; + + /* child node */ + sound_rtl { + compatible = "rockchip,rockchip-audio-rt5645"; + rockchip,model = "I2S-RT5650"; + rockchip,i2s-controller = <&i2s>; + rockchip,audio-codec = <&rt5645>; + }; + + /* child node */ + sound_maxim { + compatible = "rockchip,rockchip-audio-max98090"; + rockchip,model = "ROCKCHIP-I2S"; + rockchip,i2s-controller = <&i2s>; + rockchip,audio-codec = <&max98090>; + rockchip,headset-codec = <&headsetcodec>; + }; +};