From patchwork Thu May 22 06:04:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Harvey X-Patchwork-Id: 4220541 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8FD3BBEEE2 for ; Thu, 22 May 2014 06:08:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BEBEE2020F for ; Thu, 22 May 2014 06:08:13 +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 9982820251 for ; Thu, 22 May 2014 06:08:11 +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 1WnM8D-0003au-I9; Thu, 22 May 2014 06:05:33 +0000 Received: from mail-pb0-f54.google.com ([209.85.160.54]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WnM86-0003Z8-6J for linux-arm-kernel@lists.infradead.org; Thu, 22 May 2014 06:05:27 +0000 Received: by mail-pb0-f54.google.com with SMTP id jt11so2186057pbb.27 for ; Wed, 21 May 2014 23:05:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=A5SAI92wPy6dIrOz60aWMgp01N1LxBbCUKRQqu3Wbbg=; b=jbnKl1Gk6o21WpPUBvAiczX6jvBQsMSYiTaHdN/J/UKoVOKFNDHhEYGHp3Vr22aaO3 i5pMesEjSdi9/X3E+RwiAizmmvz1B2rhxBYe9mNdzjI9cJdqqYUBFwbiGDoI2C/98U5R kwckmlUqfb1CIF993Q9UPfznULG2CT1jERdPbkdd6W6BgsE99FjUYXYhgqTwjoncb2W1 6bKZqLBTmIl/qQVJk8BnTP0sflD1iGBnvfbRJwBkPms9jaWV28EUBa6ZsgrchinVMpER ho6O3bqol4dwE88khZjpdfWWl8P6hV+2W3TTQSMNuiu2f50q4V1201xbrTBzGeZIGxzo /rJg== X-Gm-Message-State: ALoCoQmn8uq0tIak3rO8ZP/ijcXOvhd7AwT6McjLwnh1ZabZyD92ADUnjaybsCJevX/3R2DCrB87 X-Received: by 10.68.186.33 with SMTP id fh1mr64447372pbc.140.1400738705206; Wed, 21 May 2014 23:05:05 -0700 (PDT) Received: from tharvey-gw.gw (68-189-91-139.static.snlo.ca.charter.com. [68.189.91.139]) by mx.google.com with ESMTPSA id ck10sm115169833pac.0.2014.05.21.23.05.03 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 21 May 2014 23:05:03 -0700 (PDT) From: Tim Harvey To: Shawn Guo Subject: [PATCH 2/3] ARM: dts: imx6: ventana: change sound device name Date: Wed, 21 May 2014 23:04:54 -0700 Message-Id: <1400738695-32663-2-git-send-email-tharvey@gateworks.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1400738695-32663-1-git-send-email-tharvey@gateworks.com> References: <1400738695-32663-1-git-send-email-tharvey@gateworks.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140521_230526_247299_3F07167C X-CRM114-Status: GOOD ( 11.03 ) X-Spam-Score: -0.7 (/) Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,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 The 'model' property in the imx-audio-sgtl5000 binding specifies the user-visible name of the audio device. This should be something common and not baseboard specific. Signed-off-by: Tim Harvey --- arch/arm/boot/dts/imx6q-gw5400-a.dts | 4 ++-- arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 4 ++-- arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 4 ++-- arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-gw5400-a.dts b/arch/arm/boot/dts/imx6q-gw5400-a.dts index e51bb3f..1ead807 100644 --- a/arch/arm/boot/dts/imx6q-gw5400-a.dts +++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts @@ -115,9 +115,9 @@ }; sound { - compatible = "fsl,imx6q-sabrelite-sgtl5000", + compatible = "fsl,imx6q-ventana-sgtl5000", "fsl,imx-audio-sgtl5000"; - model = "imx6q-sabrelite-sgtl5000"; + model = "sgtl5000-audio"; ssi-controller = <&ssi1>; audio-codec = <&codec>; audio-routing = diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi index 035d3a8..fd9f6b7 100644 --- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi @@ -114,9 +114,9 @@ }; sound { - compatible = "fsl,imx6q-sabrelite-sgtl5000", + compatible = "fsl,imx6q-ventana-sgtl5000", "fsl,imx-audio-sgtl5000"; - model = "imx6q-sabrelite-sgtl5000"; + model = "sgtl5000-audio"; ssi-controller = <&ssi1>; audio-codec = <&codec>; audio-routing = diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi index c8e5ae0..4b9aeb1 100644 --- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi @@ -117,9 +117,9 @@ }; sound { - compatible = "fsl,imx6q-sabrelite-sgtl5000", + compatible = "fsl,imx6q-ventana-sgtl5000", "fsl,imx-audio-sgtl5000"; - model = "imx6q-sabrelite-sgtl5000"; + model = "sgtl5000-audio"; ssi-controller = <&ssi1>; audio-codec = <&codec>; audio-routing = diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi index 2795dfc..8e1a869 100644 --- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi @@ -107,9 +107,9 @@ }; sound { - compatible = "fsl,imx6q-sabrelite-sgtl5000", + compatible = "fsl,imx6q-ventana-sgtl5000", "fsl,imx-audio-sgtl5000"; - model = "imx6q-sabrelite-sgtl5000"; + model = "sgtl5000-audio"; ssi-controller = <&ssi1>; audio-codec = <&codec>; audio-routing =