Received: by 10.223.185.116 with SMTP id b49csp3484659wrg; Mon, 19 Feb 2018 00:22:18 -0800 (PST) X-Google-Smtp-Source: AH8x225ct4zs6sYdoh4iq8IkBklxuVyO3RtCMye61fFtnhltMFzLvpyLGGJSjDmnXpPI/hEP1t/H X-Received: by 10.98.220.80 with SMTP id t77mr13537366pfg.55.1519028538875; Mon, 19 Feb 2018 00:22:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519028538; cv=none; d=google.com; s=arc-20160816; b=SFzTp4H214YDC+soTzVSpH/deWzF3bseYynMzO7pslNGsW59tFY8V4WAxlXMhYeltm CWC2GGIsu8WfRQLqNqfOTtgP/m+4Awa/bvRwPO0ggDd0oN0YqciFM4ATKxgdU/YPzmwF 8e6kyNhv0ivDbJlRBI71+Lv56AwQzh+5WBlb2ZbG1B8ozrXrjL/4f6xdeIISqK7F7h9V WhR6AmWUGbgUdCfzaJr6xtcmshRwejsrCFnJt4i9Ftwm9g7GbyJnzulCZb16U7LR8PuN HuQBrTmr8G5A8FReuhYkgmEoK/TMcymFwoUnx8+WsUHKQ21YH1IH18IdB/Bt9fZey46P KMKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=P8Slv5reBzJSLsZyOM/Fsf2Hba979M+PuMm52OI3B+E=; b=BKUTR+DHNU7gwVc22/S5Zec8gfWNX9UaoZlqF1ARRxLaOrSyQMf3DfBJdoe1yFlm0n auxL9nB27JXj6hiUjPC/4WjWwcoPvQ8Rw1TmazozG9acgqUCoB3uvc8nDRs0jLHbfdfw 3vTHmxomt/3bcbG8M1gvTEg1+Kb9AjoSRQTBBOsCydnftJB07FZH6pZq7RkuUuTNEfN7 PT5pXna/fWWt3YOEYJJNw9ZVEcuC5tOGjtBh0QJ3dQIoF6Ej7VokLjuVQl6OeQcsCN2U +hiygRxDbi6uKo/iEvfNCm/y/2DtGrkva3vAJRurz8v2NmDmh1Gg9F7An5JUQBd4jprg rzAA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s70si5078944pgc.244.2018.02.19.00.22.04; Mon, 19 Feb 2018 00:22:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752493AbeBSIUr (ORCPT + 99 others); Mon, 19 Feb 2018 03:20:47 -0500 Received: from vegas.theobroma-systems.com ([144.76.126.164]:44762 "EHLO mail.theobroma-systems.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752058AbeBSITC (ORCPT ); Mon, 19 Feb 2018 03:19:02 -0500 Received: from [86.59.122.178] (port=46472 helo=blau.lan) by mail.theobroma-systems.com with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1engf6-0001N0-AQ; Mon, 19 Feb 2018 09:19:00 +0100 From: Klaus Goger To: linux-rockchip@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Heiko Stuebner , Klaus Goger Subject: [PATCH v3 1/2] arm64: dts: rockchip: move i2s0 node from baseboard to SoM Date: Mon, 19 Feb 2018 09:18:53 +0100 Message-Id: <20180219081855.34400-2-klaus.goger@theobroma-systems.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180219081855.34400-1-klaus.goger@theobroma-systems.com> References: <20180219081855.34400-1-klaus.goger@theobroma-systems.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The I2S definition is part of the SoM and therefore should be in rk3399-puma.dtsi. Also correct the number of channels available. Signed-off-by: Klaus Goger --- Changes in v3: None Changes in v2: None arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 8 -------- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts index 9a7486058455..8fd0d7ba1dc9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts @@ -117,14 +117,6 @@ clock-frequency = <400000>; }; -&i2s0 { - status = "okay"; - rockchip,playback-channels = <8>; - rockchip,capture-channels = <8>; - #sound-dai-cells = <0>; - status = "okay"; -}; - &pcie_phy { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi index ce15a57a5b85..fc913e2d962f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -435,6 +435,14 @@ }; }; +&i2s0 { + pinctrl-0 = <&i2s0_2ch_bus>; + rockchip,playback-channels = <2>; + rockchip,capture-channels = <2>; + #sound-dai-cells = <0>; + status = "okay"; +}; + &io_domains { status = "okay"; bt656-supply = <&vcc_1v8>; -- 2.11.0