From patchwork Wed Nov 8 17:13:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 10048835 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 0E49E60381 for ; Wed, 8 Nov 2017 17:13:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E963B2A7AA for ; Wed, 8 Nov 2017 17:13:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE2412A7B9; Wed, 8 Nov 2017 17:13:40 +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.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B82F02A7AA for ; Wed, 8 Nov 2017 17:13:39 +0000 (UTC) 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:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=tP2G1xVrDHskGTIDGOeQykXIc+3LHjTkhbTC0IoYbLY=; b=GLi t+0qbTyEwKILTRdn/z6FabcWQH1TgVhnKkHIYX+FLZO8d3azRCbNKjLYL5yYY8CWOeQXmu0JE4ira XvHiIXTMhWrJc1ySdje4jxgQMn5x1UAOInZkcHB7LsNR3unXoQssOalM/pzRDBXrXdTyRsYoxmBuu Aif1w8BWt7P3cWWlaBfRn9t7/YCK6ceyHFtAvExdy4uksZHdWHfGTpfTNSCDWVw+j2mxPV8aerVCC xmgIfWIryLxrsZTEhM8+6c3s3vypYF3GZxufR+wLTD3EcDFkBSlobHRRBNKExL1tCO4iqppoEWHqo g2UnRFd8D2e7M/5UdTrLidCl/Gbp5cg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eCTv1-0008Mp-29; Wed, 08 Nov 2017 17:13:39 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eCTux-0008MT-NG for linux-arm-kernel@bombadil.infradead.org; Wed, 08 Nov 2017 17:13:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Message-Id:Date: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:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=vo4T63p88c6Jrso9VFbeg3qT/f1uQqb3Ff05i6RFCvc=; b=q9a1AKRMqkXpav/rJpWPeVPhI AoMPvFCxX8VicOo40jKG/DgG5nHo89Y/ftYfKWZS3XsUd2mJ6EM/WKrWOF1GTUP28HTw4A+l7KLp3 aUZ0ZdRCijDRqTwWoPtTe7zoOCC5NVCXPfoDZH+RCro+KWrb59JGMOu5COcB9c0U/RQ4w5itpRckX cXAkrf8oqBKp3xtxI5r6SodF+w+XMrhQaBoPunNq33JECZtIcRgdBZr1kCMDahqccr3KPLZtiHCYj Uc4amL8ICuAbrRXfK7mVMQVWkXWCW7GlZYAGKbeZYhcs5W5783j03wDuV1maQ5OtR/Rv7LClAEk5Q AIPmGT5qg==; Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eCTup-00036t-TG for linux-arm-kernel@lists.infradead.org; Wed, 08 Nov 2017 17:13:33 +0000 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.84_2) (envelope-from ) id 1eCTuO-0006TA-Lk; Wed, 08 Nov 2017 18:13:00 +0100 From: Lucas Stach To: Shawn Guo Subject: [PATCH] ARM: dts: imx: rdu1: cosmetic changes to the audio nodes Date: Wed, 8 Nov 2017 18:13:00 +0100 Message-Id: <20171108171300.15068-1-l.stach@pengutronix.de> X-Mailer: git-send-email 2.11.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel@pengutronix.de, Chris Healy , linux-arm-kernel@lists.infradead.org, patchwork-lst@pengutronix.de 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 This renames the audio device to "Front" in order to match the RDU2 naming, which makes it easier for a unified userspace to deal with both boards. Also rename the phandle for the headphone amplifier to more closely resemble the RDU2 DTS. Signed-off-by: Lucas Stach Reviewed-by: Chris Healy --- arch/arm/boot/dts/imx51-zii-rdu1.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts index 2628dbe4174b..31c35919c580 100644 --- a/arch/arm/boot/dts/imx51-zii-rdu1.dts +++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts @@ -243,7 +243,7 @@ sound { compatible = "simple-audio-card"; - simple-audio-card,name = "RDU1 audio"; + simple-audio-card,name = "Front"; simple-audio-card,format = "i2s"; simple-audio-card,bitclock-master = <&sound_codec>; simple-audio-card,frame-master = <&sound_codec>; @@ -252,7 +252,7 @@ simple-audio-card,routing = "Headphone Jack", "HPLEFT", "Headphone Jack", "HPRIGHT"; - simple-audio-card,aux-devs = <&tpa6130a2>; + simple-audio-card,aux-devs = <&hpa1>; sound_cpu: simple-audio-card,cpu { sound-dai = <&ssi2>; @@ -480,7 +480,7 @@ reg = <0x50>; }; - tpa6130a2: amp@60 { + hpa1: amp@60 { compatible = "ti,tpa6130a2"; reg = <0x60>; pinctrl-names = "default";