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 E6B3AC433EF for ; Sat, 4 Jun 2022 13:04:40 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0FA458405A; Sat, 4 Jun 2022 15:04:39 +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="nJiasg7N"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1C5C184286; Sat, 4 Jun 2022 15:04:37 +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 9633A8405A for ; Sat, 4 Jun 2022 15:04: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=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 3F8D660BA1; Sat, 4 Jun 2022 13:04:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81EC2C385B8; Sat, 4 Jun 2022 13:04:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654347872; bh=eB4jrNLffjwX+5qNaSeO9AljqUEGSCplib34oeVARds=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=nJiasg7NQnfiqZZl8Dazuk4lgTuRKP0rDSO9K1g4iyjzlh97Qg1V+xsjLByxpFDYP U0qfTyLCORQpkDUiNXez/JzILZsPKFhHkRvsEvat0k3aw7oC7SvMxS1q9hPjZ9vXfl jSI1Ly8pfe/RLVUs5Pzm/Nc6FhMteVDjqa2l+v4U8zkZfafvZzYkdEIQgq4UJxd4Pr dZkIgAiFizZQc7Vp+38MmRZEQ0z99lXB4/Jc4FRMD/Rvqd7IdNUIMVB8rJNnUox8IO W6X9U4gpa/f09Y0c2DdqRjJqWT5z6rSjX+fK7AaGhA12WJGSpBZuU/HtlxNEBnaSPV hlbtJrd9vvpUw== Received: by pali.im (Postfix) id 62796AAC; Sat, 4 Jun 2022 15:04:29 +0200 (CEST) Date: Sat, 4 Jun 2022 15:04:29 +0200 From: Pali =?utf-8?B?Um9ow6Fy?= To: Priyanka Jain , Wolfgang Denk , Sinan Akman Cc: u-boot@lists.denx.de Subject: Re: [PATCH] powerpc: mpc85xx: Fix compilation with CONFIG_WDT Message-ID: <20220604130429.w5l4fspbrrfkdyij@pali> References: <20220428113143.9918-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220428113143.9918-1-pali@kernel.org> User-Agent: NeoMutt/20180716 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 PING On Thursday 28 April 2022 13:31:43 Pali Rohár wrote: > 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 >