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: