From patchwork Wed Nov 4 17:45:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 11881801 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 6560DC388F9 for ; Wed, 4 Nov 2020 17:47:27 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 007BE205CA for ; Wed, 4 Nov 2020 17:47:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="i1GmRp30"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="IdW/I17k" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 007BE205CA Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=LuLuKSuHmsJmb95CdaSGTgXsaMePAUcQu83IaCAzGws=; b=i1GmRp30fednbjKLDxZ+8F1mV aHmU1qtqP/KLLESuDRx+BC+ew8qe+feATtkwCZEMpLX5fmvaAbEI1rgmRf/BurOvCXzTwo5t5gu97 XuQIiXVUvoOsg7UchbJdaFsI1dGQkXidOfMhxgE+AIF4CbQvhCHBBbf6QtQXdOfWSfSv2ZyvOc42W uOeV5QxHdi3iVmZReppefM/pFBfiScyaFdZen8K85+aY9gIdLxw48/aMZIR7cU1xNCc6GYO9Jk8vi bc8CoiOTbpO6QjcBnWrC9nyXKbw/gKytK0I0zSv2utGOpDs/tG9ze4f9cuof79lmZMNRyO4c6esV8 fETTuRehQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaMqz-0000dN-KU; Wed, 04 Nov 2020 17:45:49 +0000 Received: from esa5.microchip.iphmx.com ([216.71.150.166]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaMqu-0000b4-Kr for linux-arm-kernel@lists.infradead.org; Wed, 04 Nov 2020 17:45:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1604511944; x=1636047944; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=QpD53wBg29UptUvVNqRf5JTCpttxxocLcDTpaKiBG1k=; b=IdW/I17kFg8e12fDjrzT2ODtcJL/2X9waxKpZBpC4vmKkcILIQp3TxeJ VvMhf1UflY2WTF82ISi95bPMohnweX9pnS4tlVLii5LmxHtPpJyw/LVZx pkUEZX/vdyTr2YAcPbk2glZseDLb+xOwqjWRSK3Evi6t151uZ7ECaqTLJ wahrJDvxnHvTV4Qsraf6AvD6U5j9N1sJnX+ZawfneNh7/C+cZqbFSSk+o RFI5FmLaCb8BzwpVZdAwqzBDdRFdpMcJAdqeBWjAy1rdW0K2gs3rytvkj Br7OAhCKKavoJSYYjFPkjJmLN2N+4ecYuQw5Y+xJMPpK9CcdfIdz6q/Yr g==; IronPort-SDR: RHs+mEGmKoB6Jy+JeJRk3mrweSaB3yI2cwUheA0p0iA5DySGBlZwkRvSdEfW5MaikCHqJOeMq2 sqPGvrXq0SnBaodpSbVaJhvplb9nYm+vQveW0QIrF7iQ9WlaMoJf1jf4MWClv36BUxlha1E4n4 tkIdaeO+ZI9/Vxh23iFiINAQETczbqqOzTkoicZQMVV1PFA6zChrnIVQ0EyYjGg1Z0/pPcrxqO mad5oHquSVy70INrktEBnsXfWzpIM8AXqCu/uishqPQw5ByaDECi26i7dkVYDUOhdCwrd0dVqs Hf0= X-IronPort-AV: E=Sophos;i="5.77,451,1596524400"; d="scan'208";a="97190163" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 04 Nov 2020 10:45:42 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 4 Nov 2020 10:45:41 -0700 Received: from m18063-ThinkPad-T460p.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 4 Nov 2020 10:45:37 -0700 From: Claudiu Beznea To: , , , , , Subject: [PATCH v2 1/8] clk: at91: sama7g5: fix compilation error Date: Wed, 4 Nov 2020 19:45:19 +0200 Message-ID: <1604511926-29516-2-git-send-email-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1604511926-29516-1-git-send-email-claudiu.beznea@microchip.com> References: <1604511926-29516-1-git-send-email-claudiu.beznea@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201104_124544_892086_FEC0ABAA X-CRM114-Status: GOOD ( 14.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, eugen.hristev@microchip.com, Claudiu Beznea , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org pmc_data_allocate() has been changed. pmc_data_free() was removed. Adapt the code taking this into consideration. With this the programmable clocks were also saved in sama7g5_pmc so that they could be later referenced. Fixes: cb783bbbcf54 ("clk: at91: sama7g5: add clock support for sama7g5") Signed-off-by: Claudiu Beznea Reviewed-by: Tudor Ambarus Tested-by: Tudor Ambarus --- drivers/clk/at91/sama7g5.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/clk/at91/sama7g5.c b/drivers/clk/at91/sama7g5.c index 0db2ab3eca14..a092a940baa4 100644 --- a/drivers/clk/at91/sama7g5.c +++ b/drivers/clk/at91/sama7g5.c @@ -838,7 +838,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np) sama7g5_pmc = pmc_data_allocate(PMC_I2S1_MUX + 1, nck(sama7g5_systemck), nck(sama7g5_periphck), - nck(sama7g5_gck)); + nck(sama7g5_gck), 8); if (!sama7g5_pmc) return; @@ -980,6 +980,8 @@ static void __init sama7g5_pmc_setup(struct device_node *np) sama7g5_prog_mux_table); if (IS_ERR(hw)) goto err_free; + + sama7g5_pmc->pchws[i] = hw; } for (i = 0; i < ARRAY_SIZE(sama7g5_systemck); i++) { @@ -1052,7 +1054,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np) kfree(alloc_mem); } - pmc_data_free(sama7g5_pmc); + kfree(sama7g5_pmc); } /* Some clks are used for a clocksource */