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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 6C106C28CC1 for ; Sat, 1 Jun 2019 13:29:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CBC727440 for ; Sat, 1 Jun 2019 13:29:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559395752; bh=gQlPNPhZcXT6VIEEzKrUXnPC76Ad8zmFYPWyY//o/gw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gVr/oAqhSIPJP/tuyjN7Ld+jw12ADjYWa35G3PsXMLEEDP4zYuUUDTeCI7TNhpKU3 9eJOJjqnmRkYXsPwd+i5wvaQn7yiOLrAfFNcRNUf/mJGuMLlZgZV0Cq+Qje8qe8Xth y/DhCO6zVrSDR0yz+APhBHqCHSVaFSbJEtB6kIqU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729745AbfFAN3L (ORCPT ); Sat, 1 Jun 2019 09:29:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:57614 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729889AbfFAN1C (ORCPT ); Sat, 1 Jun 2019 09:27:02 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9DE04273B2; Sat, 1 Jun 2019 13:27:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559395621; bh=gQlPNPhZcXT6VIEEzKrUXnPC76Ad8zmFYPWyY//o/gw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MkfBOSNxrY25g+WOeA2nGLz+NkTwPKH52ahPGb2GRBIOw9+sJHNEMfCj2c97vTgza 7xmQxk6+EKIPFOpZUWZ5KONkm0s2NmjkRLcye6WgWC0eyccH07mJ/xBI19q9axKq/o D7czrADW542jHNXxJEruKb2bHVaH+56rTlLEsfm4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrey Smirnov , Angus Ainslie , Chris Healy , Lucas Stach , Fabio Estevam , Shawn Guo , linux-arm-kernel@lists.infradead.org, Sasha Levin , devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 35/56] ARM: dts: imx6sx: Specify IMX6SX_CLK_IPG as "ahb" clock to SDMA Date: Sat, 1 Jun 2019 09:25:39 -0400 Message-Id: <20190601132600.27427-35-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190601132600.27427-1-sashal@kernel.org> References: <20190601132600.27427-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrey Smirnov [ Upstream commit cc839d0f8c284fcb7591780b568f13415bbb737c ] Since 25aaa75df1e6 SDMA driver uses clock rates of "ipg" and "ahb" clock to determine if it needs to configure the IP block as operating at 1:1 or 1:2 clock ratio (ACR bit in SDMAARM_CONFIG). Specifying both clocks as IMX6SL_CLK_SDMA results in driver incorrectly thinking that ratio is 1:1 which results in broken SDMA funtionality. Fix the code to specify IMX6SL_CLK_AHB as "ahb" clock for SDMA, to avoid detecting incorrect clock ratio. Signed-off-by: Andrey Smirnov Cc: Angus Ainslie (Purism) Cc: Chris Healy Cc: Lucas Stach Cc: Fabio Estevam Cc: Shawn Guo Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm/boot/dts/imx6sl.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index d8ba99f1d87ba..ac820dfef9774 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi @@ -657,7 +657,7 @@ reg = <0x020ec000 0x4000>; interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SL_CLK_SDMA>, - <&clks IMX6SL_CLK_SDMA>; + <&clks IMX6SL_CLK_AHB>; clock-names = "ipg", "ahb"; #dma-cells = <3>; /* imx6sl reuses imx6q sdma firmware */ -- 2.20.1