From patchwork Mon Jul 7 13:04:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 4494721 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 762799F392 for ; Mon, 7 Jul 2014 13:07:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9B013202E6 for ; Mon, 7 Jul 2014 13:07:52 +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 66CC320274 for ; Mon, 7 Jul 2014 13:07:51 +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 1X48cG-0006iR-6h; Mon, 07 Jul 2014 13:05:56 +0000 Received: from mail-bn1blp0184.outbound.protection.outlook.com ([207.46.163.184] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X48cC-0006WQ-1O for linux-arm-kernel@lists.infradead.org; Mon, 07 Jul 2014 13:05:53 +0000 Received: from BLUPR03MB248.namprd03.prod.outlook.com (10.255.213.26) by BLUPR03MB216.namprd03.prod.outlook.com (10.255.212.155) with Microsoft SMTP Server (TLS) id 15.0.959.24; Mon, 7 Jul 2014 13:05:29 +0000 Received: from BY2PR03CA062.namprd03.prod.outlook.com (10.141.249.35) by BLUPR03MB248.namprd03.prod.outlook.com (10.255.213.26) with Microsoft SMTP Server (TLS) id 15.0.980.8; Mon, 7 Jul 2014 13:05:28 +0000 Received: from BL2FFO11FD008.protection.gbl (2a01:111:f400:7c09::189) by BY2PR03CA062.outlook.office365.com (2a01:111:e400:2c5d::35) with Microsoft SMTP Server (TLS) id 15.0.974.11 via Frontend Transport; Mon, 7 Jul 2014 13:05:27 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD008.mail.protection.outlook.com (10.173.161.4) with Microsoft SMTP Server (TLS) id 15.0.980.11 via Frontend Transport; Mon, 7 Jul 2014 13:05:27 +0000 Received: from fabio-Latitude-E6410.am.freescale.net ([10.29.244.56]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s67D5OMd017377; Mon, 7 Jul 2014 06:05:25 -0700 From: Fabio Estevam To: Subject: [PATCH] ARM: imx6: Align ssi nodes between mx6 variants Date: Mon, 7 Jul 2014 10:04:52 -0300 Message-ID: <1404738292-8843-1-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.8.3.2 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(6009001)(199002)(189002)(77982001)(50466002)(229853001)(110136001)(44976005)(80022001)(81156004)(31966008)(84676001)(21056001)(87286001)(87936001)(104166001)(83322001)(74502001)(76482001)(106466001)(97736001)(19580405001)(19580395003)(2371002)(2351001)(105606002)(79102001)(6806004)(107046002)(48376002)(33646001)(4396001)(50226001)(50986999)(26826002)(62966002)(81542001)(81342001)(86362001)(93916002)(575784001)(47776003)(64706001)(68736004)(92726001)(46102001)(74662001)(92566001)(88136002)(20776003)(99396002)(69596002)(85852003)(85306003)(83072002)(89996001)(36756003)(77156001)(95666004)(102836001)(104016002); DIR:OUT; SFP:; SCL:1; SRVR:BLUPR03MB248; H:az84smr01.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; LANG:; MIME-Version: 1.0 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID: X-Forefront-PRVS: 02652BD10A Received-SPF: Fail (: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=Fabio.Estevam@freescale.com; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID: X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140707_060552_249682_D294CE1E X-CRM114-Status: UNSURE ( 6.39 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: Fabio Estevam , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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.6 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 Since commit 98ea6ad2edd2 (ARM: dts: imx6: use imx51-ssi) the mx6 ssi is compatible with imx51, so align all the mx6 variant ssi compatible strings as: compatible = "fsl,-ssi", "fsl,imx51-ssi"; Signed-off-by: Fabio Estevam --- arch/arm/boot/dts/imx6qdl.dtsi | 9 +++------ arch/arm/boot/dts/imx6sl.dtsi | 9 +++------ arch/arm/boot/dts/imx6sx.dtsi | 6 +++--- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index d7c97d9..c701af9 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -274,8 +274,7 @@ ssi1: ssi@02028000 { compatible = "fsl,imx6q-ssi", - "fsl,imx51-ssi", - "fsl,imx21-ssi"; + "fsl,imx51-ssi"; reg = <0x02028000 0x4000>; interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_SSI1_IPG>; @@ -288,8 +287,7 @@ ssi2: ssi@0202c000 { compatible = "fsl,imx6q-ssi", - "fsl,imx51-ssi", - "fsl,imx21-ssi"; + "fsl,imx51-ssi"; reg = <0x0202c000 0x4000>; interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_SSI2_IPG>; @@ -302,8 +300,7 @@ ssi3: ssi@02030000 { compatible = "fsl,imx6q-ssi", - "fsl,imx51-ssi", - "fsl,imx21-ssi"; + "fsl,imx51-ssi"; reg = <0x02030000 0x4000>; interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_SSI3_IPG>; diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index c0ee12f..68ce59b7 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi @@ -227,8 +227,7 @@ ssi1: ssi@02028000 { compatible = "fsl,imx6sl-ssi", - "fsl,imx51-ssi", - "fsl,imx21-ssi"; + "fsl,imx51-ssi"; reg = <0x02028000 0x4000>; interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SL_CLK_SSI1>; @@ -241,8 +240,7 @@ ssi2: ssi@0202c000 { compatible = "fsl,imx6sl-ssi", - "fsl,imx51-ssi", - "fsl,imx21-ssi"; + "fsl,imx51-ssi"; reg = <0x0202c000 0x4000>; interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SL_CLK_SSI2>; @@ -255,8 +253,7 @@ ssi3: ssi@02030000 { compatible = "fsl,imx6sl-ssi", - "fsl,imx51-ssi", - "fsl,imx21-ssi"; + "fsl,imx51-ssi"; reg = <0x02030000 0x4000>; interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SL_CLK_SSI3>; diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 5e31c5c..c3111f0 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -323,7 +323,7 @@ }; ssi1: ssi@02028000 { - compatible = "fsl,imx6sx-ssi", "fsl,imx21-ssi"; + compatible = "fsl,imx6sx-ssi", "fsl,imx51-ssi"; reg = <0x02028000 0x4000>; interrupts = ; clocks = <&clks IMX6SX_CLK_SSI1_IPG>, @@ -336,7 +336,7 @@ }; ssi2: ssi@0202c000 { - compatible = "fsl,imx6sx-ssi", "fsl,imx21-ssi"; + compatible = "fsl,imx6sx-ssi", "fsl,imx51-ssi"; reg = <0x0202c000 0x4000>; interrupts = ; clocks = <&clks IMX6SX_CLK_SSI2_IPG>, @@ -349,7 +349,7 @@ }; ssi3: ssi@02030000 { - compatible = "fsl,imx6sx-ssi", "fsl,imx21-ssi"; + compatible = "fsl,imx6sx-ssi", "fsl,imx51-ssi"; reg = <0x02030000 0x4000>; interrupts = ; clocks = <&clks IMX6SX_CLK_SSI3_IPG>,