From nobody Thu Apr 9 13:32:17 2026 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1FDD4224AF1; Fri, 27 Feb 2026 07:31:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=68.232.153.233 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772177517; cv=none; b=TzmI8HWaRcs88Ef1EUA1yEbP+9qc3g0kn8DiqSVA5QLNOWUoGaay4Be15/KrfufEMeRoqg6kAiNTTrS2zQ4eYYDIfKFCOkLYnZUFpjuRh9ihpqhK9z6mdBQtUoSHs320Bm0+XcxeeITDMLzmbmXZfCeSJM5vRMOCW1tcy7zBZEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772177517; c=relaxed/simple; bh=Uw38JxW9SQFg5yvRQWMgdAVRw8MAPa94R0JCVi5ZRg4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PVemDdRD2bC5nAMnNV4GIxpFrVamcy1Cn8EEf6flAdLfeVQWnu+ojHWHvtPvKrWXToFvwRIDp4RDC7q6h+4HesRRsfun6CYXK/nuLU6SmoEX7g+7uBRl/fjiBw3P3/ExAa9coLnfaRp9MgoNfrvdW2BvBxglE3U91bU2Y77EnS0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com; spf=pass smtp.mailfrom=microchip.com; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b=Sd8IzB1A; arc=none smtp.client-ip=68.232.153.233 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=microchip.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="Sd8IzB1A" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1772177517; x=1803713517; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Uw38JxW9SQFg5yvRQWMgdAVRw8MAPa94R0JCVi5ZRg4=; b=Sd8IzB1Artz2Z5uOhGk3EHxI6zdks9ZiHwP+2y89XWPEkIKPUxDKmGgo Yx4zkkSAndAMvFvGWAJ6CZ5X069GTBjlWjoEQZu0A9mMtoEQDqIDWPHrh 3/zGdapaO6d5yFV5Iv6Lpo8stRjVeNy09KjcOEXzltXEZOE/tjglYPBKu x4WJTW6oOeVr8aXXVHtZRz3a+kgJflt2BcNPGcokdle+VjYlUwdcskjSn qB7OJtiw5+Z6zmZ1uOThQQj/PqCAqz9jJv2Ue8dofE39cbHme+inLlc3l cKsLM0t3kXMrlLfQ1JDabdDcXUmGekNCHo6alcicVPzLEhZTLZnKyXFYl w==; X-CSE-ConnectionGUID: pqQRGmnkTLWZUXpRkz7jXw== X-CSE-MsgGUID: 2g0Dt5UPR0SRgo8urMj53A== X-IronPort-AV: E=Sophos;i="6.21,313,1763449200"; d="scan'208";a="285335714" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa5.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 27 Feb 2026 00:31:49 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.58; Fri, 27 Feb 2026 00:31:35 -0700 Received: from che-ll-i71840.microchip.com (10.10.85.11) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.58 via Frontend Transport; Fri, 27 Feb 2026 00:31:31 -0700 From: Balakrishnan Sambath To: , CC: , , , , , , Balakrishnan Sambath Subject: [PATCH 3/3] watchdog: at91sam9_wdt: Rename AT91_WDT_WDDIS to AT91_WDT_WDDIS_LEGACY Date: Fri, 27 Feb 2026 13:01:16 +0530 Message-ID: <20260227073116.30447-4-balakrishnan.s@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260227073116.30447-1-balakrishnan.s@microchip.com> References: <20260227073116.30447-1-balakrishnan.s@microchip.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace AT91_WDT_WDDIS with AT91_WDT_WDDIS_LEGACY to match the updated bit definition naming. Signed-off-by: Balakrishnan Sambath --- drivers/watchdog/at91sam9_wdt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wd= t.c index aba66b8e9d03..88a4c1ec99bd 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -162,20 +162,20 @@ static int at91_wdt_init(struct platform_device *pdev= , struct at91wdt *wdt) =20 tmp =3D wdt_read(wdt, AT91_WDT_MR); if ((tmp & mask) !=3D (wdt->mr & mask)) { if (tmp =3D=3D WDT_MR_RESET) { wdt_write(wdt, AT91_WDT_MR, wdt->mr); tmp =3D wdt_read(wdt, AT91_WDT_MR); } } =20 - if (tmp & AT91_WDT_WDDIS) { - if (wdt->mr & AT91_WDT_WDDIS) + if (tmp & AT91_WDT_WDDIS_LEGACY) { + if (wdt->mr & AT91_WDT_WDDIS_LEGACY) return 0; dev_err(dev, "watchdog is disabled\n"); return -EINVAL; } =20 value =3D tmp & AT91_WDT_WDV; delta =3D (tmp & AT91_WDT_WDD) >> 16; =20 if (delta < value) @@ -297,20 +297,20 @@ static int of_at91wdt_init(struct device_node *np, st= ruct at91wdt *wdt) } else { wdt->mr |=3D AT91_WDT_WDRSTEN; } =20 if (!of_property_read_string(np, "atmel,reset-type", &tmp) && !strcmp(tmp, "proc")) wdt->mr |=3D AT91_WDT_WDRPROC; =20 if (of_property_read_bool(np, "atmel,disable")) { - wdt->mr |=3D AT91_WDT_WDDIS; - wdt->mr_mask &=3D AT91_WDT_WDDIS; + wdt->mr |=3D AT91_WDT_WDDIS_LEGACY; + wdt->mr_mask &=3D AT91_WDT_WDDIS_LEGACY; } =20 if (of_property_read_bool(np, "atmel,idle-halt")) wdt->mr |=3D AT91_WDT_WDIDLEHLT; =20 if (of_property_read_bool(np, "atmel,dbg-halt")) wdt->mr |=3D AT91_WDT_WDDBGHLT; =20 wdt->mr |=3D max | ((max - min) << 16); --=20 2.34.1