Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp1196900ybg; Tue, 2 Jun 2020 03:59:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzz9bcdvfPUUtpjsJEWtgNKrKKRPlVQImoaRnp3YdyRzXmLLirdUC7cwWNtFlCZKUM109xw X-Received: by 2002:a17:906:7813:: with SMTP id u19mr22089565ejm.199.1591095576186; Tue, 02 Jun 2020 03:59:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591095576; cv=none; d=google.com; s=arc-20160816; b=g1wQz86ZGbdG/46eG/cMV4r2JiSQCRN9tD0iEiFZqXVsgku4RiVxWVN5CwK9LyUl9Q AX/cXTCgTaBYUvPHe1d/G2k7hGC9yVpvbeUmULEMhUjNJG/1hr2tALP3r8lrI8rEX8mp +Vdw8Q1Wfky7VbLehVQNgggueqerruFeOAskPusXBICXeQXOfjeIx2DKkQapLp8xWfkO B54k7tg03lNfDiZCSJzc3iFTNC8jMBQdEk1grfx9dUJ6dip3TSaKkbldbIacn8CoOJh1 jd+6DI8u0C1VM3EH7yZnS6+JCyIGDjMdTnptmVQKpGgLGSmgbL+aEignlYm3yk9M2fxv JAYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:to:from; bh=MITeZ6MW6QUqnsJRijp6IZotaxKl+80x/CP6iImLt1Q=; b=qxJ3PFBaCQa2rjmQk/xMbIFvmsTVHjH71WMgNxfbPEFrrcOt6lto9Xm6NGOkzsGC0R eU/WJblr9BdymmSk6aaCVXcMQg6Fjo8G1Go9Nbqv/zTGQyT3+KwlKxTPHqbxRs2OYVrm E3JnXgUEQZS/aq5geyrbFBRhyQQH2If62l3ZcaXpo2S71JXL3GvHqLrUoTVCsOA6GQJm rGp37COhTqrOpzAylyuVXEcIdVXh+dV51QMGfcLX+tEwEEX3xLbECl2J3WRKBymdlNga //ZMkRS7kp64C0sTIvW1g7Tym9CWFTkNXWOuI5y6AeWqXk9v4T+xVU5cOLP2aHN4HpuK RqOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o10si1289245ejr.656.2020.06.02.03.59.13; Tue, 02 Jun 2020 03:59:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726461AbgFBKzV (ORCPT + 99 others); Tue, 2 Jun 2020 06:55:21 -0400 Received: from inva021.nxp.com ([92.121.34.21]:44208 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726110AbgFBKzV (ORCPT ); Tue, 2 Jun 2020 06:55:21 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 2DE6D200A30; Tue, 2 Jun 2020 12:55:19 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 5C8DD200634; Tue, 2 Jun 2020 12:55:15 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 5B3E640285; Tue, 2 Jun 2020 18:55:10 +0800 (SGT) From: Shengjiu Wang To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: dts: imx6sll: Make ssi node name same as other platforms Date: Tue, 2 Jun 2020 18:44:50 +0800 Message-Id: <1591094690-30514-1-git-send-email-shengjiu.wang@nxp.com> X-Mailer: git-send-email 2.7.4 X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In imx6sll.dtsi, the ssi node name is different with other platforms (imx6qdl, imx6sl, imx6sx), but the sound/soc/fsl/fsl-asoc-card.c machine driver needs to check ssi node name for audmux configuration, then different ssi node name causes issue on imx6sll platform. So we change ssi node name to make all platforms have same name. Signed-off-by: Shengjiu Wang --- arch/arm/boot/dts/imx6sll.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi index edd3abb9a9f1..51e59e16f6c9 100644 --- a/arch/arm/boot/dts/imx6sll.dtsi +++ b/arch/arm/boot/dts/imx6sll.dtsi @@ -271,7 +271,7 @@ status = "disabled"; }; - ssi1: ssi-controller@2028000 { + ssi1: ssi@2028000 { compatible = "fsl,imx6sl-ssi", "fsl,imx51-ssi"; reg = <0x02028000 0x4000>; interrupts = ; @@ -284,7 +284,7 @@ status = "disabled"; }; - ssi2: ssi-controller@202c000 { + ssi2: ssi@202c000 { compatible = "fsl,imx6sl-ssi", "fsl,imx51-ssi"; reg = <0x0202c000 0x4000>; interrupts = ; @@ -297,7 +297,7 @@ status = "disabled"; }; - ssi3: ssi-controller@2030000 { + ssi3: ssi@2030000 { compatible = "fsl,imx6sl-ssi", "fsl,imx51-ssi"; reg = <0x02030000 0x4000>; interrupts = ; -- 2.21.0