From patchwork Tue Jan 3 11:22:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 9494767 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B7555606A7 for ; Tue, 3 Jan 2017 11:24:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B5A9200F5 for ; Tue, 3 Jan 2017 11:24:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 902EF26CF9; Tue, 3 Jan 2017 11:24:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 313F5200F5 for ; Tue, 3 Jan 2017 11:24:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cONBu-0007Cv-EI; Tue, 03 Jan 2017 11:23:42 +0000 Received: from mail-wj0-x236.google.com ([2a00:1450:400c:c01::236]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cONBY-00073k-Up for linux-arm-kernel@lists.infradead.org; Tue, 03 Jan 2017 11:23:22 +0000 Received: by mail-wj0-x236.google.com with SMTP id v7so442788361wjy.2 for ; Tue, 03 Jan 2017 03:23:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1EQhoEOUKyIdEdZdCBO6ROi9ZIwtJQWMvsZlpwLduuQ=; b=B/zAisDeiIihUh8TIce6MWgU7qUjGBqU5/m2fR6DUWqYfFeJYLonqVODIloF1bHX13 u3Y0IlCwbqp36+tu5yeK+YuNYoVGOs/FcoLgWDuNu3axOQmmyUyaG+SMs8r25Pv1za9G YYMYMV5L+lz+4yCkChrAshCly3xr9YhpMRf8vWAMsj/zFFs4Zdi9J+vDAx1u2py3k1mR gBLnk8hCIEY3HO0f7luNltNERQVE1mSVwI0LoSQRXUtuzYXlKE345c4uQPzkZNUiehgX ncp5vZ8aWplbbbefbsOL4qgFx6JVEl6e3y5wKlfDFG9LswG2hD4JucbWBWgaVBQ172J6 oQOQ== 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:in-reply-to :references; bh=1EQhoEOUKyIdEdZdCBO6ROi9ZIwtJQWMvsZlpwLduuQ=; b=ViuZ14uP5SPCrqx6H2/ysrEeouhaIfmO9APBuCxSBZpKvHCWs1ESWPr1/Xmh5D1Rd1 WA7fofL6EO9X6VrPkUIWLoqMjBYIi9KtMf13MtYP/P/w/kX++m/Xb+HnzIER7Rr5pGws CujbTJ8i7NbgPPWyU0dLnneG8OiIrN846AVNFOh8HJvKRym07XyCWL2a3374yrLmGun3 AMBVXEMydaEZMUmjf9q9P486FW5oOHhgVHyQaIK4s3vEILWehSVIHFizAY4AKNclg9cV nbOjTuaI4+tzJZAENF1AhPHOEUeZ60Ib10Nl3FJTvmG6xcCeIEo2JOHrBjl8SYX/05jU htZw== X-Gm-Message-State: AIkVDXJAhEWZYpHk4qbSCOUuFqe51G3+4CE7q6mLhtVWGDCsNzJO2t1r9Jz0BQ0Oj/o0Sg== X-Received: by 10.194.178.170 with SMTP id cz10mr51874947wjc.224.1483442579080; Tue, 03 Jan 2017 03:22:59 -0800 (PST) Received: from t450s.home (AStLambert-153-1-56-89.w83-204.abo.wanadoo.fr. [83.204.135.89]) by smtp.googlemail.com with ESMTPSA id e5sm89026872wma.12.2017.01.03.03.22.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jan 2017 03:22:58 -0800 (PST) From: Gary Bisson To: shawnguo@kernel.org Subject: [PATCH 2/2] ARM: dts: imx6qdl-nitrogen6_som2: fix sgtl5000 pinctrl init Date: Tue, 3 Jan 2017 12:22:47 +0100 Message-Id: <20170103112247.4563-3-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170103112247.4563-1-gary.bisson@boundarydevices.com> References: <20170103112247.4563-1-gary.bisson@boundarydevices.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170103_032321_247009_8EEE64AC X-CRM114-Status: GOOD ( 10.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fabio.estevam@nxp.com, devicetree@vger.kernel.org, Gary Bisson , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Since the codec is probed first, the pinctrl node should be under the codec node. The codec init was working for this board since U-Boot was already setting GPIO_0 as CLKO1 but better fix it anyway. Signed-off-by: Gary Bisson --- arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi index d80f21abea62..31d4cc62dbc7 100644 --- a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi @@ -250,8 +250,6 @@ compatible = "fsl,imx6q-nitrogen6_som2-sgtl5000", "fsl,imx-audio-sgtl5000"; model = "imx6q-nitrogen6_som2-sgtl5000"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_sgtl5000>; ssi-controller = <&ssi1>; audio-codec = <&codec>; audio-routing = @@ -320,6 +318,8 @@ codec: sgtl5000@0a { compatible = "fsl,sgtl5000"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sgtl5000>; reg = <0x0a>; clocks = <&clks IMX6QDL_CLK_CKO>; VDDA-supply = <®_2p5v>;