From patchwork Thu Oct 19 08:04:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Subhajit Ghosh X-Patchwork-Id: 13428425 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB59BC41513 for ; Thu, 19 Oct 2023 08:04:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232788AbjJSIEz (ORCPT ); Thu, 19 Oct 2023 04:04:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232895AbjJSIEy (ORCPT ); Thu, 19 Oct 2023 04:04:54 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08E4212E for ; Thu, 19 Oct 2023 01:04:51 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1c5c91bec75so53871145ad.3 for ; Thu, 19 Oct 2023 01:04:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tweaklogic.com; s=google; t=1697702690; x=1698307490; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=amvbJJr0EcJgPf0fIdoc/bnu/yWtT48GlSjc/kIMZRs=; b=Au/vv363RpvXXgjrtpEcrVjvHwoj427iFtyqpAn6hKxsSLgb/juW+obeRrhc5hwSsI Idmwtum0xSNisMJM9qRgE4Be+hPVAswTLXVishu2pJjF31SUBjGrLMm0Qonsf9RI/OZx POSgWCatAVh/1Mz1WonzNNViMJM9cxHA3b/9M/3hQlF1HPrsyfrAUgITtkulvqglYfRW QcohId+SMn1SBF9C6sx7faZOJvvOZZWc3RDna/oOWXGm9zAzc+lprnVOURUCWsPYSg5q WbS4g2c9J7D8MS9sGnUVQgA/NMn0Sd3Oc0Ia3i2D0EEhApZ8NWqPX0hDKhWFnx1JD8bK LDqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697702690; x=1698307490; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=amvbJJr0EcJgPf0fIdoc/bnu/yWtT48GlSjc/kIMZRs=; b=rSRrRy5Rc03NyegOvkeJMWd1UmcBaXYHIzmNLDPD78W6T/MdixW0GKoNDfNhIxa/mJ iOQ5uHtYqdCjPdPC5RsZr6GxcASZVmBjsqAaqgtofT19/Os6dtqKCDnqDc9vVY607Tvz WqUqKVIBIKshARNtiOXlgKwZ/e4kzs4yj0/x2M6aKyIiQx2QeZJPZVKXqYO6DmYwXGza 8uvSY3e1h55Z3Xzqh+EEAFt3rwm0dKoR7BxPvYa/X+J/+EZRHWTb5pcaQ3IgDmxH6XrS CHrg7tyvCAT+QOqneeFXf0vBYJdwHnl1aWVU2WUtJz0zbE1tQ7iGRFEDk846PQHv8EoY C5Zw== X-Gm-Message-State: AOJu0YyMpoEQmkRpEzp8EUut0PYFf3dqFaSYerne/mte90dU4iasBmEX tnWTdFIn1FZo2brv8563s+mzTw== X-Google-Smtp-Source: AGHT+IGslNK906q5HyMCKssxFpUMoV4W8ICoihMkpQ50b0Oiis3kzSOiNyReQorYn28uD1dHZOVr6Q== X-Received: by 2002:a17:902:d042:b0:1c7:49dd:2df with SMTP id l2-20020a170902d04200b001c749dd02dfmr1225061pll.32.1697702690357; Thu, 19 Oct 2023 01:04:50 -0700 (PDT) Received: from localhost.localdomain (2403-580d-82f4-0-43ac-2324-cc6e-9fa5.ip6.aussiebb.net. [2403:580d:82f4:0:43ac:2324:cc6e:9fa5]) by smtp.gmail.com with ESMTPSA id a20-20020a170902ee9400b001c739768214sm1245450pld.92.2023.10.19.01.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 01:04:49 -0700 (PDT) From: Subhajit Ghosh To: Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Subhajit Ghosh , Matt Ranostay , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] dt-bindings: iio: light: Squash APDS9300 and APDS9960 schemas Date: Thu, 19 Oct 2023 18:34:37 +1030 Message-Id: <20231019080437.94849-1-subhajit.ghosh@tweaklogic.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Squashing Avago (Broadcom) APDS9300 and APDS9960 schemas into one file and removing the other. Link: https://lore.kernel.org/all/4e785d2e-d310-4592-a75a-13549938dcef@linaro.org/ Signed-off-by: Subhajit Ghosh --- .../bindings/iio/light/avago,apds9300.yaml | 35 ++++++++++++--- .../bindings/iio/light/avago,apds9960.yaml | 44 ------------------- 2 files changed, 29 insertions(+), 50 deletions(-) delete mode 100644 Documentation/devicetree/bindings/iio/light/avago,apds9960.yaml diff --git a/Documentation/devicetree/bindings/iio/light/avago,apds9300.yaml b/Documentation/devicetree/bindings/iio/light/avago,apds9300.yaml index 206af44f2c43..7826a1749fcd 100644 --- a/Documentation/devicetree/bindings/iio/light/avago,apds9300.yaml +++ b/Documentation/devicetree/bindings/iio/light/avago,apds9300.yaml @@ -4,17 +4,26 @@ $id: http://devicetree.org/schemas/iio/light/avago,apds9300.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Avago APDS9300 ambient light sensor +title: Avago Gesture, RGB, ALS and Proximity sensors maintainers: - Jonathan Cameron + - Matt Ranostay description: | - Datasheet at https://www.avagotech.com/docs/AV02-1077EN + Avago (Broadcom) optical and proximity sensors with I2C interfaces. + Datasheet at https://docs.broadcom.com/doc/AV02-1077EN + Datasheet at https://docs.broadcom.com/doc/AV02-4191EN properties: compatible: - const: avago,apds9300 + oneOf: + - items: + - const: avago,apds9300 + - const: avago,apds9960 + - enum: + - avago,apds9300 + - avago,apds9960 reg: maxItems: 1 @@ -22,14 +31,28 @@ properties: interrupts: maxItems: 1 -additionalProperties: false - required: - compatible - reg +allOf: + - $ref: ../common.yaml# + - if: + properties: + compatible: + contains: + enum: + - avago,apds9960 + then: + required: + - interrupts + +additionalProperties: false + examples: - | + #include + i2c { #address-cells = <1>; #size-cells = <0>; @@ -38,7 +61,7 @@ examples: compatible = "avago,apds9300"; reg = <0x39>; interrupt-parent = <&gpio2>; - interrupts = <29 8>; + interrupts = <29 IRQ_TYPE_LEVEL_LOW>; }; }; ... diff --git a/Documentation/devicetree/bindings/iio/light/avago,apds9960.yaml b/Documentation/devicetree/bindings/iio/light/avago,apds9960.yaml deleted file mode 100644 index f06e0fda5629..000000000000 --- a/Documentation/devicetree/bindings/iio/light/avago,apds9960.yaml +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/iio/light/avago,apds9960.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Avago APDS9960 gesture/RGB/ALS/proximity sensor - -maintainers: - - Matt Ranostay - -description: | - Datasheet at https://www.avagotech.com/docs/AV02-4191EN - -properties: - compatible: - const: avago,apds9960 - - reg: - maxItems: 1 - - interrupts: - maxItems: 1 - -additionalProperties: false - -required: - - compatible - - reg - -examples: - - | - i2c { - #address-cells = <1>; - #size-cells = <0>; - - light-sensor@39 { - compatible = "avago,apds9960"; - reg = <0x39>; - interrupt-parent = <&gpio1>; - interrupts = <16 1>; - }; - }; -...