From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E0DBC32757 for ; Wed, 14 Aug 2019 17:24:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D70A720665 for ; Wed, 14 Aug 2019 17:24:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565803455; bh=v720qxCs8TbGE4Kj7ssm8H7/F2V38ssks+iqb4MtGGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hzdrFfheJ+AyFC4z1X+COCGx8ygOMKkUIafFmR5c0JoNQTa+puXik0bvhMbRa3FpR c2D7bXj2dvz3DT8UpLNVFBskSPXBuqOH5yJbziKbljsmCCwaDpR2x8hLxJHYSX+YRB CbrTYuwhgxYYaVQB8y9VZY1P4LPdDO+3pjS2QZ1E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729710AbfHNRYK (ORCPT ); Wed, 14 Aug 2019 13:24:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:56120 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729749AbfHNRGw (ORCPT ); Wed, 14 Aug 2019 13:06:52 -0400 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 0CEC821721; Wed, 14 Aug 2019 17:06:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802411; bh=v720qxCs8TbGE4Kj7ssm8H7/F2V38ssks+iqb4MtGGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mPBaKPCDvbCOKK5qvPOgM74+j8NA2kerWYHZdx79QQzsVw0ai/55vIXcS/08mwp8m 975uKtZrOCCSAgiYeHoRBgBIO1b0PMWK744unWxleimZaQ1Yq/S+4hpFS7bUCOGhfV J0q2D/ki9oLnx/dagB4rWQp+GxdcK/d0BVbX14Y8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lucas Stach , Daniel Baluta , Shawn Guo , Sasha Levin Subject: [PATCH 5.2 089/144] arm64: dts: imx8mq: fix SAI compatible Date: Wed, 14 Aug 2019 19:00:45 +0200 Message-Id: <20190814165803.600979108@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165759.466811854@linuxfoundation.org> References: <20190814165759.466811854@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 8d0148473dece51675d11dd59b8db5fe4b5d2e7e ] The i.MX8M SAI block is not compatible with the i.MX6SX one, as the register layout has changed due to two version registers being added at the beginning of the address map. Remove the bogus compatible. Fixes: 8c61538dc945 ("arm64: dts: imx8mq: Add SAI2 node") Signed-off-by: Lucas Stach Reviewed-by: Daniel Baluta Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/freescale/imx8mq.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi index 6d635ba0904c5..6632cbd88bed3 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi @@ -675,8 +675,7 @@ sai2: sai@308b0000 { #sound-dai-cells = <0>; - compatible = "fsl,imx8mq-sai", - "fsl,imx6sx-sai"; + compatible = "fsl,imx8mq-sai"; reg = <0x308b0000 0x10000>; interrupts = ; clocks = <&clk IMX8MQ_CLK_SAI2_IPG>, -- 2.20.1