From patchwork Tue Dec 3 22:34:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 180744 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2146774ile; Tue, 3 Dec 2019 14:40:11 -0800 (PST) X-Google-Smtp-Source: APXvYqxL4P8qfCyNZLKk4IxQR3KvXt/94Xr2JLUAhmPUni3sU7e3mYUPbeuf5xO6e9QU2aAwSbSM X-Received: by 2002:aca:2207:: with SMTP id b7mr281602oic.109.1575412811416; Tue, 03 Dec 2019 14:40:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575412811; cv=none; d=google.com; s=arc-20160816; b=pVi/+yxvfelufQuo8+VpiDt+aV2uvtUjITOK6UJurZBpmrKt65REP+8l/+hd4xEPXX zKdPT6hAQ67LpLPg3Ys41+L9l2t/y21/nK3MO+CcfIaxITcvytnJVQ+VqrB8D7XHC4CV 9o3VgHrBme4U58VXHTHHCjJnmd/WB6NzxVSus7EWH12TRKlb4qVKWdYBY6IG4ptIz9dn l57EXDB0wN/ZqaiNsUt6Bqh6Dk95f3mlADJTmCMAoU8DPisHAxpJJuV5hBjpb/3dRpUB qGy5nD5CcU5pDFrBNzJDuxBZmtZxMoH+bgsDSZjrBw2hjW8Q9iaKcFX2QbXUkvOvImLl vtiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ps/WX97NPSZySBdbdmKLd22uuZvdvRytEMMIAE/6Y8E=; b=RD89noGdRawqlde1oaOv1ljIp+bnh3kGoSsQFWUvRdjUhjHuQv6Aa60Cg4q3LLQ//4 Py6c5vU3EX12W+ZnEzyy6lWEohaBt5ttWaIBIqxvdDatXka+d29o326tQysZj0+gg8Zf Oh9Sh9WCg+Hl4niaG774XZp7CzfCKx9nbB722I5fjXNtyQulRfLmwxkRGlXnCdG6XAap BECBtuAaaQIfoFjT7oxK9zznPk4S+B6/h0Pk10HKxFdsd9j9nrN2uspMYH2e00GcUdrk Px3S2ApP6htPdN/OBzyHx7poVJb/7E4A5G4VNQp5bfGcdRN2Z1dvHTT/Hk/uCeZt7dRs ItTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fk9uEisC; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 10si2122695oin.212.2019.12.03.14.40.11; Tue, 03 Dec 2019 14:40:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fk9uEisC; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727970AbfLCWkJ (ORCPT + 15 others); Tue, 3 Dec 2019 17:40:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:51924 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728347AbfLCWkJ (ORCPT ); Tue, 3 Dec 2019 17:40:09 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 153DB20862; Tue, 3 Dec 2019 22:40:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575412808; bh=XvQ9NfBL+EK23l2Iyl98LW3G6qs6QdmuhwboJ0xde/I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fk9uEisCa3dCallMc+cqUYm5OKfp2urBoaTqkFEDeXj1YxwPCo6R/noDuhgp8IKH/ uGB25+XTTlKL6ZcI/Y9vhw3v1R65JiYpbp+JrlkiWRgFcZ6cxaOZ5IcsOHk3fi57IY q5kmbHHepiw2l6OiIKlZnoKAQbQM4acAI+xVV8tw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shengjiu Wang , Shawn Guo , Sasha Levin Subject: [PATCH 5.3 024/135] arm64: dts: imx8mm: fix compatible string for sdma Date: Tue, 3 Dec 2019 23:34:24 +0100 Message-Id: <20191203213010.261622371@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203213005.828543156@linuxfoundation.org> References: <20191203213005.828543156@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shengjiu Wang [ Upstream commit e346ff93f02b1ba81e976d4e67ec56582dbdf7f1 ] SDMA in i.MX8MM should use same configuration as i.MX8MQ So need to change compatible string to be "fsl,imx8mq-sdma". Fixes: a05ea40eb384 ("arm64: dts: imx: Add i.mx8mm dtsi support") Signed-off-by: Shengjiu Wang Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/freescale/imx8mm.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi index 0d0a6543e5db2..a9824b862c419 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi @@ -370,7 +370,7 @@ }; sdma2: dma-controller@302c0000 { - compatible = "fsl,imx8mm-sdma", "fsl,imx7d-sdma"; + compatible = "fsl,imx8mm-sdma", "fsl,imx8mq-sdma"; reg = <0x302c0000 0x10000>; interrupts = ; clocks = <&clk IMX8MM_CLK_SDMA2_ROOT>, @@ -381,7 +381,7 @@ }; sdma3: dma-controller@302b0000 { - compatible = "fsl,imx8mm-sdma", "fsl,imx7d-sdma"; + compatible = "fsl,imx8mm-sdma", "fsl,imx8mq-sdma"; reg = <0x302b0000 0x10000>; interrupts = ; clocks = <&clk IMX8MM_CLK_SDMA3_ROOT>, @@ -693,7 +693,7 @@ }; sdma1: dma-controller@30bd0000 { - compatible = "fsl,imx8mm-sdma", "fsl,imx7d-sdma"; + compatible = "fsl,imx8mm-sdma", "fsl,imx8mq-sdma"; reg = <0x30bd0000 0x10000>; interrupts = ; clocks = <&clk IMX8MM_CLK_SDMA1_ROOT>,