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 Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9C780C433F5 for ; Thu, 28 Apr 2022 11:32:36 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2F67183DCA; Thu, 28 Apr 2022 13:32:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="V9XaSpSP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DC70683D6B; Thu, 28 Apr 2022 13:32:31 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3677483E9E for ; Thu, 28 Apr 2022 13:32:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7276761F67; Thu, 28 Apr 2022 11:32:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E2EBC385B8; Thu, 28 Apr 2022 11:32:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651145546; bh=q7nhXqx2Atw7WCe7wocJZvDwksp9l3kqN2hENXNzxck=; h=From:To:Cc:Subject:Date:From; b=V9XaSpSPip966beCQ41fAiZjcAFN0gr+DwOvyKVuvmTD+l6misoHEsmkJGFizAuOi +OeY/f0LoSjaVt6QYZUCAiymNMTxspujgygjBR+uFNDrqIfraH6LLsGrwmRgvBvt7K chtL8KAwbs6l+pLTPJooF7Ll71Do3HC56bis1Iyj/TueK//APGIkErbgXhd9CpWjL0 x6hUreP11ZJU/WBCbS7yaCdzQd6mHMmJ2ifP7JRTNjlMCnwqqjT5b1mVedIht47O1D n/OcoBVy6w/nPug/Cq+8Xc+gh4oSHyot/cUhjEX2zydIzeAzHCQh1JT+hLiDG28NzT EhJ5NZRR1YL/g== Received: by pali.im (Postfix) id 388F68A0; Thu, 28 Apr 2022 13:32:23 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Priyanka Jain , Wolfgang Denk , Sinan Akman Cc: u-boot@lists.denx.de Subject: [PATCH] powerpc: mpc85xx: Fix compilation with CONFIG_WDT Date: Thu, 28 Apr 2022 13:31:43 +0200 Message-Id: <20220428113143.9918-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean When CONFIG_WDT is enabled then non-DM watchdog code cannot be used due to conflicting functions like watchdog_reset(). So disable compilation of mpc85xx watchdog_reset() function when CONFIG_WDT is enabled. Signed-off-by: Pali Rohár --- arch/powerpc/cpu/mpc85xx/cpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index 261f79e40585..226a26ba320a 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -348,6 +348,7 @@ __weak unsigned long get_tbclk(void) } +#ifndef CONFIG_WDT #if defined(CONFIG_WATCHDOG) #define WATCHDOG_MASK (TCR_WP(63) | TCR_WRC(3) | TCR_WIE) void @@ -376,6 +377,7 @@ watchdog_reset(void) enable_interrupts(); } #endif /* CONFIG_WATCHDOG */ +#endif /* * Initializes on-chip MMC controllers. -- 2.20.1