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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 276B4C10F12 for ; Mon, 15 Apr 2019 19:06:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E6B81218EA for ; Mon, 15 Apr 2019 19:06:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555355177; bh=7DsOpPYvtwZ9Mu5MY6ncdl1osHiPlEXpm3yAOMdh16U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yiC+mYQ8T14MdjVhbPgYKHBQ3PV0TexFy279yyBAN5D3i1ApYlc9isZMiCoBdyIoL jqOU4+EPNcAsPuQp0+Ox7rp1sAajYyFOT2wa8M7fXaFz/Ery7mv9Xcpqm1rOeoZUCD n8OUlTcdZ+k2pAGutEGED7/GYLNShi/GurSRrtSw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729878AbfDOTGQ (ORCPT ); Mon, 15 Apr 2019 15:06:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:40564 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729871AbfDOTGP (ORCPT ); Mon, 15 Apr 2019 15:06:15 -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 31579218A1; Mon, 15 Apr 2019 19:06:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555355174; bh=7DsOpPYvtwZ9Mu5MY6ncdl1osHiPlEXpm3yAOMdh16U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sfXHWYKtCMFtobGQ2iWxXJL9OXT4rSLquaS7ATNFReHcuteTEBQ4ukr82n7a2XrHh fEPl/7sTEl9TpASi7BLOtG0gADMvH7xkcOc8+Nj/aVVUgtVkFPpz5snPXHhCsEbjZM KIms5jiiMH7fAQ962pKxanEA/+EVywnsGQNCfFZA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Neil Armstrong , Sasha Levin Subject: [PATCH 4.19 041/101] Revert "clk: meson: clean-up clock registration" Date: Mon, 15 Apr 2019 20:58:39 +0200 Message-Id: <20190415183742.628462437@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415183740.341577907@linuxfoundation.org> References: <20190415183740.341577907@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 This reverts commit c8e4f8406842332fb55cd792016e5dac266f6354. This patch was not initially a fix and is dependent on other changes which are not fixes eithers. With this change, multiple Amlogic based boards fails to boot, as reported by kernelci. Cc: stable@vger.kernel.org # 4.19.34 Signed-off-by: Neil Armstrong Signed-off-by: Sasha Levin --- drivers/clk/meson/meson-aoclk.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/clk/meson/meson-aoclk.c b/drivers/clk/meson/meson-aoclk.c index 258c8d259ea1..f965845917e3 100644 --- a/drivers/clk/meson/meson-aoclk.c +++ b/drivers/clk/meson/meson-aoclk.c @@ -65,20 +65,15 @@ int meson_aoclkc_probe(struct platform_device *pdev) return ret; } - /* Populate regmap */ - for (clkid = 0; clkid < data->num_clks; clkid++) + /* + * Populate regmap and register all clks + */ + for (clkid = 0; clkid < data->num_clks; clkid++) { data->clks[clkid]->map = regmap; - /* Register all clks */ - for (clkid = 0; clkid < data->hw_data->num; clkid++) { - if (!data->hw_data->hws[clkid]) - continue; - ret = devm_clk_hw_register(dev, data->hw_data->hws[clkid]); - if (ret) { - dev_err(dev, "Clock registration failed\n"); + if (ret) return ret; - } } return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, -- 2.19.1