From patchwork Wed Nov 4 09:39:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 11880049 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 6E04DC4741F for ; Wed, 4 Nov 2020 09:41:12 +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 E2EFB2225B for ; Wed, 4 Nov 2020 09:41:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JedooTK3"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="AP4G1KYP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E2EFB2225B 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=JedooTK3T0/7GtCUghnc68Axo 1/uelthrBqUyN/H1i/tOaAxayesvtCZDLC4MmJziVma0MADrCsPdwoG/L1qHVE34Vz7VVJICg2UTG YyIbvskobnRayJR7lIGqzLiIgDtJTvYi4cYi1upw9k4RBFWtFGw+pDXHV57Z7kUtKg7W5rUsJuwHl gav3Eduxx7RBhXWfgaqkPEGS4kxyo3W2w1FK0xurLMpFhgGlp4oVN3IFxAbCGtpvme5cabtIJs+W0 snpGudBB8OinkGoKA9QWrGsGFCNeV9V7WsMbVZKmjtueu6QgBd8t6OG9p6+DArwZDaFtDUnUYd5sZ WwLg391yw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaFHD-0002LQ-KV; Wed, 04 Nov 2020 09:40:23 +0000 Received: from esa1.microchip.iphmx.com ([68.232.147.91]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaFH9-0002Kf-E2 for linux-arm-kernel@lists.infradead.org; Wed, 04 Nov 2020 09:40:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1604482819; x=1636018819; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=QpD53wBg29UptUvVNqRf5JTCpttxxocLcDTpaKiBG1k=; b=AP4G1KYPquk3XN9vik+k/XN3LYFGWgQBfjws7nkTKm7cqMj00qoHKfX5 3Tcy/Y59F5uaKQnlTzNPeOQvdleTAAhdMm9RURA2kRwCG64186fuvFXpZ 6X3He8xkCaDg+dzq+AN5iseofhg6BiLabEJnlf4aacFqEcy9tL9q0Z0Vp A/Vjrgb0rW4HNXStKr0x5gTSPo/XrHsdioOSfCqQKSLXpgBAKFnF+tLIP EpWUGiGWe59hac0SuIXEchQ9puYB7emwUyjsM3WBM7INGuzJouOxZP/57 BHMRx4kvbn3XNyWNLn5KRRkEGzj50ENhKgBAHgC/IY+Ovosv0lCzNWShd g==; IronPort-SDR: zEc3iTYy5GwZyJs0ZA1yBBdboQeNT/qdAQuu0a08lohqoRXldUafOOjSHKfZGAEDrpkUO3DINI 540IHUzO4Sj6EKHMQSTiHhUI+QRB5X6C/HFWy3K9e6uTuAVEHjy2niXNE4uaAmZzKTYLt1Rm1q KsiATmNZ3dAbwwO+gCfL14xVQW9h8NKOo3oeiVFtvxBmDB8BxRyNqaKjIb4TgrVtT2oCCll1wQ Y9aN3O7jFlitLF8Txsg541vBE1xSa5MslVI0nGjKdBnHCBzaz7MCorN48ao0TP8099FUSNlQjd h2g= X-IronPort-AV: E=Sophos;i="5.77,450,1596524400"; d="scan'208";a="102141343" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 04 Nov 2020 02:40:16 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.87.72) by chn-vm-ex02.mchp-main.com (10.10.87.72) 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 02:40:16 -0700 Received: from m18063-ThinkPad-T460p.microchip.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 4 Nov 2020 02:40:11 -0700 From: Claudiu Beznea To: , , , , , Subject: [PATCH 1/8] clk: at91: sama7g5: fix compilation error Date: Wed, 4 Nov 2020 11:39:55 +0200 Message-ID: <1604482802-1647-2-git-send-email-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1604482802-1647-1-git-send-email-claudiu.beznea@microchip.com> References: <1604482802-1647-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_044019_746374_DF3002C8 X-CRM114-Status: GOOD ( 13.46 ) 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, Claudiu Beznea , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.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 --- 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 */