From patchwork Mon Mar 15 04:32:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 400736 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, 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 0CCC0C433DB for ; Mon, 15 Mar 2021 04:33:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A81F964E4D for ; Mon, 15 Mar 2021 04:33:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229826AbhCOEdO (ORCPT ); Mon, 15 Mar 2021 00:33:14 -0400 Received: from new1-smtp.messagingengine.com ([66.111.4.221]:58009 "EHLO new1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229699AbhCOEcy (ORCPT ); Mon, 15 Mar 2021 00:32:54 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.nyi.internal (Postfix) with ESMTP id C9AED5807FC; Mon, 15 Mar 2021 00:32:53 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 15 Mar 2021 00:32:53 -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=fm2; bh=czi+mm/WRAlli yY3vx1O61Hzo2LcF+Emfju32DJj5MA=; b=JNiMNkxIId8JyOvAY6zEBR6EHtYam P3mS4NQ366vCcWNXoTRGGtcyJn9qAx0iu7auw3sWDIfB7oUnfATsXtj/1AMRqfJW F4doI6jlwbvM0MiefsgUHLdybLA7Zp21yvkuI9Uan6XdMNDKPhqDUL9w0po7NnOe snoPtjz8xnj3yRHJenvTFOE96x4+3jAvPImpAj3j67tgd18iYJ4FS8rHrBa3G4gg BeeAwisq5Tq/HOMWwoOsB0qGLgP8+sHFuBAE10QeRbNtsjPLDI8uGOqoxKYASJy0 kQwGN5YLfq/+EisYlnRzl0A+H2OHtMv7iPwe4LoR99zUGohwJFvuJEcHQ== 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= fm2; bh=czi+mm/WRAlliyY3vx1O61Hzo2LcF+Emfju32DJj5MA=; b=IZW3zEKy Mw0kMffsNcXyhxp1I4F5FmqrbUVB1FpXfWpwC4dy6IsMpVE0RdRlP8gzlzcIAsRo D8RtxgDvfXL7e1rUoQnYm/aOeP+HbBrv+7M5ZDATxep3bLz2UlDyEH7dVtDRX5m8 4mmEVz8psAmxSfSZ6VA0GRYYK9C0RC0/MO4Cu2dqZ1Id53itTTYI+BDGaDI0BN0Z EZ6zYnhhwEcWELBiHCdqTNdcIMfEBVuIlUOjqsVALhXNT9lLuf3F6dF3G7EBSfHM fK5IEjl3I+6AHahEA/U6CGkyILP9ytOTOmw2M7TvK55W24bq6t8+AbCmCGoA7CJk iuqg9aMeXSYaiw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddvkedgjeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 169331080054; Mon, 15 Mar 2021 00:32:52 -0400 (EDT) From: Samuel Holland To: Daniel Lezcano , Thomas Gleixner , Rob Herring , Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Catalin Marinas , Will Deacon Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH 1/5] dt-bindings: timer: Simplify conditional expressions Date: Sun, 14 Mar 2021 23:32:46 -0500 Message-Id: <20210315043250.45095-2-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210315043250.45095-1-samuel@sholland.org> References: <20210315043250.45095-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The sun4i timer IP block has a variable number of interrupts based on the compatible. Use enums to combine the two sections for the existing 3-interrupt variants, and to simplify adding new compatible strings. Signed-off-by: Samuel Holland --- .../timer/allwinner,sun4i-a10-timer.yaml | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml b/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml index 1c7cf32e7ac2..3462598e609d 100644 --- a/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml +++ b/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml @@ -34,8 +34,8 @@ allOf: - if: properties: compatible: - items: - const: allwinner,sun4i-a10-timer + enum: + - allwinner,sun4i-a10-timer then: properties: @@ -46,8 +46,8 @@ allOf: - if: properties: compatible: - items: - const: allwinner,sun8i-a23-timer + enum: + - allwinner,sun8i-a23-timer then: properties: @@ -58,20 +58,9 @@ allOf: - if: properties: compatible: - items: - const: allwinner,sun8i-v3s-timer - - then: - properties: - interrupts: - minItems: 3 - maxItems: 3 - - - if: - properties: - compatible: - items: - const: allwinner,suniv-f1c100s-timer + enum: + - allwinner,sun8i-v3s-timer + - allwinner,suniv-f1c100s-timer then: properties: From patchwork Mon Mar 15 04:32:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 402013 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, 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 5381FC433E0 for ; Mon, 15 Mar 2021 04:33:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 093A864E21 for ; Mon, 15 Mar 2021 04:33:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229851AbhCOEdP (ORCPT ); Mon, 15 Mar 2021 00:33:15 -0400 Received: from new1-smtp.messagingengine.com ([66.111.4.221]:59201 "EHLO new1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229594AbhCOEcy (ORCPT ); Mon, 15 Mar 2021 00:32:54 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.nyi.internal (Postfix) with ESMTP id 98FD75807DD; Mon, 15 Mar 2021 00:32:53 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 15 Mar 2021 00:32:53 -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=fm2; bh=jvtWrGk1v3ZHG VbBzJ3xjNsfiIB+WPFTiLXwxkYfxso=; b=hhL5YrbdLCUMqBWvHXI8g4WOF9fI7 17t14vUeOBxPSGkUuAfHWegEeIayFiaqTWGFFsv4kkThrrGnn/iTu8zjYLBttMin Ko0JPUDskSVLJ4u5EN0BCKgrRpci6GhyknKD9z1cFlbZj/rbclrAUfW8uTCEle79 lAm1TQSX4pAtkZdpiTCPNG2Kb/hgp+wYmgM2986BjUT/DmCajZ6vLrInt94soH9K 3ggbWfydScOsZrtw99WrnxWKhpgkkG6F/MJPPuJq8pIws3rqC/OdhSvRUGStPkrc 2mCb/QuC5LY5yEJixU/UBBxwN7d5JxbEUYk6Xtoe6Mau+c/Lwt6ID6Lzg== 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= fm2; bh=jvtWrGk1v3ZHGVbBzJ3xjNsfiIB+WPFTiLXwxkYfxso=; b=uzND26RK o8/AxFwgpv2ZZMFq+6yB3DDS+kkkbzmDNCyzFX/VkIVaXDAegwb1GFKnTtIqb/wT 88BOpPnIsmw5sR6feE3fnuOjfdusXEbaqtavJxPUsO0xCX8yudF2TDTZJwoLNtR1 pAzAkZjt8129gmQo/SI2EjmJziU3JcED15laxaYttNYail6Wurto7zF8SCwjPWG6 a23kcEjaP+95e+01JSJL+tk4thtv4PQF8GaIwWmvkX95AWSMmXr/SDpIOzrOCRoC ocGQBhodHFGbn7a93vIi9lgp5PIbaP7/BLqTYEVBpDsNByK97TSwIgkIxVDGviok p+zJ3RfSIL034A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddvkedgjeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 8F72B108005F; Mon, 15 Mar 2021 00:32:52 -0400 (EDT) From: Samuel Holland To: Daniel Lezcano , Thomas Gleixner , Rob Herring , Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Catalin Marinas , Will Deacon Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH 2/5] dt-bindings: timer: Add compatibles for sun50i timers Date: Sun, 14 Mar 2021 23:32:47 -0500 Message-Id: <20210315043250.45095-3-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210315043250.45095-1-samuel@sholland.org> References: <20210315043250.45095-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The sun50i SoCs contain timer blocks which are useful as broadcast clockevent sources. They each have 2 interrupts, matching the A23 variant, so add the new compatible strings with the A23 compatible as a fallback. Signed-off-by: Samuel Holland --- .../timer/allwinner,sun4i-a10-timer.yaml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml b/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml index 3462598e609d..53fd24bdc34e 100644 --- a/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml +++ b/Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml @@ -12,11 +12,18 @@ maintainers: properties: compatible: - enum: - - allwinner,sun4i-a10-timer - - allwinner,sun8i-a23-timer - - allwinner,sun8i-v3s-timer - - allwinner,suniv-f1c100s-timer + oneOf: + - enum: + - allwinner,sun4i-a10-timer + - allwinner,sun8i-a23-timer + - allwinner,sun8i-v3s-timer + - allwinner,suniv-f1c100s-timer + - items: + - enum: + - allwinner,sun50i-a64-timer + - allwinner,sun50i-h6-timer + - allwinner,sun50i-h616-timer + - const: allwinner,sun8i-a23-timer reg: maxItems: 1 From patchwork Mon Mar 15 04:32:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 402012 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, 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 75691C43381 for ; Mon, 15 Mar 2021 04:33:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 39D4F64E4D for ; Mon, 15 Mar 2021 04:33:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229699AbhCOEdQ (ORCPT ); Mon, 15 Mar 2021 00:33:16 -0400 Received: from new1-smtp.messagingengine.com ([66.111.4.221]:56595 "EHLO new1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229663AbhCOEcy (ORCPT ); Mon, 15 Mar 2021 00:32:54 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.nyi.internal (Postfix) with ESMTP id B6A9D5807EA; Mon, 15 Mar 2021 00:32:53 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 15 Mar 2021 00:32:53 -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=fm2; bh=SF9IU2RVsueqQ aPsp71TscQ9XCUTFLqI/yko/XtJYbQ=; b=qR3R85uqjeJmF4ATRd58nHRPLHT/X czI7Bnx1JhhQfe/hX3NZpUHWnOOIPaZ0nAHxmPZFhK+6hqZqRRNmJWkn7Sk8yLyr 0jf+kx0NyHgDDvXUluCCQWhoaVNoxrMXwd4p2GTVhg7kuar3DleXgNFQ01fzur89 zGwLLgY24CBEjPDtTFOxT4y5CLdJJizS6p+XaIfGXFNYHYJZVsaMmxtwF9Vn7y59 921FeKpepxZpVUlILy7wut3xB5YuhevFJzNmpPNxo+vGE5IpdnISsg/tLeJGXGfW tv1uRlea8b0Fxq0Z2jC/zhbUNUYYUMYHOxIsvXz7EH7O1pzTYsiTLasOw== 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= fm2; bh=SF9IU2RVsueqQaPsp71TscQ9XCUTFLqI/yko/XtJYbQ=; b=T1rfS1fP zj6z7MTBgkzaAZurBpcg93n1g4DhssMguREt8b8i0jpXMMXk/Zc6KFuaW5jk24QS RJ5AFrPFqGuzhSrKS0PhzA9uX3yk4VblacdUCxaHQQx3tCnDBQnkqRDqgJDfs1fU MVgY0N5BpAok82193VmyBNpnkLGm06rnjgPIqQsSxUpXFNruRAc5DcdJSLjkpJAf PI5cTvGmzQilQT0qy0/4wDN9a0IzuAsPI2AqEBjfyrcQgg4o8bFIadebj4Pyjn0f 7Dj5/BJ6ZgI8AdLJfYH4Oin7acA85ILpenk6E6yZ8b0vR26S8ZHvkiRnQu5YN6gy PzMuWx9VbE3Vww== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddvkedgjeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 14A981080064; Mon, 15 Mar 2021 00:32:53 -0400 (EDT) From: Samuel Holland To: Daniel Lezcano , Thomas Gleixner , Rob Herring , Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Catalin Marinas , Will Deacon Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH 3/5] arm64: dts: allwinner: a64: Sort watchdog node Date: Sun, 14 Mar 2021 23:32:48 -0500 Message-Id: <20210315043250.45095-4-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210315043250.45095-1-samuel@sholland.org> References: <20210315043250.45095-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Nodes should be sorted by unit address. Move the watchdog node to the correct place, so it will be next to the timer node when that is added. Signed-off-by: Samuel Holland --- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index 206693423aa6..33df866f6ea9 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -905,6 +905,14 @@ uart4_rts_cts_pins: uart4-rts-cts-pins { }; }; + wdt0: watchdog@1c20ca0 { + compatible = "allwinner,sun50i-a64-wdt", + "allwinner,sun6i-a31-wdt"; + reg = <0x01c20ca0 0x20>; + interrupts = ; + clocks = <&osc24M>; + }; + spdif: spdif@1c21000 { #sound-dai-cells = <0>; compatible = "allwinner,sun50i-a64-spdif", @@ -1436,13 +1444,5 @@ r_rsb: rsb@1f03400 { #address-cells = <1>; #size-cells = <0>; }; - - wdt0: watchdog@1c20ca0 { - compatible = "allwinner,sun50i-a64-wdt", - "allwinner,sun6i-a31-wdt"; - reg = <0x01c20ca0 0x20>; - interrupts = ; - clocks = <&osc24M>; - }; }; }; From patchwork Mon Mar 15 04:32:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 400735 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, 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 8B767C433E9 for ; Mon, 15 Mar 2021 04:33:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6F6AF64E41 for ; Mon, 15 Mar 2021 04:33:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229896AbhCOEdR (ORCPT ); Mon, 15 Mar 2021 00:33:17 -0400 Received: from new1-smtp.messagingengine.com ([66.111.4.221]:46419 "EHLO new1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229792AbhCOEcy (ORCPT ); Mon, 15 Mar 2021 00:32:54 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.nyi.internal (Postfix) with ESMTP id 43E24580804; Mon, 15 Mar 2021 00:32:54 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 15 Mar 2021 00:32:54 -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=fm2; bh=7mMCgOzVk1VRf 7k85AEAzifdmxeEa3WAqFUUcfBk/Sw=; b=Is/j1v+zbr8tb0aWRaWBg6mBt+VFP 1xOlOEZLv60MNR6RLVwHBTz68tliB+UBU69qynYu3LFGGqMsX05aSWZ8jCvAUyEV /lb+s9peK9ZXbczlZrPSlwu8yole7AzWovPgf5vazjzL0fCBPDmHC+jvka2GLA3f esFrfliy4XuQ0Yim2qjkV4zJCcmKLp5tXcwBt4eWoSYdgjWntslaEzMY0MevLXhN e4o2kyVM6E8NCiAkFz2HDtS4Scmhg1ths4sOUdrjG3UogVxCjyO0c5b5jOTd6zCD eHNcbR4pwQQ/yLLfWyLXk6HSJiFlw8n3Ywib6Dc1qgeQaQCU1Jn1iJ9Mg== 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= fm2; bh=7mMCgOzVk1VRf7k85AEAzifdmxeEa3WAqFUUcfBk/Sw=; b=NW/HVdoJ 6AdKugo04FNeDFncrF2ZtcO/Z62Dr2xG5jbx5P0NxgPFzPR6wIxuUKjlw374KOxp AVlncY5/ec83xtYOOQF8zi4l5MlFCeX/l3192V1I1YcCZfprVyYbG6LraCiHzfco HIWabLOGyGTxspBlLPhiYVcfcHJlP2i7d2halcPLnLC+jgnRa5Py03GJPWRYwzU5 TayTWjmOetbzDDVSCyc3UHUQ6zCntLcjWOmWDdQ/bzl38KAuf+C3Vlt09vaEkPHc Hyy/t5AlZw2Bg3QyFowx+BoZ0KU9+TZgDUYS8afF+xl6UezqSHcoDOXA4AGL5+ju i8Fxsnr67aQnJQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddvkedgjeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 8D9751080063; Mon, 15 Mar 2021 00:32:53 -0400 (EDT) From: Samuel Holland To: Daniel Lezcano , Thomas Gleixner , Rob Herring , Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Catalin Marinas , Will Deacon Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH 4/5] arm64: dts: allwinner: Add sun4i MMIO timer nodes Date: Sun, 14 Mar 2021 23:32:49 -0500 Message-Id: <20210315043250.45095-5-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210315043250.45095-1-samuel@sholland.org> References: <20210315043250.45095-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org For a CPU to enter an idle state, there must be some timer which can trigger an IRQ to wake it back up. The local ARM architectural timer is not sufficient, because that timer stops when the CPU is powered down. Some other CPU's ARM architectural timer can be used, but this prevents that other CPU from entering an idle state. So to allow all CPUs to enter an idle state at the same time, some MMIO timer must be available that is not tied to any CPU. The basic "sun4i" timer seems most appropriate for this purpose due to its moderate rate, balancing precision and power consumption. Signed-off-by: Samuel Holland --- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 9 +++++++++ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 9 +++++++++ arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index 33df866f6ea9..64e8b4a372cc 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -905,6 +905,15 @@ uart4_rts_cts_pins: uart4-rts-cts-pins { }; }; + timer@1c20c00 { + compatible = "allwinner,sun50i-a64-timer", + "allwinner,sun8i-a23-timer"; + reg = <0x01c20c00 0xa0>; + interrupts = , + ; + clocks = <&osc24M>; + }; + wdt0: watchdog@1c20ca0 { compatible = "allwinner,sun50i-a64-wdt", "allwinner,sun6i-a31-wdt"; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi index 62334054c710..9ba3b30e11fa 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -332,6 +332,15 @@ cpu_speed_grade: cpu-speed-grade@1c { }; }; + timer@3009000 { + compatible = "allwinner,sun50i-h6-timer", + "allwinner,sun8i-a23-timer"; + reg = <0x03009000 0xa0>; + interrupts = , + ; + clocks = <&osc24M>; + }; + watchdog: watchdog@30090a0 { compatible = "allwinner,sun50i-h6-wdt", "allwinner,sun6i-a31-wdt"; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi index c277b53f94ea..ff55712ce96e 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi @@ -128,6 +128,15 @@ ccu: clock@3001000 { #reset-cells = <1>; }; + timer@3009000 { + compatible = "allwinner,sun50i-h616-timer", + "allwinner,sun8i-a23-timer"; + reg = <0x03009000 0xa0>; + interrupts = , + ; + clocks = <&osc24M>; + }; + watchdog: watchdog@30090a0 { compatible = "allwinner,sun50i-h616-wdt", "allwinner,sun6i-a31-wdt"; From patchwork Mon Mar 15 04:32:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 402011 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, 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 AEFB5C4332B for ; Mon, 15 Mar 2021 04:33:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 87E3364E86 for ; Mon, 15 Mar 2021 04:33:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229890AbhCOEdQ (ORCPT ); Mon, 15 Mar 2021 00:33:16 -0400 Received: from new1-smtp.messagingengine.com ([66.111.4.221]:45015 "EHLO new1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229809AbhCOEcz (ORCPT ); Mon, 15 Mar 2021 00:32:55 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.nyi.internal (Postfix) with ESMTP id BB495580806; Mon, 15 Mar 2021 00:32:54 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 15 Mar 2021 00:32:54 -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=fm2; bh=dGOSu91ccRc7/ g9NBATCWczOqGj+KwM6uf+lTMCJph0=; b=INsffJjTtAvcvikujjQ5lK8GO9146 bs5PsjTVuym7m44yXHZJCUur4UXkpFQqRkFb0yFLLb5tjt0M/vm5EmgEKnD76khz bAJ2bJ2SUU/ikYW/PFUq8E3LjfGSTEiGOAYATLkM3w6f1YcmS4jB8+9OwKm+THAA Yxz/NxbrER6jjAbjHS0pKXZk4G/GfgSt+QITwU/obhjXUdioSLGFkAP88mLBW91z 8og8G5soRH/HhVSk3w6Q0ndsELpnxSm6OnYJMk7jS/uYbInccKS0MwU1ppfQPXJK 1GOIGAe2NwfgQLFfnIR0DyfIeRtJ6AMvGsUD2kH2AAwrBnNjq3s4lNZrQ== 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= fm2; bh=dGOSu91ccRc7/g9NBATCWczOqGj+KwM6uf+lTMCJph0=; b=bz1M8pU8 blQl6shGSjymIeQw26uJa0fEEVLv47ptsZCpo72/28j3CovvKOFJWAl98O+nPOAw mjHHAkqts475qNmd5+9NXOzPkmSUBDqwbzbJXKqnfAf+neFijnSl0dHXbTOh+1A9 FtBFNHWByzGSjeWmV2s52I5DUheWcTxhcii6znH+7nDSiJYuOoSBcL0ImQ0qdxxK uiDf37lsRiDH+d2WD0Rj50noyhmV0ClBLYlObhPbOKM4AsGkObyIAoVK0gZrsafa 5r+XXgXLXEnSuDBJJ8SWcWMv575VLaxc9MCwuxeJpkac1tTMi/gH7AgJWzq6f32w g28TGrh/xjBfBA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddvkedgjeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 116001080054; Mon, 15 Mar 2021 00:32:54 -0400 (EDT) From: Samuel Holland To: Daniel Lezcano , Thomas Gleixner , Rob Herring , Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Catalin Marinas , Will Deacon Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH 5/5] arm64: sunxi: Build the sun4i timer driver Date: Sun, 14 Mar 2021 23:32:50 -0500 Message-Id: <20210315043250.45095-6-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210315043250.45095-1-samuel@sholland.org> References: <20210315043250.45095-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org While the ARM architectural timer is generatlly the best timer to use, a non-c3stop timer is needed for cpuidle. Use the sun4i timer for this purpose, which is present on all 64-bit sunxi SoCs. Signed-off-by: Samuel Holland --- arch/arm64/Kconfig.platforms | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index cdfd5fed457f..7f6a66431fa7 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -26,6 +26,7 @@ config ARCH_SUNXI select IRQ_FASTEOI_HIERARCHY_HANDLERS select PINCTRL select RESET_CONTROLLER + select SUN4I_TIMER help This enables support for Allwinner sunxi based SoCs like the A64.