From patchwork Thu Jan 7 08:25:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caesar Wang X-Patchwork-Id: 7974201 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 3650F9F3E6 for ; Thu, 7 Jan 2016 08:27:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6622A2013D for ; Thu, 7 Jan 2016 08:27:34 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 89CD220172 for ; Thu, 7 Jan 2016 08:27:33 +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 1aH5uu-0000dL-TK; Thu, 07 Jan 2016 08:27:32 +0000 Received: from mail-pa0-f42.google.com ([209.85.220.42]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aH5uh-0000Q1-GZ; Thu, 07 Jan 2016 08:27:20 +0000 Received: by mail-pa0-f42.google.com with SMTP id cy9so253138107pac.0; Thu, 07 Jan 2016 00:26:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IPjU5ZreuMaxkCCxdRNpyTHG0E/JHC3j8wNK+iKG1Y4=; b=Xes3C+QiRfq3QHBotY6uqCVQ+5llusetXQQRDp2I/wBueGM2Dan3a7tkxi/VjtBvzy OFjqXX9hb14VOsFfNymDL5t3wEe7hZR9bq13fSSrDQdU+7V6+Tkjc9LgVrnlKugj/Qgm W4I8gl1IfMy38PEGy/jlFAdgQDJU85JqwKMTwSMV4LAWjMzC0PmBzdFpKOAFyuComZlt akPaHVkv5mjsRyprVpeXV1pU4efXLTh3hHbWB0PXXFR8VaLoj/ACQILQF9Ua0vyeu/km M+lUTzUhtmDpFkoEthMpoT9SPe/e3Js0mCvoAFxuQ28lCJ9hd7isWYElgECXZCO51k8Q carQ== X-Received: by 10.66.190.66 with SMTP id go2mr150968653pac.114.1452155218853; Thu, 07 Jan 2016 00:26:58 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id qj8sm9945010pac.40.2016.01.07.00.26.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jan 2016 00:26:57 -0800 (PST) From: Caesar Wang To: Heiko Stuebner , Ulf Hansson Subject: [PATCH v2 02/12] ARM: dts: rockchip: add the sound codec for kylin board Date: Thu, 7 Jan 2016 16:25:45 +0800 Message-Id: <1452155155-16232-3-git-send-email-wxt@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452155155-16232-1-git-send-email-wxt@rock-chips.com> References: <1452155155-16232-1-git-send-email-wxt@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160107_002719_727298_B7793221 X-CRM114-Status: GOOD ( 10.41 ) X-Spam-Score: -2.4 (--) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , Pawel Moll , Ian Campbell , Kumar Gala , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Rob Herring , leecam@google.com, linux-arm-kernel@lists.infradead.org, keescook@google.com, leozwang@google.com, Caesar Wang 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY 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 Support the rt5616 codec for kylin board, but we need enable the i2s firstly. Also, this patch adds the CPU/CODEC information for simple card to make the happy work. Signed-off-by: Caesar Wang --- Changes in v2: - fix the mclk-fs as the 256. arch/arm/boot/dts/rk3036-kylin.dts | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts index 992f9ca..27b6326 100644 --- a/arch/arm/boot/dts/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rk3036-kylin.dts @@ -46,6 +46,28 @@ model = "Rockchip RK3036 KylinBoard"; compatible = "rockchip,rk3036-kylin", "rockchip,rk3036"; + sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,name = "rockchip,rt5616-codec"; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,widgets = + "Microphone", "Microphone Jack", + "Headphone", "Headphone Jack"; + simple-audio-card,routing = + "MIC1", "Microphone Jack", + "MIC2", "Microphone Jack", + "Microphone Jack", "micbias1", + "Headphone Jack", "HPOL", + "Headphone Jack", "HPOR"; + simple-audio-card,cpu { + sound-dai = <&i2s>; + }; + simple-audio-card,codec { + sound-dai = <&rt5616>; + }; + }; + vcc_sys: vsys-regulator { compatible = "regulator-fixed"; regulator-name = "vcc_sys"; @@ -257,6 +279,17 @@ &i2c2 { status = "okay"; + + rt5616: rt5616@1b { + #sound-dai-cells = <0>; + compatible = "rt5616"; + reg = <0x1b>; + }; +}; + +&i2s { + #sound-dai-cells = <0>; + status = "okay"; }; &sdio {