From patchwork Tue Dec 3 22:34:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 180742 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2146383ile; Tue, 3 Dec 2019 14:39:44 -0800 (PST) X-Google-Smtp-Source: APXvYqzu6MkOQL//RivJyW8sXlwuc7EH3SFM2SwEIAi8bNCdr4bKgpiczaxQDKoUP4wo1GByx9sQ X-Received: by 2002:aca:5d57:: with SMTP id r84mr1634oib.42.1575412784736; Tue, 03 Dec 2019 14:39:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575412784; cv=none; d=google.com; s=arc-20160816; b=C2DzJbfDZDjjObAtFA4pzsAeMWGxqOWu38ffgLPnGuk284B/bUmBe5SBoFowMoY2J3 dGsc4JK5tiMfBUk9rrIPNFsNPokZgeO5Tw4Zuw9mzumQoS43KmF36nM5l0abkn0hMtge /99d915CCWZ4z8Ovwwwwt6BY5Lt3sjeKI1ESoCwKA5a9sJ7QriRdCFnz8J0rtp5q2sMC tke6bhmk62ONH0oGnXlyUlA8WwOU/sk1asrwU+TIxfVj6pO/6p675IM1WKz5jk4kkW/0 wUrHyMDG7oJAj/Q3AiBR6KqGBxnKB/ABGOo6GJfXBw7azxv9Cv11taNC9frz/DWmYILf Tzlw== 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=08Pm2L8XZxj0Jf9EnARnwcBqbmeMFbtOBhEU1h9/0E4=; b=SNdo4zlbJ3+LxnHJAzdKnc5FgC7FpUmFpIc2wOuSVry+/v3mn0vv10oRfWz2cFfOIF Sn6jfjwgBOoMyxVhn1lp7E8EhZJBlKB3CA3RaOrHC3vtdpsE4Q4wUoysIrU4GL6fygWC NJ+Be4S2eVGXDDxUEKaETAVlOyQ8KoyAhn8sN+Nh1p0agtiT9JEq0+b8EL9HlOl3K91a eKWpKxgXN3G0m7itJRpjn1/dd8M9Cb6yeCkvaGh4v5fyyk1jVGsCnw3C+c/X07y0S+p+ o55ZavboeQBaws5irniywFt4W6DfGQ26aRVBt04Upg3IJcrrVdPPbbiOJeUoZ5+JQi7r hRow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QGNbUESn; 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 v2si2538130otf.58.2019.12.03.14.39.44; Tue, 03 Dec 2019 14:39:44 -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=QGNbUESn; 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 S1728277AbfLCWjn (ORCPT + 15 others); Tue, 3 Dec 2019 17:39:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:50320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728276AbfLCWjn (ORCPT ); Tue, 3 Dec 2019 17:39:43 -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 94F532080F; Tue, 3 Dec 2019 22:39:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575412782; bh=3F2pxH644GYrnzt6iwQEkQ9qYogZ/qu94MAd/ic4aOE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QGNbUESnnXu5+/wOYhH3+rHcCjdWDhh5/XPzPiCaU9q3r9v7EnUeUI+bPI44y+a44 XEoD7fBw22XZKnv4QO09PCblnDkNKOHh+mVKzxtBcATPUP1cT2XonHR9bG4AHIhUTa qjpTLx+D9yGeYQ0l9or+7rkNKORhNX3R0davLUcI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marian Mihailescu , Marek Szyprowski , Krzysztof Kozlowski , Sylwester Nawrocki , Sasha Levin Subject: [PATCH 5.3 015/135] clk: samsung: exynos542x: Move G3D subsystem clocks to its sub-CMU Date: Tue, 3 Dec 2019 23:34:15 +0100 Message-Id: <20191203213008.333510326@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: Marek Szyprowski [ Upstream commit c9f7567aff31348a3dcf54845f7e389f5df0c0c1 ] G3D clocks require special handling of their parent bus clock during power domain on/off sequences. Those clocks were not initially added to the sub-CMU handler, because that time there was no open-source driver for the G3D (MALI Panfrost) hardware module and it was not possible to test it. This patch fixes this issue. Parent clock for G3D hardware block is now properly preserved during G3D power domain on/off sequence. This restores proper MALI Panfrost performance broken by commit 8686764fc071 ("ARM: dts: exynos: Add G3D power domain to Exynos542x"). Reported-by: Marian Mihailescu Fixes: b06a532bf1fa ("clk: samsung: Add Exynos5 sub-CMU clock driver") Signed-off-by: Marek Szyprowski Tested-by: Marian Mihailescu Acked-by: Krzysztof Kozlowski Signed-off-by: Sylwester Nawrocki Signed-off-by: Sasha Levin --- drivers/clk/samsung/clk-exynos5420.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c index 7670cc596c742..dfa862d55246e 100644 --- a/drivers/clk/samsung/clk-exynos5420.c +++ b/drivers/clk/samsung/clk-exynos5420.c @@ -1172,8 +1172,6 @@ static const struct samsung_gate_clock exynos5x_gate_clks[] __initconst = { GATE(CLK_SCLK_ISP_SENSOR2, "sclk_isp_sensor2", "dout_isp_sensor2", GATE_TOP_SCLK_ISP, 12, CLK_SET_RATE_PARENT, 0), - GATE(CLK_G3D, "g3d", "mout_user_aclk_g3d", GATE_IP_G3D, 9, 0, 0), - /* CDREX */ GATE(CLK_CLKM_PHY0, "clkm_phy0", "dout_sclk_cdrex", GATE_BUS_CDREX0, 0, 0, 0), @@ -1248,6 +1246,15 @@ static struct exynos5_subcmu_reg_dump exynos5x_gsc_suspend_regs[] = { { DIV2_RATIO0, 0, 0x30 }, /* DIV dout_gscl_blk_300 */ }; +static const struct samsung_gate_clock exynos5x_g3d_gate_clks[] __initconst = { + GATE(CLK_G3D, "g3d", "mout_user_aclk_g3d", GATE_IP_G3D, 9, 0, 0), +}; + +static struct exynos5_subcmu_reg_dump exynos5x_g3d_suspend_regs[] = { + { GATE_IP_G3D, 0x3ff, 0x3ff }, /* G3D gates */ + { SRC_TOP5, 0, BIT(16) }, /* MUX mout_user_aclk_g3d */ +}; + static const struct samsung_div_clock exynos5x_mfc_div_clks[] __initconst = { DIV(0, "dout_mfc_blk", "mout_user_aclk333", DIV4_RATIO, 0, 2), }; @@ -1320,6 +1327,14 @@ static const struct exynos5_subcmu_info exynos5x_gsc_subcmu = { .pd_name = "GSC", }; +static const struct exynos5_subcmu_info exynos5x_g3d_subcmu = { + .gate_clks = exynos5x_g3d_gate_clks, + .nr_gate_clks = ARRAY_SIZE(exynos5x_g3d_gate_clks), + .suspend_regs = exynos5x_g3d_suspend_regs, + .nr_suspend_regs = ARRAY_SIZE(exynos5x_g3d_suspend_regs), + .pd_name = "G3D", +}; + static const struct exynos5_subcmu_info exynos5x_mfc_subcmu = { .div_clks = exynos5x_mfc_div_clks, .nr_div_clks = ARRAY_SIZE(exynos5x_mfc_div_clks), @@ -1351,6 +1366,7 @@ static const struct exynos5_subcmu_info exynos5800_mau_subcmu = { static const struct exynos5_subcmu_info *exynos5x_subcmus[] = { &exynos5x_disp_subcmu, &exynos5x_gsc_subcmu, + &exynos5x_g3d_subcmu, &exynos5x_mfc_subcmu, &exynos5x_mscl_subcmu, }; @@ -1358,6 +1374,7 @@ static const struct exynos5_subcmu_info *exynos5x_subcmus[] = { static const struct exynos5_subcmu_info *exynos5800_subcmus[] = { &exynos5x_disp_subcmu, &exynos5x_gsc_subcmu, + &exynos5x_g3d_subcmu, &exynos5x_mfc_subcmu, &exynos5x_mscl_subcmu, &exynos5800_mau_subcmu, 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 Kroah-Hartman 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>, From patchwork Tue Dec 3 22:34:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 180746 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2149062ile; Tue, 3 Dec 2019 14:42:39 -0800 (PST) X-Google-Smtp-Source: APXvYqzJLmlkDI6HklWPSGix9REQNa40W8aZS2i6LdRRYnqSsbO4MqapCpu+I82kP+mXVPZN6rFp X-Received: by 2002:a9d:6b12:: with SMTP id g18mr176584otp.211.1575412959519; Tue, 03 Dec 2019 14:42:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575412959; cv=none; d=google.com; s=arc-20160816; b=JIk78vm8nRpNTX3wjfEGwK1jJVnjYC2kUpcddVWEtGiOIuaYCTX8cF1VdS5GV4STam 5ClHKkLE8SoUofSGqLm49G45+1dsPKZUEff+yL/PXNtCmM8/b81uNwOz9MqRvg7jprjG P9gqmVjAjdt2OjmAvDUIFXfsE85p6iCq/dGxBQrHlAnalVZ4lkjLvjb+MQxEGTACteVZ p6WdC5SVlK4oFn8+52jDXnjaMvz+sufKJLXU55FisnmNSI0m+YNdTcuqTpYJiVnBYGJ0 aOtwYF880EpFTknFS2zpADh6xv/08NTJZ7zrUpVuUkLDw1BJHXTluNfARizAAhWgP4VT k7RQ== 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=HZwjRNgclgMvrgyHCFj8ca7CGIIOnmT+0XbSowGPo2M=; b=LqtUKuxiJrMVCxK+iWg/JQf9ABhmOQYClCKHYvTXjowi9fwvwcq2v0eSrv6CeG2LFC I445RGHJIcL/Nussl6BC2OvdlkwKpAzNzWqpBBOxWZ2G9qABrjOb8VhIbggbJFRhSBT+ 3pe3RR+EGqsagf4du8lC0rmxkeOa5r2MBAeBaWO2nQswwBtxcuml0SZEbyKW1m7fHIEr UXXoAQiGeHkHYpu1q+Ilr5KmE+sUgkRJXKrckUg+I99Hj5/KsTHw/UOIzNp6DVhje4Eh R03Wl/DHatIZS8tr9Kcs4lLT5qfBk0uvY3R/L3LrD+9asgRWNJ0n6NmZWOf/saqEMV7p eDWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=W6IX0gFM; 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 1si1731006oij.276.2019.12.03.14.42.39; Tue, 03 Dec 2019 14:42:39 -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=W6IX0gFM; 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 S1728357AbfLCWmi (ORCPT + 15 others); Tue, 3 Dec 2019 17:42:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:57600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728343AbfLCWmf (ORCPT ); Tue, 3 Dec 2019 17:42:35 -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 812C020803; Tue, 3 Dec 2019 22:42:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575412955; bh=Sh1A6WczwZM9OYsqHw8JzdjYAOOxO4WI8CWupzY34jc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W6IX0gFMfaPYosoSSd+VSLT96dpCM6RX/crfvAlaGzSgZEs9ZZ4OkhWyCxPsnr3rj iZsbWXvMRDX4yUzoxeGRyjBZFftOTkJP5hYXXX+f21S6E/ByzcYLYruSAhAdzF01Gf QdFSY1Yodc1cIKA4NooGowqplLDGUVkccov5rOAc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Ujfalusi , Stephen Boyd , Sasha Levin Subject: [PATCH 5.3 043/135] clk: ti: dra7-atl-clock: Remove ti_clk_add_alias call Date: Tue, 3 Dec 2019 23:34:43 +0100 Message-Id: <20191203213015.983469970@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: Peter Ujfalusi [ Upstream commit 9982b0f69b49931b652d35f86f519be2ccfc7027 ] ti_clk_register() calls it already so the driver should not create duplicated alias. Signed-off-by: Peter Ujfalusi Link: https://lkml.kernel.org/r/20191002083436.10194-1-peter.ujfalusi@ti.com Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/ti/clk-dra7-atl.c | 6 ------ 1 file changed, 6 deletions(-) -- 2.20.1 diff --git a/drivers/clk/ti/clk-dra7-atl.c b/drivers/clk/ti/clk-dra7-atl.c index a01ca9395179a..f65e16c4f3c4b 100644 --- a/drivers/clk/ti/clk-dra7-atl.c +++ b/drivers/clk/ti/clk-dra7-atl.c @@ -174,7 +174,6 @@ static void __init of_dra7_atl_clock_setup(struct device_node *node) struct clk_init_data init = { NULL }; const char **parent_names = NULL; struct clk *clk; - int ret; clk_hw = kzalloc(sizeof(*clk_hw), GFP_KERNEL); if (!clk_hw) { @@ -207,11 +206,6 @@ static void __init of_dra7_atl_clock_setup(struct device_node *node) clk = ti_clk_register(NULL, &clk_hw->hw, node->name); if (!IS_ERR(clk)) { - ret = ti_clk_add_alias(NULL, clk, node->name); - if (ret) { - clk_unregister(clk); - goto cleanup; - } of_clk_add_provider(node, of_clk_src_simple_get, clk); kfree(parent_names); return;