From patchwork Mon Jul 26 03:51:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1509731 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm3 header.b=DEnQEUhx; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=jAiPfcuG; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4GY5b9120Hz9sj5 for ; Mon, 26 Jul 2021 13:52:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231601AbhGZDLS (ORCPT ); Sun, 25 Jul 2021 23:11:18 -0400 Received: from new2-smtp.messagingengine.com ([66.111.4.224]:39343 "EHLO new2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231530AbhGZDLS (ORCPT ); Sun, 25 Jul 2021 23:11:18 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id B6720580457; Sun, 25 Jul 2021 23:51:46 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 25 Jul 2021 23:51:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm3; bh=H3jwiRFGXqJPvuv7Y4q/rPalVp 61u1Fw/7F6aOr79LI=; b=DEnQEUhxbmdScDeubloC1ND86h8tYv8bVxrPn1LwGc 9ZQxGFMjHYpjLl8dO31XXc6CzHhsAqYXz4gJcuC+67Q+7n0qXurdxsvl1O57/7Dn hNXNrLkjW3YUPrgnqnDzWVt2GIchjvIUSKpIIvHCUyJjtJ3yMUx5cSsEngjDO6pw xG0D3hxOkuJHqqzPUvfl+vCr2PfZMB108kbZbScILPv3LBb6nZk9RHk3lbbIfTSB 6P/Urs9UztRG7UWbDtY3fhdMOJpGCVzMFFgYH3GH0zBm5yZIh/QaRzDB6uuYkOAI 7QF5Q62Qijsp25LPD6j4awKBNTHJVBsiKHcHRRf0u7DA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=H3jwiRFGXqJPvuv7Y 4q/rPalVp61u1Fw/7F6aOr79LI=; b=jAiPfcuGN3j+8SGBwkGLvBedOFfeEpr3Y 2HvcuQkNm7rrwj8T+yBEb3SL5Mvez1y++G/grk+yCaqIagvoO7xZlZKtFQ3kAzIr KK//onyqKn4k4/iVVLtqpTDJ7pfWgSZBT2ie32E86aCv2WfzzU8loOcoKFkdYiWP 5do7oqIPZ8EKpfjOKB9T6Pp8H+IL+UYxTQlzyy9XQbjuczBNkkQWSkDPXqloCOAI zM2KAu++JL5rHn5RUsVILlLkO0Ak8nlKxM5wajuBXlZMPJrloA6qXoYVY7f+RbSM Y5bPQFR1BrcwG2m8nqLVUr5sn7Vfrr1a7EEMcYo9ZWZ0gj6KUnjKg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrgeeggdejvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgggfestdekredtredttdenucfhrhhomhepufgrmhhuvghlucfj ohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecuggftrfgrth htvghrnhepieetkefhheduudfgledtudefjeejfeegveehkeeufffhhfejkeehiefftdev tdevnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepsh grmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 25 Jul 2021 23:51:43 -0400 (EDT) From: Samuel Holland To: Wim Van Sebroeck , Guenter Roeck , Rob Herring , Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH 1/3] dt-bindings: watchdog: sunxi: Add compatible for R329 Date: Sun, 25 Jul 2021 22:51:41 -0500 Message-Id: <20210726035143.53132-1-samuel@sholland.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On existing SoCs, the watchdog has a single clock input: HOSC (OSC24M) divided by 750. However, starting with R329, LOSC (OSC32k) is added as an alternative clock source, with a bit to switch between them. Since 24 MHz / 750 == 32 kHz, not 32.768 kHz, the hardware adjusts the cycle counts to keep the timeouts independent of the clock source. This keeps the programming interface backward-compatible. R329 also adds two new registers, to allow software to immediately drive the SoC reset signal. Signed-off-by: Samuel Holland Reviewed-by: Guenter Roeck --- .../watchdog/allwinner,sun4i-a10-wdt.yaml | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml index 9aa3c313c49f..853ceb1b7c0f 100644 --- a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml @@ -24,6 +24,7 @@ properties: - allwinner,sun50i-a100-wdt - allwinner,sun50i-h6-wdt - allwinner,sun50i-h616-wdt + - allwinner,sun50i-r329-wdt - const: allwinner,sun6i-a31-wdt - items: - const: allwinner,suniv-f1c100s-wdt @@ -33,7 +34,16 @@ properties: maxItems: 1 clocks: - maxItems: 1 + minItems: 1 + maxItems: 2 + + clock-names: + minItems: 1 + maxItems: 2 + items: + enum: + - hosc + - losc interrupts: maxItems: 1 @@ -44,6 +54,24 @@ required: - clocks - interrupts +if: + properties: + compatible: + contains: + enum: + - allwinner,sun50i-r329-wdt + +then: + properties: + clocks: + minItems: 2 + + clock-names: + minItems: 2 + + required: + - clock-names + unevaluatedProperties: false examples: From patchwork Mon Jul 26 03:51:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1509732 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm3 header.b=oOtd0tfi; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=TSobTx6f; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4GY5bD1w9Pz9t25 for ; Mon, 26 Jul 2021 13:52:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231642AbhGZDLT (ORCPT ); Sun, 25 Jul 2021 23:11:19 -0400 Received: from new2-smtp.messagingengine.com ([66.111.4.224]:56309 "EHLO new2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231597AbhGZDLS (ORCPT ); Sun, 25 Jul 2021 23:11:18 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id 662D9580459; Sun, 25 Jul 2021 23:51:47 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 25 Jul 2021 23:51:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=dL2RNdEFfB0CS xPuX7MdY2R8OOMX4hoFvSZkqBvBGH0=; b=oOtd0tfigbM00v0lFNv9Ni04KgC5H qMpvXFCm9AWFOWVv+WJUxZ8JVa7JBi5dRdPlH4OAsXPgOWP/uayt4v13h+XwPRSE oQG8q6rvZSXP4R8Oi4w6N7mwGJ2U144Be3UIubs6xQc9lsANgflOMQd1xfkNbLXi VFM/9itGDD9MoHnWUUafI4Tg5uNZ0RcM2DIskAkWkXGILHoiLw5oo5FKh2j+Fz46 9H4jBmQLn5bQIxaDLPOo5WogMSvZsznMN3uUzCZbEfRpBNJVbp2c5vq55N/QozH7 ctNwseBzR6kHtZQBB731IqTKZX20CNyAAokXxua5OJIYVz6/XQVBYXtkg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=dL2RNdEFfB0CSxPuX7MdY2R8OOMX4hoFvSZkqBvBGH0=; b=TSobTx6f IsRz3GnbZjS7lnSso4qnZpwq6ceixRzioqO8D8C4mrVVK5QdM7jjSDZw4yt3didM f7c8GKCsiV6noT7GeyOhzY+SsIDaPEEIgQevvA7Xi4wjvRNlVDkC5I7+kkRtXhad 4LrXB0LVaYs7r3dswRepeY16avIrZ9fVlly06OLaCRVifk+RZLE//nwPlQGT+gXQ Pa/cOZBeNwF9V8Wb/qkNWVvof3jeIS6EeiDvjsf3E0YvK0FHihZ3Vse5irfdRdcT kz5d7nAn9MUJ+pdN6lraB41+d/8/rKJDbpD9epF9SLKt9eyChcxJVdikAfGdHDk4 OBJJwEvbres9eA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrgeeggdejvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhuvghl ucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecuggftrf grthhtvghrnhepudfhjeefvdfhgfefheetgffhieeigfefhefgvddvveefgeejheejvdfg jeehueeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 25 Jul 2021 23:51:46 -0400 (EDT) From: Samuel Holland To: Wim Van Sebroeck , Guenter Roeck , Rob Herring , Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH 2/3] dt-bindings: watchdog: sunxi: Add compatible for D1 Date: Sun, 25 Jul 2021 22:51:42 -0500 Message-Id: <20210726035143.53132-2-samuel@sholland.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210726035143.53132-1-samuel@sholland.org> References: <20210726035143.53132-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org D1 keeps the same register layout and clock sources as the R329, but it adds a key field which must be set to update the watchdog's "CFG" and "MODE" registers. Therefore it is not backward-compatible. Signed-off-by: Samuel Holland Reviewed-by: Rob Herring --- .../devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml index 853ceb1b7c0f..756e6ab99860 100644 --- a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml @@ -29,6 +29,7 @@ properties: - items: - const: allwinner,suniv-f1c100s-wdt - const: allwinner,sun4i-a10-wdt + - const: allwinner,sun20i-d1-wdt reg: maxItems: 1 @@ -59,6 +60,7 @@ if: compatible: contains: enum: + - allwinner,sun20i-d1-wdt - allwinner,sun50i-r329-wdt then: